Seperate dali-adaptor & dali-adaptor-uv packages

- Remove dali-adaptor dependency from dali-toolkit.
- Add dali-adaptor-uv dependency to dali-addon because DALi JS apps always
run the libuv-based adaptor.
- Before this patch, dali-addon only checked dali-adaptor package (which was
confusingly named to 'dali') and dali-toolkit package.
- Now dali-addon checks dali-core, dali-adaptor-uv, and dali-toolkit packages to make it clearer.

Change-Id: Iaca57047a250ee863bbe6963c31168a7bdbacd68

diff --git a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
index 9ebbcf4..1ce796d 100644 (file)
--- a/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit-internal/CMakeLists.txt
@@ -40,7 +40,7 @@ LIST(APPEND TC_SOURCES
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
     dali-core
-    dali
+    dali-adaptor
     dali-toolkit
 )
 

diff --git a/automated-tests/src/dali-toolkit/CMakeLists.txt b/automated-tests/src/dali-toolkit/CMakeLists.txt
index e338ad4..e0e2601 100644 (file)
--- a/automated-tests/src/dali-toolkit/CMakeLists.txt
+++ b/automated-tests/src/dali-toolkit/CMakeLists.txt
@@ -84,7 +84,7 @@ LIST(APPEND TC_SOURCES
 
 PKG_CHECK_MODULES(${CAPI_LIB} REQUIRED
     dali-core
-    dali
+    dali-adaptor
     dali-toolkit
 )
 

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 77c33f0..1fa0845 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -29,7 +29,6 @@ DALI_TOOLKIT_VERSION=dali_version
 AC_SUBST(DALI_TOOLKIT_VERSION)
 
 PKG_CHECK_MODULES(DALICORE, dali-core)
-PKG_CHECK_MODULES(DALI, dali)
 
 DALI_TOOLKIT_CFLAGS=-DPLATFORM_TIZEN
 

diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am
index 833348a..0e36158 100644 (file)
--- a/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@ -68,14 +68,12 @@ libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \
                       -I../../../ \
                       $(DALI_TOOLKIT_CFLAGS) \
                       $(DALICORE_CFLAGS) \
-                      $(DALI_CFLAGS) \
                       $(DLOG_CFLAGS) \
                       $(FRIBIDI_CFLAGS) \
                       $(HTMLCXX_CFLAGS)
 
 libdali_toolkit_la_LIBADD = \
                       $(DALICORE_LIBS) \
-                      $(DALI_LIBS) \
                       $(DLOG_LIBS) \
                       $(FRIBIDI_LIBS) \
                       $(HTMLCXX_LIBS)

diff --git a/node-addon/binding.gyp b/node-addon/binding.gyp
index dcef968..dad473d 100644 (file)
--- a/node-addon/binding.gyp
+++ b/node-addon/binding.gyp
@@ -66,7 +66,7 @@
       'cflags': [
             '-fPIC',
             '-frtti',
-            '<!@(pkg-config --cflags dali dali-toolkit)'
+            '<!@(pkg-config --cflags dali-core dali-adaptor-uv dali-toolkit)'
         ],
 
     'cflags_cc': [
@@ -74,10 +74,10 @@
             '-frtti'    # needed for typeinfo with dali-any
         ],
       'ldflags': [
-            '<!@(pkg-config --libs-only-L --libs-only-other dali dali-toolkit)'
+            '<!@(pkg-config --libs-only-L --libs-only-other dali-core dali-adaptor-uv dali-toolkit)'
         ],
       'libraries': [
-        '<!@(pkg-config --libs-only-l dali dali-toolkit)'
+        '<!@(pkg-config --libs-only-l dali-core dali-adaptor-uv dali-toolkit)'
       ]
     }]
 }

diff --git a/node-addon/build/tizen/CMakeLists.txt b/node-addon/build/tizen/CMakeLists.txt
index bd4dd2c..f76d25a 100644 (file)
--- a/node-addon/build/tizen/CMakeLists.txt
+++ b/node-addon/build/tizen/CMakeLists.txt
@@ -110,7 +110,8 @@ set_source_files_properties(${builddir}/lib.${TOOLSET}/dali.node PROPERTIES GENE
 set_target_properties(dali_addon PROPERTIES EXCLUDE_FROM_ALL "FALSE")
 
 
-SET(PKG_LIST dali
+SET(PKG_LIST dali-core
+             dali-adaptor-uv
              dali-toolkit)
 
 INCLUDE(FindPkgConfig)

diff --git a/packaging/dali-addon.spec b/packaging/dali-addon.spec
index fe4bc23..7bb302f 100644 (file)
--- a/packaging/dali-addon.spec
+++ b/packaging/dali-addon.spec
@@ -7,17 +7,17 @@ License:    Apache License, Version 2.0
 URL:        https://review.tizen.org/gerrit/#/q/project:platform/core/uifw/dali-toolkit
 Distribution: Tizen
 Source0:    %{name}-%{version}.tar.gz
-Requires:   dali
 
-# Do NOT put an adaptor here - it is an application choice which adaptor to use
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  cmake
-BuildRequires:  pkgconfig(dali)
 BuildRequires:  pkgconfig(dali-core)
 BuildRequires:  pkgconfig(dali-toolkit)
 BuildRequires:  nodejs-devel
 
+# DALi JS applications using dali-addon always run on dali-adaptor-uv.
+BuildRequires:  pkgconfig(dali-adaptor-uv)
+
 %description
 DALi Node.JS addon
 

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index 1e82cbb..c8057f7 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -9,13 +9,16 @@ Source0:    %{name}-%{version}.tar.gz
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
-Requires:       dali
-# Do NOT put an adaptor here - it is an application choice which adaptor to use
+
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
-BuildRequires:  pkgconfig(dali)
 BuildRequires:  pkgconfig(dali-core)
 
+# dali-toolkit only need to know the interfaces(APIs) of dali-adaptor(the devel package).
+# It doesn't need to know which adaptor will be used by applications.
+# Applications or dali-addon will decide which one they will use.
+BuildRequires:  dali-adaptor-devel
+
 #############################
 # profile setup
 #############################