From 1cb510889bcd8e40a5a4a48557aecdd706d727ca Mon Sep 17 00:00:00 2001
From: Erik Hatcher <ehatcher@apache.org>
Date: Mon, 5 Jan 2004 16:35:10 +0000
Subject: [PATCH] build distributions, and consolidate from master build

git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@150905 13f79535-47bb-0310-9956-ffa450edef68
---
 sandbox/contributions/build.xml  |  6 +++++
 sandbox/contributions/common.xml | 46 +++++++++++++++++---------------
 2 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/sandbox/contributions/build.xml b/sandbox/contributions/build.xml
index 99fab9f58a3..89f88863f86 100644
--- a/sandbox/contributions/build.xml
+++ b/sandbox/contributions/build.xml
@@ -1,7 +1,11 @@
 <project name="sandbox" default="build-tree">
 
+  <property name="dist.dir" location="dist"/>
+
   <target name="clean">
     <subant target="clean">
+      <property name="dist.dir" location="${dist.dir}"/>
+
       <fileset dir="."
                includes="*/build.xml"
       />
@@ -10,6 +14,8 @@
 
   <target name="build-tree">
     <subant target="">
+      <property name="dist.dir" location="${dist.dir}"/>
+
       <!-- Exclude LARM for now,
            until its build is brought up to speed
       -->
diff --git a/sandbox/contributions/common.xml b/sandbox/contributions/common.xml
index a684c9570fc..2b57ba96c56 100644
--- a/sandbox/contributions/common.xml
+++ b/sandbox/contributions/common.xml
@@ -12,6 +12,8 @@
 
   <property name="dist.dir" location="dist"/>
 
+  <property name="dist.name" value="${ant.project.name}.jar"/>
+
   <property name="junit.jar" location="${ant.home}/lib/junit.jar"/>
   <dirname file="${ant.file.common}" property="common.dir"/>
   <property name="lucene.dir" location="${common.dir}/../../jakarta-lucene"/>
@@ -22,6 +24,7 @@
   <!-- ========================================================== -->
   <!-- Datatype declarations                                      -->
   <!-- ========================================================== -->
+  <!-- TODO: define ${lucene.jar} for easeir overriding -->
   <path id="compile.classpath">
     <fileset dir="${lucene.dir}" includes="build/lucene*.jar"/>
     <pathelement path="${project.classpath}"/>
@@ -59,30 +62,29 @@
     <delete dir="${test.classes.dir}"/>
   </target>
 
-  <target name="dist" depends="compile"
-    description="Create JAR">
-    <jar jarfile="${lucene-ant.jar}"
-      basedir="${build.classes.dir}"
-      />
+  <target name="dist" depends="compile" description="Create JAR">
+    <jar jarfile="${dist.dir}/${dist.name}"
+         basedir="${build.classes.dir}"
+    />
   </target>
 
   <target name="compile" depends="init">
     <javac destdir="${build.classes.dir}"
-      debug="${build.debug}"
-      includeAntRuntime="yes"
-      deprecation="true"
-      srcdir="${src.dir}"
-      classpathref="compile.classpath"
-      />
+           debug="${build.debug}"
+           includeAntRuntime="yes"
+           deprecation="true"
+           srcdir="${src.dir}"
+           classpathref="compile.classpath"
+    />
   </target>
 
   <target name="test-compile" depends="compile" if="has.tests">
     <javac destdir="${test.classes.dir}"
-      debug="${build.debug}"
-      includeAntRuntime="yes"
-      srcdir="src/test"
-      classpathref="test.classpath"
-      />
+           debug="${build.debug}"
+           includeAntRuntime="yes"
+           srcdir="src/test"
+           classpathref="test.classpath"
+    />
 
     <copy todir="${test.classes.dir}">
       <fileset dir="src/test" excludes="**/*.java"/>
@@ -91,9 +93,9 @@
 
   <target name="test" depends="test-compile" if="has.tests">
     <junit printsummary="no"
-      errorProperty="test.failed"
-      failureProperty="test.failed"
-      fork="${junit.fork}">
+           errorProperty="test.failed"
+           failureProperty="test.failed"
+           fork="${junit.fork}">
       <classpath refid="test.classpath"/>
       <sysproperty key="docs.dir" file="${test.classes.dir}"/>
       <sysproperty key="index.dir" file="${test.output.dir}/index"/>
@@ -101,8 +103,8 @@
       <test name="${testcase}" if="testcase"/>
       <batchtest todir="${test.data.dir}" unless="testcase">
         <fileset dir="${test.classes.dir}"
-          includes="**/*Test.class,**/Test*.class"
-          />
+                 includes="**/*Test.class,**/Test*.class"
+        />
       </batchtest>
     </junit>
 
@@ -112,6 +114,6 @@
 
   </target>
 
-  <target name="default" depends="test"/>
+  <target name="default" depends="test,dist"/>
 
 </project>