--- jsr166/build.xml	2002/12/13 07:09:11	1.17
+++ jsr166/build.xml	2003/05/17 21:20:50	1.23
@@ -1,16 +1,35 @@
-<project name="jsr166" default="jar">
+<project name="jsr166" default="usage">
 
   <description>
-
     Build file for JSR-166
 
-    Note that junit.jar must be in ${ant.home}/lib for the
-    test target to work. [FIXME: This should be automatically
-    enforced by this build file by failing with a message if
-    junit.jar is not in the right place.]
-
+    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>
+
+  <property file="user.properties"/>
+  <property name="testcase" value="*"/>
+
   <!-- Compilation options -->
   <property name="build.sourcelevel"    value="1.5"/>
   <property name="build.debug"          value="true"/>
@@ -33,8 +52,8 @@
   <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
 
   <!-- Source locations -->
-  <property name="src.dir"              location="${basedir}"/>
-  <property name="test.src.dir"         location="${basedir}/etc/testcases"/>
+  <property name="src.dir"              location="${basedir}/src/main"/>
+  <property name="test.src.dir"         location="${basedir}/src/test"/>
   <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
   <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
@@ -78,9 +97,6 @@
       <bootclasspath refid="javac.bootclasspath"/>
       <compilerarg line="${javac.args} ${build.warnings.option}"/>
 
-      <!-- need this because srcdir is basedir! -->
-      <include name="java/**/*.java"/>
-
     </javac>
   </target>
 
@@ -94,12 +110,12 @@
   </target>
 
 
-  <target name="test" depends="init, report-tests"
-          description="Runs all 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">
+          description="Reports on style errors in Java source (verbose, mostly chaff)">
     <taskdef resource="checkstyletask.properties"
             classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
 
@@ -111,15 +127,13 @@
 
 
   <target name="doccheck" depends="filter-src"
-          description="Reports on javadoc style errors">
+          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>
+      <packageset dir="${build.filter.src.dir}"/>
     </javadoc>
   </target>
 
@@ -137,14 +151,17 @@
       <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>
+      <packageset dir="${build.filter.src.dir}"/>
 
     </javadoc>
   </target>
 
 
+  <!--
+   # javac -s doesn't reliably generate compilable code. It generates
+   # bridge methods (marked as "synthetic") that can have identical
+   # signatures to existing methods except for the return value.
+   -->
   <target name="strip" depends="init">
     <mkdir dir="${build.stripped.dir}"/>
     <javac srcdir="${src.dir}"
@@ -158,9 +175,6 @@
       <bootclasspath refid="javac.bootclasspath"/>
       <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
 
-      <!-- need this because srcdir is basedir! -->
-      <include name="java/**/*.java"/>
-
     </javac>
   </target>
 
@@ -186,8 +200,7 @@
   <!-- Anthill targets -->
 
   <!-- Should really run the tests instead of just the jar target -->
-  <target name="anthill-build" depends="jar, docs, dist-docs"
-          description="Build the jar and both the external and internal docs"/>
+  <target name="anthill-build" depends="jar, docs, dist-docs"/>
 
   <target name="anthill-publish">
     <copy todir="${deployDir}/docs/private">
@@ -198,6 +211,9 @@
     </copy>
     <copy tofile="${deployDir}/index.html"
           file="${basedir}/etc/anthill-index.html"/>
+    <copy todir="${deployDir}/notes">
+      <fileset dir="${basedir}/etc/notes"/>
+    </copy>
   </target>
 
 
@@ -234,9 +250,7 @@
             overview="${src.dir}/intro.html"
               source="${build.sourcelevel}">
 
-      <packageset dir="${build.filter.src.dir}">
-        <include name="java/**"/>
-      </packageset>
+      <packageset dir="${build.filter.src.dir}"/>
 
     </javadoc>
   </target>
@@ -255,7 +269,7 @@
     <mkdir dir="${build.filter.src.dir}"/>
     <copy todir="${build.filter.src.dir}">
       <fileset dir="${src.dir}">
-        <include name="java/**/*.java"/>
+        <include name="**/*.java"/>
       </fileset>
       <filterchain>
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"
@@ -305,7 +319,6 @@
       <bootclasspath refid="javac.bootclasspath"/>
       <compilerarg line="${javac.args} ${build.warnings.option}"/>
       <classpath refid="test.classpath"/>
-      <include name="**/*Test.java"/>
 
     </javac>
   </target>
@@ -320,18 +333,17 @@
                     dir="${build.reports.dir}"
                    fork="true">
 
-      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
-
-      <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"/>
 
       <batchtest todir="${build.reports.dir}">
         <fileset dir="${test.src.dir}">
-          <include name="**/*Test.java"/>
+          <include name="**/${testcase}Test.java"/>
         </fileset>
       </batchtest>
 
@@ -362,4 +374,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>