From 68a72378a641788435c5b7854a9e1557b4e84f5b Mon Sep 17 00:00:00 2001
From: Yohann Roussel <yroussel@google.com>
Date: Tue, 5 May 2015 14:40:11 +0200
Subject: Prepare distributable files in a single folder

Default target was renamed "all", a new dist target was added doing just the
files required for distribution.

Bug: 20815603

(cherry picked from commit 032af85a4757447f6f7b37f6dd8fc3ee63a3d934)

Change-Id: I99706d6bcde6df1f111044d0b3840c8e16226a7d
---
 build.xml | 29 ++++++++++++++++++++++++++---
 1 file changed, 26 insertions(+), 3 deletions(-)

diff --git a/build.xml b/build.xml
index 66f6b3f..a56745d 100644
--- a/build.xml
+++ b/build.xml
@@ -15,11 +15,11 @@
    limitations under the License.
 -->
 
-<project name="jill" default="dist">
+<project name="jill" default="all">
 
   <import file="../jack/build.xml"/>
 
-  <target name="dist" depends="jill,
+  <target name="all" depends="jill,
     jill-api,
     jill-api-src,
     jillunittests"/>
@@ -28,7 +28,8 @@
     jill-api-lib-clean,
     jill-api-src-clean,
     jillunittests-clean,
-    asm4-clean" />
+    asm4-clean,
+    dist-clean"/>
 
   <dirname property="jill-project.dir" file="${ant.file.jill}"/>
 
@@ -36,6 +37,28 @@
   <property name="jill-api.dir" value="${jill-project.dir}/jill-api" />
   <property name="asm4.dir" value="${jill-project.dir}/asm4" />
 
+  <!-- ******************* -->
+  <!-- Distributed files   -->
+  <!-- ******************* -->
+
+  <property name="jill-top-dist.dir" value="${jill-project.dir}/dist" />
+
+  <target name="dist-clean">
+    <delete dir="${jill-top-dist.dir}"/>
+  </target>
+
+  <target name="dist" depends="jill,
+    jill-api,
+    jill-api-src">
+    <mkdir dir="${jill-top-dist.dir}"/>
+    <copy todir="${jill-top-dist.dir}" flatten="true">
+      <filelist dir="/" >
+        <file name="${jill.dist.dir}/${jill.execname}" />
+        <file name="${jill-api.dist.dir}/${jill-api.name}" />
+        <file name="${jill-api.dist.dir}/${jill-api-src.name}" />
+      </filelist>
+    </copy>
+  </target>
 
   <!-- ******************* -->
   <!-- jill                -->
-- 
cgit v1.1