--- jsr166/build.xml	2002/10/08 14:43:34	1.2
+++ jsr166/build.xml	2002/12/10 15:02:46	1.6
@@ -2,13 +2,18 @@
 
   <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 -->
   <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.sourcelevel"    value="1.5"/>
 
   <!-- Build locations -->
   <property name="build.dir"            location="build"/>
@@ -35,7 +40,7 @@
   <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
 
   <property name="gj.compiler.args"
-           value='-J-Xbootclasspath/p:${javac.jar} -gj'
+           value='-J-Xbootclasspath/p:${javac.jar} -deprecation -warnunchecked'
   />
 
   <path id="gj.compiler.bootclasspath">
@@ -45,7 +50,6 @@
 
   <path id="test.classpath">
     <pathelement location="${product.jar}"/>
-    <pathelement location="${junit.jar}"/>
   </path>
 
 
@@ -80,7 +84,7 @@
   <target name="test" depends="report-tests"/>
 
 
-  <target name="docs" depends="filter-src">
+  <target name="docs" depends="clean-docs, filter-src">
     <delete dir="${build.javadocs.dir}"/>
     <mkdir dir="${build.javadocs.dir}"/>
     <javadoc destdir="${build.javadocs.dir}"
@@ -90,7 +94,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,10 +104,14 @@
   </target>
 
 
-  <target name="clean">
+  <target name="clean" depends="clean-docs">
     <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>
     <delete dir="${build.lib.dir}"/>
+  </target>
+
+
+  <target name="clean-docs">
     <delete dir="${build.javadocs.dir}"/>
   </target>