--- jsr166/build.xml	2002/12/04 04:30:54	1.4
+++ jsr166/build.xml	2002/12/11 04:43:23	1.8
@@ -13,7 +13,7 @@
   <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"/>
@@ -21,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"/>
 
@@ -40,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">
@@ -83,11 +84,28 @@
 
   <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}">
@@ -104,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>