projects / platform / core / uifw / dali-toolkit.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (from parent 1: 74a038e)
Remove CXX03 Build 67/205367/1
authorAdeel Kazmi <adeel.kazmi@samsung.com>
Wed, 1 May 2019 09:38:04 +0000 (10:38 +0100)
committerAdeel Kazmi <adeel.kazmi@samsung.com>
Thu, 2 May 2019 18:57:17 +0000 (19:57 +0100)
Change-Id: Ic61075c2d69f31cdd3057bfb92dae930cb93ee85

build/tizen/configure.ac patch | blob | history
build/tizen/dali-toolkit/Makefile.am patch | blob | history
packaging/dali-toolkit.spec patch | blob | history

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 40bdf27..24d2a9e 100755 (executable)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -1,5 +1,5 @@
 #
 #
-# Copyright (c) 2016 Samsung Electronics Co., Ltd.
+# Copyright (c) 2019 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -74,25 +74,14 @@ AC_ARG_ENABLE([csharp],
               [enable_csharp=$enableval],
               [enable_csharp=automatic])
 
               [enable_csharp=$enableval],
               [enable_csharp=automatic])
 
-AC_ARG_ENABLE([cxx03_abi],
-              [AC_HELP_STRING([--enable-cxx03-abi],
-                              [Specify abi for the build])],
-              [enable_cxx03_abi=$enableval],
-              [enable_cxx03_abi=no])
-
 AC_ARG_ENABLE([rename_so],
               [AC_HELP_STRING([--enable-rename-so],
                               [Specify whether so file is renamed or not])],
               [enable_rename_so=$enableval],
               [enable_rename_so=yes])
 
 AC_ARG_ENABLE([rename_so],
               [AC_HELP_STRING([--enable-rename-so],
                               [Specify whether so file is renamed or not])],
               [enable_rename_so=$enableval],
               [enable_rename_so=yes])
 
-AM_CONDITIONAL([ENABLE_CXX03_ABI], [test x$enable_cxx03_abi = xyes])
 AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes])
 
 AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes])
 
-if test "x$enable_cxx03_abi" = "xyes"; then
-  DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
-fi
-
 if test "x$enable_debug" = "xyes"; then
   DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDEBUG_ENABLED"
 fi
 if test "x$enable_debug" = "xyes"; then
   DALI_TOOLKIT_CFLAGS="$DALI_TOOLKIT_CFLAGS -DDEBUG_ENABLED"
 fi
@@ -195,13 +184,8 @@ DOXYGEN_ROOT_DIR=../../..
 AC_SUBST(DOXYGEN_DOCS_DIR)
 AC_SUBST(DOXYGEN_ROOT_DIR)
 
 AC_SUBST(DOXYGEN_DOCS_DIR)
 AC_SUBST(DOXYGEN_ROOT_DIR)
 
-if test "x$enable_cxx03_abi" = "xyes"; then
-PKG_CHECK_MODULES(DALI, dali-core-cxx03)
-PKG_CHECK_MODULES(DALIDAPTOR, dali-adaptor-cxx03)
-else
 PKG_CHECK_MODULES(DALICORE, dali-core)
 PKG_CHECK_MODULES(DALIADAPTOR, dali-adaptor)
 PKG_CHECK_MODULES(DALICORE, dali-core)
 PKG_CHECK_MODULES(DALIADAPTOR, dali-adaptor)
-fi
 
 # Enable csharp plugin
 build_csharp_plugin=no
 
 # Enable csharp plugin
 build_csharp_plugin=no
@@ -244,12 +228,9 @@ AC_CONFIG_FILES([
  docs/dali.doxy
  docs-internal/dali-internal.doxy
  ../../automated-tests/CMakeLists.txt
  docs/dali.doxy
  docs-internal/dali-internal.doxy
  ../../automated-tests/CMakeLists.txt
+ dali-toolkit.pc
 ])
 
 ])
 
-if test "x$enable_cxx03_abi" = "xno"; then
-AC_CONFIG_FILES([dali-toolkit.pc])
-fi
-
 AC_OUTPUT
 
 echo "
 AC_OUTPUT
 
 echo "
diff --git a/build/tizen/dali-toolkit/Makefile.am b/build/tizen/dali-toolkit/Makefile.am
index 53a4788..07f5e38 100644 (file)
--- a/build/tizen/dali-toolkit/Makefile.am
+++ b/build/tizen/dali-toolkit/Makefile.am
@@ -1,5 +1,5 @@
 #
 #
-# Copyright (c) 2018 Samsung Electronics Co., Ltd.
+# Copyright (c) 2019 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.
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
 # you may not use this file except in compliance with the License.
@@ -91,24 +91,6 @@ LIBDALI_TOOLKIT_LA_LIBADD = \
 
 
 # The library
 
 
 # The library
-if ENABLE_CXX03_ABI
-
-lib_LTLIBRARIES = libdali-toolkit.la
-libdali_toolkit_la_SOURCES = $(LIBDALI_TOOLKIT_LA_SOURCES)
-libdali_toolkit_la_LIBADD = $(LIBDALI_TOOLKIT_LA_LIBADD)
-libdali_toolkit_la_CXXFLAGS = $(LIBDALI_TOOLKIT_LA_CXXFLAGS)
-libdali_toolkit_la_CFLAGS = $(LIBDALI_TOOLKTI_LA_CFLAGS)
-
-if ENABLE_RENAME_SO
-#rename
-install: install-am
-       rm -rf $(libdir)/libdali-toolkit.so
-       rm -rf $(libdir)/libdali-toolkit-cxx03.so
-       ln -s $(libdir)/libdali-toolkit.so.0.0.* $(libdir)/libdali-toolkit-cxx03.so
-endif
-
-else
-
 lib_LTLIBRARIES = libdali-toolkit-cxx11.la
 libdali_toolkit_cxx11_la_SOURCES = $(LIBDALI_TOOLKIT_LA_SOURCES)
 libdali_toolkit_cxx11_la_LIBADD = $(LIBDALI_TOOLKIT_LA_LIBADD)
 lib_LTLIBRARIES = libdali-toolkit-cxx11.la
 libdali_toolkit_cxx11_la_SOURCES = $(LIBDALI_TOOLKIT_LA_SOURCES)
 libdali_toolkit_cxx11_la_LIBADD = $(LIBDALI_TOOLKIT_LA_LIBADD)
@@ -123,8 +105,6 @@ install: install-am
        ln -s $(libdir)/libdali-toolkit-cxx11.so.0.0.* $(libdir)/libdali-toolkit.so
 endif
 
        ln -s $(libdir)/libdali-toolkit-cxx11.so.0.0.* $(libdir)/libdali-toolkit.so
 endif
 
-endif
-
 # Install headers
 topleveldir = $(devincludepath)/dali-toolkit
 toplevel_HEADERS = ../../../dali-toolkit/dali-toolkit.h
 # Install headers
 topleveldir = $(devincludepath)/dali-toolkit
 toplevel_HEADERS = ../../../dali-toolkit/dali-toolkit.h
diff --git a/packaging/dali-toolkit.spec b/packaging/dali-toolkit.spec
index fb30d69..c84b3f0 100644 (file)
--- a/packaging/dali-toolkit.spec
+++ b/packaging/dali-toolkit.spec
@@ -10,35 +10,17 @@ Source0:    %{name}-%{version}.tar.gz
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
 Requires(post): /sbin/ldconfig
 Requires(postun): /sbin/ldconfig
 
-%if 0%{?tizen_version_major} < 4
-%define disable_cxx03_build 1
-%endif
-
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(dali-core)
 BuildRequires:  pkgconfig(dali-adaptor)
 BuildRequires:  pkgconfig
 BuildRequires:  pkgconfig(dlog)
 BuildRequires:  pkgconfig(dali-core)
 BuildRequires:  pkgconfig(dali-adaptor)
-%if !0%{?disable_cxx03_build}
-BuildRequires:  pkgconfig(dali-core-cxx03)
-BuildRequires:  pkgconfig(dali-adaptor-cxx03)
-%endif
-BuildRequires: gettext
-
-
-#need libtzplatform-config for directory if tizen version is 3.x
-
-%if 0%{?tizen_version_major} >= 3
+BuildRequires:  gettext
 BuildRequires:  pkgconfig(libtzplatform-config)
 BuildRequires:  pkgconfig(libtzplatform-config)
-%endif
 
 #############################
 # profile setup
 #############################
 
 
 #############################
 # profile setup
 #############################
 
-%if "%{tizen_version_major}" == "2" && 0%{?tizen_profile_name:1}
-%define profile %{tizen_profile_name}
-%endif
-
 %description
 Dali 3D engine Toolkit - a set of controls that provide
 user interface functionality.
 %description
 Dali 3D engine Toolkit - a set of controls that provide
 user interface functionality.
@@ -86,15 +68,6 @@ Conflicts:  %{name}-resources_720x1280
 dali-toolkit default resource files for 1920x1080
 Contain po / sounds / common images / style / style images
 
 dali-toolkit default resource files for 1920x1080
 Contain po / sounds / common images / style / style images
 
-%if !0%{?disable_cxx03_build}
-%package cxx03
-Summary:       Dali 3D engine Toolkit with cxx03
-Provides:      %{name}-cxx03 = %{version}-%{release}
-
-%description cxx03
-Dali 3D engine Toolkit with cxx03
-%endif
-
 ##############################
 # devel
 ##############################
 ##############################
 # devel
 ##############################
@@ -112,15 +85,8 @@ Application development package for Dali 3D engine toolkit - headers and package
 %prep
 %setup -q
 
 %prep
 %setup -q
 
-#Use TZ_PATH when tizen version is 3.x
-
-%if "%{tizen_version_major}" == "2"
-%define dali_data_rw_dir            /opt/usr/share/dali/
-%define dali_data_ro_dir            /usr/share/dali/
-%else
 %define dali_data_rw_dir            %TZ_SYS_SHARE/dali/
 %define dali_data_ro_dir            %TZ_SYS_RO_SHARE/dali/
 %define dali_data_rw_dir            %TZ_SYS_SHARE/dali/
 %define dali_data_ro_dir            %TZ_SYS_RO_SHARE/dali/
-%endif
 
 %define dali_toolkit_image_files    %{dali_data_ro_dir}/toolkit/images/
 %define dali_toolkit_sound_files    %{dali_data_ro_dir}/toolkit/sounds/
 
 %define dali_toolkit_image_files    %{dali_data_ro_dir}/toolkit/images/
 %define dali_toolkit_sound_files    %{dali_data_ro_dir}/toolkit/sounds/
@@ -177,30 +143,6 @@ for FILE in libdali-toolkit-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{ver
 mv pkgconfig/dali-toolkit.pc %{_builddir}/%{name}-%{version}/build/tizen/dali-toolkit.pc
 popd
 
 mv pkgconfig/dali-toolkit.pc %{_builddir}/%{name}-%{version}/build/tizen/dali-toolkit.pc
 popd
 
-%if !0%{?disable_cxx03_build}
-make clean
-
-libtoolize --force
-cd %{_builddir}/dali-toolkit-%{version}/build/tizen
-autoreconf --install
-
-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
-
-%configure --enable-profile=TIZEN \
-           --enable-cxx03-abi=yes \
-%if 0%{?enable_debug}
-           --enable-debug \
-%endif
-%if 0%{?enable_trace}
-      --enable-trace \
-%endif
-           --enable-i18n=yes \
-           --enable-rename-so=no
-
-make %{?jobs:-j%jobs}
-%endif
-
 ##############################
 # Installation
 ##############################
 ##############################
 # Installation
 ##############################
@@ -230,9 +172,6 @@ popd
 pushd  %{buildroot}%{_libdir}
 rm -rf libdali-toolkit.so
 rm -rf libdali-toolkit-cxx11.so
 pushd  %{buildroot}%{_libdir}
 rm -rf libdali-toolkit.so
 rm -rf libdali-toolkit-cxx11.so
-%if !0%{?disable_cxx03_build}
-ln -s libdali-toolkit.so.0.0.* libdali-toolkit-cxx03.so
-%endif
 ln -s libdali-toolkit-cxx11.so.0.0.* libdali-toolkit.so
 popd
 
 ln -s libdali-toolkit-cxx11.so.0.0.* libdali-toolkit.so
 popd
 
@@ -425,19 +364,6 @@ esac
 %{_libdir}/libdali-toolkit.so
 %license LICENSE
 
 %{_libdir}/libdali-toolkit.so
 %license LICENSE
 
-%if !0%{?disable_cxx03_build}
-%files cxx03
-%if 0%{?enable_dali_smack_rules}
-%manifest dali-toolkit.manifest-smack
-%else
-%manifest dali-toolkit.manifest
-%endif
-%defattr(-,root,root,-)
-%{_libdir}/libdali-toolkit.so.*
-%{_libdir}/libdali-toolkit-cxx03.so
-%license LICENSE
-%endif
-
 %files devel
 %defattr(-,root,root,-)
 %{dev_include_path}/dali-toolkit/*
 %files devel
 %defattr(-,root,root,-)
 %{dev_include_path}/dali-toolkit/*
Domain: Graphics System / DALi;