--- jsr166/build.xml	2009/08/01 13:05:44	1.78
+++ jsr166/build.xml	2010/11/13 13:20:12	1.83
@@ -21,30 +21,30 @@
 
 
   <!-- Compilation options -->
-  <property name="build.sourcelevel"    value="1.5"/>
+  <property name="build.sourcelevel"    value="1.6"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
 
   <!-- Build locations -->
-  <property name="build.dir"            location="build"/>
-  <property name="build.classes.dir"    location="${build.dir}/classes"/>
-  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
-  <property name="build.loops.dir"      location="${build.dir}/loops"/>
-  <property name="build.lib.dir"        location="${build.dir}/lib"/>
-  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
-  <property name="build.reports.dir"    location="${build.dir}/reports"/>
-  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
+  <property name="build.dir"                   location="build"/>
+  <property name="build.classes.dir"           location="${build.dir}/classes"/>
+  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
+  <property name="build.loops.dir"             location="${build.dir}/loops"/>
+  <property name="build.lib.dir"               location="${build.dir}/lib"/>
+  <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
+  <property name="build.reports.dir"           location="${build.dir}/reports"/>
+  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
   <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
   <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
 
-  <property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>
+  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
   <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
 
-  <property name="build.extra166y.dir"    location="${build.dir}/extra166y"/>
-  <property name="build.extra166ylib.dir"        location="${build.dir}/extra166ylib"/>
-  <property name="build.extra166yjavadocs.dir"   location="${build.dir}/extra166yjavadocs"/>
+  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
+  <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
+  <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
@@ -57,19 +57,19 @@
   <property name="topsrc.dir"           location="${basedir}/src"/>
   <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
   <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
-  <property name="extra166ysrc.dir"       location="${basedir}/src/extra166y"/>
-
+  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
+  <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
   <!-- Distribution locations -->
-  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
+  <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
   <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
   <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
-  <property name="dist.extra166yjavadocs.dir"    location="${dist.dir}/extra166ydocs"/>
+  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
 
   <!-- Jar locations -->
   <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
   <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
   <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
-  <property name="extra166yproduct.jar"   location="${build.extra166ylib.dir}/extra166y.jar"/>
+  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
   <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
 
   <!-- Bootclasspath argument -->
@@ -89,6 +89,9 @@
 
   <!-- Main targets -->
 
+  <target name="dists"
+          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
+          description="Builds all public jars and docs"/>
 
   <target name="compile"
           depends="init, configure-compiler"
@@ -105,7 +108,7 @@
              fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg value="-XDignore.symbol.file"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
 
 <!--
       <exclude name="java/lang/**"/>
@@ -146,10 +149,10 @@
     <mkdir dir="${build.javadocs.dir}"/>
 
     <javadoc destdir="${build.javadocs.dir}"
-                link="http://java.sun.com/javase/6/docs/api/"
+                link="http://download.oracle.com/javase/6/docs/api/"
             overview="${src.dir}/intro.html"
-            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
-    >           
+            sourcepath="${src.dir}:${jdksrc.dir}"
+    >
 
       <packageset dir="${src.dir}"/>
 
@@ -164,7 +167,6 @@
           description="Puts all distributable products in single hierarchy"/>
 
 
-
   <target name="release"
           depends="dist"
           description="Puts entire CVS tree, plus distribution productions, in a jar">
@@ -212,10 +214,10 @@
     <mkdir dir="${dist.javadocs.dir}"/>
 
     <javadoc destdir="${dist.javadocs.dir}"
-            link="http://java.sun.com/javase/6/docs/api/"
+            link="http://download.oracle.com/javase/6/docs/api/"
             overview="${src.dir}/intro.html"
 
-            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
+            sourcepath="${src.dir}:${jdksrc.dir}"
      >
 <!--
       <packageset dir="${src.dir}" defaultexcludes="yes">
@@ -509,10 +511,8 @@
     <mkdir dir="${build.jsr166xjavadocs.dir}"/>
 
     <javadoc destdir="${build.jsr166xjavadocs.dir}"
-             link="http://java.sun.com/javase/6/docs/api/"
-
-            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
-
+             link="http://download.oracle.com/javase/6/docs/api/"
+            sourcepath="${topsrc.dir}:${jdksrc.dir}"
     >
       <packageset dir="${topsrc.dir}" defaultexcludes="yes">
       <include name="jsr166x"/>
@@ -554,7 +554,7 @@
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
 
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"
-                link="http://java.sun.com/javase/6/docs/api/"
+                link="http://download.oracle.com/javase/6/docs/api/"
               source="${build.sourcelevel}">
 
       <packageset dir="${topsrc.dir}" defaultexcludes="yes">
@@ -591,6 +591,7 @@
 
       <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="${bootclasspath.args}"/>
 
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
@@ -622,9 +623,8 @@
     <mkdir dir="${build.jsr166yjavadocs.dir}"/>
 
     <javadoc destdir="${build.jsr166yjavadocs.dir}"
-                link="http://java.sun.com/javase/6/docs/api/"
-            sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
-
+                link="http://download.oracle.com/javase/6/docs/api/"
+            sourcepath="${topsrc.dir}:${jdksrc.dir}"
     >
       <packageset dir="${topsrc.dir}" defaultexcludes="no">
       <include name="jsr166y"/>
@@ -664,10 +664,10 @@
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
 
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"
-                link="http://java.sun.com/javase/6/docs/api/"
+                link="http://download.oracle.com/javase/6/docs/api/"
               source="${build.sourcelevel}"
-            sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
-            >           
+            sourcepath="${topsrc.dir}:${jdksrc.dir}"
+            >
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">
       <include name="jsr166y/*.java"/>
             </fileset>
@@ -702,6 +702,7 @@
 
       <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="${bootclasspath.args}"/>
 
 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
@@ -733,9 +734,8 @@
     <mkdir dir="${build.extra166yjavadocs.dir}"/>
 
     <javadoc destdir="${build.extra166yjavadocs.dir}"
-                link="http://java.sun.com/javase/6/docs/api/"
-            sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
-
+                link="http://download.oracle.com/javase/6/docs/api/"
+            sourcepath="${topsrc.dir}:${jdksrc.dir}"
     >
       <packageset dir="${topsrc.dir}" defaultexcludes="no">
       <include name="extra166y"/>
@@ -775,9 +775,9 @@
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>
 
     <javadoc destdir="${dist.extra166yjavadocs.dir}"
-                link="http://java.sun.com/javase/6/docs/api/"
+                link="http://download.oracle.com/javase/6/docs/api/"
               source="${build.sourcelevel}"
-            sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
+            sourcepath="${topsrc.dir}:${jdksrc.dir}"
             >
       <fileset dir="${topsrc.dir}" defaultexcludes="yes">
       <include name="extra166y/*.java"/>