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 60f132e0ee9bea4e050b99f5795454a90245d2d9..67fa27bf66172eae2adef82b02d99d746a3ba00e 100644 (file)
--- 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)/swt_4.3
+DIBS_SWT_DIR=-Dclasspath.dibs=$(MSYS_ROOTDIR)
 else
-DIBS_SWT_DIR=-Dclasspath.dibs=$(ROOTDIR)/swt_4.3
+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 fb93363cc1162756c404141cd5dbce750817c76a..bf38eeb348b3f18203caa2ebf60d583ac060c8b1 100644 (file)
--- 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 6b7b1d653e83e5ce5a4efc016a1be12e60d56e60..bc3fd2932106149ad081ca463b3eb8ed1e2eb307 100644 (file)
--- 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 aaa260343f637a47efa04e4c86f15db60cc36dd7..74f95539ae6afe3cc0764ca0396d2bf14bcd96d1 100755 (executable)
--- 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 2ecbba95e23f5b3b6cf0623efe68f34984575ba5..16bcd157d0e62e1128ed6cf5d892bb0382a7d60f 100755 (executable)
--- 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