From: syeon.hwang <syeon.hwang@samsung.com>
Date: Wed, 25 Jul 2012 07:51:36 +0000 (+0900)
Subject: [Title]  Modify build.xml to use JAVA_HOME env
X-Git-Tag: TizenStudio_2.0_p2.3~1396^2~54^2~1
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=beabbcf8283e3d85b568b78fa943cd71767a2d6c;p=sdk%2Femulator%2Fqemu.git

[Title]  Modify build.xml to use JAVA_HOME env
[Type]
[Module]
[Priority]
[CQ#]
[Redmine#]
[Problem]
[Cause]
[Solution]
[TestCase]
---

diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml
index 188594a..b4eb298 100644
--- a/tizen/src/skin/client/build.xml
+++ b/tizen/src/skin/client/build.xml
@@ -11,6 +11,7 @@
 		<os family="mac" />
 	</condition>
 
+	<property environment="env" />
 	<property name="jar.file" value="emulator-skin.jar" />
 	<property name="mainclass" value="org.tizen.emulator.skin.EmulatorSkinMain" />
 
@@ -86,7 +87,7 @@
 			<arg line="Share.c" />
 			<arg line="-o" />
 			<arg line="libshare.so" />
-			<arg line="-I/usr/lib/jvm/jdk1.7.0_04/include" />
+			<arg line="-I${env.JAVA_HOME}/include" />
 			<arg line="-fPIC" />
 		</exec>
 		<delete>
@@ -105,7 +106,7 @@
 			<arg line="Share.c" />
 			<arg line="-o" />
 			<arg line="libshare.dylib" />
-			<arg line="-I/System/Library/Frameworks/JavaVM.framework/Headers" />
+			<arg line="-I${env.JAVA_HOME}/Headers" />
 			<arg line="-fPIC" />
 		</exec>
 		<delete>
@@ -127,43 +128,5 @@
 		</javac>
 	</target>
 
-	<target name="create-native-linux-dibs" if="isLinux">
-		<echo message="create native shared library on linux..." />
-		<javah classpath="build;lib/swt.jar" destdir="native_src">
-			<class name="org.tizen.emulator.skin.EmulatorSkin" />
-		</javah>
-		<exec dir="native_src" executable="gcc" failifexecutionfails="false">
-			<arg line="-shared" />
-			<arg line="-c" />
-			<arg line="Share.c" />
-			<arg line="-o" />
-			<arg line="libshare.so" />
-			<arg line="-I${include.path.jni}" />
-			<arg line="-fPIC" />
-		</exec>
-		<delete>
-			<fileset dir="native_src" includes="**/*.h" />
-		</delete>
-	</target>
-
-	<target name="create-native-mac-dibs" if="isMac">
-		<echo message="create native shared library on mac..." />
-		<javah classpath="build;lib/swt.jar" destdir="native_src">
-			<class name="org.tizen.emulator.skin.EmulatorSkin" />
-		</javah>
-		<exec dir="native_src" executable="gcc" failifexecutionfails="false">
-			<arg line="-dynamiclib" />
-			<arg line="-c" />
-			<arg line="Share.c" />
-			<arg line="-o" />
-			<arg line="libshare.dylib" />
-			<arg line="-I${include.path.jni}" />
-			<arg line="-fPIC" />
-		</exec>
-		<delete>
-			<fileset dir="native_src" includes="**/*.h" />
-		</delete>
-	</target>
-
-	<target name="make-jar-dibs" depends="compile-dibs, create-native-linux-dibs, create-native-mac-dibs, create-jar" />
+	<target name="make-jar-dibs" depends="compile-dibs, create-native-linux, create-native-mac, create-jar" />
 </project>