--- jsr166/build.xml	2003/01/20 18:25:07	1.19
+++ jsr166/build.xml	2003/05/27 16:21:52	1.26
@@ -27,9 +27,12 @@ ant [target], where target is one of:
     </echo>
   </target>
 
+  <property file="user.properties"/>
+  <property name="testcase" value="*"/>
 
   <!-- Compilation options -->
   <property name="build.sourcelevel"    value="1.5"/>
+  <property name="build.docsourcelevel" value="1.4"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
@@ -50,8 +53,8 @@ ant [target], where target is one of:
   <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"/>
@@ -67,9 +70,10 @@ ant [target], where target is one of:
   <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
   <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
 
-  <property name="javac.args"           value='-J-Xbootclasspath/p:${javac.jar}'/>
+  <property name="javac.args"           value='-J-Xbootclasspath/p:$[src.dir]:${javac.jar}'/>
 
   <path id="javac.bootclasspath">
+    <pathelement location="${src.dir}"/>
     <pathelement location="${collect.jar}"/>
     <pathelement location="${rt.jar}"/>
   </path>
@@ -95,9 +99,6 @@ ant [target], where target is one of:
       <bootclasspath refid="javac.bootclasspath"/>
       <compilerarg line="${javac.args} ${build.warnings.option}"/>
 
-      <!-- need this because srcdir is basedir! -->
-      <include name="java/**/*.java"/>
-
     </javac>
   </target>
 
@@ -134,9 +135,7 @@ ant [target], where target is one of:
     <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>
 
@@ -148,20 +147,23 @@ ant [target], where target is one of:
     <javadoc destdir="${build.javadocs.dir}"
                 link="http://java.sun.com/j2se/1.4.1/docs/api"
             overview="${src.dir}/intro.html"
-              source="${build.sourcelevel}">
+              source="${build.docsourcelevel}">
 
       <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>
+      <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}"
@@ -175,9 +177,6 @@ ant [target], where target is one of:
       <bootclasspath refid="javac.bootclasspath"/>
       <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
 
-      <!-- need this because srcdir is basedir! -->
-      <include name="java/**/*.java"/>
-
     </javac>
   </target>
 
@@ -214,7 +213,6 @@ ant [target], where target is one of:
     </copy>
     <copy tofile="${deployDir}/index.html"
           file="${basedir}/etc/anthill-index.html"/>
-    <mkdir dir="${deployDir}/notes}"/>
     <copy todir="${deployDir}/notes">
       <fileset dir="${basedir}/etc/notes"/>
     </copy>
@@ -252,11 +250,9 @@ ant [target], where target is one of:
     <javadoc destdir="${dist.javadocs.dir}"
                 link="http://java.sun.com/j2se/1.4.1/docs/api"
             overview="${src.dir}/intro.html"
-              source="${build.sourcelevel}">
+              source="${build.docsourcelevel}">
 
-      <packageset dir="${build.filter.src.dir}">
-        <include name="java/**"/>
-      </packageset>
+      <packageset dir="${build.filter.src.dir}"/>
 
     </javadoc>
   </target>
@@ -275,7 +271,7 @@ ant [target], where target is one of:
     <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"
@@ -325,7 +321,6 @@ ant [target], where target is one of:
       <bootclasspath refid="javac.bootclasspath"/>
       <compilerarg line="${javac.args} ${build.warnings.option}"/>
       <classpath refid="test.classpath"/>
-      <include name="**/*Test.java"/>
 
     </javac>
   </target>
@@ -340,18 +335,17 @@ ant [target], where target is one of:
                     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>
 
@@ -386,7 +380,7 @@ ant [target], where target is one of:
     <!-- FIXME: this test isn't specific enough -->
     <available property="junit.available"
                classname="junit.framework.TestCase"/>
-    <fail message="Need JUnit 1.8 to run tests" unless="junit.available"/>
+    <fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
   </target>