Merge "Libraries & RPM renamed to provide DALi 2" into devel/master

diff --git a/.gitignore b/.gitignore
index 37cc90f..559051e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -10,7 +10,7 @@ CMakeFiles/
 cmake_install.cmake
 dali.info
 install_manifest.txt
-libdali-core.so*
+libdali2-core.so*
 *~
 *.pc
 *.o

diff --git a/automated-tests/src/dali-internal/CMakeLists.txt b/automated-tests/src/dali-internal/CMakeLists.txt
index c23ab7d..f39572a 100644 (file)
--- a/automated-tests/src/dali-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-internal/CMakeLists.txt
@@ -30,7 +30,7 @@ LIST(APPEND TC_SOURCES
 )
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-     dali-core
+     dali2-core
 )
 
 ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror )

diff --git a/automated-tests/src/dali/CMakeLists.txt b/automated-tests/src/dali/CMakeLists.txt
index 8eabe80..71172a7 100644 (file)
--- a/automated-tests/src/dali/CMakeLists.txt
+++ b/automated-tests/src/dali/CMakeLists.txt
@@ -129,7 +129,7 @@ LIST(APPEND TC_SOURCES
 )
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
-     dali-core
+     dali2-core
 )
 
 ADD_COMPILE_OPTIONS( -O0 -ggdb --coverage -Wall -Werror )

diff --git a/build/tizen/CMakeLists.txt b/build/tizen/CMakeLists.txt
index 645f444..b8b0987 100644 (file)
--- a/build/tizen/CMakeLists.txt
+++ b/build/tizen/CMakeLists.txt
@@ -1,7 +1,7 @@
 CMAKE_MINIMUM_REQUIRED(VERSION 3.1)
 CMAKE_POLICY(SET CMP0012 NEW) # Prevent dereferencing of OFF/ON as variables
 
-SET(name "dali-core")
+SET(name "dali2-core")
 
 PROJECT(${name})
 SET(PKG_NAME ${name})
@@ -14,7 +14,7 @@ IF(CMAKE_CXX_COMPILER_ID STREQUAL "GNU")
 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})
@@ -126,7 +126,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} )
-  SET( CORE_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali-core.pc )
+  SET( CORE_PKG_CFG_FILE ${CMAKE_CURRENT_SOURCE_DIR}/dali2-core.pc )
   CONFIGURE_FILE( ${CORE_PKG_CFG_FILE}.in ${CORE_PKG_CFG_FILE} @ONLY )
 ENDIF()
 

diff --git a/build/tizen/dali-core.pc.in b/build/tizen/dali2-core.pc.in
similarity index 88%
rename from build/tizen/dali-core.pc.in
rename to build/tizen/dali2-core.pc.in
index d1b8f7a..de15e39 100644 (file)
--- a/build/tizen/dali-core.pc.in
+++ b/build/tizen/dali2-core.pc.in
@@ -8,5 +8,5 @@ Name: DALi 3D Engine
 Description: Cross platform 3D Engine
 Version: ${apiversion}
 Requires:
-Libs: -L${libdir} -ldali-core
+Libs: -L${libdir} -ldali2-core
 Cflags: -I${includedir}

diff --git a/packaging/dali.spec b/packaging/dali.spec
index 12933df..3f8d1a8 100644 (file)
--- a/packaging/dali.spec
+++ b/packaging/dali.spec
@@ -1,4 +1,4 @@
-Name:       dali
+Name:       dali2
 Summary:    DALi 3D Engine
 Version:    1.9.10
 Release:    1
@@ -12,9 +12,6 @@ Requires(postun): /sbin/ldconfig
 BuildRequires:  cmake
 BuildRequires:  pkgconfig
 BuildRequires:  gawk
-Provides: libdali-core-cxx11.so
-Provides: libdali-core-cxx11.so.0
-Provides: libdali-core-cxx11.so.0.0.0
 
 %if 0%{?tizen_version_major} >= 3
 BuildRequires:  pkgconfig(libtzplatform-config)
@@ -101,13 +98,6 @@ cd build/tizen
 pushd %{_builddir}/%{name}-%{version}/build/tizen
 %make_install
 
-# Create links to ensure linking with cxx11 library is preserved
-pushd  %{buildroot}%{_libdir}
-ln -sf libdali-core.so libdali-core-cxx11.so
-ln -sf libdali-core.so libdali-core-cxx11.so.0
-ln -sf libdali-core.so libdali-core-cxx11.so.0.0.0
-popd
-
 ##############################
 # Post Install
 ##############################
@@ -133,13 +123,12 @@ exit 0
 %manifest dali.manifest
 %endif
 %defattr(-,root,root,-)
-%{_libdir}/libdali-core-cxx11.so*
-%{_libdir}/libdali-core.so*
+%{_libdir}/libdali2-core.so*
 %license LICENSE
 
 %files devel
 %defattr(-,root,root,-)
-%{_libdir}/pkgconfig/dali-core.pc
+%{_libdir}/pkgconfig/dali2-core.pc
 %{dev_include_path}/dali/public-api/*
 %{dev_include_path}/dali/devel-api/*
 %{dev_include_path}/dali/doc/*