From 0d1c75493edd1dc2b2b2d4a684b232d5e55315d7 Mon Sep 17 00:00:00 2001
From: SeokYeon Hwang <syeon.hwang@samsung.com>
Date: Tue, 1 Dec 2015 14:03:09 +0900
Subject: [PATCH] build: use same build script on DIBS and local

Conflicts:
        build.xml
        package/build.common

Change-Id: Ide8c0cc66d6d87cadf6e7da5655ed185df7bb9d9
Signed-off-by: SeokYeon Hwang <syeon.hwang@samsung.com>
(cherry picked from commit ba797fea43cd6e4c0530fecf4b7fa04d0c7d55ce)
---
 build.xml            | 29 +++--------------------------
 package/build.common | 13 ++++++++++---
 2 files changed, 13 insertions(+), 29 deletions(-)

diff --git a/build.xml b/build.xml
index b6feddd..6f7f2db 100644
--- a/build.xml
+++ b/build.xml
@@ -5,7 +5,7 @@
 	<property name="mainclass" value="org.tizen.emulator.manager.EmulatorManager" />
 
 	<property name="proto.file" value="protobuf.jar" />
-	<property name="swt.file" value="swt.jar" />
+	<property name="swt.file" value="swt-4.4.jar" />
 	<property name="jsch.file" value="jsch-0.1.50.jar" />
 	<property name="jna.file" value="jna-4.1.0.jar" />
 	<property name="jna-platform.file" value="jna-platform-4.1.0.jar" />
@@ -20,8 +20,8 @@
 		<fileset dir="${common.dir}/lib" includes="${jsch.file}" />
 		<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}" />
+		<fileset dir="${common.dir}/lib" includes="${jna-platform.file}" />
+		<fileset dir="${common.dir}/lib" includes="${sdk-manager.file}" />
 	</path>
 
 	<target name="clean">
@@ -94,27 +94,4 @@
 	<target name="all" depends="prepare-compile, common-compile">
 		<delete dir="${build.dir}" />
 	</target>
-
-	<!-- for dibs system... -->
-	<path id="common-classpath-dibs">
-		<fileset dir="${classpath.dibs}" includes="${swt.file}" />
-		<fileset dir="${classpath.dibs}" includes="${jsch.file}" />
-		<fileset dir="${classpath.dibs}" includes="${proto.file}" />
-		<fileset dir="${classpath.dibs}" includes="${jna.file}" />
-		<fileset dir="${classpath.dibs}" includes="${jna-platform.file}" />
-	        <fileset dir="${classpath.dibs}" includes="${sdk-manager.file}" />
-	</path>
-
-	<target name="common-compile-dibs" depends="make-properties">
-		<echo message="compiling emulator manager jar" />
-		<antcall target="prepare-compile"/>
-		<javac includeantruntime="false" encoding="UTF-8" fork="true" srcdir="${common.dir}/src:${common.dir}/jaxb_src:${common.dir}/widget_src" destdir="${build.dir}" debug="on" memorymaximumsize="128m">
-			<classpath refid="common-classpath-dibs" />
-		</javac>
-	<antcall target="create-common-jar"/>
-	</target>
-
-	<target name="make-jar-dibs" depends="common-compile-dibs" >
-		<delete dir="${build.dir}" />
-	</target>
 </project>
diff --git a/package/build.common b/package/build.common
index 235473d..31eeba8 100755
--- a/package/build.common
+++ b/package/build.common
@@ -1,13 +1,20 @@
 build_common()
 {
 	cd "$SRCDIR"
-	cp "$ROOTDIR/swt_4.4/swt.jar" "$ROOTDIR/"
-	cp "$ROOTDIR/library/sdk-manager.jar" "$ROOTDIR/"
+
+	mkdir -p "$SRCDIR/lib"
+	cp "$ROOTDIR/swt-4.4.jar" "$SRCDIR/lib"
+	cp "$ROOTDIR/jsch-0.1.50.jar" "$SRCDIR/lib"
+	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`
 	BINARY_VERSION=`echo ${BINARY_VERSION} | tr -d ' '`
 
-	ant -buildfile build.xml -Dclasspath.dibs="$ROOTDIR" -Dpackage.version="$BINARY_VERSION" make-jar-dibs
+	ant -buildfile build.xml -Dpackage.version="$BINARY_VERSION"
 }
 
 install_common()
-- 
2.7.4