From: jihye424.kim <jihye424.kim@samsung.com>
Date: Mon, 14 Dec 2015 07:20:38 +0000 (+0900)
Subject: build: remove sdk-manager.jar build dependency
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0ecc5b7597c519baf577e07396fdae0b1cc3c248;p=sdk%2Femulator%2Femulator-manager.git

build: remove sdk-manager.jar build dependency

Change-Id: I67a36680efec9e80f7f01274c505facb45b9057e
Signed-off-by: jihye424.kim <jihye424.kim@samsung.com>
---

diff --git a/.classpath b/.classpath
index 44b5e14..cbe00d4 100644
--- a/.classpath
+++ b/.classpath
@@ -4,12 +4,11 @@
 	<classpathentry kind="src" path="widget_src"/>
 	<classpathentry kind="src" path="jaxb_src"/>
 	<classpathentry kind="src" path="resource"/>
-	<classpathentry exported="true" kind="lib" path="lib/swt.jar" sourcepath="lib/src.zip"/>
+	<classpathentry kind="lib" path="lib/swt-4.4.jar"/>
 	<classpathentry kind="lib" path="lib/jsch-0.1.50.jar"/>
 	<classpathentry kind="lib" path="lib/protobuf.jar"/>
 	<classpathentry kind="lib" path="lib/jna-4.1.0.jar"/>
 	<classpathentry kind="lib" path="lib/jna-platform-4.1.0.jar"/>
-	<classpathentry kind="lib" path="lib/sdk-manager.jar"/>
 	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
 	<classpathentry kind="output" path="bin"/>
 </classpath>
diff --git a/README b/README
index 1e43cbe..8e121b7 100644
--- a/README
+++ b/README
@@ -1,15 +1,12 @@
 Emulator manager consists of two java project.
  - emulator-manager
  - emulator-manager-resources.
-This README tells how to build above two project and test Emulator manager.
+This README tells how to build above two projects and test Emulator manager.
 
 How to build emulator-manager?
 1. Before building emulator-manager, some library files are required. Please follow the next steps.
 	- Download an emulator-common-lib-dev_XXX.zip at sdk package server.
 	- Unzip an emulator-common-lib-dev_XXX.zip file.
-	- Download an sdk-manager_xxx.zip at sdk package server.
-	- Unzip an sdk-manager_xxx.zip file.
-	- (Choose an .zip with latest version and proper OS.)
 
 2. Create 'lib' directory under the {emulator-manager_SRC}
 **  {emulator-manager_SRC} means root dir of emulator-manager source.
@@ -46,7 +43,7 @@ How to build emulator-manager-resources?
 
 How to run and test Emulator manager?
 1. Copy jar file
-	1. Install tizen sdk.
+	1. Install Tizen SDK
 	2. Copy emulator-manager.jar to {tizen-sdk}/tools/emulator/bin
 	**  {tizen-sdk} means tizen sdk installed path.
 	**  Before copy file, you'd better back up original files.
@@ -56,13 +53,20 @@ How to run and test Emulator manager?
 	4. Launch emulator manager
 
 2. Using eclipse
-	1. Install tizen sdk.
+	1. Install Tizen SDK
 	2. Start eclipse
 		- Import emulator-manager project (EmulatorManager) and emulator-manager-resources project ({profile}-plugin).
 		- Check 'lib' directory. If not exist 'lib' directroy, make 'lib' directory and then, copy libraries that mentioned at building emulator-manager section.
+
 	3. Copy sdk.info file from sdk installed path to path that up to 3 depth from emulator-manager source dir.
 		- ex) cd {emulator-manager_SRC} ;  cp {tizen-sdk}/sdk.info ../../../
-	4. Run as emulator manager
+	4. Edit a run configuration to check Tizen SDK has been updated (optional)
+		- Download an sdk-manager_xxx.zip at sdk package server
+		- Unzip an sdk-manager_xxx.zip file (Choose the latest version with proper OS)
+		- Select 'Classpath' tab
+		- Select 'Add JARs...' in 'User Entries'
+		- Select 'sdk-manager.jar' file
+	5. Run as emulator manager
 
 	** If emulator-manager-resources is modified, build sources using build.sh and copy em-plugin-xxx.jar such as:
 	- $ ./build.sh (in emulator-manager-resources directory)
diff --git a/build.xml b/build.xml
index 6f7f2db..2619837 100644
--- a/build.xml
+++ b/build.xml
@@ -21,7 +21,6 @@
 		<fileset dir="${common.dir}/lib" includes="${proto.file}" />
 		<fileset dir="${common.dir}/lib" includes="${jna.file}" />
 		<fileset dir="${common.dir}/lib" includes="${jna-platform.file}" />
-		<fileset dir="${common.dir}/lib" includes="${sdk-manager.file}" />
 	</path>
 
 	<target name="clean">
diff --git a/package/build.common b/package/build.common
index 31eeba8..f0aebd7 100755
--- a/package/build.common
+++ b/package/build.common
@@ -8,7 +8,6 @@ build_common()
 	cp "$ROOTDIR/protobuf.jar" "$SRCDIR/lib"
 	cp "$ROOTDIR/jna-4.1.0.jar" "$SRCDIR/lib"
 	cp "$ROOTDIR/jna-platform-4.1.0.jar" "$SRCDIR/lib"
-	cp "$ROOTDIR/library/sdk-manager.jar" "$SRCDIR/lib"
 
 	PKG_INFO=$SRCDIR/package/pkginfo.manifest
 	BINARY_VERSION=`awk -F: '$1 == "Version" {name=$2; print name}' $PKG_INFO`
diff --git a/package/pkginfo.manifest b/package/pkginfo.manifest
index 6cf4ab6..515ef93 100644
--- a/package/pkginfo.manifest
+++ b/package/pkginfo.manifest
@@ -5,20 +5,20 @@ Maintainer: MinKee Lee <minkee.lee@samsung.com>, Jihye Kim <jihye424.kim@samsung
 Package: emulator-manager
 OS: ubuntu-32, ubuntu-64
 Build-host-os: ubuntu-32
-Build-dependency: emulator-common-lib-dev, sdk-manager
+Build-dependency: emulator-common-lib-dev
 Install-dependency: emulator-common-lib, emulator-supplements
 Description: Tizen Emulator Manager
 
 Package: emulator-manager
 OS: windows-32, windows-64
 Build-host-os: windows-32
-Build-dependency: emulator-common-lib-dev, sdk-manager
+Build-dependency: emulator-common-lib-dev
 Install-dependency: emulator-common-lib, emulator-supplements
 Description: Tizen Emulator Manager
 
 Package: emulator-manager
 OS: macos-64
 Build-host-os: macos-64
-Build-dependency: emulator-common-lib-dev, sdk-manager
+Build-dependency: emulator-common-lib-dev
 Install-dependency: emulator-common-lib, emulator-supplements
 Description: Tizen Emulator Manager