From ade42febcc032fe1032f10c9aac37d5557e743c9 Mon Sep 17 00:00:00 2001 From: SeokYeon Hwang Date: Wed, 21 Oct 2015 16:49:22 +0900 Subject: [PATCH] build: clean DIBS build scripts up Specific operations for MacOS move to macos-64 script. Routines checking whether TARGET_OS is valid or not is added. Change-Id: I7aadff447dcd7e7cbe6f55de9f4f6f319c21c2f3 Signed-off-by: SeokYeon Hwang --- package/build.common | 32 ------------------------- package/build.linux | 6 +++++ package/build.macos-64 | 37 +++++++++++++++++++++++++++-- package/{build.windows-32 => build.windows} | 5 ++++ 4 files changed, 46 insertions(+), 34 deletions(-) rename package/{build.windows-32 => build.windows} (83%) diff --git a/package/build.common b/package/build.common index 6525b8a..2b5100a 100644 --- a/package/build.common +++ b/package/build.common @@ -40,8 +40,6 @@ build_common() # install_common install_common() { - cd $SRCDIR/tizen - # emulator EMULATOR_COMMON_DIR=$SRCDIR/package/3.0-emulator-qemu-common.package.${TARGET_OS}/data/platforms/tizen-3.0/common mkdir -p $EMULATOR_COMMON_DIR @@ -52,36 +50,6 @@ install_common() mkdir -p $EMULATOR_X86_DIR cp -pPR $SRCDIR/tizen/emulator $EMULATOR_X86_DIR/emulator - 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 - # profile skins MOBILE_3_0_SKIN_RESOURCE_DIR=$SRCDIR/package/mobile-3.0-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-3.0/mobile/emulator-resources/skins WEARABLE_3_0_SKIN_RESOURCE_DIR=$SRCDIR/package/wearable-3.0-emulator-qemu-skins.package.${TARGET_OS}/data/platforms/tizen-3.0/wearable/emulator-resources/skins diff --git a/package/build.linux b/package/build.linux index d18eeeb..6246c69 100755 --- a/package/build.linux +++ b/package/build.linux @@ -2,6 +2,12 @@ # check build environment prepare() { + if [ "${TARGET_OS}" != "windows-32" ] && [ "${TARGET_OS}" != "windows-64" ] \ + && ["${TARGET_OS}" != "ubuntu-32" ] && ["${TARGET_OS}" != "ubuntu-64" ] + then + exit 1 + fi + if [ "${TARGET_OS}" = "windows-32" ] || [ "${TARGET_OS}" = "windows-64" ] then # for Windows target (cross compiling) diff --git a/package/build.macos-64 b/package/build.macos-64 index 3d1f7c8..a3c3828 100755 --- a/package/build.macos-64 +++ b/package/build.macos-64 @@ -1,8 +1,11 @@ -#!/bin/bash -xe +#!/bin/sh -xe # check build environment prepare() { - echo "nothing to do" + if [ "${TARGET_OS}" != "macos-64" ] + then + exit 1 + fi } # clean @@ -23,4 +26,34 @@ 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.windows-32 b/package/build.windows similarity index 83% rename from package/build.windows-32 rename to package/build.windows index 010e5a9..ce258aa 100755 --- a/package/build.windows-32 +++ b/package/build.windows @@ -2,6 +2,11 @@ # check build environment prepare() { + if [ "${TARGET_OS}" != "windows-32" ] && [ "${TARGET_OS}" != "windows-64" ] + then + exit 1 + fi + PYTHON_DIR=`env | grep PATH | grep Python` if [ "$PYTHON_DIR" = "" ] then -- 2.7.4