From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Wed, 21 Oct 2015 07:49:22 +0000 (+0900)
Subject: build: clean DIBS build scripts up
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.2~208
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ade42febcc032fe1032f10c9aac37d5557e743c9;p=sdk%2Femulator%2Fqemu.git

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 <syeon.hwang@samsung.com>
---

diff --git a/package/build.common b/package/build.common
index 6525b8ab4b..2b5100a5b5 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 d18eeebebe..6246c69926 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 3d1f7c85da..a3c38286a9 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 b/package/build.windows
new file mode 100755
index 0000000000..ce258aaba5
--- /dev/null
+++ b/package/build.windows
@@ -0,0 +1,40 @@
+#!/bin/sh -xe
+# 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
+		echo "Make sure that you have installed Python 2.x version"
+		echo "and then set installed Python/bin path into PATH system variable on your PC!"
+		exit 1
+	fi
+
+	ROOTDIR=$MSYS_ROOTDIR
+}
+
+# clean
+clean()
+{
+	echo "nothing to do"
+}
+
+
+# build
+build()
+{
+	. $SRCDIR/package/build.common
+	build_common
+}
+
+# install
+install()
+{
+	. $SRCDIR/package/build.common
+	install_common
+}
diff --git a/package/build.windows-32 b/package/build.windows-32
deleted file mode 100755
index 010e5a9a06..0000000000
--- a/package/build.windows-32
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/sh -xe
-# check build environment
-prepare()
-{
-	PYTHON_DIR=`env | grep PATH | grep Python`
-	if [ "$PYTHON_DIR" = "" ]
-	then
-		echo "Make sure that you have installed Python 2.x version"
-		echo "and then set installed Python/bin path into PATH system variable on your PC!"
-		exit 1
-	fi
-
-	ROOTDIR=$MSYS_ROOTDIR
-}
-
-# clean
-clean()
-{
-	echo "nothing to do"
-}
-
-
-# build
-build()
-{
-	. $SRCDIR/package/build.common
-	build_common
-}
-
-# install
-install()
-{
-	. $SRCDIR/package/build.common
-	install_common
-}