Libraries & RPM renamed to provide DALi 2

Change-Id: I7e21bc9357279865317d59f11ac9f339a4c8aa79

diff --git a/automated-tests/src/dali-adaptor-internal/CMakeLists.txt b/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
index 4b0039e..691d90c 100644 (file)
--- a/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-adaptor-internal/CMakeLists.txt
@@ -35,8 +35,8 @@ LIST(APPEND TC_SOURCES
 )
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-    dali-core
-    dali-adaptor
+    dali2-core
+    dali2-adaptor
     ecore
 )
 

diff --git a/automated-tests/src/dali-adaptor/CMakeLists.txt b/automated-tests/src/dali-adaptor/CMakeLists.txt
index 2fe5be8..5be920e 100644 (file)
--- a/automated-tests/src/dali-adaptor/CMakeLists.txt
+++ b/automated-tests/src/dali-adaptor/CMakeLists.txt
@@ -37,8 +37,8 @@ LIST(APPEND TC_SOURCES
 )
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-    dali-core
-    dali-adaptor
+    dali2-core
+    dali2-adaptor
     ecore
     ecore-x
 )

diff --git a/automated-tests/src/dali-platform-abstraction/CMakeLists.txt b/automated-tests/src/dali-platform-abstraction/CMakeLists.txt
index 07fc820..43f9817 100644 (file)
--- a/automated-tests/src/dali-platform-abstraction/CMakeLists.txt
+++ b/automated-tests/src/dali-platform-abstraction/CMakeLists.txt
@@ -27,8 +27,8 @@ LIST(APPEND TC_SOURCES
 )
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-    dali-core
-    dali-adaptor
+    dali2-core
+    dali2-adaptor
 )
 
 ADD_COMPILE_OPTIONS(-O0 -ggdb --coverage -Wall -Werror)

diff --git a/build/tizen/.gitignore b/build/tizen/.gitignore
index 3f59603..8469aaf 100644 (file)
--- a/build/tizen/.gitignore
+++ b/build/tizen/.gitignore
@@ -5,11 +5,10 @@ CMakeLists_temp.txt
 CMakeCache.txt
 CMakeFiles
 cmake_install.cmake
-dali-adaptor.pc
-dali-adaptor-integration.pc
+dali2-adaptor.pc
+dali2-adaptor-integration.pc
 dali.info
 doc
 install_manifest.txt
-libdali-adaptor.so.0
-libdali-adaptor.so.0.0.0
+libdali2-adaptor.so.*
 linker-test

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 7c56a82..19d7750 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -6,7 +6,7 @@ SET(CMAKE_C_STANDARD 99)
 PROJECT(${name} CXX)
 SET(PKG_NAME ${name})
 
-SET(name "dali-adaptor")
+SET(name "dali2-adaptor")
 
 SET(GCC_COMPILER_VERSION_REQUIRED "6")
 IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
@@ -39,7 +39,7 @@ ENDIF()
 GET_FILENAME_COMPONENT(ROOT_SRC_DIR ${ROOT_SRC_DIR} ABSOLUTE)
 
 # 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})
@@ -48,7 +48,7 @@ SET(DALI_ADAPTOR_VERSION ${${name}_VERSION} )
 
 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( dali2-core REQUIRED)
 ENDIF()
 
 SET( VCPKG_INCLUDE_DIR "${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}/include")
@@ -140,8 +140,8 @@ IF( ENABLE_PKG_CONFIGURE )
   # Requires the following variables to be setup:
   # @PREFIX@ @EXEC_PREFIX@ @DALI_ADAPTOR_VERSION@ @LIB_DIR@ @DEV_INCLUDE_PATH@
   SET( DEV_INCLUDE_PATH ${INCLUDE_DIR} )
-  SET( ADAPTOR_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali-adaptor.pc )
-  SET( ADAPTOR_INTEGRATION_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali-adaptor-integration.pc )
+  SET( ADAPTOR_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali2-adaptor.pc )
+  SET( ADAPTOR_INTEGRATION_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali2-adaptor-integration.pc )
   CONFIGURE_FILE( ${ADAPTOR_PKG_CFG_FILE}.in ${ADAPTOR_PKG_CFG_FILE} @ONLY )
   CONFIGURE_FILE( ${ADAPTOR_INTEGRATION_PKG_CFG_FILE}.in ${ADAPTOR_INTEGRATION_PKG_CFG_FILE} @ONLY )
 ENDIF()

diff --git a/build/tizen/dali-adaptor-integration.pc.in b/build/tizen/dali2-adaptor-integration.pc.in
similarity index 94%
rename from build/tizen/dali-adaptor-integration.pc.in
rename to build/tizen/dali2-adaptor-integration.pc.in
index fbbb3cd..fa312a7 100644 (file)
--- a/build/tizen/dali-adaptor-integration.pc.in
+++ b/build/tizen/dali2-adaptor-integration.pc.in
@@ -7,6 +7,6 @@ includedir=@DEV_INCLUDE_PATH@
 Name: dali-adaptor-integration
 Description: Integration APIs for dali-adaptor
 Version: ${apiversion}
-Requires: dali-adaptor
+Requires: dali2-adaptor
 Libs: -L${libdir}
 Cflags: -I${includedir}/dali/public-api/adaptor-framework/ -I${includedir}/dali/devel-api/adaptor-framework/ -I${includedir}/dali/integration-api/adaptor-framework/

diff --git a/build/tizen/dali-adaptor.pc.in b/build/tizen/dali2-adaptor.pc.in
similarity index 80%
rename from build/tizen/dali-adaptor.pc.in
rename to build/tizen/dali2-adaptor.pc.in
index 8838a0d..6b69d3f 100644 (file)
--- a/build/tizen/dali-adaptor.pc.in
+++ b/build/tizen/dali2-adaptor.pc.in
@@ -7,6 +7,6 @@ includedir=@DEV_INCLUDE_PATH@
 Name: dali-adaptor
 Description: DALi adaptor using ecore
 Version: ${apiversion}
-Requires: dali-core
-Libs: -L${libdir} -ldali-adaptor
+Requires: dali2-core
+Libs: -L${libdir} -ldali2-adaptor
 Cflags: -I${includedir}/dali

diff --git a/build/tizen/deps-check.cmake b/build/tizen/deps-check.cmake
index b496dd9..46669c8 100644 (file)
--- a/build/tizen/deps-check.cmake
+++ b/build/tizen/deps-check.cmake
@@ -101,7 +101,7 @@ CHECK_MODULE_AND_SET( CAPI_APPFW_WIDGET_BASE appcore-widget-base [] )
 CHECK_MODULE_AND_SET( CAPI_APPFW_COMMON capi-appfw-app-common [] )
 CHECK_MODULE_AND_SET( CAPI_APPFW_CONTROL capi-appfw-app-control [] )
 
-CHECK_MODULE_AND_SET( DALICORE dali-core [] )
+CHECK_MODULE_AND_SET( DALICORE dali2-core [] )
 
 IF( ANDROID_PROFILE )
   INCLUDE_DIRECTORIES( ${ANDROID_NDK} )

diff --git a/build/tizen/plugins/CMakeLists.txt b/build/tizen/plugins/CMakeLists.txt
index 5ee1048..6e66b82 100644 (file)
--- a/build/tizen/plugins/CMakeLists.txt
+++ b/build/tizen/plugins/CMakeLists.txt
@@ -2,7 +2,7 @@ IF( (NOT UBUNTU_PROFILE) )
   PKG_CHECK_MODULES(FEEDBACK feedback)
   PKG_CHECK_MODULES(MMFSOUND mm-sound)
 
-  SET(PLUGIN_TARGET dali-feedback-plugin-cxx11 )
+  SET(PLUGIN_TARGET dali2-feedback-plugin )
 
   MESSAGE(STATUS ${ROOT_SRC_DIR}/plugins )
   SET( plugin_src_dir ${ROOT_SRC_DIR}/plugins )

diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec
index 7cf4628..9d91208 100644 (file)
--- a/packaging/dali-adaptor.spec
+++ b/packaging/dali-adaptor.spec
@@ -15,7 +15,7 @@
 %global __provides_exclude_from ^.*\\.(wearable|mobile|tv|ivi|common)$
 %endif
 
-Name:       dali-adaptor
+Name:       dali2-adaptor
 Summary:    The DALi Tizen Adaptor
 Version:    1.9.9
 Release:    1
@@ -27,12 +27,6 @@ Source0:    %{name}-%{version}.tar.gz
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 Requires:       giflib
-Provides: libdali-adaptor-cxx11.so
-Provides: libdali-adaptor-cxx11.so.0
-Provides: libdali-adaptor-cxx11.so.0.0.0
-Provides: libdali-adaptor.so
-Provides: libdali-adaptor.so.0
-Provides: libdali-adaptor.so.0.0.0
 
 %define tizen_platform_config_supported 1
 BuildRequires:  pkgconfig(libtzplatform-config)
@@ -49,8 +43,8 @@ BuildRequires:  pkgconfig(gles20)
 BuildRequires:  pkgconfig(glesv2)
 BuildRequires:  pkgconfig(ttrace)
 
-BuildRequires:  dali-devel
-BuildRequires:  dali-integration-devel
+BuildRequires:  dali2-devel
+BuildRequires:  dali2-integration-devel
 
 BuildRequires:  pkgconfig
 BuildRequires:  gawk
@@ -79,7 +73,7 @@ BuildRequires:  pkgconfig(wayland-client)
 BuildRequires:  wayland-devel
 BuildRequires:  wayland-extension-client-devel
 
-# dali-adaptor uses ecore mainloop
+# We use ecore mainloop
 %if 0%{?tizen_version_major} >= 5
 BuildRequires:  pkgconfig(ecore-wl2)
 BuildRequires:  pkgconfig(wayland-egl-tizen)
@@ -87,10 +81,10 @@ BuildRequires:  pkgconfig(wayland-egl-tizen)
 BuildRequires:  pkgconfig(ecore-wayland)
 %endif
 
-# dali-adaptor needs tbm_surface in tizen 3.0 wayland
+# We need tbm_surface in tizen 3.0 wayland
 BuildRequires:  pkgconfig(libtbm)
 
-# for dali-adaptor
+# for the adaptor
 BuildRequires:  pkgconfig(appcore-ui)
 BuildRequires:  pkgconfig(appcore-widget-base)
 BuildRequires:  pkgconfig(bundle)
@@ -218,11 +212,11 @@ Integration development package for the Adaptor - headers for integrating with a
 ##############################
 # Dali Feedback Plugin
 ##############################
-%package dali-feedback-plugin
+%package dali2-feedback-plugin
 Summary:    Plugin to play haptic and audio feedback for Dali
 Group:      System/Libraries
 Requires:   %{name} = %{version}-%{release}
-%description dali-feedback-plugin
+%description dali2-feedback-plugin
 Feedback plugin to play haptic and audio feedback for Dali
 
 ##############################
@@ -397,7 +391,7 @@ pushd mobile
 %make_install
 %if "%{?profile}" != "mobile"
 pushd  %{buildroot}%{_libdir}
-cp libdali-adaptor.so.*.*.* libdali-adaptor.so.mobile # If we're only building this profile, then there's no need to copy the lib
+cp libdali2-adaptor.so.*.*.* libdali2-adaptor.so.mobile # If we're only building this profile, then there's no need to copy the lib
 popd
 make clean # So that we can gather symbol/size information for only one profile if we're building all profiles
 %endif
@@ -410,7 +404,7 @@ pushd tv
 %make_install
 %if "%{?profile}" != "tv"
 pushd  %{buildroot}%{_libdir}
-cp libdali-adaptor.so.*.*.* libdali-adaptor.so.tv # If we're only building this profile, then there's no need to copy the lib
+cp libdali2-adaptor.so.*.*.* libdali2-adaptor.so.tv # If we're only building this profile, then there's no need to copy the lib
 popd
 make clean # So that we can gather symbol/size information for only one profile if we're building all profiles
 %endif
@@ -423,7 +417,7 @@ pushd wearable
 %make_install
 %if "%{?profile}" != "wearable"
 pushd  %{buildroot}%{_libdir}
-cp libdali-adaptor.so.*.*.* libdali-adaptor.so.wearable # If we're only building this profile, then there's no need to copy the lib
+cp libdali2-adaptor.so.*.*.* libdali2-adaptor.so.wearable # If we're only building this profile, then there's no need to copy the lib
 popd
 make clean # So that we can gather symbol/size information for only one profile if we're building all profiles
 %endif
@@ -436,7 +430,7 @@ pushd ivi
 %make_install
 %if "%{?profile}" != "ivi"
 pushd  %{buildroot}%{_libdir}
-cp libdali-adaptor.so.*.*.* libdali-adaptor.so.ivi # If we're only building this profile, then there's no need to copy the lib
+cp libdali2-adaptor.so.*.*.* libdali2-adaptor.so.ivi # If we're only building this profile, then there's no need to copy the lib
 popd
 make clean # So that we can gather symbol/size information for only one profile if we're building all profiles
 %endif
@@ -451,13 +445,6 @@ pushd common
 popd
 %endif
 
-# Create links to ensure linking with cxx11 library is preserved
-pushd  %{buildroot}%{_libdir}
-ln -sf libdali-adaptor.so libdali-adaptor-cxx11.so
-ln -sf libdali-adaptor.so libdali-adaptor-cxx11.so.0
-ln -sf libdali-adaptor.so libdali-adaptor-cxx11.so.0.0.0
-popd
-
 # Create a symbolic link in integration-api to preserve legacy repo build
 pushd %{buildroot}%{_includedir}/dali/integration-api
 ln -sf adaptor-framework adaptors
@@ -480,7 +467,7 @@ exit 0
 
 %post
 pushd %{_libdir}
-for i in mobile tv wearable ivi; do [[ -f libdali-adaptor.so.$i ]] && ln -sf libdali-adaptor.so.$i libdali-adaptor.so.0.0.0; done
+for i in mobile tv wearable ivi; do [[ -f libdali2-adaptor.so.$i ]] && ln -sf libdali2-adaptor.so.$i libdali2-adaptor.so.2.0.0; done
 popd
 /sbin/ldconfig
 exit 0
@@ -500,7 +487,7 @@ exit 0
 %post profile_mobile
 %if "%{?profile}" != "mobile"
 pushd %{_libdir}
-ln -sf libdali-adaptor.so.mobile libdali-adaptor.so.0.0.0
+ln -sf libdali2-adaptor.so.mobile libdali2-adaptor.so.2.0.0
 popd
 %endif
 /sbin/ldconfig
@@ -518,7 +505,7 @@ exit 0
 %post profile_tv
 %if "%{?profile}" != "tv"
 pushd %{_libdir}
-ln -sf libdali-adaptor.so.tv libdali-adaptor.so.0.0.0
+ln -sf libdali2-adaptor.so.tv libdali2-adaptor.so.2.0.0
 popd
 %endif
 /sbin/ldconfig
@@ -536,7 +523,7 @@ exit 0
 %post profile_wearable
 %if "%{?profile}" != "wearable"
 pushd %{_libdir}
-ln -sf libdali-adaptor.so.wearable libdali-adaptor.so.0.0.0
+ln -sf libdali2-adaptor.so.wearable libdali2-adaptor.so.2.0.0
 popd
 %endif
 /sbin/ldconfig
@@ -554,7 +541,7 @@ exit 0
 %post profile_ivi
 %if "%{?profile}" != "ivi"
 pushd %{_libdir}
-ln -sf libdali-adaptor.so.ivi libdali-adaptor.so.0.0.0
+ln -sf libdali2-adaptor.so.ivi libdali2-adaptor.so.0.0.0
 popd
 %endif
 /sbin/ldconfig
@@ -588,19 +575,16 @@ exit 0
 %{_bindir}/*
 %license LICENSE
 %defattr(-,root,root,-)
-%{_libdir}/libdali-adaptor-cxx11.so
-%{_libdir}/libdali-adaptor-cxx11.so.0
-%{_libdir}/libdali-adaptor-cxx11.so.0.0.0
-%{_libdir}/libdali-adaptor.so
-%{_libdir}/libdali-adaptor.so.0
-%{_libdir}/libdali-adaptor.so.0.0.0
+%{_libdir}/libdali2-adaptor.so
+%{_libdir}/libdali2-adaptor.so.2
+%{_libdir}/libdali2-adaptor.so.2.0.0
 
 #################################################
 
-%files dali-feedback-plugin
+%files dali2-feedback-plugin
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
-%{_libdir}/libdali-feedback-plugin-cxx11.so*
+%{_libdir}/libdali2-feedback-plugin.so*
 %{dali_plugin_sound_files}/*
 
 #################################################
@@ -618,7 +602,7 @@ exit 0
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
 %if "%{?profile}" != "mobile"
-%{_libdir}/libdali-adaptor.so.mobile
+%{_libdir}/libdali2-adaptor.so.mobile
 %endif
 %endif
 
@@ -628,7 +612,7 @@ exit 0
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
 %if "%{?profile}" != "tv"
-%{_libdir}/libdali-adaptor.so.tv
+%{_libdir}/libdali2-adaptor.so.tv
 %endif
 %endif
 
@@ -638,7 +622,7 @@ exit 0
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
 %if "%{?profile}" != "wearable"
-%{_libdir}/libdali-adaptor.so.wearable
+%{_libdir}/libdali2-adaptor.so.wearable
 %endif
 %endif
 
@@ -648,7 +632,7 @@ exit 0
 %manifest dali-adaptor.manifest
 %defattr(-,root,root,-)
 %if "%{?profile}" != "ivi"
-%{_libdir}/libdali-adaptor.so.ivi
+%{_libdir}/libdali2-adaptor.so.ivi
 %endif
 %endif
 
@@ -658,10 +642,10 @@ exit 0
 %{_includedir}/dali/public-api/*
 %{_includedir}/dali/devel-api/*
 %{_includedir}/dali/doc/*
-%{_libdir}/pkgconfig/dali-adaptor.pc
+%{_libdir}/pkgconfig/dali2-adaptor.pc
 
 %files integration-devel
 %defattr(-,root,root,-)
 %{_includedir}/dali/integration-api/adaptor-framework/*
 %{_includedir}/dali/integration-api/adaptors
-%{_libdir}/pkgconfig/dali-adaptor-integration.pc
+%{_libdir}/pkgconfig/dali2-adaptor-integration.pc