--- jsr166/build.xml	2002/10/07 04:07:37	1.1
+++ jsr166/build.xml	2002/10/09 23:45:31	1.3
@@ -2,6 +2,11 @@
 
   <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.]
   </description>
 
   <!-- Compilation options -->
@@ -35,9 +40,18 @@
   <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
 
   <property name="gj.compiler.args"
-           value='-J-Xbootclasspath/p:${javac.jar} -bootclasspath ${collect.jar};${rt.jar} -gj'
+           value='-J-Xbootclasspath/p:${javac.jar} -gj'
   />
 
+  <path id="gj.compiler.bootclasspath">
+    <pathelement location="${collect.jar}"/>
+    <pathelement location="${rt.jar}"/>
+  </path>
+
+  <path id="test.classpath">
+    <pathelement location="${product.jar}"/>
+  </path>
+
 
   <target name="compile">
     <mkdir dir="${build.classes.dir}"/>
@@ -49,6 +63,7 @@
            source="${build.sourcelevel}"
              fork="true">
 
+      <bootclasspath refid="gj.compiler.bootclasspath"/>
       <compilerarg line="${gj.compiler.args}"/>
 
       <!-- need this because srcdir is basedir! -->
@@ -160,13 +175,9 @@
            source="${build.sourcelevel}"
              fork="true">
 
+      <bootclasspath refid="gj.compiler.bootclasspath"/>
       <compilerarg line="${gj.compiler.args}"/>
-
-      <classpath id="test.classpath">
-        <pathelement location="${product.jar}"/>
-        <pathelement location="${junit.jar}"/>
-      </classpath>
-
+      <classpath refid="test.classpath"/>
       <include name="**/*Test.java"/>
 
     </javac>