Modified folder structure of widget viewer dali and fixed build issue

Change-Id: Ia6257f12c0a508059569822bc894b61d95067bb1

diff --git a/CMakeLists.txt b/build/tizen/CMakeLists.txt
similarity index 77%
rename from CMakeLists.txt
rename to build/tizen/CMakeLists.txt
index dcaa1d4..a27a930 100644 (file)
--- a/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -11,12 +11,12 @@ SET(VERSION "${FULLVER}")
 
 SET(IMAGE_DIR "${TZ_SYS_SHARE}/${PROJECT_NAME}/images")
 SET(LOCALE_DIR "${TZ_SYS_SHARE}/${PROJECT_NAME}/locale")
+SET(ROOT_SRC_DIR ${CMAKE_SOURCE_DIR}/../..)
 
 INCLUDE(FindPkgConfig)
 pkg_check_modules(viewer_dali REQUIRED
        dlog
        widget_service
-       pkgmgr-info
        capi-system-info
        dali-core
        dali-adaptor
@@ -29,10 +29,10 @@ pkg_check_modules(viewer_dali REQUIRED
 )
 
 SET(BUILD_SOURCE
-       public_api/widget_view/widget_view.cpp
-       public_api/widget_view_manager/widget_view_manager.cpp
-       internal/widget_view/widget_view_impl.cpp
-       internal/widget_view_manager/widget_view_manager_impl.cpp
+       ${ROOT_SRC_DIR}/widget_viewer_dali/public_api/widget_view/widget_view.cpp
+       ${ROOT_SRC_DIR}/widget_viewer_dali/public_api/widget_view_manager/widget_view_manager.cpp
+       ${ROOT_SRC_DIR}/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
+       ${ROOT_SRC_DIR}/widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.cpp
 )
 
 FOREACH(flag ${viewer_dali_CFLAGS})
@@ -45,14 +45,14 @@ SET(CMAKE_CXX_FLAGS "${CMAKE_C_FLAGS}")
 SET(CMAKE_C_FLAGS_DEBUG "-O0 -g")
 SET(CMAKE_C_FLAGS_RELEASE "-O2")
 
-SET(LOCAL_PUBLIC_HEADER_DIR ${CMAKE_CURRENT_SOURCE_DIR}/public_api)
+SET(LOCAL_PUBLIC_HEADER_DIR ${ROOT_SRC_DIR}/widget_viewer_dali/public_api)
 SET(IMAGE_DIR "${TZ_SYS_SHARE}/${PROJECT_NAME}/images")
 ADD_DEFINITIONS("-DWIDGET_VIEW_RESOURCE_DEFAULT_IMG=\"${IMAGE_DIR}/unknown.png\"")
 
 ADD_DEFINITIONS("-DWIDGET_VIEWER_DALI_LOCALE=\"${LOCALE_DIR}\"")
 ADD_DEFINITIONS("-DPKGNAME=\"${PROJECT_NAME}\"")
 
-INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${ROOT_SRC_DIR})
 
 ADD_LIBRARY(${PROJECT_NAME} SHARED ${BUILD_SOURCE})
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES SOVERSION ${VERSION_MAJOR})
@@ -65,7 +65,7 @@ SET_DIRECTORY_PROPERTIES(PROPERTIES ADDITIONAL_MAKE_CLEAN_FILES "${PROJECT_NAME}
 
 INSTALL(TARGETS ${PROJECT_NAME} DESTINATION ${LIB_INSTALL_DIR})
 INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${PROJECT_NAME}.pc DESTINATION ${LIB_INSTALL_DIR}/pkgconfig)
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/public_api/${PROJECT_NAME}.h DESTINATION include/${PROJECT_NAME})
+INSTALL(FILES ${ROOT_SRC_DIR}/widget_viewer_dali/public_api/${PROJECT_NAME}.h DESTINATION include/${PROJECT_NAME})
 
 FILE(GLOB LOCAL_WIDGE_VIEW_HEADER_LIST RELATIVE "${LOCAL_PUBLIC_HEADER_DIR}" "${LOCAL_PUBLIC_HEADER_DIR}/widget_view/*.h")
 FOREACH(flag ${LOCAL_WIDGE_VIEW_HEADER_LIST})
@@ -77,6 +77,6 @@ FOREACH(flag ${LOCAL_WIDGE_VIEW_MANAGER_HEADER_LIST})
         INSTALL(FILES ${LOCAL_PUBLIC_HEADER_DIR}/${flag} DESTINATION include/${PROJECT_NAME}/public_api/widget_view_manager)
 ENDFOREACH(flag)
 
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/images/unknown.png DESTINATION ${IMAGE_DIR})
+INSTALL(FILES ${ROOT_SRC_DIR}/widget_viewer_dali/images/unknown.png DESTINATION ${IMAGE_DIR})
 
 ADD_SUBDIRECTORY(po)

diff --git a/po/CMakeLists.txt b/build/tizen/po/CMakeLists.txt
similarity index 95%
rename from po/CMakeLists.txt
rename to build/tizen/po/CMakeLists.txt
index 3e1f684..53bdc1b 100644 (file)
--- a/po/CMakeLists.txt
+++ b/build/tizen/po/CMakeLists.txt
@@ -59,7 +59,7 @@ SET(POFILES
 
 SET(MSGFMT "/usr/bin/msgfmt")
 FOREACH(pofile ${POFILES})
-       SET(pofile ${CMAKE_CURRENT_SOURCE_DIR}/${pofile})
+       SET(pofile ${ROOT_SRC_DIR}/widget_viewer_dali/po/${pofile})
        MESSAGE(STATUS "  ${pofile}")
        GET_FILENAME_COMPONENT(absPofile ${pofile} ABSOLUTE)
        GET_FILENAME_COMPONENT(lang ${absPofile} NAME_WE)

diff --git a/widget_viewer_dali.pc.in b/build/tizen/widget_viewer_dali.pc.in
similarity index 100%
rename from widget_viewer_dali.pc.in
rename to build/tizen/widget_viewer_dali.pc.in

diff --git a/libwidget_viewer_dali.manifest b/libwidget_viewer_dali.manifest
new file mode 100644 (file)
index 0000000..a76fdba
--- /dev/null
+++ b/libwidget_viewer_dali.manifest
@@ -0,0 +1,5 @@
+<manifest>
+       <request>
+               <domain name="_" />
+       </request>
+</manifest>

diff --git a/packaging/widget-viewer-dali.spec b/packaging/widget-viewer-dali.spec
new file mode 100644 (file)
index 0000000..ebfc6f5
--- /dev/null
+++ b/packaging/widget-viewer-dali.spec
@@ -0,0 +1,111 @@
+%bcond_with wayland
+
+Name:    libwidget_viewer_dali
+Summary: Library for developing the application
+Version: 1.4.11
+Release: 1
+Group:   System/Libraries
+License: Flora-1.1
+Source0: %{name}-%{version}.tar.gz
+BuildRequires: cmake
+BuildRequires: gettext-tools
+BuildRequires: pkgconfig
+BuildRequires: pkgconfig(dlog)
+BuildRequires: pkgconfig(widget_service)
+BuildRequires: pkgconfig(capi-appfw-application)
+BuildRequires: pkgconfig(capi-system-info)
+BuildRequires: pkgconfig(libtbm)
+BuildRequires: pkgconfig(dali-core)
+BuildRequires: pkgconfig(dali-adaptor)
+BuildRequires: pkgconfig(dali-toolkit)
+BuildRequires: pkgconfig(cynara-client)
+BuildRequires: pkgconfig(ecore-wayland)
+BuildRequires: pkgconfig(wayland-tbm-client)
+BuildRequires: pkgconfig(screen_connector_watcher)
+
+%description
+API for creating a new instance of the widget and managing its life-cycle.
+
+##############################
+# devel
+##############################
+%package devel
+Summary: Development Library for widget Viewer Dali Application
+Group: Development/Building
+Requires: %{name} = %{version}-%{release}
+
+%description devel
+Header and package configuration files for the widget viewer development
+
+##############################
+# Preparation
+##############################
+%prep
+%setup -q
+
+##############################
+# Build
+##############################
+%build
+PREFIX="/usr"
+CXXFLAGS+=" -Wall -g -O2"
+LDFLAGS+=" -Wl,--rpath=$PREFIX/lib -Wl,--as-needed"
+
+%ifarch %{arm}
+CXXFLAGS+=" -D_ARCH_ARM_"
+%endif
+
+cd %{_builddir}/%{name}-%{version}/build/tizen
+
+MAJORVER=`echo %{version} | awk 'BEGIN {FS="."}{print $1}'`
+%cmake -DWIDGET_ENABLED=On \
+          -DTZ_SYS_SHARE=/usr/share \
+       -DFULLVER=%{version} \
+       -DMAJORVER=${MAJORVER} \
+       .
+
+make %{?jobs:-j%jobs}
+
+##############################
+# Installation
+##############################
+
+%install
+rm -rf %{buildroot}
+pushd build/tizen
+%make_install
+
+##############################
+# Post Install
+##############################
+
+%post
+/sbin/ldconfig
+exit 0
+
+##############################
+# Post Uninstall
+##############################
+
+%postun
+/sbin/ldconfig
+exit 0
+
+##############################
+# Files in Binary Packages
+##############################
+
+%files
+%manifest %{name}.manifest
+%defattr(-,root,root,-)
+%{_libdir}/%{name}.so*
+%license LICENSE
+/usr/share/widget_viewer_dali/images/*.png
+/usr/share/widget_viewer_dali/locale/*/LC_MESSAGES/*
+
+%files devel
+%defattr(-,root,root,-)
+%{_includedir}/widget_viewer_dali/*
+%{_libdir}/pkgconfig/widget_viewer_dali.pc
+
+# End of a file

diff --git a/images/unknown.png b/widget_viewer_dali/images/unknown.png
similarity index 100%
rename from images/unknown.png
rename to widget_viewer_dali/images/unknown.png

diff --git a/internal/widget_view/widget_view_impl.cpp b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
similarity index 99%
rename from internal/widget_view/widget_view_impl.cpp
rename to widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
index f1bfea4..422fb16 100644 (file)
--- a/internal/widget_view/widget_view_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.cpp
@@ -16,7 +16,7 @@
  */
 
 // CLASS HEADER
-#include <internal/widget_view/widget_view_impl.h>
+#include <widget_viewer_dali/internal/widget_view/widget_view_impl.h>
 
 // INTERNAL INCLUDES
 

diff --git a/internal/widget_view/widget_view_impl.h b/widget_viewer_dali/internal/widget_view/widget_view_impl.h
similarity index 99%
rename from internal/widget_view/widget_view_impl.h
rename to widget_viewer_dali/internal/widget_view/widget_view_impl.h
index 8d66248..8aedda1 100644 (file)
--- a/internal/widget_view/widget_view_impl.h
+++ b/widget_viewer_dali/internal/widget_view/widget_view_impl.h
@@ -19,7 +19,7 @@
  */
 
 // INTERNAL INCLUDES
-#include <public_api/widget_view/widget_view.h>
+#include <widget_viewer_dali/public_api/widget_view/widget_view.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/adaptor-framework/native-image-source.h>

diff --git a/internal/widget_view_manager/widget_view_manager_impl.cpp b/widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.cpp
similarity index 97%
rename from internal/widget_view_manager/widget_view_manager_impl.cpp
rename to widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.cpp
index d03a6e1..930fd9e 100644 (file)
--- a/internal/widget_view_manager/widget_view_manager_impl.cpp
+++ b/widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.cpp
@@ -16,10 +16,10 @@
  */
 
 // CLASS HEADER
-#include <internal/widget_view_manager/widget_view_manager_impl.h>
+#include <widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.h>
 
 // INTERNAL INCLUDES
-#include <internal/widget_view/widget_view_impl.h>
+#include <widget_viewer_dali/internal/widget_view/widget_view_impl.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/type-registry.h>

diff --git a/internal/widget_view_manager/widget_view_manager_impl.h b/widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.h
similarity index 95%
rename from internal/widget_view_manager/widget_view_manager_impl.h
rename to widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.h
index 24f79df..94a3211 100644 (file)
--- a/internal/widget_view_manager/widget_view_manager_impl.h
+++ b/widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.h
@@ -19,8 +19,8 @@
  */
 
 // INTERNAL INCLUDES
-#include <public_api/widget_view/widget_view.h>
-#include <public_api/widget_view_manager/widget_view_manager.h>
+#include <widget_viewer_dali/public_api/widget_view/widget_view.h>
+#include <widget_viewer_dali/public_api/widget_view_manager/widget_view_manager.h>
 
 // EXTERNAL INCLUDES
 #include <dali/public-api/object/base-object.h>

diff --git a/po/ar.po b/widget_viewer_dali/po/ar.po
similarity index 100%
rename from po/ar.po
rename to widget_viewer_dali/po/ar.po

diff --git a/po/as.po b/widget_viewer_dali/po/as.po
similarity index 100%
rename from po/as.po
rename to widget_viewer_dali/po/as.po

diff --git a/po/az.po b/widget_viewer_dali/po/az.po
similarity index 100%
rename from po/az.po
rename to widget_viewer_dali/po/az.po

diff --git a/po/be_BY.po b/widget_viewer_dali/po/be_BY.po
similarity index 100%
rename from po/be_BY.po
rename to widget_viewer_dali/po/be_BY.po

diff --git a/po/bn.po b/widget_viewer_dali/po/bn.po
similarity index 100%
rename from po/bn.po
rename to widget_viewer_dali/po/bn.po

diff --git a/po/bn_BD.po b/widget_viewer_dali/po/bn_BD.po
similarity index 100%
rename from po/bn_BD.po
rename to widget_viewer_dali/po/bn_BD.po

diff --git a/po/de.po b/widget_viewer_dali/po/de.po
similarity index 100%
rename from po/de.po
rename to widget_viewer_dali/po/de.po

diff --git a/po/en.po b/widget_viewer_dali/po/en.po
similarity index 100%
rename from po/en.po
rename to widget_viewer_dali/po/en.po

diff --git a/po/en_PH.po b/widget_viewer_dali/po/en_PH.po
similarity index 100%
rename from po/en_PH.po
rename to widget_viewer_dali/po/en_PH.po

diff --git a/po/en_US.po b/widget_viewer_dali/po/en_US.po
similarity index 100%
rename from po/en_US.po
rename to widget_viewer_dali/po/en_US.po

diff --git a/po/es_ES.po b/widget_viewer_dali/po/es_ES.po
similarity index 100%
rename from po/es_ES.po
rename to widget_viewer_dali/po/es_ES.po

diff --git a/po/es_US.po b/widget_viewer_dali/po/es_US.po
similarity index 100%
rename from po/es_US.po
rename to widget_viewer_dali/po/es_US.po

diff --git a/po/fa.po b/widget_viewer_dali/po/fa.po
similarity index 100%
rename from po/fa.po
rename to widget_viewer_dali/po/fa.po

diff --git a/po/fr.po b/widget_viewer_dali/po/fr.po
similarity index 100%
rename from po/fr.po
rename to widget_viewer_dali/po/fr.po

diff --git a/po/gu.po b/widget_viewer_dali/po/gu.po
similarity index 100%
rename from po/gu.po
rename to widget_viewer_dali/po/gu.po

diff --git a/po/hi.po b/widget_viewer_dali/po/hi.po
similarity index 100%
rename from po/hi.po
rename to widget_viewer_dali/po/hi.po

diff --git a/po/hy.po b/widget_viewer_dali/po/hy.po
similarity index 100%
rename from po/hy.po
rename to widget_viewer_dali/po/hy.po

diff --git a/po/id.po b/widget_viewer_dali/po/id.po
similarity index 100%
rename from po/id.po
rename to widget_viewer_dali/po/id.po

diff --git a/po/it_IT.po b/widget_viewer_dali/po/it_IT.po
similarity index 100%
rename from po/it_IT.po
rename to widget_viewer_dali/po/it_IT.po

diff --git a/po/jv.po b/widget_viewer_dali/po/jv.po
similarity index 100%
rename from po/jv.po
rename to widget_viewer_dali/po/jv.po

diff --git a/po/ka.po b/widget_viewer_dali/po/ka.po
similarity index 100%
rename from po/ka.po
rename to widget_viewer_dali/po/ka.po

diff --git a/po/kk.po b/widget_viewer_dali/po/kk.po
similarity index 100%
rename from po/kk.po
rename to widget_viewer_dali/po/kk.po

diff --git a/po/km.po b/widget_viewer_dali/po/km.po
similarity index 100%
rename from po/km.po
rename to widget_viewer_dali/po/km.po

diff --git a/po/kn.po b/widget_viewer_dali/po/kn.po
similarity index 100%
rename from po/kn.po
rename to widget_viewer_dali/po/kn.po

diff --git a/po/ko_KR.po b/widget_viewer_dali/po/ko_KR.po
similarity index 100%
rename from po/ko_KR.po
rename to widget_viewer_dali/po/ko_KR.po

diff --git a/po/ky_KG.po b/widget_viewer_dali/po/ky_KG.po
similarity index 100%
rename from po/ky_KG.po
rename to widget_viewer_dali/po/ky_KG.po

diff --git a/po/lo.po b/widget_viewer_dali/po/lo.po
similarity index 100%
rename from po/lo.po
rename to widget_viewer_dali/po/lo.po

diff --git a/po/ml.po b/widget_viewer_dali/po/ml.po
similarity index 100%
rename from po/ml.po
rename to widget_viewer_dali/po/ml.po

diff --git a/po/mn_MN.po b/widget_viewer_dali/po/mn_MN.po
similarity index 100%
rename from po/mn_MN.po
rename to widget_viewer_dali/po/mn_MN.po

diff --git a/po/mr.po b/widget_viewer_dali/po/mr.po
similarity index 100%
rename from po/mr.po
rename to widget_viewer_dali/po/mr.po

diff --git a/po/ms.po b/widget_viewer_dali/po/ms.po
similarity index 100%
rename from po/ms.po
rename to widget_viewer_dali/po/ms.po

diff --git a/po/my_ZG.po b/widget_viewer_dali/po/my_ZG.po
similarity index 100%
rename from po/my_ZG.po
rename to widget_viewer_dali/po/my_ZG.po

diff --git a/po/ne.po b/widget_viewer_dali/po/ne.po
similarity index 100%
rename from po/ne.po
rename to widget_viewer_dali/po/ne.po

diff --git a/po/or.po b/widget_viewer_dali/po/or.po
similarity index 100%
rename from po/or.po
rename to widget_viewer_dali/po/or.po

diff --git a/po/pa.po b/widget_viewer_dali/po/pa.po
similarity index 100%
rename from po/pa.po
rename to widget_viewer_dali/po/pa.po

diff --git a/po/pt_BR.po b/widget_viewer_dali/po/pt_BR.po
similarity index 100%
rename from po/pt_BR.po
rename to widget_viewer_dali/po/pt_BR.po

diff --git a/po/pt_PT.po b/widget_viewer_dali/po/pt_PT.po
similarity index 100%
rename from po/pt_PT.po
rename to widget_viewer_dali/po/pt_PT.po

diff --git a/po/ru_RU.po b/widget_viewer_dali/po/ru_RU.po
similarity index 100%
rename from po/ru_RU.po
rename to widget_viewer_dali/po/ru_RU.po

diff --git a/po/si.po b/widget_viewer_dali/po/si.po
similarity index 100%
rename from po/si.po
rename to widget_viewer_dali/po/si.po

diff --git a/po/su_ID.po b/widget_viewer_dali/po/su_ID.po
similarity index 100%
rename from po/su_ID.po
rename to widget_viewer_dali/po/su_ID.po

diff --git a/po/ta.po b/widget_viewer_dali/po/ta.po
similarity index 100%
rename from po/ta.po
rename to widget_viewer_dali/po/ta.po

diff --git a/po/te.po b/widget_viewer_dali/po/te.po
similarity index 100%
rename from po/te.po
rename to widget_viewer_dali/po/te.po

diff --git a/po/tg_TJ.po b/widget_viewer_dali/po/tg_TJ.po
similarity index 100%
rename from po/tg_TJ.po
rename to widget_viewer_dali/po/tg_TJ.po

diff --git a/po/th.po b/widget_viewer_dali/po/th.po
similarity index 100%
rename from po/th.po
rename to widget_viewer_dali/po/th.po

diff --git a/po/tk_TM.po b/widget_viewer_dali/po/tk_TM.po
similarity index 100%
rename from po/tk_TM.po
rename to widget_viewer_dali/po/tk_TM.po

diff --git a/po/tl.po b/widget_viewer_dali/po/tl.po
similarity index 100%
rename from po/tl.po
rename to widget_viewer_dali/po/tl.po

diff --git a/po/tr_TR.po b/widget_viewer_dali/po/tr_TR.po
similarity index 100%
rename from po/tr_TR.po
rename to widget_viewer_dali/po/tr_TR.po

diff --git a/po/uk.po b/widget_viewer_dali/po/uk.po
similarity index 100%
rename from po/uk.po
rename to widget_viewer_dali/po/uk.po

diff --git a/po/ur.po b/widget_viewer_dali/po/ur.po
similarity index 100%
rename from po/ur.po
rename to widget_viewer_dali/po/ur.po

diff --git a/po/uz.po b/widget_viewer_dali/po/uz.po
similarity index 100%
rename from po/uz.po
rename to widget_viewer_dali/po/uz.po

diff --git a/po/vi.po b/widget_viewer_dali/po/vi.po
similarity index 100%
rename from po/vi.po
rename to widget_viewer_dali/po/vi.po

diff --git a/po/xh.po b/widget_viewer_dali/po/xh.po
similarity index 100%
rename from po/xh.po
rename to widget_viewer_dali/po/xh.po

diff --git a/po/zh_CN.po b/widget_viewer_dali/po/zh_CN.po
similarity index 100%
rename from po/zh_CN.po
rename to widget_viewer_dali/po/zh_CN.po

diff --git a/po/zu.po b/widget_viewer_dali/po/zu.po
similarity index 100%
rename from po/zu.po
rename to widget_viewer_dali/po/zu.po

diff --git a/public_api/widget_view/widget_view.cpp b/widget_viewer_dali/public_api/widget_view/widget_view.cpp
similarity index 95%
rename from public_api/widget_view/widget_view.cpp
rename to widget_viewer_dali/public_api/widget_view/widget_view.cpp
index ed91fe2..064b7cd 100644 (file)
--- a/public_api/widget_view/widget_view.cpp
+++ b/widget_viewer_dali/public_api/widget_view/widget_view.cpp
@@ -16,10 +16,10 @@
  */
 
 // CLASS HEADER
-#include <public_api/widget_view/widget_view.h>
+#include <widget_viewer_dali/public_api/widget_view/widget_view.h>
 
 // INTERNAL INCLUDES
-#include <internal/widget_view/widget_view_impl.h>
+#include <widget_viewer_dali/internal/widget_view/widget_view_impl.h>
 
 namespace Dali
 {

diff --git a/public_api/widget_view/widget_view.h b/widget_viewer_dali/public_api/widget_view/widget_view.h
similarity index 100%
rename from public_api/widget_view/widget_view.h
rename to widget_viewer_dali/public_api/widget_view/widget_view.h

diff --git a/public_api/widget_view_manager/widget_view_manager.cpp b/widget_viewer_dali/public_api/widget_view_manager/widget_view_manager.cpp
similarity index 91%
rename from public_api/widget_view_manager/widget_view_manager.cpp
rename to widget_viewer_dali/public_api/widget_view_manager/widget_view_manager.cpp
index a3aaa57..26ed61e 100644 (file)
--- a/public_api/widget_view_manager/widget_view_manager.cpp
+++ b/widget_viewer_dali/public_api/widget_view_manager/widget_view_manager.cpp
@@ -16,12 +16,12 @@
  */
 
 // CLASS HEADER
-#include <public_api/widget_view_manager/widget_view_manager.h>
+#include <widget_viewer_dali/public_api/widget_view_manager/widget_view_manager.h>
 
 // EXTERNAL INCLUDES
 
 // INTERNAL INCLUDES
-#include <internal/widget_view_manager/widget_view_manager_impl.h>
+#include <widget_viewer_dali/internal/widget_view_manager/widget_view_manager_impl.h>
 
 namespace Dali
 {

diff --git a/public_api/widget_view_manager/widget_view_manager.h b/widget_viewer_dali/public_api/widget_view_manager/widget_view_manager.h
similarity index 100%
rename from public_api/widget_view_manager/widget_view_manager.h
rename to widget_viewer_dali/public_api/widget_view_manager/widget_view_manager.h

diff --git a/public_api/widget_viewer_dali.h b/widget_viewer_dali/public_api/widget_viewer_dali.h
similarity index 100%
rename from public_api/widget_viewer_dali.h
rename to widget_viewer_dali/public_api/widget_viewer_dali.h