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).


git-svn-id: https://svn.apache.org/repos/asf/lucene/java/trunk@150045 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Erik Hatcher 2003-09-18 17:42:35 +00:00
parent 7965b58fa2
commit 404a71b517
1 changed files with 18 additions and 17 deletions

View File

@ -1,6 +1,6 @@
<?xml version="1.0"?> <?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 <!-- Give user a chance to override without editing this file
(and without typing -D each time it compiles it --> (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 <javac
encoding="${build.encoding}" encoding="${build.encoding}"
srcdir="${src.dir}" srcdir="${src.dir}"
@ -123,7 +123,7 @@
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- --> <!-- -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="jar" depends="compile"> <target name="jar-core" depends="compile-core">
<jar <jar
jarfile="${build.dir}/${final.name}.jar" jarfile="${build.dir}/${final.name}.jar"
@ -156,7 +156,7 @@ Implementation-Version: build 2003-09-18 13:08:01
Implementation-Vendor: Lucene Implementation-Vendor: Lucene
--> -->
<target name="jardemo" depends="compile,demo"> <target name="jar-demo" depends="compile-demo">
<jar <jar
jarfile="${build.demo}/${build.demo.name}.jar" jarfile="${build.demo}/${build.demo.name}.jar"
basedir="${build.demo.classes}" basedir="${build.demo.classes}"
@ -164,7 +164,7 @@ Implementation-Vendor: Lucene
/> />
</target> </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}"/>
<mkdir dir="${build.demo}/${build.demo.war.name}/WEB-INF"/> <mkdir dir="${build.demo}/${build.demo.war.name}/WEB-INF"/>
<mkdir dir="${build.demo}/${build.demo.war.name}/WEB-INF/lib"/> <mkdir dir="${build.demo}/${build.demo.war.name}/WEB-INF/lib"/>
@ -212,7 +212,7 @@ Implementation-Vendor: Lucene
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- --> <!-- -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="demo" depends="compile"> <target name="compile-demo" depends="compile-core">
<mkdir dir="${build.demo}"/> <mkdir dir="${build.demo}"/>
<mkdir dir="${build.demo.src}"/> <mkdir dir="${build.demo.src}"/>
@ -240,7 +240,7 @@ Implementation-Vendor: Lucene
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- --> <!-- -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="test" depends="compile,demo"> <target name="compile-test" depends="compile-core,compile-demo">
<mkdir dir="${build.test.classes}"/> <mkdir dir="${build.test.classes}"/>
<javac <javac
encoding="${build.encoding}" encoding="${build.encoding}"
@ -257,7 +257,7 @@ Implementation-Vendor: Lucene
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- --> <!-- -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="test-unit" depends="compile,test" if="junit.present"> <target name="test" depends="compile-test" if="junit.present">
<mkdir dir="${junit.reports}"/> <mkdir dir="${junit.reports}"/>
<junit printsummary="off" haltonfailure="no"> <junit printsummary="off" haltonfailure="no">
<classpath refid="junit.classpath"/> <classpath refid="junit.classpath"/>
@ -272,6 +272,9 @@ Implementation-Vendor: Lucene
</junit> </junit>
</target> </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 --> <!-- D O C U M E N T A T I O N -->
<!-- ================================================================== --> <!-- ================================================================== -->
@ -334,7 +337,7 @@ Implementation-Vendor: Lucene
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- --> <!-- -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="javadocs" depends="compile"> <target name="javadocs">
<mkdir dir="${build.javadocs}"/> <mkdir dir="${build.javadocs}"/>
<javadoc <javadoc
sourcepath="${src.dir}:${build.src}" sourcepath="${src.dir}:${build.src}"
@ -350,7 +353,6 @@ Implementation-Vendor: Lucene
doctitle="${Name} ${version} API" doctitle="${Name} ${version} API"
bottom="Copyright &amp;copy; ${year} Apache Software Foundation. All Rights Reserved." bottom="Copyright &amp;copy; ${year} Apache Software Foundation. All Rights Reserved."
> >
<classpath refid="classpath"/>
<tag name="todo" description="To Do:"/> <tag name="todo" description="To Do:"/>
</javadoc> </javadoc>
</target> </target>
@ -360,7 +362,7 @@ Implementation-Vendor: Lucene
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- --> <!-- -->
<!-- ================================================================== --> <!-- ================================================================== -->
<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}"/>
<mkdir dir="${dist.dir}/docs"/> <mkdir dir="${dist.dir}/docs"/>
<mkdir dir="${dist.dir}/docs/api"/> <mkdir dir="${dist.dir}/docs/api"/>
@ -447,8 +449,7 @@ Implementation-Vendor: Lucene
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- --> <!-- -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="dist" depends="package-all"> <target name="dist" depends="package-all"/>
</target>
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- S O U R C E D I S T R I B U T I O N --> <!-- S O U R C E D I S T R I B U T I O N -->
@ -517,16 +518,14 @@ Implementation-Vendor: Lucene
<!-- --> <!-- -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="package-all-src" depends="package-zip-src, package-tgz-src" <target name="package-all-src" depends="package-zip-src, package-tgz-src"
description="--> Generates the .tar.gz and .zip source distributions"> description="--> Generates the .tar.gz and .zip source distributions"/>
</target>
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- same as package-all-src. it is just here for compatibility. --> <!-- same as package-all-src. it is just here for compatibility. -->
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- --> <!-- -->
<!-- ================================================================== --> <!-- ================================================================== -->
<target name="dist-src" depends="package-all-src"> <target name="dist-src" depends="package-all-src"/>
</target>
<!-- ================================================================== --> <!-- ================================================================== -->
<!-- C L E A N --> <!-- C L E A N -->
@ -646,4 +645,6 @@ Implementation-Vendor: Lucene
</java> </java>
</target> </target>
<target name="default" depends="jar-core"/>
</project> </project>