(Build) Stopped toolkit-base compiling separately.

Change-Id: I6c139dced184806f6a5762ca982430dc92fec3ec
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>

diff --git a/build/slp/Makefile.am b/build/slp/Makefile.am
index b65cf4b..8f7dc32 100644 (file)
--- a/build/slp/Makefile.am
+++ b/build/slp/Makefile.am
@@ -14,8 +14,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-SUBDIRS = dali-toolkit-base \
-          dali-toolkit
+SUBDIRS = dali-toolkit

 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dali-toolkit.pc
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dali-toolkit.pc

diff --git a/build/slp/configure.ac b/build/slp/configure.ac
index 10590f3..d8b0656 100644 (file)
--- a/build/slp/configure.ac
+++ b/build/slp/configure.ac
@@ -55,6 +55,16 @@ if test "x$enable_debug" = "xno" -a "x$enable_exportall" = "xno"; then
   DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -fvisibility=hidden -DHIDE_DALI_INTERNALS"
 fi
 
   DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -fvisibility=hidden -DHIDE_DALI_INTERNALS"
 fi
 

+# Tizen Profile options
+AC_ARG_ENABLE([profile],
+              [AC_HELP_STRING([--enable-profile=COMMON,MOBILE,LITE,WEARABLE,TV],
+                            [Select the variant of tizen])],
+              [dali_profile=$enableval],
+              [dali_profile=COMMON])
+
+# Different platforms use either the full Toolkit or the basic version
+# The basic version excludes components under dali-toolkit/optional
+AM_CONDITIONAL([TOOLKIT_BASIC_VERSION], [test x$dali_profile = xLITE])

 
 if test x$DALI_DATA_RW_DIR != x; then
   dataReadWriteDir=${DALI_DATA_RW_DIR}/
 
 if test x$DALI_DATA_RW_DIR != x; then
   dataReadWriteDir=${DALI_DATA_RW_DIR}/


@@ -80,7 +90,6 @@ AC_SUBST(devincludepath)
 AC_CONFIG_FILES([
  Makefile
  dali-toolkit/Makefile
 AC_CONFIG_FILES([
  Makefile
  dali-toolkit/Makefile

- dali-toolkit-base/Makefile

  dali-toolkit.pc
 ])
 
  dali-toolkit.pc
 ])
 


@@ -91,6 +100,7 @@ Configuration
 -------------
   Prefix:                           $prefix
   Debug Build:                      $enable_debug
 -------------
   Prefix:                           $prefix
   Debug Build:                      $enable_debug

+  Profile:                          $dali_profile

   Data Dir (Read/Write):            $dataReadWriteDir
   Data Dir (Read Only):             $dataReadOnlyDir
 "
   Data Dir (Read/Write):            $dataReadWriteDir
   Data Dir (Read Only):             $dataReadOnlyDir
 "

diff --git a/build/slp/dali-toolkit-base/Makefile.am b/build/slp/dali-toolkit-base/Makefile.am
deleted file mode 100644 (file)
index 36a76cb..0000000
--- a/build/slp/dali-toolkit-base/Makefile.am
+++ /dev/null
@@ -1,72 +0,0 @@
-#
-# Copyright (c) 2014 Samsung Electronics Co., Ltd.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-# http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-
-# Build the Dali Toolkit Base library
-
-# Base files
-toolkit_base_images_dir = ../../../base/dali-toolkit/images
-toolkit_base_sounds_dir = ../../../base/dali-toolkit/sounds
-toolkit_base_styles_dir = ../../../base/dali-toolkit/styles
-toolkit_base_src_dir    = ../../../base/dali-toolkit/internal
-public_api_base_src_dir = ../../../base/dali-toolkit/public-api
-
-include ../../../base/dali-toolkit/images/file.list
-include ../../../base/dali-toolkit/sounds/file.list
-include ../../../base/dali-toolkit/styles/file.list
-include ../../../base/dali-toolkit/internal/file.list
-include ../../../base/dali-toolkit/public-api/file.list
-
-#resources_dir = ../../../resources
-#daliimagedir = ${dataReadOnlyDir}/toolkit/images/
-#daliimage_DATA = ${dali_toolkit_base_image_files}
-#dalisounddir = ${dataReadOnlyDir}/toolkit/sounds/
-#dalisound_DATA = ${dali_toolkit_base_sound_files}
-
-#dalistyledir = ${dataReadOnlyDir}/toolkit/styles/
-#dalistyle_DATA = ${dali_toolkit_style_files}
-
-# The Base library
-lib_LTLIBRARIES = libdali-toolkit-base.la
-
-libdali_toolkit_base_la_SOURCES = \
-                     $(toolkit_base_src_files) \
-                     $(public_api_base_src_files)
-
-libdali_toolkit_base_la_DEPENDENCIES =
-
-libdali_toolkit_base_la_CXXFLAGS = -DDALI_COMPILATION \
-                      -DDALI_TOOLKIT_BASE \
-                      -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
-                      -DDALI_SOUND_DIR="\"${dalisounddir}\"" \
-                      -DDALI_STYLE_DIR="\"${dalistyledir}\"" \
-                      -DDALI_DATA_READ_ONLY_DIR="\"${dataReadOnlyDir}\"" \
-                      -Werror -Wall \
-                      -I../../../base \
-                      -I../../../capi \
-                      $(DALI_TOOLKIT_CFLAGS) \
-                      $(DALICORE_CFLAGS) \
-                      $(DALI_CFLAGS) \
-                      $(DLOG_CFLAGS) \
-                      $(FRIBIDI_CFLAGS) \
-                      $(HTMLCXX_CFLAGS)
-
-libdali_toolkit_base_la_LIBADD = \
-                      $(DALICORE_LIBS) \
-                      $(DALI_LIBS) \
-                      $(DLOG_LIBS) \
-                      $(FRIBIDI_LIBS) \
-                      $(HTMLCXX_LIBS)
-

diff --git a/build/slp/dali-toolkit/Makefile.am b/build/slp/dali-toolkit/Makefile.am
index dfb7494..2c9dd9d 100644 (file)
--- a/build/slp/dali-toolkit/Makefile.am
+++ b/build/slp/dali-toolkit/Makefile.am
@@ -14,7 +14,7 @@
 # limitations under the License.
 #
 
 # limitations under the License.
 #
 

-# Build the Dali Toolkit library (Combined Base and Optional)
+# Build the Dali Toolkit library

 
 # Base files
 toolkit_base_images_dir = ../../../base/dali-toolkit/images
 
 # Base files
 toolkit_base_images_dir = ../../../base/dali-toolkit/images


@@ -38,42 +38,58 @@ include ../../../optional/dali-toolkit/images/file.list
 include ../../../optional/dali-toolkit/internal/file.list
 include ../../../optional/dali-toolkit/public-api/file.list
 
 include ../../../optional/dali-toolkit/internal/file.list
 include ../../../optional/dali-toolkit/public-api/file.list
 

-# CAPI
+# CAPI headers

 capi_devel_src_dir = ../../../capi/dali-toolkit/public-api
 
 include ../../../capi/dali-toolkit/public-api/file.list
 
 resources_dir = ../../../resources
 daliimagedir = ${dataReadOnlyDir}/toolkit/images/
 capi_devel_src_dir = ../../../capi/dali-toolkit/public-api
 
 include ../../../capi/dali-toolkit/public-api/file.list
 
 resources_dir = ../../../resources
 daliimagedir = ${dataReadOnlyDir}/toolkit/images/

+if TOOLKIT_BASIC_VERSION
+daliimage_DATA = ${dali_toolkit_base_image_files}
+else

 daliimage_DATA = ${dali_toolkit_base_image_files} \
                  ${dali_toolkit_optional_image_files}
 daliimage_DATA = ${dali_toolkit_base_image_files} \
                  ${dali_toolkit_optional_image_files}

+endif # TOOLKIT_BASIC_VERSION

 
 dalisounddir = ${dataReadOnlyDir}/toolkit/sounds/
 dalisound_DATA = ${dali_toolkit_base_sound_files}
 
 
 dalisounddir = ${dataReadOnlyDir}/toolkit/sounds/
 dalisound_DATA = ${dali_toolkit_base_sound_files}
 

-# The Combined library
+# The library

 lib_LTLIBRARIES = libdali-toolkit.la
 
 lib_LTLIBRARIES = libdali-toolkit.la
 

+if TOOLKIT_BASIC_VERSION
+libdali_toolkit_la_SOURCES = \
+                     $(toolkit_base_src_files) \
+                     $(public_api_base_src_files)
+else

 libdali_toolkit_la_SOURCES = \
                      $(toolkit_base_src_files) \
                      $(public_api_base_src_files) \
                      $(toolkit_optional_src_files) \
                      $(public_api_optional_src_files)
 libdali_toolkit_la_SOURCES = \
                      $(toolkit_base_src_files) \
                      $(public_api_base_src_files) \
                      $(toolkit_optional_src_files) \
                      $(public_api_optional_src_files)

+endif # TOOLKIT_BASIC_VERSION

 
 dalistyledir = ${dataReadOnlyDir}/toolkit/styles/
 dalistyle_DATA = ${dali_toolkit_style_files}
 
 libdali_toolkit_la_DEPENDENCIES =
 
 
 dalistyledir = ${dataReadOnlyDir}/toolkit/styles/
 dalistyle_DATA = ${dali_toolkit_style_files}
 
 libdali_toolkit_la_DEPENDENCIES =
 

+toolkit_basic_includes = -I../../../base \
+                         -I../../../capi
+
+if ! TOOLKIT_BASIC_VERSION
+toolkit_optional_includes = -I../../../optional
+endif
+

 libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \
                       -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
                       -DDALI_SOUND_DIR="\"${dalisounddir}\"" \
                       -DDALI_STYLE_DIR="\"${dalistyledir}\"" \
                       -DDALI_DATA_READ_ONLY_DIR="\"${dataReadOnlyDir}\"" \
                       -Werror -Wall \
 libdali_toolkit_la_CXXFLAGS = -DDALI_COMPILATION \
                       -DDALI_IMAGE_DIR="\"${daliimagedir}\"" \
                       -DDALI_SOUND_DIR="\"${dalisounddir}\"" \
                       -DDALI_STYLE_DIR="\"${dalistyledir}\"" \
                       -DDALI_DATA_READ_ONLY_DIR="\"${dataReadOnlyDir}\"" \
                       -Werror -Wall \

-                      -I../../../base \
-                      -I../../../optional \
-                      -I../../../capi \
+                      $(toolkit_basic_includes) \
+                      $(toolkit_optional_includes) \

                       $(DALI_TOOLKIT_CFLAGS) \
                       $(DALICORE_CFLAGS) \
                       $(DALI_CFLAGS) \
                       $(DALI_TOOLKIT_CFLAGS) \
                       $(DALICORE_CFLAGS) \
                       $(DALI_CFLAGS) \

diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index faeda62..6847470 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -36,17 +36,6 @@ Requires:   boost-devel
 Application development package for the OpenGLES Canvas toolkit - headers and package config
 
 ##############################
 Application development package for the OpenGLES Canvas toolkit - headers and package config
 
 ##############################

-# Dali Base library
-##############################
-%package dali-toolkit-base
-Summary:    The basic OpenGLES Canvas Core Library Toolkit
-Group:      Development/Building
-
-%description dali-toolkit-base
-A subset of the controls provided by the main package, intended for lightweight applications.
-all the controls provided by the main package.
-
-##############################

 # Preparation
 ##############################
 %prep
 # Preparation
 ##############################
 %prep


@@ -99,10 +88,6 @@ cp -af %{_builddir}/%{name}-%{version}/LICENSE %{buildroot}/usr/share/license/%{
 /sbin/ldconfig
 exit 0
 
 /sbin/ldconfig
 exit 0
 

-%post dali-toolkit-base
-/sbin/ldconfig
-exit 0
-

 ##############################
 # Post Uninstall
 ##############################
 ##############################
 # Post Uninstall
 ##############################


@@ -110,10 +95,6 @@ exit 0
 /sbin/ldconfig
 exit 0
 
 /sbin/ldconfig
 exit 0
 

-%postun dali-toolkit-base
-/sbin/ldconfig
-exit 0
-

 ##############################
 # Files in Binary Packages
 ##############################
 ##############################
 # Files in Binary Packages
 ##############################


@@ -131,6 +112,3 @@ exit 0
 %{dev_include_path}/%{name}/*
 %{_libdir}/pkgconfig/*.pc
 
 %{dev_include_path}/%{name}/*
 %{_libdir}/pkgconfig/*.pc
 

-%files dali-toolkit-base
-%defattr(-,root,root,-)
-%{_libdir}/libdali-toolkit-base.so*