--- jsr166/build.xml	2013/01/19 17:15:44	1.100
+++ jsr166/build.xml	2013/01/20 06:11:07	1.115
@@ -35,7 +35,7 @@
 
 
   <!-- Compilation options -->
-  <property name="build.sourcelevel"    value="1.6"/>
+  <property name="build.sourcelevel"    value="6"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
@@ -45,31 +45,22 @@
   <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.4jdk7.dir"              location="${build.dir}/4jdk7"/>
-  <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
-  <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
-  <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
-  <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
+  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
+  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
+  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
+  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
 
   <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.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
-  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
-
   <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
-  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
-  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
-
   <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.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
+  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
+  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
+  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
 
   <!-- JDK binary locations -->
   <property name="jdks.home"  location="${user.home}/jdk"/>
@@ -124,24 +115,23 @@
   <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
   <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
   <property name="extra166ysrc.dir"     location="${topsrc.dir}/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.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}/jsr166.docs"/>
+  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
+  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
+  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
+  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
+  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
 
   <!-- 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.dir}/jsr166.jar"/>
+  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
+  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
+  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
+  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
+  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
+  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
 
   <!-- Bootclasspath argument -->
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
@@ -154,8 +144,15 @@
   <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}"/>
 
+  <!-- Define the "jtreg" task -->
+  <!-- See the docs in "jtreg -onlineHelp" -->
+  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
+           classpath="${lib.dir}/jtreg.jar" />
+
   <!-- Test classpath -->
   <path id="test.classpath">
     <pathelement location="${build.testcases.dir}"/>
@@ -169,6 +166,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 +174,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}"/>
 
@@ -217,8 +215,6 @@
           depends="compile"
           description="Builds library jar from compiled sources">
 
-    <mkdir dir="${build.lib.dir}"/>
-
     <jar destfile="${product.jar}">
       <fileset dir="${build.classes.dir}"/>
     </jar>
@@ -228,13 +224,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 +258,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"/>
 
 
@@ -290,8 +286,6 @@
           description="Removes all build products">
 
     <delete dir="${build.dir}"/>
-    <delete dir="${build.classes.dir}"/>
-    <delete dir="${build.lib.dir}"/>
 
   </target>
 
@@ -309,16 +303,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">
 
@@ -333,36 +317,43 @@
     <mkdir dir="${build.testcases.dir}"/>
 
     <javac srcdir="${tck.src.dir}"
-          destdir="${build.testcases.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
+           destdir="${build.testcases.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="6"
+           classpath="${junit.jar}"
+           bootclasspath="${product.jar}:${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac8}"
+           fork="true">
 
-      <compilerarg value="${bootclasspath.args}"/>
+      <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-
-      <classpath refid="test.classpath"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
 
     </javac>
 
     <javac srcdir="${test.src.dir}"
-          destdir="${build.testcases.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
+           destdir="${build.testcases.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="6"
+           classpath=""
+           bootclasspath="${product.jar}:${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac8}"
+           fork="true">
 
-      <include name="jsr166/test/**"/>
+      <include name="jsr166/test/**/*.java"/>
 
-      <compilerarg value="${bootclasspath.args}"/>
       <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-
-      <classpath refid="test.classpath"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
 
     </javac>
 
@@ -379,8 +370,6 @@
       <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
 
-      <classpath refid="test.classpath"/>
-
     </javac>
 -->
 
@@ -400,9 +389,10 @@
           errorProperty="junit.failed"
         failureProperty="junit.failed"
                     dir="${build.reports.dir}"
+                    jvm="${java8}"
                    fork="true">
 
-      <jvmarg value="${bootclasspath.args}"/>
+      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
       <jvmarg value="-server"/>
       <jvmarg value="-showversion"/>
 
@@ -503,7 +493,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 +533,7 @@
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.6"
+           source="6"
            classpath=""
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
@@ -558,8 +548,6 @@
 
     </javac>
 
-    <mkdir dir="${build.4jdk7.lib.dir}"/>
-
     <jar destfile="${4jdk7product.jar}" index="true">
       <fileset dir="${build.4jdk7.classes.dir}"/>
     </jar>
@@ -571,7 +559,7 @@
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.6"
+           source="6"
            classpath="${junit.jar}"
            bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
            includeAntRuntime="false"
@@ -627,14 +615,41 @@
     </junit>
   </target>
 
+  <target name="4jdk7-test-jtreg"
+	  depends="4jdk7compile"
+          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
+    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
+    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
+    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
+    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
+    <jtreg dir="${jtreg.src.dir}"
+           jdk="${jdk7.home}"
+           workDir="${build.4jdk7.dir}/JTwork"
+           reportDir="${build.4jdk7.dir}/JTreport">
+
+      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
+      <arg value="-agentvm"/>
+      <arg value="-v:nopass,fail"/>
+      <arg value="-vmoptions:-esa -ea"/>
+      <arg value="-automatic"/>
+      <arg value="-k:!ignore"/>
+    </jtreg>
+  </target>
+
+
+  <target name="4jdk7-test"
+	  depends="4jdk7-test-tck, 4jdk7-test-jtreg"
+          description="Runs tck and jtreg tests for jsr166-4jdk7">
+  </target>
+
 
   <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,13 +666,13 @@
 
 
   <target name="4jdk7dist"
-          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
+          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
 
   <target name="4jdk7clean"
-          description="Removes all build products">
+          description="Removes all 4jdk7 build products">
 
     <delete dir="${build.4jdk7.dir}"/>
 
@@ -670,27 +685,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">
 
@@ -698,26 +692,32 @@
 
   </target>
 
-  <!-- jsr166x -->
 
+  <!-- jsr166x -->
 
   <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}"/>
+    <mkdir dir="${build.jsr166x.classes.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.classes.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>
 
@@ -729,10 +729,8 @@
           depends="jsr166xcompile"
           description="Builds library jar from compiled sources">
 
-    <mkdir dir="${build.jsr166xlib.dir}"/>
-
-    <jar destfile="${jsr166xproduct.jar}">
-      <fileset dir="${build.jsr166x.dir}"/>
+    <jar destfile="${jsr166x.jar}">
+      <fileset dir="${build.jsr166x.classes.dir}"/>
     </jar>
 
   </target>
@@ -740,32 +738,33 @@
 
 
   <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}"/>
+    <delete dir="${dist.jsr166xjavadocs.dir}"/>
+    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
 
-    <javadoc destdir="${build.jsr166xjavadocs.dir}"
-             packagenames="jsr166x"
+    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
+             packagenames="jsr166x.*"
              link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" />
+             source="5"
+             bootclasspath="${bootclasspath6}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
+             additionalparam="-XDignore.symbol.file=true"/>
 
   </target>
 
 
   <target name="jsr166xdist"
-          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
+          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
           description="Puts all distributable products in single hierarchy"/>
 
 
 
   <target name="jsr166xclean"
-          description="Removes all build products">
+          description="Removes all jsr166x build products">
 
     <delete dir="${build.jsr166x.dir}"/>
-    <delete dir="${build.jsr166xlib.dir}"/>
 
   </target>
 
@@ -777,26 +776,10 @@
   </target>
 
 
-
-  <target name="jsr166xdist-docs"
-          description="Builds javadocs without custom tags to dist folder">
-
-    <delete dir="${dist.jsr166xjavadocs.dir}"/>
-    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
-
-    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
-             packagenames="jsr166x"
-             link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" />
-
-  </target>
-
   <target name="jsr166xdist-jar"
           depends="jsr166xclean, jsr166xjar">
 
-    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
 
   </target>
 
@@ -804,40 +787,38 @@
 
 
   <target name="jsr166ycompile"
-          depends="init, configure-compiler"
+          depends="configure-compiler"
           description="Compiles jsr166y sources">
 
-    <mkdir dir="${build.jsr166y.dir}"/>
+    <mkdir dir="${build.jsr166y.classes.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.classes.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">
-      <fileset dir="${build.jsr166y.dir}"/>
+    <jar destfile="${jsr166y.jar}" index="true">
+      <fileset dir="${build.jsr166y.classes.dir}"/>
     </jar>
 
   </target>
@@ -845,32 +826,33 @@
 
 
   <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}"/>
+    <delete dir="${dist.jsr166yjavadocs.dir}"/>
+    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
 
-    <javadoc destdir="${build.jsr166yjavadocs.dir}"
-             packagenames="jsr166y"
+    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
+             packagenames="jsr166y.*"
              link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" />
+             source="6"
+             bootclasspath="${bootclasspath6}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
+             additionalparam="-XDignore.symbol.file=true"/>
 
   </target>
 
 
   <target name="jsr166ydist"
-          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
+          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
           description="Puts all distributable products in single hierarchy"/>
 
 
 
   <target name="jsr166yclean"
-          description="Removes all build products">
+          description="Removes all jsr166y build products">
 
     <delete dir="${build.jsr166y.dir}"/>
-    <delete dir="${build.jsr166ylib.dir}"/>
 
   </target>
 
@@ -881,25 +863,10 @@
 
   </target>
 
-  <target name="jsr166ydist-docs"
-          description="Builds javadocs without custom tags to dist folder">
-
-    <delete dir="${dist.jsr166yjavadocs.dir}"/>
-    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
-
-    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
-             packagenames="jsr166y"
-             link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" />
-
-  </target>
-
   <target name="jsr166ydist-jar"
           depends="jsr166yclean, jsr166yjar">
 
-    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
 
   </target>
 
@@ -908,26 +875,28 @@
 
 
   <target name="extra166ycompile"
-          depends="init, configure-compiler, jsr166ycompile"
+          depends="configure-compiler, jsr166yjar"
           description="Compiles extra166y sources">
 
-    <mkdir dir="${build.extra166y.dir}"/>
+    <mkdir dir="${build.extra166y.classes.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.classes.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>
 
@@ -939,10 +908,8 @@
           depends="extra166ycompile"
           description="Builds library jar from compiled sources">
 
-    <mkdir dir="${build.extra166ylib.dir}"/>
-
-    <jar destfile="${extra166yproduct.jar}" index="true">
-      <fileset dir="${build.extra166y.dir}"/>
+    <jar destfile="${extra166y.jar}" index="true">
+      <fileset dir="${build.extra166y.classes.dir}"/>
     </jar>
 
   </target>
@@ -950,32 +917,33 @@
 
 
   <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}"/>
+    <delete dir="${dist.extra166yjavadocs.dir}"/>
+    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
 
-    <javadoc destdir="${build.extra166yjavadocs.dir}"
-             packagenames="extra166y"
+    <javadoc destdir="${dist.extra166yjavadocs.dir}"
+             packagenames="extra166y.*"
              link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" />
+             source="6"
+             bootclasspath="${bootclasspath6}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             executable="${javadoc7}"
+             additionalparam="-XDignore.symbol.file=true"/>
 
   </target>
 
 
   <target name="extra166ydist"
-          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
+          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
           description="Puts all distributable products in single hierarchy"/>
 
 
 
   <target name="extra166yclean"
-          description="Removes all build products">
+          description="Removes all extra166y build products">
 
     <delete dir="${build.extra166y.dir}"/>
-    <delete dir="${build.extra166ylib.dir}"/>
 
   </target>
 
@@ -986,25 +954,10 @@
 
   </target>
 
-  <target name="extra166ydist-docs"
-          description="Builds javadocs without custom tags to dist folder">
-
-    <delete dir="${dist.extra166yjavadocs.dir}"/>
-    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
-
-    <javadoc destdir="${dist.extra166yjavadocs.dir}"
-             packagenames="extra166y"
-             link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" />
-
-  </target>
-
   <target name="extra166ydist-jar"
           depends="extra166yclean, extra166yjar">
 
-    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
 
   </target>
 
@@ -1014,14 +967,14 @@
           depends="configure-compiler"
           description="Compiles jsr166e sources">
 
-    <mkdir dir="${build.jsr166e.dir}"/>
+    <mkdir dir="${build.jsr166e.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
-           destdir="${build.jsr166e.dir}"
+           destdir="${build.jsr166e.classes.dir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.7"
+           source="7"
            classpath=""
            includeAntRuntime="false"
            includeJavaRuntime="false"
@@ -1043,10 +996,8 @@
           depends="jsr166ecompile"
           description="Builds library jar from compiled sources">
 
-    <mkdir dir="${build.jsr166elib.dir}"/>
-
-    <jar destfile="${jsr166eproduct.jar}" index="true">
-      <fileset dir="${build.jsr166e.dir}"/>
+    <jar destfile="${jsr166e.jar}" index="true">
+      <fileset dir="${build.jsr166e.classes.dir}"/>
     </jar>
 
   </target>
@@ -1054,66 +1005,46 @@
 
 
   <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}"/>
+    <delete dir="${dist.jsr166ejavadocs.dir}"/>
+    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
 
-    <javadoc destdir="${build.jsr166ejavadocs.dir}"
-             packagenames="jsr166e,jsr166e.extra"
-             link="${jdkapi7docs.url}"
-             source="1.7"
+    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
+             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>
 
 
   <target name="jsr166edist"
-          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
+          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
           description="Puts all distributable products in single hierarchy"/>
 
 
 
   <target name="jsr166eclean"
-          description="Removes all build products">
+          description="Removes all jsr166e build products">
 
     <delete dir="${build.jsr166e.dir}"/>
-    <delete dir="${build.jsr166elib.dir}"/>
 
   </target>
 
 
-
   <target name="jsr166edist-clean"
           description="Removes all build and distribution products">
 
   </target>
 
-  <target name="jsr166edist-docs"
-          description="Builds javadocs without custom tags to dist folder">
-
-    <delete dir="${dist.jsr166ejavadocs.dir}"/>
-    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
-
-    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
-             packagenames="jsr166e,jsr166e.extra"
-             link="${jdkapidocs.url}"
-             source="1.7"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" />
-
-  </target>
-
   <target name="jsr166edist-jar"
           depends="jsr166eclean, jsr166ejar">
 
-    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
 
   </target>