--- jsr166/build.xml	2002/10/08 14:43:34	1.2
+++ jsr166/build.xml	2002/12/11 04:43:23	1.8
@@ -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"/>
@@ -16,7 +21,8 @@
   <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
   <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.pubdocs.dir"    location="${build.dir}/javadocs"/>
+  <property name="build.privdocs.dir"   location="${build.dir}/privdocs"/>
   <property name="build.reports.dir"    location="${build.dir}/reports"/>
   <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
 
@@ -35,7 +41,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 +51,6 @@
 
   <path id="test.classpath">
     <pathelement location="${product.jar}"/>
-    <pathelement location="${junit.jar}"/>
   </path>
 
 
@@ -79,18 +84,36 @@
 
   <target name="test" depends="report-tests"/>
 
+  <target name="docs" depends="public-docs, private-docs"/>
 
-  <target name="docs" depends="filter-src">
-    <delete dir="${build.javadocs.dir}"/>
-    <mkdir dir="${build.javadocs.dir}"/>
-    <javadoc destdir="${build.javadocs.dir}"
+  <target name="public-docs" depends="clean-docs, filter-src">
+    <delete dir="${build.pubdocs.dir}"/>
+    <mkdir dir="${build.pubdocs.dir}"/>
+    <javadoc destdir="${build.pubdocs.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>
+
+    </javadoc>
+  </target>
+
+
+  <target name="private-docs" depends="clean-docs, filter-src">
+    <delete dir="${build.privdocs.dir}"/>
+    <mkdir dir="${build.privdocs.dir}"/>
+    <javadoc destdir="${build.privdocs.dir}"
                 link="http://java.sun.com/j2se/1.4.1/docs/api"
             overview="${src.dir}/intro.html"
               source="${build.sourcelevel}">
 
       <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,11 +122,17 @@
   </target>
 
 
-  <target name="clean">
+  <target name="clean" depends="clean-docs">
     <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>
     <delete dir="${build.lib.dir}"/>
-    <delete dir="${build.javadocs.dir}"/>
+  </target>
+
+
+  <target name="clean-docs">
+    <delete dir="${build.filter.src.dir}"/>
+    <delete dir="${build.pubdocs.dir}"/>
+    <delete dir="${build.privdocs.dir}"/>
   </target>