--- jsr166/build.xml	2002/10/08 14:43:34	1.2
+++ jsr166/build.xml	2003/03/14 04:14:07	1.21
@@ -1,14 +1,41 @@
-<project name="jsr166" default="jar">
+<project name="jsr166" default="usage">
 
   <description>
     Build file for JSR-166
+
+    JUnit 1.8 must be in ${ant.home}/lib for the test target to work.
   </description>
 
+
+  <target name="usage" description="Prints this message">
+    <echo>
+ant [target], where target is one of:
+
+ usage       (default) Prints this message
+ compile     Compiles all sources to build folder
+ jar         Builds library jar from compiled sources
+ test        Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)
+ docs        Builds javadocs with custom tags to build folder
+ dist-docs   Builds javadocs without custom tags to dist folder
+ dist        Puts all distributable products in single hierarchy
+
+ clean       Removes all build products
+ dist-clean  Removes all build and distribution products
+
+ checkstyle  Reports on style errors in Java source (verbose, mostly chaff)
+ doccheck    Reports on javadoc style errors (not working yet)
+    </echo>
+  </target>
+
+
   <!-- Compilation options -->
+  <property name="build.sourcelevel"    value="1.5"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
-  <property name="build.sourcelevel"    value="1.4"/>
+  <!--
+  <property name="build.warnings"       value="true"/>
+  -->
 
   <!-- Build locations -->
   <property name="build.dir"            location="build"/>
@@ -17,7 +44,9 @@
   <property name="build.lib.dir"        location="${build.dir}/lib"/>
   <property name="build.ant.dir"        location="${build.dir}/ant"/>
   <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
+  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
   <property name="build.reports.dir"    location="${build.dir}/reports"/>
+  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
   <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
 
   <!-- Source locations -->
@@ -26,6 +55,10 @@
   <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
   <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
+  <property name="dist.dir"             location="${basedir}/dist"/>
+
+  <!-- Distribution locations -->
+  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
 
   <!-- Jar locations -->
   <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
@@ -34,22 +67,22 @@
   <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
   <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
 
-  <property name="gj.compiler.args"
-           value='-J-Xbootclasspath/p:${javac.jar} -gj'
-  />
+  <property name="javac.args"           value='-J-Xbootclasspath/p:${javac.jar}'/>
 
-  <path id="gj.compiler.bootclasspath">
+  <path id="javac.bootclasspath">
     <pathelement location="${collect.jar}"/>
     <pathelement location="${rt.jar}"/>
   </path>
 
   <path id="test.classpath">
     <pathelement location="${product.jar}"/>
-    <pathelement location="${junit.jar}"/>
   </path>
 
 
-  <target name="compile">
+  <!-- Main targets -->
+
+  <target name="compile" depends="init"
+          description="Compiles all sources to build folder">
     <mkdir dir="${build.classes.dir}"/>
     <javac srcdir="${src.dir}"
           destdir="${build.classes.dir}"
@@ -59,8 +92,8 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <bootclasspath refid="gj.compiler.bootclasspath"/>
-      <compilerarg line="${gj.compiler.args}"/>
+      <bootclasspath refid="javac.bootclasspath"/>
+      <compilerarg line="${javac.args} ${build.warnings.option}"/>
 
       <!-- need this because srcdir is basedir! -->
       <include name="java/**/*.java"/>
@@ -69,7 +102,8 @@
   </target>
 
 
-  <target name="jar" depends="compile">
+  <target name="jar" depends="compile"
+          description="Builds library jar from compiled sources">
     <mkdir dir="${build.lib.dir}"/>
     <jar basedir="${build.classes.dir}"
         destfile="${product.jar}"
@@ -77,10 +111,38 @@
   </target>
 
 
-  <target name="test" depends="report-tests"/>
+  <target name="test" depends="init, check-junit, report-tests"
+          description="Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)"/>
+
+
+  <target name="checkstyle" depends="filter-src"
+          description="Reports on style errors in Java source (verbose, mostly chaff)">
+    <taskdef resource="checkstyletask.properties"
+            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
+
+    <checkstyle>
+      <formatter type="plain"/>  <!-- also available: type="xml" -->
+      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
+    </checkstyle>
+  </target>
 
 
-  <target name="docs" depends="filter-src">
+  <target name="doccheck" depends="filter-src"
+          description="Reports on javadoc style errors (not working yet)">
+    <delete dir="${build.doccheck.dir}"/>
+    <mkdir dir="${build.doccheck.dir}"/>
+    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
+         docletpath="${lib.dir}/doccheck.jar"
+            destdir="${build.doccheck.dir}">
+      <packageset dir="${build.filter.src.dir}">
+        <include name="java/**"/>
+      </packageset>
+    </javadoc>
+  </target>
+
+
+  <target name="docs" depends="filter-src"
+          description="Builds javadocs with custom tags to build folder">
     <delete dir="${build.javadocs.dir}"/>
     <mkdir dir="${build.javadocs.dir}"/>
     <javadoc destdir="${build.javadocs.dir}"
@@ -90,7 +152,8 @@
 
       <tag name="revised" description="Last revised:"/>
       <tag name="spec" description="Specified by:"/>
-
+      <tag name="editor" description="Last edited by:"/>
+      <tag name="fixme" description="FIX ME:"/>
       <packageset dir="${build.filter.src.dir}">
         <include name="java/**"/>
       </packageset>
@@ -99,17 +162,106 @@
   </target>
 
 
-  <target name="clean">
+  <target name="strip" depends="init">
+    <mkdir dir="${build.stripped.dir}"/>
+    <javac srcdir="${src.dir}"
+          destdir="${build.stripped.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+
+      <bootclasspath refid="javac.bootclasspath"/>
+      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
+
+      <!-- need this because srcdir is basedir! -->
+      <include name="java/**/*.java"/>
+
+    </javac>
+  </target>
+
+
+  <target name="dist" depends="init, dist-clean, dist-jar, dist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+  <target name="clean"
+          description="Removes all build products">
     <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>
     <delete dir="${build.lib.dir}"/>
-    <delete dir="${build.javadocs.dir}"/>
   </target>
 
 
-  <!-- Internal targets used by docs target -->
+  <target name="dist-clean"
+          description="Removes all build and distribution products">
+    <delete dir="${dist.dir}"/>
+  </target>
+
+
+  <!-- Anthill targets -->
+
+  <!-- Should really run the tests instead of just the jar target -->
+  <target name="anthill-build" depends="jar, docs, dist-docs"/>
+
+  <target name="anthill-publish">
+    <copy todir="${deployDir}/docs/private">
+      <fileset dir="${build.javadocs.dir}"/>
+    </copy>
+    <copy todir="${deployDir}/docs/public">
+      <fileset dir="${dist.javadocs.dir}"/>
+    </copy>
+    <copy tofile="${deployDir}/index.html"
+          file="${basedir}/etc/anthill-index.html"/>
+    <copy todir="${deployDir}/notes">
+      <fileset dir="${basedir}/etc/notes"/>
+    </copy>
+  </target>
+
+
+  <!-- Internal targets -->
+
+  <target name="set-warnings-if" if="build.warnings">
+    <property name="build.warnings.option" value="-warnunchecked"/>
+  </target>
+
+
+  <target name="set-warnings-unless" unless="build.warnings">
+    <property name="build.warnings.option" value=""/>
+  </target>
+
+
+  <target name="init" depends="set-warnings-if, set-warnings-unless">
+    <!-- Version is kept in a separate file -->
+    <loadfile property="version" srcFile="version.properties"/>
+    <echo>Building JSR-166 version ${version}</echo>
+  </target>
+
+
+  <target name="dist-jar" depends="clean, jar">
+    <copy file="${product.jar}" todir="${dist.dir}"/>
+  </target>
+
+
+  <target name="dist-docs" depends="filter-src"
+          description="Builds javadocs without custom tags to dist folder">
+    <delete dir="${dist.javadocs.dir}"/>
+    <mkdir dir="${dist.javadocs.dir}"/>
+    <javadoc destdir="${dist.javadocs.dir}"
+                link="http://java.sun.com/j2se/1.4.1/docs/api"
+            overview="${src.dir}/intro.html"
+              source="${build.sourcelevel}">
+
+      <packageset dir="${build.filter.src.dir}">
+        <include name="java/**"/>
+      </packageset>
 
-  <target name="compile-ant">
+    </javadoc>
+  </target>
+
+
+  <target name="compile-ant-filter" depends="init">
     <mkdir dir="${build.ant.dir}"/>
     <javac srcdir="${ant.src.dir}"
           destdir="${build.ant.dir}"
@@ -118,11 +270,11 @@
   </target>
 
 
-  <target name="filter-src" depends="compile-ant">
+  <target name="filter-src" depends="compile-ant-filter">
     <mkdir dir="${build.filter.src.dir}"/>
     <copy todir="${build.filter.src.dir}">
       <fileset dir="${src.dir}">
-        <include name="**/*.java"/>
+        <include name="java/**/*.java"/>
       </fileset>
       <filterchain>
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"
@@ -159,8 +311,6 @@
   </target>
 
 
-  <!-- Internal targets used by test target -->
-
   <target name="compile-tests" depends="jar">
     <mkdir dir="${build.testcases.dir}"/>
     <javac srcdir="${test.src.dir}"
@@ -171,26 +321,28 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <bootclasspath refid="gj.compiler.bootclasspath"/>
-      <compilerarg line="${gj.compiler.args}"/>
+      <bootclasspath refid="javac.bootclasspath"/>
+      <compilerarg line="${javac.args} ${build.warnings.option}"/>
       <classpath refid="test.classpath"/>
-      <include name="**/*Test.java"/>
 
     </javac>
   </target>
 
+
   <target name="run-tests" depends="compile-tests">
     <mkdir dir="${build.reports.dir}"/>
     <junit printsummary="true"
              showoutput="true"
           errorProperty="junit.failed"
         failureProperty="junit.failed"
-                    dir="${build.reports.dir}">
+                    dir="${build.reports.dir}"
+                   fork="true">
 
-      <classpath>
-        <path refid="test.classpath"/>
-        <pathelement location="${build.testcases.dir}"/>
-      </classpath>
+      <!--
+       ! This nastiness is so JUnit can test classes we are inserting
+       ! into the java.* packages.
+       -->
+      <jvmarg value="-Xbootclasspath/p:${product.jar};${build.testcases.dir};${junit.jar}"/>
 
       <formatter type="xml"/>
 
@@ -227,4 +379,12 @@
   </target>
 
 
+  <target name="check-junit">
+    <!-- FIXME: this test isn't specific enough -->
+    <available property="junit.available"
+               classname="junit.framework.TestCase"/>
+    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
+  </target>
+
+
 </project>