Add build_def.sh and revise build_def.prop to synchronize with SES/SmartThingsPlugin...

copy_libs.sh has been removed.

[Version] 0.3.14

Change-Id: I748efe1fb9b4fc6d86475818a26d6b422490ceb8
Signed-off-by: Sangchul Lee <sc11.lee@samsung.com>
(cherry picked from commit 6795861cc757f22f0d21e6fa14ef3c1ed6eaa989)

diff --git a/build_def.prop b/build_def.prop
index 23c62832622740addfadd374cf031819317c26d9..85b354540152a1054516361c89892c99c53806f1 100644 (file)
--- a/build_def.prop
+++ b/build_def.prop
@@ -1,4 +1,4 @@
 PREBUILD_COMMAND =
-PREBUILD_COMMAND = sh copy_libs.sh;sh update_version.sh
+PREBUILD_COMMAND = sh update_version.sh
 POSTBUILD_COMMAND =
 POSTBUILD_DESC =

diff --git a/build_def.sh b/build_def.sh
new file mode 100755 (executable)
index 0000000..6bc573e
--- /dev/null
+++ b/build_def.sh
@@ -0,0 +1,45 @@
+source build_def_common
+
+BUILD_COMMAND=${1}
+BUILD_ARCH=${2}
+BUILD_CONFIG=${3}
+PROJ_PATH=${4}
+TIZEN_VERSION=${5}
+archPath=$BUILD_ARCH
+
+echo "Using build build arch :: $BUILD_ARCH"
+echo "Using build build config :: $BUILD_CONFIG"
+
+echo "Current PWD :: $PROJ_PATH"
+PROJ_ROOT="$(echo $PROJ_PATH|tr '^C' 'c'|tr '\\' '/')"
+echo "Current PWD :: $PROJ_ROOT"
+echo "Using build tizen version :: $TIZEN_VERSION"
+
+PROP_FILE="${PROJ_ROOT}/project_def.prop"
+
+echo "[================= ${1} script =================]"
+if [ "${1}" == "PREBUILD_COMMAND" ]; then
+    echo "Copying Dependent Libraries to Libs Folder"
+
+    # Recover original prop file
+    RecoverProp $PROP_FILE
+
+    # remove so
+    rm -f ${PROJ_ROOT}/libs/*.so
+
+    # copy esplusplayer to build
+    cp -f ${PROJ_ROOT}/../libs/mm-avplayer/$TIZEN_VERSION/lib/fhub_esplusplayer/$BUILD_CONFIG/6.0-$archPath/libesplusplayer.so ${PROJ_ROOT}/libs
+    ls -als ${PROJ_ROOT}/libs
+    printenv
+
+    # Backup original prop file
+    BackupProp $PROP_FILE
+
+    # Add options for coverage
+    if [ "$TIZEN_VERSION" == "tizen7.0" ]; then
+        AddOpts "USER_DEFS =" "ST_AVP_TIZEN_70" $PROP_FILE
+    fi
+elif [ "${1}" == "POSTBUILD_COMMAND" ]; then
+    # Recover original prop file
+    RecoverProp $PROP_FILE
+fi

diff --git a/copy_libs.sh b/copy_libs.sh
deleted file mode 100644 (file)
index cd45e1b..0000000
--- a/copy_libs.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-echo "Copying Dependent Libraries to Libs Folder"
-if [ -z ${SBI_SYSROOT+x} ]; then echo "environment variable SBI_SYSROOT is not set ";ROOTSTRAP=$(cat ../../DEFAULT_ROOTSTRAP); echo "using RS :$ROOTSTRAP" ; else echo "SBI_SYSROOT is set to '$SBI_SYSROOT'"; ROOTSTRAP=$(basename "$SBI_SYSROOT");fi;
-PROFILE=$(echo $ROOTSTRAP | rev | cut -d"-" -f2- | rev )
-archPath=aarch64
-if [ "$BUILD_ARCH" != "aarch64" ];
-then
-       archPath=arm
-fi
-echo "Using build Rootstrap :: $ROOTSTRAP"
-echo "Using build Profile :: $PROFILE"
-echo "Using build build arch :: $BUILD_ARCH"
-echo "Using build build config :: $BUILD_CONFIG"
-
-echo "Current PWD : $PROJ_PATH"
-PROJ_ROOT="$(echo $PROJ_PATH|tr '^C' 'c'|tr '\\' '/')"
-echo "Current PWD : $PROJ_ROOT"
-rm -f ${PROJ_ROOT}/libs/*.so
-
-# copy esplusplayer to build
-cp -f ${PROJ_ROOT}/../libs/mm-avplayer/lib/fhub_esplusplayer/$BUILD_CONFIG/6.0-$archPath/libesplusplayer.so ${PROJ_ROOT}/libs
-ls -als ${PROJ_ROOT}/libs
-printenv

diff --git a/packaging/espp-service.spec b/packaging/espp-service.spec
index 1e6977858caf5d1db9295cdcc6191b460327c6c2..140217873644cd7286c289d0eaef49a9cb6e6a97 100644 (file)
--- a/packaging/espp-service.spec
+++ b/packaging/espp-service.spec
@@ -1,6 +1,6 @@
 Name:       espp-service
 Summary:    ESPP service package which contains client lib. and daemon binary
-Version:    0.3.13
+Version:    0.3.14
 Release:    0
 Group:      Multimedia/Libraries
 License:    Apache-2.0

diff --git a/project_def.prop b/project_def.prop
index 3d476e88bb57bb777a062405e0529ebd14590106..3d7cae92252c74d13d9e7d3687b03c7c2b6d4b7a 100644 (file)
--- a/project_def.prop
+++ b/project_def.prop
@@ -11,7 +11,7 @@ profile = mobile-7.0
 USER_SRCS = ./src/daemon/*.c ./src/common/*.c
 
 # User Defines
-USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.12"
+USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.14"
 
 # User Includes
 USER_INC_DIRS = ./src/daemon ./src/common ./inc ./inc/esplusplayer_capi

diff --git a/src/client/project_def.prop b/src/client/project_def.prop
index a5e3792220177860bf3f8fdc58f0d6d8937a05f0..cb338e4b45f638dc89ca36f9368583854cd0d9f0 100644 (file)
--- a/src/client/project_def.prop
+++ b/src/client/project_def.prop
@@ -11,7 +11,7 @@ profile = mobile-7.0
 USER_SRCS = ../common/*.c ./*.c
 
 # User Defines
-USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.10"
+USER_DEFS = USE_DLOG USE_SERVICE_APP ESPP_SERVICE_VERSION="0.3.14"
 
 # User Includes
 USER_INC_DIRS = ../common ./

diff --git a/tizen-manifest.xml b/tizen-manifest.xml
index d6afad924a3b701a55265e1ee4f576b02000d446..c8bbda7d2f838eedc9381a8ca0719fcc57551df3 100644 (file)
--- a/tizen-manifest.xml
+++ b/tizen-manifest.xml
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<manifest xmlns="http://tizen.org/ns/packages" api-version="7.0" package="com.samsung.tizen.espp-service" version="0.3.12">
+<manifest xmlns="http://tizen.org/ns/packages" api-version="7.0" package="com.samsung.tizen.espp-service" version="0.3.14">
     <profile name="mobile"/>
     <description>espp-service</description>
     <service-application appid="com.samsung.tizen.espp-service" auto-restart="false" exec="espp-service" multiple="false" nodisplay="false" on-boot="false" taskmanage="false" type="capp">