[tor-commits] [collector/master] Generate jars and the tarball in generated/dist/.

[karsten at torproject.org]

commit 98e881d821bd5cc4ee2757d8e8b2105a5a9fab31
Author: Karsten Loesing <karsten.loesing at gmx.net>
Date:   Thu Oct 20 13:35:30 2016 +0200

    Generate jars and the tarball in generated/dist/.
---
 build.xml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/build.xml b/build.xml
index 979a11e..d84a86a 100644
--- a/build.xml
+++ b/build.xml
@@ -7,6 +7,7 @@
   <property name="resources" value="src/main/resources/"/>
   <property name="webappsources" value="src/main/webapp"/>
   <property name="generated" value="generated/"/>
+  <property name="dist" value="${generated}/dist"/>
   <property name="testresult" value="${generated}/test-results"/>
   <property name="testsources" value="src/test/java"/>
   <property name="testresources" value="src/test/resources/"/>
@@ -17,11 +18,11 @@
   <property name="docs" value="${generated}/javadoc/"/>
   <property name="libs" value="lib"/>
   <property name="cobertura.ser.file" value="${basedir}/cobertura.ser" />
-  <property name="jarfile" value="collector-${release.version}.jar" />
-  <property name="jarsourcesfile" value="collector-${release.version}-sources.jar" />
-  <property name="jarjavadocfile" value="collector-${release.version}-javadoc.jar" />
+  <property name="jarfile" value="${dist}/collector-${release.version}.jar" />
+  <property name="jarsourcesfile" value="${dist}/collector-${release.version}-sources.jar" />
+  <property name="jarjavadocfile" value="${dist}/collector-${release.version}-javadoc.jar" />
   <property name="release.tarball"
-            value="collector-${release.version}.tar.gz" />
+            value="${dist}/collector-${release.version}.tar.gz" />
   <property file="build.properties" />
   <patternset id="runtime" >
       <include name="commons-codec-1.9.jar"/>
@@ -90,10 +91,6 @@
       <fileset dir="${generated}" defaultexcludes="false" includes="**" />
     </delete>
     <delete file="${cobertura.ser.file}" quiet="true"/>
-    <delete file="${jarfile}" quiet="true"/>
-    <delete file="${jarsourcesfile}" quiet="true"/>
-    <delete file="${jarjavadocfile}" quiet="true"/>
-    <delete file="${release.tarball}"/>
   </target>
   <target name="compile" depends="init">
     <javac srcdir="${sources}"