ehatcher 2003/09/18 10:42:35
Modified: . build.xml
Log:
More build file cleanup - making target names
more sensible in an effort to start splitting the
coupling between the demo, tests, and core. Test
target is now "test" ("test-unit" alias remains).
Revision Changes Path
1.45 +18 -17 jakarta-lucene/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-lucene/build.xml,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -r1.44 -r1.45
--- build.xml 18 Sep 2003 17:19:19 -0000 1.44
+++ build.xml 18 Sep 2003 17:42:35 -0000 1.45
@@ -1,6 +1,6 @@
<?xml version="1.0"?>
-<project name="Lucene" default="jar" basedir=".">
+<project name="Lucene" default="default" basedir=".">
<!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it -->
@@ -102,7 +102,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="compile" depends="init">
+ <target name="compile-core" depends="init">
<javac
encoding="${build.encoding}"
srcdir="${src.dir}"
@@ -123,7 +123,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="jar" depends="compile">
+ <target name="jar-core" depends="compile-core">
<jar
jarfile="${build.dir}/${final.name}.jar"
@@ -156,7 +156,7 @@
Implementation-Vendor: Lucene
-->
- <target name="jardemo" depends="compile,demo">
+ <target name="jar-demo" depends="compile-demo">
<jar
jarfile="${build.demo}/${build.demo.name}.jar"
basedir="${build.demo.classes}"
@@ -164,7 +164,7 @@
/>
</target>
- <target name="wardemo" depends="compile,demo,jar,jardemo">
+ <target name="war-demo" depends="jar-core,jar-demo">
<mkdir dir="${build.demo}/${build.demo.war.name}"/>
<mkdir dir="${build.demo}/${build.demo.war.name}/WEB-INF"/>
<mkdir dir="${build.demo}/${build.demo.war.name}/WEB-INF/lib"/>
@@ -212,7 +212,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="demo" depends="compile">
+ <target name="compile-demo" depends="compile-core">
<mkdir dir="${build.demo}"/>
<mkdir dir="${build.demo.src}"/>
@@ -240,7 +240,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="test" depends="compile,demo">
+ <target name="compile-test" depends="compile-core,compile-demo">
<mkdir dir="${build.test.classes}"/>
<javac
encoding="${build.encoding}"
@@ -257,7 +257,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="test-unit" depends="compile,test" if="junit.present">
+ <target name="test" depends="compile-test" if="junit.present">
<mkdir dir="${junit.reports}"/>
<junit printsummary="off" haltonfailure="no">
<classpath refid="junit.classpath"/>
@@ -272,6 +272,9 @@
</junit>
</target>
+ <!-- backwards compatible target - may be removed -->
+ <target name="test-unit" depends="test"/>
+
<!-- ================================================================== -->
<!-- D O C U M E N T A T I O N -->
<!-- ================================================================== -->
@@ -334,7 +337,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="javadocs" depends="compile">
+ <target name="javadocs">
<mkdir dir="${build.javadocs}"/>
<javadoc
sourcepath="${src.dir}:${build.src}"
@@ -350,7 +353,6 @@
doctitle="${Name} ${version} API"
bottom="Copyright &copy; ${year} Apache Software Foundation. All Rights
Reserved."
>
- <classpath refid="classpath"/>
<tag name="todo" description="To Do:"/>
</javadoc>
</target>
@@ -360,7 +362,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="package" depends="jar, javadocs, demo, wardemo">
+ <target name="package" depends="jar-core, javadocs, war-demo">
<mkdir dir="${dist.dir}"/>
<mkdir dir="${dist.dir}/docs"/>
<mkdir dir="${dist.dir}/docs/api"/>
@@ -447,8 +449,7 @@
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="dist" depends="package-all">
- </target>
+ <target name="dist" depends="package-all"/>
<!-- ================================================================== -->
<!-- S O U R C E D I S T R I B U T I O N -->
@@ -517,16 +518,14 @@
<!-- -->
<!-- ================================================================== -->
<target name="package-all-src" depends="package-zip-src, package-tgz-src"
- description="--> Generates the .tar.gz and .zip source distributions">
- </target>
+ description="--> Generates the .tar.gz and .zip source distributions"/>
<!-- ================================================================== -->
<!-- same as package-all-src. it is just here for compatibility. -->
<!-- ================================================================== -->
<!-- -->
<!-- ================================================================== -->
- <target name="dist-src" depends="package-all-src">
- </target>
+ <target name="dist-src" depends="package-all-src"/>
<!-- ================================================================== -->
<!-- C L E A N -->
@@ -645,5 +644,7 @@
<arg value="${target}"/>
</java>
</target>
+
+ <target name="default" depends="jar-core"/>
</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
