From: Minkee Lee <minkee.lee@samsung.com>
Date: Wed, 29 Jun 2016 06:32:10 +0000 (+0900)
Subject: build: change the swt file path
X-Git-Tag: Tizen_Studio_1.3_Release_p2.3~12^2~8
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=67e17c2c92d1041384fe3b9ae9069b31d03655bb;p=sdk%2Femulator%2Fqemu.git

build: change the swt file path

Library package structure is changed.
- dev package: swt_4.3/swt.jar -> swt-4.5.jar
- lib package: swt.jar -> swt-4.5.jar

Change-Id: Id62d01d651bb9c8a53813aa603ab113ff254c553
Signed-off-by: Minkee Lee <minkee.lee@samsung.com>
---

diff --git a/tizen/src/Makefile b/tizen/src/Makefile
index 960ef1b6ca..67fa27bf66 100644
--- a/tizen/src/Makefile
+++ b/tizen/src/Makefile
@@ -33,9 +33,9 @@ qemu_distclean:
 
 # DIBS classpath for emulator-skin.jar
 ifdef CONFIG_WIN32
-DIBS_SWT_DIR=-Dclasspath.dibs=$(MSYS_ROOTDIR)/platforms/tizen-2.3/common/emulator/bin
+DIBS_SWT_DIR=-Dclasspath.dibs=$(MSYS_ROOTDIR)
 else
-DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)/platforms/tizen-2.3/common/emulator/bin
+DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)
 endif
 
 # Building check-gl
diff --git a/tizen/src/skin/client/.classpath b/tizen/src/skin/client/.classpath
index fb93363cc1..bf38eeb348 100644
--- a/tizen/src/skin/client/.classpath
+++ b/tizen/src/skin/client/.classpath
@@ -4,6 +4,6 @@
 	<classpathentry kind="src" path="jaxb_src"/>
 	<classpathentry kind="src" path="resource"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
-	<classpathentry kind="lib" path="lib/swt.jar" sourcepath="lib/src.zip"/>
+	<classpathentry kind="lib" path="lib/swt-4.5.jar" sourcepath="lib/src.zip"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/tizen/src/skin/client/build.xml b/tizen/src/skin/client/build.xml
index 6b7b1d653e..bc3fd29321 100644
--- a/tizen/src/skin/client/build.xml
+++ b/tizen/src/skin/client/build.xml
@@ -23,7 +23,7 @@
 	<property name="jar.file" value="emulator-skin.jar" />
 	<property name="mainclass" value="org.tizen.emulator.skin.EmulatorSkinMain" />
 
-	<property name="swt.file" value="swt.jar" />
+	<property name="swt.file" value="swt-4.5.jar" />
 
 	<path id="classpath">
 		<pathelement location="${env.TIZEN_SDK_DEV_PATH}/distrib/lib/${swt.file}" />
diff --git a/tizen/src/skin/client/native_src/make_so_linux.sh b/tizen/src/skin/client/native_src/make_so_linux.sh
index aaa260343f..74f95539ae 100755
--- a/tizen/src/skin/client/native_src/make_so_linux.sh
+++ b/tizen/src/skin/client/native_src/make_so_linux.sh
@@ -2,7 +2,7 @@
 
 #Example
 
-javah -classpath ../bin/:../lib/swt.jar -jni org.tizen.emulator.skin.EmulatorShmSkin
+javah -classpath ../bin/:../lib/swt-4.5.jar -jni org.tizen.emulator.skin.EmulatorShmSkin
 rm ./org_tizen_emulator_skin_EmulatorShmSkin_PollFBThread.h
 #TODO: jdk path
 gcc -c share.c -o share.o -I /usr/lib/jvm/jdk1.7.0_04/include -I /usr/lib/jvm/jdk1.7.0_04/include/linux
diff --git a/tizen/src/skin/client/native_src/make_so_mac.sh b/tizen/src/skin/client/native_src/make_so_mac.sh
index 2ecbba95e2..16bcd157d0 100755
--- a/tizen/src/skin/client/native_src/make_so_mac.sh
+++ b/tizen/src/skin/client/native_src/make_so_mac.sh
@@ -2,7 +2,7 @@
 
 #Example
 
-javah -classpath ../emulator-skin.jar:../lib/swt.jar -jni org.tizen.emulator.skin.EmulatorShmSkin
+javah -classpath ../emulator-skin.jar:../lib/swt-4.5.jar -jni org.tizen.emulator.skin.EmulatorShmSkin
 rm ./org_tizen_emulator_skin_EmulatorShmSkin_PollFBThread.h
 #TODO: jdk path
 cc -c share.c -o share.o -I/System/Library/Frameworks/JavaVM.framework/Headers