From 0273c191217b3cacf1b0abcf28c663f1c9158b91 Mon Sep 17 00:00:00 2001
From: Dmitriy Nikiforov <d.nikiforov@partner.samsung.com>
Date: Tue, 28 Jun 2016 10:50:50 +0300
Subject: [PATCH] SRADA-263: Updated build.linux and DACLI build.xml scripts
 for DIBS build

Change-Id: I242e3024ea00ee72db631db8918076ddc9e9f16b
---
 org.tizen.dynamicanalyzer.cli/build.xml |  5 +++--
 package/build.linux                     | 16 ++++++++++++++++
 2 files changed, 19 insertions(+), 2 deletions(-)

diff --git a/org.tizen.dynamicanalyzer.cli/build.xml b/org.tizen.dynamicanalyzer.cli/build.xml
index 64a712b..9baf0f8 100644
--- a/org.tizen.dynamicanalyzer.cli/build.xml
+++ b/org.tizen.dynamicanalyzer.cli/build.xml
@@ -3,9 +3,10 @@
     <!--this file was based on one created by Eclipse Runnable JAR Export Wizard-->
     <!--ANT 1.7 is required                                                     -->
 
-    <dirset id="build.dirset" dir="../build_result/N.da" includes="*/da" />
+    <property name="product.name" value="dynamic-analyzer-product" />
+    <dirset id="build.dirset" dir="../build_result/N.${product.name}" includes="*/${product.name}" />
 
-    <property name="build.dir"        location="../build_result/N.da/${toString:build.dirset}" />
+    <property name="build.dir"        location="../build_result/N.${product.name}/${toString:build.dirset}" />
     <property name="classes.dir"      location="bin/classes" />
     <property name="src.dir"          location="src" />
     <property name="libjars.dir"      location="${build.dir}/plugins" />
diff --git a/package/build.linux b/package/build.linux
index 34466b9..dd9b56e 100644
--- a/package/build.linux
+++ b/package/build.linux
@@ -244,6 +244,21 @@ __execute_pde_build()
 	fi
 }
 
+__execute_ant_build()
+{
+	echo "Execute Ant Builder..."
+	cd ${SRCDIR}/org.tizen.dynamicanalyzer.cli
+
+	ant clean
+	ant
+
+	if [ $? != 0 ];
+	then
+		echo "Build failed..."
+		exit 1
+	fi
+}
+
 __unzip_plugin_pack()
 {
 	echo "unzip to $build_result_path"
@@ -278,6 +293,7 @@ build_plugins()
 	__make_ant_build_properties_file
 	__execute_pde_build
 	__unzip_plugin_pack
+	__execute_ant_build
 
 	echo "Build SUCCESS. You will find SDK IDE in \"${build_result_path}\"."
 }
-- 
2.7.4