--- jsr166/build.xml	2013/01/19 17:15:44	1.100
+++ jsr166/build.xml	2013/01/19 23:40:04	1.107
@@ -127,21 +127,21 @@
   <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.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
-  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
-  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
-  <property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
-  <property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
+  <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
+  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
+  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
+  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
+  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
+  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
 
   <!-- Jar locations -->
-  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
-  <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
-  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
-  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
-  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
-  <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
-  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
+  <property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>
+  <property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
+  <property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
+  <property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
+  <property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
+  <property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
+  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
 
   <!-- Bootclasspath argument -->
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
@@ -154,6 +154,8 @@
   <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
   <!-- The below does not yet exist as of 2012-11 -->
   <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
+
+  <!-- Default jdk api doc location (latest stable release seems best) -->
   <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
 
   <!-- Test classpath -->
@@ -169,6 +171,7 @@
 
   <!-- Support @jls tag, used in jdk8+ javadoc -->
   <!-- TODO: How do we get &trade to work? -->
+  <!-- TODO: Why isn't @jls a "standard" tag? -->
   <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
   <property name="javadoc.jls.cite" value="The Java Language Specification"/>
   <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
@@ -176,12 +179,12 @@
   <!-- Main targets -->
 
   <target name="dists"
-          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
+          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
           description="Builds all public jars and docs"/>
 
   <target name="compile"
           depends="configure-compiler"
-          description="Compiles src/main sources to build folder">
+          description="Compiles src/main sources to build dir">
 
     <mkdir dir="${build.classes.dir}"/>
 
@@ -228,13 +231,13 @@
 
 
   <target name="test"
-          depends="init, configure-tests, report-tests"
+          depends="configure-tests, report-tests"
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
 
 
 
   <target name="docs"
-          description="Builds javadocs for src/main">
+          description="Builds javadocs for src/main to dist dir">
 
     <delete dir="${dist.javadocs.dir}"/>
     <mkdir dir="${dist.javadocs.dir}"/>
@@ -262,7 +265,7 @@
 
 
   <target name="dist"
-          depends="init, dist-clean, dist-jar, docs"
+          depends="dist-clean, dist-jar, docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -309,16 +312,6 @@
   <!-- Internal targets -->
 
 
-  <target name="init">
-
-    <!-- Version is kept in a separate file -->
-    <loadfile property="version" srcFile="version.properties"/>
-    <echo>Building JSR-166 version ${version}</echo>
-    <echo>java.home is ${java.home}</echo>
-
-  </target>
-
-
   <target name="dist-jar"
           depends="clean, jar">
 
@@ -503,7 +496,7 @@
   <!-- Various demos and test programs -->
 
 
-  <target name="loops" depends="init, configure-compiler"
+  <target name="loops" depends="configure-compiler"
           description="Benchmark from Doug Lea's AQS paper">
 
     <mkdir dir="${build.loops.dir}"/>
@@ -543,7 +536,7 @@
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.6"
+           source="6"
            classpath=""
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
@@ -571,7 +564,7 @@
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.6"
+           source="6"
            classpath="${junit.jar}"
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
            includeAntRuntime="false"
@@ -629,12 +622,12 @@
 
 
   <target name="4jdk7docs"
-          description="Builds javadocs with custom tags to build folder">
+          description="Builds javadocs for src/jdk7 to dist dir">
 
-    <delete dir="${build.4jdk7.docs.dir}"/>
-    <mkdir dir="${build.4jdk7.docs.dir}"/>
+    <delete dir="${dist.4jdk7.docs.dir}"/>
+    <mkdir dir="${dist.4jdk7.docs.dir}"/>
 
-    <javadoc destdir="${build.4jdk7.docs.dir}"
+    <javadoc destdir="${dist.4jdk7.docs.dir}"
              packagenames="none"
              link="${jdkapi7docs.url}"
              overview="${4jdk7src.dir}/intro.html"
@@ -651,7 +644,7 @@
 
 
   <target name="4jdk7dist"
-          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
+          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -670,27 +663,6 @@
 
   </target>
 
-  <target name="4jdk7dist-docs"
-          description="Builds javadocs without custom tags to dist folder">
-
-    <delete dir="${dist.4jdk7.docs.dir}"/>
-    <mkdir dir="${dist.4jdk7.docs.dir}"/>
-
-    <javadoc destdir="${dist.4jdk7.docs.dir}"
-             packagenames="none"
-             link="${jdkapi7docs.url}"
-             overview="${4jdk7src.dir}/intro.html"
-             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
-             classpath=""
-             executable="${javadoc7}">
-      <arg value="-XDignore.symbol.file=true"/>
-      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
-        <include name="**/*.java"/>
-      </fileset>
-    </javadoc>
-
-  </target>
-
   <target name="4jdk7dist-jar"
           depends="4jdk7clean, 4jdk7compile">
 
@@ -702,22 +674,28 @@
 
 
   <target name="jsr166xcompile"
-          depends="init, configure-compiler"
-          description="Compiles jsr166x sources">
+          depends="configure-compiler"
+          description="Compiles jsr166x sources to build dir">
 
     <mkdir dir="${build.jsr166x.dir}"/>
 
-    <javac srcdir="${jsr166xsrc.dir}"
-          destdir="${build.jsr166x.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
+    <javac srcdir="${topsrc.dir}"
+           destdir="${build.jsr166x.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           classpath=""
+           source="5"
+           bootclasspath="${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
 
-      <include name="**/*.java"/>
+      <include name="jsr166x/**/*.java"/>
       <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
 
     </javac>
 
@@ -731,7 +709,7 @@
 
     <mkdir dir="${build.jsr166xlib.dir}"/>
 
-    <jar destfile="${jsr166xproduct.jar}">
+    <jar destfile="${jsr166x.jar}">
       <fileset dir="${build.jsr166x.dir}"/>
     </jar>
 
@@ -740,16 +718,18 @@
 
 
   <target name="jsr166xdocs"
-          description="Builds javadocs with custom tags to build folder">
+          description="Builds javadocs to dist dir">
 
     <delete dir="${build.jsr166xjavadocs.dir}"/>
     <mkdir dir="${build.jsr166xjavadocs.dir}"/>
 
     <javadoc destdir="${build.jsr166xjavadocs.dir}"
-             packagenames="jsr166x"
+             packagenames="jsr166x.*"
              link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             source="5"
+             bootclasspath="${bootclasspath6}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -779,16 +759,17 @@
 
 
   <target name="jsr166xdist-docs"
-          description="Builds javadocs without custom tags to dist folder">
+          description="Builds javadocs to dist dir">
 
     <delete dir="${dist.jsr166xjavadocs.dir}"/>
     <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
 
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"
-             packagenames="jsr166x"
+             packagenames="jsr166x.*"
              link="${jdkapidocs.url}"
              source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -796,7 +777,7 @@
   <target name="jsr166xdist-jar"
           depends="jsr166xclean, jsr166xjar">
 
-    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
 
   </target>
 
@@ -804,39 +785,39 @@
 
 
   <target name="jsr166ycompile"
-          depends="init, configure-compiler"
+          depends="configure-compiler"
           description="Compiles jsr166y sources">
 
     <mkdir dir="${build.jsr166y.dir}"/>
 
-    <javac srcdir="${jsr166ysrc.dir}"
-          destdir="${build.jsr166y.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
+    <javac srcdir="${topsrc.dir}"
+           destdir="${build.jsr166y.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="6"
+           classpath=""
+           bootclasspath="${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
 
-      <include name="**/*.java"/>
+      <include name="jsr166y/**/*.java"/>
       <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="${bootclasspath.args}"/>
-
-<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
-
+      <compilerarg value="-Xlint:all"/>
     </javac>
-
   </target>
 
 
-
   <target name="jsr166yjar"
           depends="jsr166ycompile"
           description="Builds library jar from compiled sources">
 
     <mkdir dir="${build.jsr166ylib.dir}"/>
 
-    <jar destfile="${jsr166yproduct.jar}" index="true">
+    <jar destfile="${jsr166y.jar}" index="true">
       <fileset dir="${build.jsr166y.dir}"/>
     </jar>
 
@@ -845,16 +826,18 @@
 
 
   <target name="jsr166ydocs"
-          description="Builds javadocs with custom tags to build folder">
+          description="Builds javadocs to dist dir">
 
     <delete dir="${build.jsr166yjavadocs.dir}"/>
     <mkdir dir="${build.jsr166yjavadocs.dir}"/>
 
     <javadoc destdir="${build.jsr166yjavadocs.dir}"
-             packagenames="jsr166y"
+             packagenames="jsr166y.*"
              link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             source="6"
+             bootclasspath="${bootclasspath6}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -882,16 +865,17 @@
   </target>
 
   <target name="jsr166ydist-docs"
-          description="Builds javadocs without custom tags to dist folder">
+          description="Builds javadocs to dist dir">
 
     <delete dir="${dist.jsr166yjavadocs.dir}"/>
     <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
 
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"
-             packagenames="jsr166y"
+             packagenames="jsr166y.*"
              link="${jdkapidocs.url}"
              source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -899,7 +883,7 @@
   <target name="jsr166ydist-jar"
           depends="jsr166yclean, jsr166yjar">
 
-    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
 
   </target>
 
@@ -908,26 +892,28 @@
 
 
   <target name="extra166ycompile"
-          depends="init, configure-compiler, jsr166ycompile"
+          depends="configure-compiler, jsr166yjar"
           description="Compiles extra166y sources">
 
     <mkdir dir="${build.extra166y.dir}"/>
 
-    <javac srcdir="${extra166ysrc.dir}"
-          destdir="${build.extra166y.dir}"
-            debug="${build.debug}"
-            classpath="${jsr166yproduct.jar}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
+    <javac srcdir="${topsrc.dir}"
+           destdir="${build.extra166y.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           classpath=""
+           source="6"
+           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
 
-      <include name="**/*.java"/>
+      <include name="extra166y/**/*.java"/>
       <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="${bootclasspath.args}"/>
-
-<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
 
     </javac>
 
@@ -941,7 +927,7 @@
 
     <mkdir dir="${build.extra166ylib.dir}"/>
 
-    <jar destfile="${extra166yproduct.jar}" index="true">
+    <jar destfile="${extra166y.jar}" index="true">
       <fileset dir="${build.extra166y.dir}"/>
     </jar>
 
@@ -950,16 +936,18 @@
 
 
   <target name="extra166ydocs"
-          description="Builds javadocs with custom tags to build folder">
+          description="Builds javadocs to build dir">
 
     <delete dir="${build.extra166yjavadocs.dir}"/>
     <mkdir dir="${build.extra166yjavadocs.dir}"/>
 
     <javadoc destdir="${build.extra166yjavadocs.dir}"
-             packagenames="extra166y"
+             packagenames="extra166y.*"
              link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             source="6"
+             bootclasspath="${bootclasspath6}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -987,16 +975,17 @@
   </target>
 
   <target name="extra166ydist-docs"
-          description="Builds javadocs without custom tags to dist folder">
+          description="Builds javadocs to dist dir">
 
     <delete dir="${dist.extra166yjavadocs.dir}"/>
     <mkdir dir="${dist.extra166yjavadocs.dir}"/>
 
     <javadoc destdir="${dist.extra166yjavadocs.dir}"
-             packagenames="extra166y"
+             packagenames="extra166y.*"
              link="${jdkapidocs.url}"
              source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -1004,7 +993,7 @@
   <target name="extra166ydist-jar"
           depends="extra166yclean, extra166yjar">
 
-    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
 
   </target>
 
@@ -1021,7 +1010,7 @@
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.7"
+           source="7"
            classpath=""
            includeAntRuntime="false"
            includeJavaRuntime="false"
@@ -1045,7 +1034,7 @@
 
     <mkdir dir="${build.jsr166elib.dir}"/>
 
-    <jar destfile="${jsr166eproduct.jar}" index="true">
+    <jar destfile="${jsr166e.jar}" index="true">
       <fileset dir="${build.jsr166e.dir}"/>
     </jar>
 
@@ -1054,21 +1043,18 @@
 
 
   <target name="jsr166edocs"
-          description="Builds javadocs with custom tags to build folder">
+          description="Builds javadocs to build dir">
 
     <delete dir="${build.jsr166ejavadocs.dir}"/>
     <mkdir dir="${build.jsr166ejavadocs.dir}"/>
 
     <javadoc destdir="${build.jsr166ejavadocs.dir}"
-             packagenames="jsr166e,jsr166e.extra"
-             link="${jdkapi7docs.url}"
-             source="1.7"
+             packagenames="jsr166e.*"
+             link="${jdkapidocs.url}"
+             source="7"
              sourcepath="${topsrc.dir}:${jdk7src.dir}"
              executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" >
-      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
-        <include name="jsr166e/**/*.java"/>
-      </fileset>
     </javadoc>
 
   </target>
@@ -1096,16 +1082,17 @@
   </target>
 
   <target name="jsr166edist-docs"
-          description="Builds javadocs without custom tags to dist folder">
+          description="Builds javadocs to dist dir">
 
     <delete dir="${dist.jsr166ejavadocs.dir}"/>
     <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
 
     <javadoc destdir="${dist.jsr166ejavadocs.dir}"
-             packagenames="jsr166e,jsr166e.extra"
+             packagenames="jsr166e.*"
              link="${jdkapidocs.url}"
-             source="1.7"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             source="7"
+             sourcepath="${topsrc.dir}:${jdk7src.dir}"
+             executable="${javadoc7}"
              additionalparam="-XDignore.symbol.file=true" />
 
   </target>
@@ -1113,7 +1100,7 @@
   <target name="jsr166edist-jar"
           depends="jsr166eclean, jsr166ejar">
 
-    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
 
   </target>