projects / platform / core / uifw / dali-toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 3ed4510)
Libraries & RPM renamed to provide DALi 2 52/232152/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 28 Apr 2020 16:20:34 +0000 (17:20 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Tue, 28 Apr 2020 17:26:46 +0000 (18:26 +0100)
Change-Id: Ibb3809dd605fa6718e0c7838a2f8b5da89eb1b12

.gitignore patch | blob | history
automated-tests/src/dali-toolkit-internal/CMakeLists.txt patch | blob | history
automated-tests/src/dali-toolkit-styling/CMakeLists.txt patch | blob | history
automated-tests/src/dali-toolkit-third-party/CMakeLists.txt patch | blob | history
automated-tests/src/dali-toolkit/CMakeLists.txt patch | blob | history
build/tizen/CMakeLists.txt patch | blob | history
build/tizen/dali2-toolkit.pc.in [moved from build/tizen/dali-toolkit.pc.in with 81% similarity] patch | blob | history
packaging/dali-toolkit.spec patch | blob | history

diff --git a/.gitignore b/.gitignore
index c4cfd6d..1f19351 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ cmake_install.cmake
 dali.node
 dali.doxy
 install_manifest.txt
 dali.node
 dali.doxy
 install_manifest.txt
-libdali-toolkit.so*
+libdali2-toolkit.so*
 *~
 *.o
 *.o.d
 *~
 *.o
 *.o.d
diff --git a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
index 98172fb..e0b5869 100755 (executable)
--- a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
@@ -76,9 +76,9 @@ LIST(APPEND TC_SOURCES
 
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
 
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-    dali-core
-    dali-adaptor
-    dali-toolkit
+    dali2-core
+    dali2-adaptor
+    dali2-toolkit
 )
 
 ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror -DDEBUG_ENABLED )
 )
 
 ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror -DDEBUG_ENABLED )
diff --git a/automated-tests/src/dali-toolkit-styling/CMakeLists.txt b/automated-tests/src/dali-toolkit-styling/CMakeLists.txt
index 32b7233..4148b92 100644 (file)
--- a/automated-tests/src/dali-toolkit-styling/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit-styling/CMakeLists.txt
@@ -54,8 +54,8 @@ LIST(APPEND TC_SOURCES
 
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
 
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-  dali-core
-  dali-toolkit
+  dali2-core
+  dali2-toolkit
 )
 
 ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror )
 )
 
 ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror )
diff --git a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt
index 3a9f9b2..3719b4d 100644 (file)
--- a/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit-third-party/CMakeLists.txt
@@ -29,9 +29,9 @@ LIST(APPEND TC_SOURCES
 
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
 
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-    dali-core
-    dali-adaptor
-    dali-toolkit
+    dali2-core
+    dali2-adaptor
+    dali2-toolkit
 )
 
 # Locate GTest
 )
 
 # Locate GTest
diff --git a/automated-tests/src/dali-toolkit/CMakeLists.txt b/automated-tests/src/dali-toolkit/CMakeLists.txt
index de0513d..7e1f18b 100755 (executable)
--- a/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@ -116,9 +116,9 @@ LIST(APPEND TC_SOURCES
 )
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
 )
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-  dali-core
-  dali-adaptor
-  dali-toolkit
+  dali2-core
+  dali2-adaptor
+  dali2-toolkit
 )
 
 ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror -DDEBUG_ENABLED)
 )
 
 ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror -DDEBUG_ENABLED)
diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 25edb06..d02db0b 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables
 
 CMAKE_MINIMUM_REQUIRED(VERSION 2.6)
 CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables
 
-SET(name "dali-toolkit")
+SET(name "dali2-toolkit")
 
 PROJECT(${name})
 SET(PKG_NAME ${name})
 
 PROJECT(${name})
 SET(PKG_NAME ${name})
@@ -14,7 +14,7 @@ if(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 endif()
 
 # API VERSION (Not DALi release version)
 endif()
 
 # API VERSION (Not DALi release version)
-SET(${name}_VERSION_MAJOR 0)
+SET(${name}_VERSION_MAJOR 2)
 SET(${name}_VERSION_MINOR 0)
 SET(${name}_VERSION_PATCH 0)
 SET(${name}_VERSION ${${name}_VERSION_MAJOR}.${${name}_VERSION_MINOR}.${${name}_VERSION_PATCH} )
 SET(${name}_VERSION_MINOR 0)
 SET(${name}_VERSION_PATCH 0)
 SET(${name}_VERSION ${${name}_VERSION_MAJOR}.${${name}_VERSION_MINOR}.${${name}_VERSION_PATCH} )
@@ -36,8 +36,8 @@ OPTION(USE_DEFAULT_RESOURCE_DIR  "Whether to use the default resource folders. O
 IF( ENABLE_PKG_CONFIGURE )
   FIND_PACKAGE( PkgConfig REQUIRED )
 
 IF( ENABLE_PKG_CONFIGURE )
   FIND_PACKAGE( PkgConfig REQUIRED )
 
-  PKG_CHECK_MODULES(DALICORE REQUIRED dali-core)
-  PKG_CHECK_MODULES(DALIADAPTOR REQUIRED dali-adaptor)
+  PKG_CHECK_MODULES(DALICORE REQUIRED dali2-core)
+  PKG_CHECK_MODULES(DALIADAPTOR REQUIRED dali2-adaptor)
 ENDIF()
 
 IF( INSTALL_DOXYGEN_DOC )
 ENDIF()
 
 IF( INSTALL_DOXYGEN_DOC )
@@ -46,8 +46,8 @@ ENDIF()
 
 IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
   FIND_PACKAGE( dali-windows-dependencies REQUIRED)
 
 IF( WIN32 ) # WIN32 includes x64 as well according to the cmake doc.
   FIND_PACKAGE( dali-windows-dependencies REQUIRED)
-  FIND_PACKAGE( dali-core REQUIRED)
-  FIND_PACKAGE( dali-adaptor REQUIRED)
+  FIND_PACKAGE( dali2-core REQUIRED)
+  FIND_PACKAGE( dali2-adaptor REQUIRED)
 ENDIF()
 
 SET( VCPKG_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
 ENDIF()
 
 SET( VCPKG_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
@@ -198,7 +198,7 @@ IF( ENABLE_PKG_CONFIGURE )
   # Requires the following variables to be setup:
   # @PREFIX@ @EXEC_PREFIX@ @DALI_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@
   SET( DEV_INCLUDE_PATH ${INCLUDE_DIR} )
   # Requires the following variables to be setup:
   # @PREFIX@ @EXEC_PREFIX@ @DALI_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@
   SET( DEV_INCLUDE_PATH ${INCLUDE_DIR} )
-  SET( CORE_PKG_CFG_FILE dali-toolkit.pc )
+  SET( CORE_PKG_CFG_FILE dali2-toolkit.pc )
   CONFIGURE_FILE( ${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY )
 ENDIF()
 
   CONFIGURE_FILE( ${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY )
 ENDIF()
 
@@ -263,7 +263,7 @@ ENDIF()
 IF( WIN32 )
   SET( DALICORE_LDFLAGS
         "${DALICORE_LDFLAGS}"
 IF( WIN32 )
   SET( DALICORE_LDFLAGS
         "${DALICORE_LDFLAGS}"
-        dali-core::dali-core )
+        dali2-core::dali2-core )
 
   FIND_PACKAGE( pthreads REQUIRED )
   FIND_PACKAGE( curl REQUIRED )
 
   FIND_PACKAGE( pthreads REQUIRED )
   FIND_PACKAGE( curl REQUIRED )
@@ -285,7 +285,7 @@ IF( WIN32 )
 
   SET( DALIADAPTOR_LDFLAGS
        "${DALIADAPTOR_LDFLAGS}"
 
   SET( DALIADAPTOR_LDFLAGS
        "${DALIADAPTOR_LDFLAGS}"
-       dali-adaptor::dali-adaptor )
+       dali2-adaptor::dali2-adaptor )
 ENDIF()
 
 
 ENDIF()
 
 
diff --git a/build/tizen/dali-toolkit.pc.in b/build/tizen/dali2-toolkit.pc.in
similarity index 81%
rename from build/tizen/dali-toolkit.pc.in
rename to build/tizen/dali2-toolkit.pc.in
index 6e1ed27..70387e5 100644 (file)
--- a/build/tizen/dali-toolkit.pc.in
+++ b/build/tizen/dali2-toolkit.pc.in
@@ -7,6 +7,6 @@ includedir=@DEV_INCLUDE_PATH@
 Name: Dali 3D Engine Toolkit
 Description: Cross platform 3D Engine Toolkit
 Version: ${apiversion}
 Name: Dali 3D Engine Toolkit
 Description: Cross platform 3D Engine Toolkit
 Version: ${apiversion}
-Requires: dali-core
-Libs: -L${libdir} -ldali-toolkit
+Requires: dali2-core
+Libs: -L${libdir} -ldali2-toolkit
 Cflags: -I${includedir}
 Cflags: -I${includedir}
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 7c98adf..0ae5d2a 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -1,4 +1,4 @@
-Name:       dali-toolkit
+Name:       dali2-toolkit
 Summary:    Dali 3D engine Toolkit
 Version:    1.9.9
 Release:    1
 Summary:    Dali 3D engine Toolkit
 Version:    1.9.9
 Release:    1
@@ -12,13 +12,10 @@ Requires(postun): /sbin/ldconfig
 BuildRequires:  cmake
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  cmake
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(dali-core)
-BuildRequires:  pkgconfig(dali-adaptor)
+BuildRequires:  pkgconfig(dali2-core)
+BuildRequires:  pkgconfig(dali2-adaptor)
 BuildRequires:  gettext
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  gettext
 BuildRequires:  pkgconfig(libtzplatform-config)
-Provides: libdali-toolkit-cxx11.so
-Provides: libdali-toolkit-cxx11.so.0
-Provides: libdali-toolkit-cxx11.so.0.0.0
 
 #############################
 # profile setup
 
 #############################
 # profile setup
@@ -98,7 +95,7 @@ Application development package for Dali 3D engine toolkit - headers and package
 
 # PO
 {
 
 # PO
 {
-cd %{_builddir}/dali-toolkit-%{version}/dali-toolkit/po
+cd %{_builddir}/dali2-toolkit-%{version}/dali-toolkit/po
 for language in *.po
 do
   language=${language%.po}
 for language in *.po
 do
   language=${language%.po}
@@ -120,7 +117,7 @@ LDFLAGS+=" --coverage "
 %endif
 
 libtoolize --force
 %endif
 
 libtoolize --force
-cd %{_builddir}/dali-toolkit-%{version}/build/tizen
+cd %{_builddir}/dali2-toolkit-%{version}/build/tizen
 
 DALI_DATA_RW_DIR="%{dali_data_rw_dir}" ; export DALI_DATA_RW_DIR
 DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR
 
 DALI_DATA_RW_DIR="%{dali_data_rw_dir}" ; export DALI_DATA_RW_DIR
 DALI_DATA_RO_DIR="%{dali_data_ro_dir}" ; export DALI_DATA_RO_DIR
@@ -151,7 +148,7 @@ pushd %{_builddir}/%{name}-%{version}/build/tizen
 
 # PO
 {
 
 # PO
 {
-cd %{_builddir}/dali-toolkit-%{version}/dali-toolkit/po
+cd %{_builddir}/dali2-toolkit-%{version}/dali-toolkit/po
 for language in *.mo
 do
   language=${language%.mo}
 for language in *.mo
 do
   language=${language%.mo}
@@ -161,13 +158,6 @@ done
 } &> /dev/null
 popd
 
 } &> /dev/null
 popd
 
-# Create links to ensure linking with cxx11 library is preserved
-pushd  %{buildroot}%{_libdir}
-ln -sf libdali-toolkit.so libdali-toolkit-cxx11.so
-ln -sf libdali-toolkit.so libdali-toolkit-cxx11.so.0
-ln -sf libdali-toolkit.so libdali-toolkit-cxx11.so.0.0.0
-popd
-
 # Remove default style and style images which are for Linux build
 rm -rf %{buildroot}%{dali_toolkit_style_files}/*
 
 # Remove default style and style images which are for Linux build
 rm -rf %{buildroot}%{dali_toolkit_style_files}/*
 
@@ -355,14 +345,13 @@ esac
 %manifest dali-toolkit.manifest
 %endif
 %defattr(-,root,root,-)
 %manifest dali-toolkit.manifest
 %endif
 %defattr(-,root,root,-)
-%{_libdir}/libdali-toolkit-cxx11.so*
-%{_libdir}/libdali-toolkit.so*
+%{_libdir}/libdali2-toolkit.so*
 %license LICENSE
 
 %files devel
 %defattr(-,root,root,-)
 %{dev_include_path}/dali-toolkit/*
 %license LICENSE
 
 %files devel
 %defattr(-,root,root,-)
 %{dev_include_path}/dali-toolkit/*
-%{_libdir}/pkgconfig/dali-toolkit.pc
+%{_libdir}/pkgconfig/dali2-toolkit.pc
 
 %files resources_360x360
 %manifest dali-toolkit-resources.manifest
 
 %files resources_360x360
 %manifest dali-toolkit-resources.manifest
Domain: Graphics System / DALi;