From: jihye kim <jihye1128.kim@samsung.com>
Date: Fri, 23 Nov 2012 05:14:05 +0000 (+0900)
Subject: [Title] emulator-manager : add emulator-manager.app source for mac os
X-Git-Tag: 2.2.1_release^2~75^2~4
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3e67ed1ecec0efc5bf74993ca83cac71361ba3c9;p=sdk%2Femulator%2Femulator-manager.git

[Title] emulator-manager : add emulator-manager.app source for mac os
[Desc.] add emulator-manager.app source for mac os
[Issue] N/A
---

diff --git a/build.xml b/build.xml
index 4bf2c10..0e98667 100644
--- a/build.xml
+++ b/build.xml
@@ -81,4 +81,16 @@
 
 	<target name="make-jar-dibs" depends="compile-dibs, create-jar" />
 
+    <taskdef name="jarbundler" classname="net.sourceforge.jarbundler.JarBundler"/>
+
+    <property name="EM_NAME" value="emulator-manager"/>
+    <property name="EM_ICON" value="em.icns"/>
+    <property name="ICON_PATH" value="resource/res"/>
+
+    <target name="make-app">
+         <jarbundler dir="." name="${EM_NAME}" mainclass="org.tizen.emulator.manager.EmulatorManager" jar="emulator-manager.jar" verbose="true" startOnMainThread="true" icon="${ICON_PATH}/${EM_ICON}">
+         </jarbundler>
+    </target>
+
+    <target name="make-jar-mac" depends="make-jar-dibs, make-app" />
 </project>
diff --git a/package/build.macos-64 b/package/build.macos-64
old mode 100755
new mode 100644
index 6e12ff3..9d2a95a
--- a/package/build.macos-64
+++ b/package/build.macos-64
@@ -12,7 +12,10 @@ clean()
 build() 
 {
 	cd $SRCDIR
-	ant -buildfile build.xml -Dclasspath.dibs=${ROOTDIR}/tools/emulator/bin make-jar-dibs
+	ant -buildfile build.xml -Dclasspath.dibs=${ROOTDIR}/tools/emulator/bin make-jar-mac
+
+	# for emulator-manager.app
+	cp ${ROOTDIR}/tools/emulator/bin/swt.jar ./
 }
 
 # install
@@ -23,10 +26,17 @@ install()
 	mkdir -p $BIN_DIR/icons
 	mkdir -p $BIN_DIR/templates
 
-	cp $SRCDIR/emulator-manager.jar $BIN_DIR/bin
 	cp $SRCDIR/supplement/emulator-manager-mac.sh $BIN_DIR/bin/emulator-manager
 	cp $SRCDIR/resource/res/em.ico $BIN_DIR/icons
 	cp $SRCDIR/standard.xml $BIN_DIR/templates
+
+	# for emulator-manager.app
+	cd emulator-manager.app/Contents/Resources/Java/
+	ln ../../../../swt.jar ./
+	rm ../../../../swt.jar
+	rm ../../../../emulator-manager.jar
+
+	mv $SRCDIR/emulator-manager.app $BIN_DIR/bin
 }
 
 [ "$1" = "clean" ] && clean
diff --git a/package/changelog b/package/changelog
index bbf3561..7c7351f 100644
--- a/package/changelog
+++ b/package/changelog
@@ -1,3 +1,7 @@
+* 1.3.57
+- add emulator-manager.app for mac os
+== jihye kim <jihye1128.kim@samsung.com> 2012-11-23
+
 *1.3.56
 - modify key listener for 'Del' key
 - add tool tip resolution combo and skin combo
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index d2f7279..8fbc734 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -1,5 +1,5 @@
 Source: emulator-manager
-Version: 1.3.56
+Version: 1.3.57
 Maintainer: Yeong-Kyoon Lee<yeongkyoon.lee@samsung.com>
 
 Package: emulator-manager
diff --git a/supplement/emulator-manager-mac.sh b/supplement/emulator-manager-mac.sh
old mode 100755
new mode 100644
index 8bfd593..f3150c2
--- a/supplement/emulator-manager-mac.sh
+++ b/supplement/emulator-manager-mac.sh
@@ -19,5 +19,5 @@ if [ -f $current_emulmgr ]
 then
 java -XstartOnFirstThread -jar $current_emulmgr "$@"
 else
-java -XstartOnFirstThread -jar $em_path"/emulator-manager.jar" "$@"
+java -XstartOnFirstThread -jar $em_path"/emulator-manager.app/Contents/Resources/Java/emulator-manager.jar" "$@"
 fi