Remove CXX03 Build

Change-Id: I44b670826afb37e96f3cacafdfe82d18ede88a03

diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am
index a98e8b8..e49738e 100644 (file)
--- a/build/tizen/Makefile.am
+++ b/build/tizen/Makefile.am
@@ -1,4 +1,4 @@
-# Copyright (c) 2017 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.
@@ -17,12 +17,7 @@ SUBDIRS = dali-core
 
 pkgconfigdir = $(libdir)/pkgconfig
 
-if ENABLE_CXX03_ABI
-pkgconfig_DATA = dali-core-cxx03.pc
-else
 pkgconfig_DATA = dali-core.pc
-endif
-
 
 MAINTAINERCLEANFILES = \
     aclocal.m4 \

diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac
index 4082251..05a7465 100644 (file)
--- a/build/tizen/configure.ac
+++ b/build/tizen/configure.ac
@@ -1,4 +1,4 @@
-# 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.
@@ -57,25 +57,14 @@ AC_ARG_ENABLE([lock_backtrace],
               [enable_lock_backtrace=$enableval],
               [enable_lock_backtrace=no])
 
-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])
 
-AM_CONDITIONAL([ENABLE_CXX03_ABI], [test x$enable_cxx03_abi = xyes])
 AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes])
 
-if test "x$enable_cxx03_abi" = "xyes"; then
-  DALI_CFLAGS="$DALI_CFLAGS -D_GLIBCXX_USE_CXX11_ABI=0"
-fi
-
 if test "x$enable_debug" = "xyes"; then
   DALI_CFLAGS="$DALI_CFLAGS -DDEBUG_ENABLED"
 fi
@@ -122,15 +111,11 @@ AC_SUBST(DALI_LDFLAGS)
 devincludepath=${includedir}
 AC_SUBST(devincludepath)
 
-AC_CONFIG_FILES([Makefile dali-core/Makefile])
-
-if test "x$enable_cxx03_abi" = "xyes"; then
-AC_CONFIG_FILES([dali-core-cxx03.pc])
-fi
-
-if test "x$enable_cxx03_abi" != "xyes"; then
-AC_CONFIG_FILES([dali-core.pc])
-fi
+AC_CONFIG_FILES([
+  Makefile
+  dali-core/Makefile
+  dali-core.pc
+])
 
 AC_OUTPUT
 
@@ -144,6 +129,5 @@ Configuration
   Data Dir (Read Only):             $dataReadOnlyDir
   Backtrace:                        $enable_backtrace
   ScopedLock Backtrace:             $enable_lock_backtrace
-  C++03 ABI:                        $enable_cxx03_abi
   Rename so file:                   $enable_rename_so
 "

diff --git a/build/tizen/dali-core-cxx03.pc.in b/build/tizen/dali-core-cxx03.pc.in
deleted file mode 100644 (file)
index 31f09d2..0000000
--- a/build/tizen/dali-core-cxx03.pc.in
+++ /dev/null
@@ -1,12 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-apiversion=@DALI_VERSION@
-libdir=@libdir@
-includedir=@devincludepath@
-
-Name: Dali 3D engine
-Description: Cross platform 3D Engine
-Version: ${apiversion}
-Requires:
-Libs: -L${libdir} -ldali-core-cxx03
-Cflags: -I${includedir} -std=c++11

diff --git a/build/tizen/dali-core/Makefile.am b/build/tizen/dali-core/Makefile.am
index 9242d3b..7e4630c 100644 (file)
--- a/build/tizen/dali-core/Makefile.am
+++ b/build/tizen/dali-core/Makefile.am
@@ -1,4 +1,4 @@
-# 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.
@@ -52,24 +52,12 @@ DALI_CORE_LA_LIBADD = $(DALI_LDFLAGS) \
 dali_core_includes = \
         -I../../..
 
-if ENABLE_CXX03_ABI
-
-lib_LTLIBRARIES = libdali-core.la
-
-libdali_core_la_SOURCES = $(DALI_CORE_LA_SOURCES)
-libdali_core_la_CXXFLAGS = $(DALI_CORE_LA_CXXFLAGS)
-libdali_core_la_LIBADD = $(DALI_CORE_LA_LIBADD)
-
-else
-
 lib_LTLIBRARIES = libdali-core-cxx11.la
 
 libdali_core_cxx11_la_SOURCES = $(DALI_CORE_LA_SOURCES)
 libdali_core_cxx11_la_CXXFLAGS = $(DALI_CORE_LA_CXXFLAGS)
 libdali_core_cxx11_la_LIBADD = $(DALI_CORE_LA_LIBADD)
 
-endif
-
 # Install headers under the correct subdirectories
 platformabstractiondir = $(includedir)/dali/integration-api
 platformabstractioneventsdir = $(includedir)/dali/integration-api/events
@@ -158,22 +146,6 @@ linker_test_CXXFLAGS = \
   $(dali_core_includes) \
   $(DALI_CFLAGS)
 
-if ENABLE_CXX03_ABI
-
-linker_test_DEPENDENCIES = libdali-core.la
-linker_test_LDADD = \
-  libdali-core.la
-
-if ENABLE_RENAME_SO
-#rename
-install: install-am
-       rm -rf $(libdir)/libdali-core.so
-       rm -rf $(libdir)/libdali-core-cxx03.so
-       ln -s $(libdir)/libdali-core.so.0.0.* $(libdir)/libdali-core-cxx03.so
-endif
-
-else
-
 linker_test_DEPENDENCIES = libdali-core-cxx11.la
 linker_test_LDADD = \
   libdali-core-cxx11.la
@@ -186,4 +158,3 @@ install: install-am
        ln -s $(libdir)/libdali-core-cxx11.so.0.0.* $(libdir)/libdali-core.so
 endif
 
-endif

diff --git a/packaging/dali.spec b/packaging/dali.spec
index 2c6974e..9759cec 100644 (file)
--- a/packaging/dali.spec
+++ b/packaging/dali.spec
@@ -16,48 +16,9 @@ BuildRequires:  gawk
 BuildRequires:  pkgconfig(libtzplatform-config)
 %endif
 
-%if 0%{?tizen_version_major} < 4
-%define disable_cxx03_build 1
-%endif
-
 %description
 DALi 3D Engine
 
-%if !0%{?disable_cxx03_build}
-##############################
-# cxx03
-##############################
-%package cxx03
-Summary:       DALi 3D Engine with cxx03 abi
-Provides:      %{name}-cxx03 = %{version}-%{release}
-
-%description cxx03
-DALi 3D Engine with cxx03 abi with cxx03 abi
-
-##############################
-# devel-cxx03
-##############################
-%package devel-cxx03
-Summary:    Development components for DALi 3D Engine with cxx03 abi
-Group:      Development/Building
-Requires:   %{name}-cxx03 = %{version}-%{release}
-Requires:   %{name}-integration-devel-cxx03 = %{version}-%{release}
-
-%description devel-cxx03
-Development components for DALi 3D Engine - public headers and package config
-
-##############################
-# integration-devel-cxx03
-##############################
-%package integration-devel-cxx03
-Summary:    Integration development package for DALi 3D Engine witch cxx03 abi
-Group:      Development/Building
-Requires:   %{name}-cxx03 = %{version}-%{release}
-
-%description integration-devel-cxx03
-Integration development package for DALi 3D Engine - headers for integrating with an adaptor/platform abstraction library.
-%endif
-
 ##############################
 # devel
 ##############################
@@ -162,36 +123,6 @@ for FILE in libdali-core-cxx11.so*; do mv "$FILE" "%{_builddir}/%{name}-%{versio
 mv pkgconfig/dali-core.pc %{_builddir}/%{name}-%{version}/build/tizen/dali-core.pc
 popd
 
-%if !0%{?disable_cxx03_build}
-make clean
-
-./configure \
-      --program-prefix=%{?_program_prefix} \
-      --prefix=%{_prefix} \
-      --exec-prefix=%{_exec_prefix} \
-      --bindir=%{_bindir} \
-      --sbindir=%{_sbindir} \
-      --sysconfdir=%{_sysconfdir} \
-      --datadir=%{_datadir} \
-      --includedir=%{_includedir} \
-      --libdir=%{_libdir} \
-      --libexecdir=%{_libexecdir} \
-      --localstatedir=%{_localstatedir} \
-      --sharedstatedir=%{_sharedstatedir} \
-      --mandir=%{_mandir} \
-      --enable-cxx03-abi=yes  \
-%if 0%{?enable_debug}
-      --enable-debug \
-%endif
-%if 0%{?enable_trace}
-      --enable-trace \
-%endif
-      --infodir=%{_infodir} \
-      --enable-rename-so=no
-
-make %{?jobs:-j%jobs}
-%endif
-
 ##############################
 # Installation
 ##############################
@@ -212,9 +143,6 @@ popd
 pushd  %{buildroot}%{_libdir}
 rm -rf libdali-core.so
 rm -rf libdali-core-cxx11.so
-%if !0%{?disable_cxx03_build}
-ln -s libdali-core.so.0.0.* libdali-core-cxx03.so
-%endif
 ln -s libdali-core-cxx11.so.0.0.* libdali-core.so
 popd
 
@@ -237,19 +165,6 @@ exit 0
 # Files in Binary Packages
 ##############################
 
-%if !0%{?disable_cxx03_build}
-%files cxx03
-%if 0%{?enable_dali_smack_rules}
-%manifest dali.manifest-smack
-%else
-%manifest dali.manifest
-%endif
-%defattr(-,root,root,-)
-%{_libdir}/libdali-core.so.*
-%{_libdir}/libdali-core-cxx03.so
-%license LICENSE
-%endif
-
 %files
 %if 0%{?enable_dali_smack_rules}
 %manifest dali.manifest-smack
@@ -261,19 +176,6 @@ exit 0
 %{_libdir}/libdali-core.so
 %license LICENSE
 
-%if !0%{?disable_cxx03_build}
-%files devel-cxx03
-%defattr(-,root,root,-)
-%{_libdir}/pkgconfig/dali-core-cxx03.pc
-%{dev_include_path}/dali/public-api/*
-%{dev_include_path}/dali/devel-api/*
-%{dev_include_path}/dali/doc/*
-
-%files integration-devel-cxx03
-%defattr(-,root,root,-)
-%{_includedir}/dali/integration-api/*
-%endif
-
 %files devel
 %defattr(-,root,root,-)
 %{_libdir}/pkgconfig/dali-core.pc