From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Wed, 2 Apr 2014 08:01:00 +0000 (+0900)
Subject: build: clean up build related files
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3.1~430
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=29d7c4e877027421a1ff197fe3d98a3e95b47556;p=sdk%2Femulator%2Fqemu.git

build: clean up build related files

1. Introduce TIZEN_SDK_DEV_PATH
2. Apply "--enable-libav" as a default
3. A "swt.jar" can be placed in TIZEN_SDK_DEV_PATH

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

diff --git a/tizen/emulator_configure.sh b/tizen/emulator_configure.sh
index d53e0050ec..88a6247164 100755
--- a/tizen/emulator_configure.sh
+++ b/tizen/emulator_configure.sh
@@ -1,5 +1,9 @@
 #!/bin/sh
 
+if [ -z "$TIZEN_SDK_DEV_PATH" ] ; then
+	TIZEN_SDK_DEV_PATH=${HOME}/tizen-sdk-dev
+fi
+
 CONFIGURE_APPEND=""
 EMUL_TARGET_LIST=""
 VIRTIOGL_EN=""
@@ -209,19 +213,22 @@ else
   CONFIGURE_APPEND="$CONFIGURE_APPEND --disable-vigs"
 fi
 
+# append common flags
+CONFIGURE_APPEND="--enable-maru --enable-libav $CONFIGURE_APPEND"
+
+export PKG_CONFIG_PATH=${TIZEN_SDK_DEV_PATH}/distrib/lib/pkgconfig:${PKG_CONFIG_PATH}
+
 case $targetos in
 Linux*)
 cd ..
 echo ""
 echo "##### QEMU configuring for emulator"
 echo "##### QEMU configure append:" $CONFIGURE_APPEND
-export PKG_CONFIG_PATH=${HOME}/tizen-sdk-dev/distrib/lib/pkgconfig:${PKG_CONFIG_PATH}
 exec ./configure \
  --enable-werror \
  --audio-drv-list=alsa \
- --enable-maru \
  --disable-vnc \
- --disable-pie $1 \
+ --disable-pie \
  --enable-virtfs \
  --disable-xen \
  $CONFIGURE_APPEND \
@@ -239,8 +246,7 @@ exec ./configure \
  --cc=gcc \
  --audio-drv-list=winwave \
  --enable-hax \
- --enable-maru \
- --disable-vnc $1 \
+ --disable-vnc \
  $CONFIGURE_APPEND \
 ;;
 Darwin*)
@@ -251,13 +257,11 @@ echo "##### QEMU configure append:" $CONFIGURE_APPEND
 ./configure \
  --extra-cflags=-mmacosx-version-min=10.4 \
  --audio-drv-list=coreaudio \
- --enable-maru \
  --enable-shm \
  --enable-hax \
  --disable-vnc \
  --disable-cocoa \
- --enable-gl \
- --disable-sdl $1 \
+ --disable-sdl \
  $CONFIGURE_APPEND \
 ;;
 esac
diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 31241337fa..72e1a80b24 100644
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -3,6 +3,10 @@ DIBS_X86_DIR=../x86
 DIBS_ARM_DIR=../arm
 DIBS_COMMON_DIR=../common
 
+ifndef TIZEN_SDK_DEV_PATH
+TIZEN_SDK_DEV_PATH=${HOME}/tizen-sdk-dev
+endif
+
 ifneq ($(wildcard ../../config-host.mak),)
 include ../../config-host.mak
 else
@@ -48,7 +52,7 @@ ifdef CONFIG_DARWIN
 endif
 
 skin_client:
-	ant -buildfile skin/client/build.xml make-jar
+	TIZEN_SDK_DEV_PATH=${TIZEN_SDK_DEV_PATH} ant -buildfile skin/client/build.xml make-jar
 
 build_info:
 	@echo "Generate a build information file"
diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml
index 0880e75bc6..72ebf0c851 100644
--- a/tizen/src/skin/client/build.xml
+++ b/tizen/src/skin/client/build.xml
@@ -18,7 +18,9 @@
 	<property name="swt.file" value="swt.jar" />
 
 	<path id="classpath">
-		<fileset dir="lib" includes="${swt.file}" />
+		<pathelement location="${env.TIZEN_SDK_DEV_PATH}/distrib/lib/${swt.file}" />
+		<pathelement location="lib/${swt.file}" />
+		<pathelement location="build/" />
 	</path>
 
 	<target name="clean">
@@ -81,7 +83,8 @@
 
 	<target name="create-native-linux" if="isLinux" unless="isMac">
 		<echo message="create native shared library on linux..." />
-		<javah classpath="build;lib/swt.jar" destdir="native_src">
+		<javah destdir="native_src">
+			<classpath refid="classpath" />
 			<class name="org.tizen.emulator.skin.EmulatorShmSkin" />
 		</javah>
 		<exec dir="native_src" executable="gcc" failifexecutionfails="false">
@@ -106,7 +109,8 @@
 
 	<target name="create-native-mac" if="isMac">
 		<echo message="create native shared library on mac..." />
-		<javah classpath="build;lib/swt.jar" destdir="native_src">
+		<javah destdir="native_src">
+			<classpath refid="classpath" />
 			<class name="org.tizen.emulator.skin.EmulatorShmSkin" />
 		</javah>
 		<exec dir="native_src" executable="gcc" failifexecutionfails="false">