From 1987efb71730a7f8fc7ceb55c1e32c4fa37c6182 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Tue, 28 Apr 2020 20:08:34 +0100 Subject: [PATCH] Libraries & RPM renamed to provide DALi 2 Change-Id: I2845621e0a30617dbadfaac7dbe1ddb074cd3ac7 --- .gitignore | 8 +-- build/tizen/Makefile.am | 41 ++++------- build/tizen/configure.ac | 25 ++----- ...harp-binder.pc.in => dali2-csharp-binder.pc.in} | 2 +- packaging/dali-csharp-binder.spec | 84 +++++++++++----------- 5 files changed, 65 insertions(+), 95 deletions(-) mode change 100755 => 100644 build/tizen/Makefile.am mode change 100755 => 100644 build/tizen/configure.ac rename build/tizen/{dali-csharp-binder.pc.in => dali2-csharp-binder.pc.in} (87%) mode change 100755 => 100644 mode change 100755 => 100644 packaging/dali-csharp-binder.spec diff --git a/.gitignore b/.gitignore index 442d770..7b7b823 100755 --- a/.gitignore +++ b/.gitignore @@ -19,10 +19,10 @@ autom4te.cache/ config.h config.log config.status -dali-csharp-binder.pc -dali-csharp-binder/.deps/ -dali-csharp-binder/.libs/ -dali-csharp-binder/Makefile +dali2-csharp-binder.pc +dali2-csharp-binder/.deps/ +dali2-csharp-binder/.libs/ +dali2-csharp-binder/Makefile libtool stamp-h1 build/tizen/m4/ diff --git a/build/tizen/Makefile.am b/build/tizen/Makefile.am old mode 100755 new mode 100644 index 849d556..f519f36 --- a/build/tizen/Makefile.am +++ b/build/tizen/Makefile.am @@ -1,5 +1,5 @@ # -# Copyright (c) 2018 Samsung Electronics Co., Ltd. +# Copyright (c) 2020 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. @@ -40,7 +40,7 @@ dali_csharp_binder_dir = ../../dali-csharp-binder include ../../dali-csharp-binder/file.list pkgconfigdir = $(libdir)/pkgconfig -pkgconfig_DATA = dali-csharp-binder.pc +pkgconfig_DATA = dali2-csharp-binder.pc # sources if UBUNTU_PROFILE @@ -111,29 +111,14 @@ endif endif -lib_LTLIBRARIES = libdali-csharp-binder.la - -libdali_csharp_binder_la_SOURCES = $(LIBDALI_CSHARP_BINDER_LA_SOURCES) -libdali_csharp_binder_la_includes = $(LIBDALI_CSHARP_BINDER_LA_INCLUDES) -libdali_csharp_binder_ladir = $(libdir) -libdali_csharp_binder_la_LDFLAGS = ${LDFLAGS} -libdali_csharp_binder_la_CXXFLAGS = $(LIBDALI_CSHARP_BINDER_LA_CXXFLAGS) -libdali_csharp_binder_la_LIBADD = $(LIBDALI_CSHARP_BINDER_LA_LIBADD) - -libdali_csharp_binderdir = $(includedir)/dali-csharp-binder -libdali_csharp_binder_HEADERS = $(dali_csharp_binder_header_files) - -## added for key grab binding only for tizen -## if TIZENBUILD -## libdali_csharp_binder_la_CXXFLAGS += -DTIZEN_BUILD -## if ECOREWL2 -## libdali_csharp_binder_la_CXXFLAGS += -DECORE_WL2 -## libdali_csharp_binder_la_CXXFLAGS += -DEFL_BETA_API_SUPPORT -## libdali_csharp_binder_la_CXXFLAGS+= $(ECORE_WL2_CFLAGS) -## else -## libdali_csharp_binder_la_CXXFLAGS+= $(ECORE_WAYLAND_CFLAGS) -## endif -## libdali_csharp_binder_la_SOURCES = $(dali_csharp_binder_src_files_tizen) -## else -## libdali_csharp_binder_la_SOURCES = $(dali_csharp_binder_src_files) -## endif +lib_LTLIBRARIES = libdali2-csharp-binder.la + +libdali2_csharp_binder_la_SOURCES = $(LIBDALI_CSHARP_BINDER_LA_SOURCES) +libdali2_csharp_binder_la_includes = $(LIBDALI_CSHARP_BINDER_LA_INCLUDES) +libdali2_csharp_binder_ladir = $(libdir) +libdali2_csharp_binder_la_LDFLAGS = ${LDFLAGS} +libdali2_csharp_binder_la_CXXFLAGS = $(LIBDALI_CSHARP_BINDER_LA_CXXFLAGS) +libdali2_csharp_binder_la_LIBADD = $(LIBDALI_CSHARP_BINDER_LA_LIBADD) + +libdali2_csharp_binderdir = $(includedir)/dali-csharp-binder +libdali2_csharp_binder_HEADERS = $(dali_csharp_binder_header_files) diff --git a/build/tizen/configure.ac b/build/tizen/configure.ac old mode 100755 new mode 100644 index 6cb6009..310ed34 --- a/build/tizen/configure.ac +++ b/build/tizen/configure.ac @@ -1,7 +1,7 @@ # -*- Autoconf -*- # Process this file with autoconf to produce a configure script. -m4_define([dali_version],[0.1.0]) +m4_define([dali_version],[2.0.0]) AC_INIT([dali], [dali_version]) AM_INIT_AUTOMAKE([-Wall foreign]) AC_CONFIG_MACRO_DIR([m4]) @@ -67,9 +67,9 @@ AM_CONDITIONAL([ENABLE_RENAME_SO], [test x$enable_rename_so = xyes]) ### AM_CONDITIONAL([TIZENBUILD], [test x$enable_tizenBuild = xyes]) ### AM_CONDITIONAL([ECOREWL2], [test x$enable_ecoreWl2 = xyes]) -PKG_CHECK_MODULES(DALICORE, dali-core) -PKG_CHECK_MODULES(DALIADAPTOR, dali-adaptor) -PKG_CHECK_MODULES(DALITOOLKIT, dali-toolkit) +PKG_CHECK_MODULES(DALICORE, dali2-core) +PKG_CHECK_MODULES(DALIADAPTOR, dali2-adaptor) +PKG_CHECK_MODULES(DALITOOLKIT, dali2-toolkit) if test "x$enable_profile" = "xMOBILE" -o "x$enable_profile" = "xWEARABLE" -o "x$enable_profile" = "xTV" -o "x$enable_profile" = "xIVI" -o "x$enable_profile" = "xCOMMON"; then PKG_CHECK_MODULES(DALIWIDGET, widget_viewer_dali) @@ -80,21 +80,6 @@ if test "x$enable_profile" = "xMOBILE" -o "x$enable_profile" = "xWEARABLE" -o "x fi fi - -# Checks for libraries. added for widget_viewer_dali binding only for tizen -# added for key grab binding only for tizen -## if test x$enable_tizenBuild = xyes; then -## PKG_CHECK_MODULES(DALI, dali-core dali-adaptor dali-toolkit widget_viewer_dali) -## if test x$enable_ecoreWl2 = xyes; then -## PKG_CHECK_MODULES(ECORE_WL2, ecore-wl2) -## else -## PKG_CHECK_MODULES(ECORE_WAYLAND, ecore-wayland) -## fi -## else -## PKG_CHECK_MODULES(DALI, dali-core dali-adaptor dali-toolkit) -## fi - - if test x$DALI_DATA_RW_DIR != x; then dataReadWriteDir=$DALI_DATA_RW_DIR else @@ -113,7 +98,7 @@ AC_SUBST(DALI_CSHARP_BINDER_CFLAGS) AC_SUBST(DALI_PROFILE_CFLAGS) AC_CONFIG_FILES([Makefile]) -AC_CONFIG_FILES([dali-csharp-binder.pc]) +AC_CONFIG_FILES([dali2-csharp-binder.pc]) AC_OUTPUT diff --git a/build/tizen/dali-csharp-binder.pc.in b/build/tizen/dali2-csharp-binder.pc.in old mode 100755 new mode 100644 similarity index 87% rename from build/tizen/dali-csharp-binder.pc.in rename to build/tizen/dali2-csharp-binder.pc.in index 7a19185..6a0964b --- a/build/tizen/dali-csharp-binder.pc.in +++ b/build/tizen/dali2-csharp-binder.pc.in @@ -9,5 +9,5 @@ Name: DALi C# binder Description: DALi C# binder Libaray Version: @VERSION@ Requires: dali-core dali-adaptor dali-toolkit -Libs: -L${libdir} -ldali-csharp-binder +Libs: -L${libdir} -ldali2-csharp-binder Cflags: -I${includedir}/dali-csharp-binder diff --git a/packaging/dali-csharp-binder.spec b/packaging/dali-csharp-binder.spec old mode 100755 new mode 100644 index 41d4a21..0c6328b --- a/packaging/dali-csharp-binder.spec +++ b/packaging/dali-csharp-binder.spec @@ -19,7 +19,7 @@ #please update nui_internal_version below, if you changed version-check.cpp %define nui_internal_version nui550 -Name: dali-csharp-binder +Name: dali2-csharp-binder Summary: The DALI Csharp Binder Version: 1.9.9 Release: 1 @@ -42,9 +42,9 @@ BuildRequires: pkgconfig(screen_connector_provider) %endif BuildRequires: pkgconfig -BuildRequires: pkgconfig(dali-core) -BuildRequires: pkgconfig(dali-adaptor) -BuildRequires: pkgconfig(dali-toolkit) +BuildRequires: pkgconfig(dali2-core) +BuildRequires: pkgconfig(dali2-adaptor) +BuildRequires: pkgconfig(dali2-toolkit) BuildRequires: pkgconfig(widget_viewer_dali) @@ -213,8 +213,8 @@ pushd %{_builddir}/%{name}-%{version}/build/tizen popd pushd %{buildroot}%{_libdir} -for FILE in libdali-csharp-binder*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.mobile"; done -mv pkgconfig/dali-csharp-binder*pc %{_builddir}/%{name}-%{version}/build/tizen/ +for FILE in libdali2-csharp-binder*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.mobile"; done +mv pkgconfig/dali2-csharp-binder*pc %{_builddir}/%{name}-%{version}/build/tizen/ popd make clean @@ -239,8 +239,8 @@ pushd %{_builddir}/%{name}-%{version}/build/tizen popd pushd %{buildroot}%{_libdir} -for FILE in libdali-csharp-binder*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.tv"; done -mv pkgconfig/dali-csharp-binder*pc %{_builddir}/%{name}-%{version}/build/tizen/ +for FILE in libdali2-csharp-binder*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.tv"; done +mv pkgconfig/dali2-csharp-binder*pc %{_builddir}/%{name}-%{version}/build/tizen/ popd make clean @@ -265,8 +265,8 @@ pushd %{_builddir}/%{name}-%{version}/build/tizen popd pushd %{buildroot}%{_libdir} -for FILE in libdali-csharp-binder*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.wearable"; done -mv pkgconfig/dali-csharp-binder*pc %{_builddir}/%{name}-%{version}/build/tizen/ +for FILE in libdali2-csharp-binder*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.wearable"; done +mv pkgconfig/dali2-csharp-binder*pc %{_builddir}/%{name}-%{version}/build/tizen/ popd make clean @@ -291,8 +291,8 @@ pushd %{_builddir}/%{name}-%{version}/build/tizen popd pushd %{buildroot}%{_libdir} -for FILE in libdali-csharp-binder*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.ivi"; done -mv pkgconfig/dali-csharp-binder*pc %{_builddir}/%{name}-%{version}/build/tizen/ +for FILE in libdali2-csharp-binder*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE.ivi"; done +mv pkgconfig/dali2-csharp-binder*pc %{_builddir}/%{name}-%{version}/build/tizen/ popd make clean @@ -318,8 +318,8 @@ pushd %{_builddir}/%{name}-%{version}/build/tizen popd pushd %{buildroot}%{_libdir} -for FILE in libdali-csharp-binder*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done -mv pkgconfig/dali-csharp-binder*pc %{_builddir}/%{name}-%{version}/build/tizen/ +for FILE in libdali2-csharp-binder*.so*; do mv "$FILE" "%{_builddir}/%{name}-%{version}/build/tizen/$FILE"; done +mv pkgconfig/dali2-csharp-binder*pc %{_builddir}/%{name}-%{version}/build/tizen/ popd make clean @@ -338,14 +338,14 @@ pushd %{_builddir}/%{name}-%{version}/build/tizen # If the profile is selected, the line below is repquired. # !unified && (wearable || tv || ivi || mobile) %if "%{?profile}" == "wearable" || "%{?profile}" == "tv" || "%{?profile}" == "ivi" || "%{?profile}" == "mobile" -rm -rf %{buildroot}%{_libdir}/libdali-csharp-binder*.so* +rm -rf %{buildroot}%{_libdir}/libdali2-csharp-binder*.so* %endif # If the profile is selected, the line below is repquired. # wearable || tv || ivi || mobile || unified %if "%{?profile}" != "common" -for FILE in libdali-*.so*; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE"; done -mv dali-csharp-binder*.pc %{buildroot}%{_libdir}/pkgconfig/ +for FILE in libdali2-*.so*; do mv "$FILE" "%{buildroot}%{_libdir}/$FILE"; done +mv dali2-csharp-binder*.pc %{buildroot}%{_libdir}/pkgconfig/ %endif popd @@ -357,36 +357,36 @@ pushd %{buildroot}%{_libdir} # If the profile is selected, the line below is repquired. # if common ||"undefined" #%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" -rm -rf libdali-csharp-binder*.so -ln -s libdali-csharp-binder.so.0.0.0 libdali-csharp-binder.so +rm -rf libdali2-csharp-binder*.so +ln -s libdali2-csharp-binder.so.0.0.0 libdali2-csharp-binder.so #%endif # If the profile is selected, the line below is repquired. # if wearable || "undefined" %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" -rm -rf libdali-csharp-binder*.so.wearable -ln -s libdali-csharp-binder.so.0.0.*.wearable libdali-csharp-binder.so.wearable +rm -rf libdali2-csharp-binder*.so.wearable +ln -s libdali2-csharp-binder.so.0.0.*.wearable libdali2-csharp-binder.so.wearable %endif # If the profile is selected, the line below is repquired. # if tv ||"undefined" %if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" -rm -rf libdali-csharp-binder*.so.tv -ln -s libdali-csharp-binder.so.0.0.*.tv libdali-csharp-binder.so.tv +rm -rf libdali2-csharp-binder*.so.tv +ln -s libdali2-csharp-binder.so.0.0.*.tv libdali2-csharp-binder.so.tv %endif # If the profile is selected, the line below is repquired. # if ivi ||"undefined" %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile" -rm -rf libdali-csharp-binder*.so.ivi -ln -s libdali-csharp-binder.so.0.0.*.ivi libdali-csharp-binder.so.ivi +rm -rf libdali2-csharp-binder*.so.ivi +ln -s libdali2-csharp-binder.so.0.0.*.ivi libdali2-csharp-binder.so.ivi %endif # If the profile is selected, the line below is repquired. # if mobile || "undefined" %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" -rm -rf libdali-csharp-binder*.so.mobile -ln -s libdali-csharp-binder.so.0.0.*.mobile libdali-csharp-binder.so.mobile +rm -rf libdali2-csharp-binder*.so.mobile +ln -s libdali2-csharp-binder.so.0.0.*.mobile libdali2-csharp-binder.so.mobile %endif popd @@ -430,7 +430,7 @@ exit 0 %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" %post profile_mobile pushd %{_libdir} -for FILE in libdali-csharp-binder.so*.mobile; do ln -sf "$FILE" "${FILE%.mobile}"; done +for FILE in libdali2-csharp-binder.so*.mobile; do ln -sf "$FILE" "${FILE%.mobile}"; done popd /sbin/ldconfig exit 0 @@ -447,7 +447,7 @@ exit 0 %if "%{?profile}" != "wearable" && "%{?profile}" != "common" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" %post profile_tv pushd %{_libdir} -for FILE in libdali-csharp-binder.so*.tv; do ln -sf "$FILE" "${FILE%.tv}"; done +for FILE in libdali2-csharp-binder.so*.tv; do ln -sf "$FILE" "${FILE%.tv}"; done popd /sbin/ldconfig exit 0 @@ -464,7 +464,7 @@ exit 0 %if "%{?profile}" != "mobile" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "common" %post profile_wearable pushd %{_libdir} -for FILE in libdali-csharp-binder.so*.wearable; do ln -sf "$FILE" "${FILE%.wearable}"; done +for FILE in libdali2-csharp-binder.so*.wearable; do ln -sf "$FILE" "${FILE%.wearable}"; done popd /sbin/ldconfig exit 0 @@ -481,7 +481,7 @@ exit 0 %if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "common" && "%{?profile}" != "mobile" %post profile_ivi pushd %{_libdir} -for FILE in libdali-csharp-binder.so*.ivi; do ln -sf "$FILE" "${FILE%.ivi}"; done +for FILE in libdali2-csharp-binder.so*.ivi; do ln -sf "$FILE" "${FILE%.ivi}"; done popd /sbin/ldconfig exit 0 @@ -504,11 +504,11 @@ exit 0 # if common ||"undefined" #%if "%{?profile}" != "wearable" && "%{?profile}" != "tv" && "%{?profile}" != "ivi" && "%{?profile}" != "mobile" %defattr(-,root,root,-) -%{_libdir}/libdali-csharp-binder.so* -%exclude %{_libdir}/libdali-csharp-binder*.so*.mobile -%exclude %{_libdir}/libdali-csharp-binder*.so*.wearable -%exclude %{_libdir}/libdali-csharp-binder*.so*.tv -%exclude %{_libdir}/libdali-csharp-binder*.so*.ivi +%{_libdir}/libdali2-csharp-binder.so* +%exclude %{_libdir}/libdali2-csharp-binder*.so*.mobile +%exclude %{_libdir}/libdali2-csharp-binder*.so*.wearable +%exclude %{_libdir}/libdali2-csharp-binder*.so*.tv +%exclude %{_libdir}/libdali2-csharp-binder*.so*.ivi #%endif # If the profile is selected, the line below is repquired. @@ -524,7 +524,7 @@ exit 0 %files profile_mobile %manifest dali-csharp-binder.manifest %defattr(-,root,root,-) -%{_libdir}/libdali-csharp-binder.so.*mobile +%{_libdir}/libdali2-csharp-binder.so.*mobile %endif # If the profile is selected, the line below is repquired. @@ -533,7 +533,7 @@ exit 0 %files profile_tv %manifest dali-csharp-binder.manifest %defattr(-,root,root,-) -%{_libdir}/libdali-csharp-binder.so.*tv +%{_libdir}/libdali2-csharp-binder.so.*tv %endif # If the profile is selected, the line below is repquired. @@ -542,7 +542,7 @@ exit 0 %files profile_wearable %manifest dali-csharp-binder.manifest %defattr(-,root,root,-) -%{_libdir}/libdali-csharp-binder.so.*wearable +%{_libdir}/libdali2-csharp-binder.so.*wearable %endif # If the profile is selected, the line below is repquired. @@ -551,12 +551,12 @@ exit 0 %files profile_ivi %manifest dali-csharp-binder.manifest %defattr(-,root,root,-) -%{_libdir}/libdali-csharp-binder.so.*ivi +%{_libdir}/libdali2-csharp-binder.so.*ivi %endif %files devel %defattr(-,root,root,-) -%dir %{_includedir}/%{name}/ -%{_includedir}/%{name}/* +%dir %{_includedir}/dali-csharp-binder/ +%{_includedir}/dali-csharp-binder/* %{_libdir}/pkgconfig/%{name}.pc -- 2.7.4