DIBS: build on DIBS in the same way on local

Using TIZEN_SDK_DEV_PATH instead of overriding PKG_CONFIG_PATH.

Change-Id: Ib99c9e6149cbca93c278e84873b8a93de6f436e0
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>

diff --git a/package/build.common b/package/build.common
index 2b5100a5b5611424b382e764110f85fb87e1347c..917b91178cecb75a179086b162a2851b7a1e4bcb 100644 (file)
--- a/package/build.common
+++ b/package/build.common
@@ -15,12 +15,12 @@ build_common()
        prepare_common
        prepare
 
-       cd ${SRCDIR}/tizen
+       TIZEN_SDK_DEV_PATH=${ROOTDIR}
+       PATH=${TIZEN_SDK_DEV_PATH}/bin:${PATH}
 
-       PKG_CONFIG_PATH=${ROOTDIR}/lib/pkgconfig
-       PATH=${PATH}:${ROOTDIR}/bin
+       cd ${SRCDIR}/tizen
 
-       PKG_CONFIG_PATH=${PKG_CONFIG_PATH} ./emulator_configure.sh x86_64
+       TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ./emulator_configure.sh x86_64
 
        make clean
        # needed for building java UI

diff --git a/package/build.macos b/package/build.macos
new file mode 100755 (executable)
index 0000000..a3c3828
--- /dev/null
+++ b/package/build.macos
@@ -0,0 +1,59 @@
+#!/bin/sh -xe
+# check build environment
+prepare()
+{
+       if [ "${TARGET_OS}" != "macos-64" ]
+       then
+               exit 1
+       fi
+}
+
+# clean
+clean()
+{
+       echo "nothing to do"
+}
+
+# build
+build()
+{
+       . $SRCDIR/package/build.common
+       build_common
+}
+
+# install
+install()
+{
+       . $SRCDIR/package/build.common
+       install_common
+
+       EMULATOR_BIN_DIR=$EMULATOR_X86_DIR/emulator/bin
+
+       # change loading path of dynamic shared libraries on MAC OS X
+       if [ "${TARGET_OS}" = "macos-64" ]; then
+               LIB_LIST="libgthread-2.0.0.dylib libglib-2.0.0.dylib libintl.8.dylib libgcc_s.1.dylib libz.1.dylib libcurl.4.dylib libgcc_s.1.dylib libcurl.4.dylib libx264.142.dylib libncurses.5.dylib libpixman-1.0.dylib libpng16.16.dylib QtOpenGL QtWidgets QtGui QtCore"
+               BIN_ARR=( emulator-x86_64 qt5_msgbox )
+               for bin in ${BIN_ARR[@]}; do
+                       LIB_ARR=( $(otool -L ${EMULATOR_BIN_DIR}/$bin | awk '/\opt\/local\/lib/ { split($1, lib, "/"); print lib[5]}') )
+                       for lib in ${LIB_ARR[@]}; do
+                       [[ $LIB_LIST =~ $lib ]] && IS_LIB=true || IS_LIB=false
+                       if [ "$IS_LIB" == "true" ] ; then
+                               install_name_tool -change /opt/local/lib/$lib @loader_path/$lib ${EMULATOR_BIN_DIR}/$bin
+                               echo "$bin: the loading path of $lib is changed."
+                       else
+                               echo "$bin: $lib does not exist in the loading path."
+                       fi
+                       done
+                       LIB_ARR=( $(otool -L ${EMULATOR_BIN_DIR}/$bin | awk '/\opt\/local\/Library/ { split($1, lib, "/"); print lib[9]}') )
+                       for lib in ${LIB_ARR[@]}; do
+                               [[ $LIB_LIST =~ $lib ]] && IS_LIB=true || IS_LIB=false
+                               if [ "$IS_LIB" == "true" ] ; then
+                                       install_name_tool -change /opt/local/Library/Frameworks/$lib.framework/Versions/5/$lib @loader_path/$lib ${EMULATOR_BIN_DIR}/$bin
+                                       echo "$bin: the loading path of $lib is changed."
+                               else
+                                       echo "$bin: $lib does not exist in the loading path."
+                               fi
+                       done
+               done
+       fi
+}

diff --git a/package/build.macos-64 b/package/build.macos-64
deleted file mode 100755 (executable)
index a3c3828..0000000
--- a/package/build.macos-64
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/bin/sh -xe
-# check build environment
-prepare()
-{
-       if [ "${TARGET_OS}" != "macos-64" ]
-       then
-               exit 1
-       fi
-}
-
-# clean
-clean()
-{
-       echo "nothing to do"
-}
-
-# build
-build()
-{
-       . $SRCDIR/package/build.common
-       build_common
-}
-
-# install
-install()
-{
-       . $SRCDIR/package/build.common
-       install_common
-
-       EMULATOR_BIN_DIR=$EMULATOR_X86_DIR/emulator/bin
-
-       # change loading path of dynamic shared libraries on MAC OS X
-       if [ "${TARGET_OS}" = "macos-64" ]; then
-               LIB_LIST="libgthread-2.0.0.dylib libglib-2.0.0.dylib libintl.8.dylib libgcc_s.1.dylib libz.1.dylib libcurl.4.dylib libgcc_s.1.dylib libcurl.4.dylib libx264.142.dylib libncurses.5.dylib libpixman-1.0.dylib libpng16.16.dylib QtOpenGL QtWidgets QtGui QtCore"
-               BIN_ARR=( emulator-x86_64 qt5_msgbox )
-               for bin in ${BIN_ARR[@]}; do
-                       LIB_ARR=( $(otool -L ${EMULATOR_BIN_DIR}/$bin | awk '/\opt\/local\/lib/ { split($1, lib, "/"); print lib[5]}') )
-                       for lib in ${LIB_ARR[@]}; do
-                       [[ $LIB_LIST =~ $lib ]] && IS_LIB=true || IS_LIB=false
-                       if [ "$IS_LIB" == "true" ] ; then
-                               install_name_tool -change /opt/local/lib/$lib @loader_path/$lib ${EMULATOR_BIN_DIR}/$bin
-                               echo "$bin: the loading path of $lib is changed."
-                       else
-                               echo "$bin: $lib does not exist in the loading path."
-                       fi
-                       done
-                       LIB_ARR=( $(otool -L ${EMULATOR_BIN_DIR}/$bin | awk '/\opt\/local\/Library/ { split($1, lib, "/"); print lib[9]}') )
-                       for lib in ${LIB_ARR[@]}; do
-                               [[ $LIB_LIST =~ $lib ]] && IS_LIB=true || IS_LIB=false
-                               if [ "$IS_LIB" == "true" ] ; then
-                                       install_name_tool -change /opt/local/Library/Frameworks/$lib.framework/Versions/5/$lib @loader_path/$lib ${EMULATOR_BIN_DIR}/$bin
-                                       echo "$bin: the loading path of $lib is changed."
-                               else
-                                       echo "$bin: $lib does not exist in the loading path."
-                               fi
-                       done
-               done
-       fi
-}