--- jsr166/build.xml	2013/01/19 21:35:40	1.103
+++ jsr166/build.xml	2015/11/05 15:02:34	1.189
@@ -1,4 +1,5 @@
-<project name="jsr166" default="usage">
+<project name="jsr166" default="usage"
+  xmlns:if="ant:if" xmlns:unless="ant:unless">
 
   <description>
 ------------------------------------------------------------------------------
@@ -16,62 +17,69 @@
   $HOME/jdk/jdk6
   $HOME/jdk/jdk7
   $HOME/jdk/jdk8
+  $HOME/jdk/jdk9
   where each of the above is a JDK or a symlink to same, and
   $HOME/jdk/src/jdk6
   $HOME/jdk/src/jdk7
   $HOME/jdk/src/jdk8
+  $HOME/jdk/src/jdk9
   where each of the above is a complete JDK source tree
   (e.g. mercurial forest) or a symlink to same.
+
+  Alternatively, define ant variables thus:
+  ant -Djdk$N.home=...
+  for $N in 6 7 8 9 ...
+
+  As of 2015-09, there is incomplete hacky support for jigsaw
+  Build for jigsaw using something like:
+  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
+  "docs" target is still broken.
 ------------------------------------------------------------------------------
   </description>
 
-  <target name="usage" description="Advises user to run with -projecthelp">
-    <echo>Run "ant -projecthelp" for full usage information.</echo>
+  <!-- Display main targets by running 'ant -projecthelp' -->
+  <target name="usage">
+    <java classname="org.apache.tools.ant.Main">
+      <arg value="-projecthelp" />
+    </java>
   </target>
 
+  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
 
   <!-- User-specific settings -->
   <property file="user.properties"/>
 
 
   <!-- 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"/>
+  <property name="build.javadoc.access" value="protected"/>
 
   <!-- 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.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"/>
 
-  <!-- JDK binary locations -->
+  <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 locations -->
   <property name="jdks.home"  location="${user.home}/jdk"/>
 
   <macrodef name="defjdklocations">
@@ -81,41 +89,54 @@
     <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
     <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
     <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
-    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
-    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
-    <property name="bootclasspath@{v}"
-     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
+    <local name="have.java.base"/>
+    <available property="have.java.base"
+      file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
+    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
+      if:set="have.java.base"/>
+    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
+      unless:set="have.java.base"/>
+    <local name="modules"/>
+    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
+    <local name="boot.jar.dir"/>
+    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
+    <path id="bootclasspath@{v}" unless:set="modules">
+      <pathelement path="${boot.jar.dir}/resources.jar"/>
+      <pathelement path="${boot.jar.dir}/rt.jar"/>
+      <pathelement path="${boot.jar.dir}/jsse.jar"/>
+      <pathelement path="${boot.jar.dir}/jce.jar"/>
+      <pathelement path="${boot.jar.dir}/charsets.jar"/>
+    </path>
+    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
     </sequential>
   </macrodef>
 
-  <defjdklocations v="6"/>
-  <defjdklocations v="7"/>
-  <defjdklocations v="8"/>
-
-  <macrodef name="run-tck-tests">
-    <attribute name="jvm"/>
-    <attribute name="tck.classes"/>
-    <attribute name="product.jar" default="${product.jar}"/>
-    <attribute name="jvmflags" default=""/>
+  <macrodef name="mirror-dir">
+    <attribute name="src"/>
+    <attribute name="dst"/>
     <sequential>
-    <java classname="JSR166TestCase"
-          jvm="@{jvm}" fork="true">
-	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
-	<jvmarg line="@{jvmflags}"/>
-	<classpath>
-	  <pathelement location="${junit.jar}"/>
-	  <pathelement location="@{tck.classes}"/>
-	</classpath>
-    </java>
+    <delete dir="@{dst}"/>
+    <mkdir dir="@{dst}"/>
+    <copy todir="@{dst}" preservelastmodified="true">
+      <fileset dir="@{src}"/>
+    </copy>
     </sequential>
   </macrodef>
 
+  <defjdklocations v="6"/>
+  <defjdklocations v="7"/>
+  <defjdklocations v="8"/>
+  <defjdklocations v="9"/>
+
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
   <property name="test.src.dir"         location="${basedir}/src/test"/>
   <property name="loops.src.dir"        location="${basedir}/src/loops"/>
   <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
-  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
+  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
+  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
+  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
+  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
   <property name="topsrc.dir"           location="${basedir}/src"/>
@@ -124,43 +145,188 @@
   <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"/>
+  <!-- Javadoc locations -->
+  <property name="docs.dir"          location="${build.dir}/docs"/>
+  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
+  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
+  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
+  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
+  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
+
+  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
+  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
+  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
+  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
+  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
+  <property name="dist.extra166ydocs.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"/>
-
-  <!-- Bootclasspath argument -->
-  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.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"/>
+
+  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
+  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
+  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
+  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
+  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
+  <!-- The expected canonical location does not yet exist as of 2014-07 -->
+  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
+  <property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
+  <!-- Default jdk doc location (latest stable release seems best) -->
+  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
 
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
-  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
-  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
-  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
-
-  <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/"/> -->
-  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
-
-  <!-- Test classpath -->
-  <path id="test.classpath">
-    <pathelement location="${build.testcases.dir}"/>
-    <pathelement location="${junit.jar}"/>
-  </path>
+  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
+  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
+  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
+  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
+  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
+  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
+
+  <!-- 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" />
+
+  <!-- Tck options; see JSR166TestCase.java
+   To profile a single tck test class:
+   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
+   To stress test a single tck test class:
+   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
+   To stress test a single tck test method:
+   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
+  -->
+  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
+  <macrodef name="run-tck-tests">
+    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
+    <attribute name="target"/>
+    <attribute name="compile-target" default="@{target}"/>
+    <attribute name="workdir"/>
+    <attribute name="classes"/>
+    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
+    <element name="javac-elements" optional="true"/>
+
+    <sequential>
+
+    <local name="modules"/>
+    <condition property="modules">
+      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
+    </condition>
+
+    <mkdir dir="@{workdir}/tck-classes"/>
+
+    <javac srcdir="@{tck.src.dir}"
+           destdir="@{workdir}/tck-classes"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="@{compile-target}"
+           target="@{compile-target}"
+           classpath="${junit.jar}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac@{compile-target}}"
+           fork="true">
+
+      <include name="*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
+      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
+      <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
+      <compilerarg line="${build.args}"/>
+      <javac-elements/>
+
+    </javac>
+
+    <java classname="${jsr166.tckTestClass}"
+          failonerror="true"
+          jvm="${java@{target}}"
+          fork="true">
+	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
+	<jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
+	<jvmarg line="@{jvmflags}"/>
+
+        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
+	<syspropertyset id="system-properties-used-by-tck">
+	  <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
+	  <propertyref prefix="jsr166."/>
+	</syspropertyset>
+
+	<classpath>
+	  <pathelement location="${junit.jar}"/>
+	  <pathelement location="@{workdir}/tck-classes"/>
+	</classpath>
+    </java>
+
+    </sequential>
+  </macrodef>
+
+  <!-- Define jtreg test sets for different jdk versions -->
+  <fileset dir="${jtreg9.src.dir}">
+    <patternset id="jdk9.jtreg.tests">
+      <include name="**/*.java"/>
+    </patternset>
+  </fileset>
+
+  <fileset dir="${jtreg8.src.dir}">
+    <patternset id="jdk8.jtreg.tests">
+      <include name="**/*.java"/>
+      <exclude name="**/SpliteratorCharacteristics.java"/>
+      <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
+      <exclude name="**/GCDuringIteration.java"/>
+    </patternset>
+  </fileset>
+
+  <fileset dir="${jtreg7.src.dir}">
+    <patternset id="jdk7.jtreg.tests">
+      <include name="**/*.java"/>
+    </patternset>
+  </fileset>
+
+  <macrodef name="run-jtreg-tests">
+    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
+    <attribute name="source" default="7"/>
+    <attribute name="target"/>
+    <attribute name="workdir"/>
+    <attribute name="classes"/>
+    <attribute name="jtregflags" default=""/>
+
+    <sequential>
+
+    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
+    <property name="jtreg.verbose" value="nopass,fail,error"/>
+
+    <local name="modules"/>
+    <condition property="modules">
+      <available file="${jdk@{target}.home}/jmods" type="dir"/>
+    </condition>
+
+    <delete dir="@{workdir}/JTwork"   quiet="true"/>
+    <delete dir="@{workdir}/JTreport" quiet="true"/>
+    <mkdir dir="@{workdir}/JTwork/scratch"/>
+    <mkdir dir="@{workdir}/JTreport"/>
+    <jtreg dir="${jtreg@{target}.src.dir}"
+           jdk="${jdk@{target}.home}"
+           workDir="@{workdir}/JTwork"
+           reportDir="@{workdir}/JTreport">
+      <patternset refid="jdk@{target}.jtreg.tests"/>
+      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
+      <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
+      <arg value="-agentvm"/>
+      <arg value="-verbose:${jtreg.verbose}"/>
+      <arg value="-vmoptions:-esa -ea"/>
+      <arg value="-automatic"/>
+      <arg value="-k:!ignore"/>
+      <arg line="@{jtregflags}"/>
+    </jtreg>
+    </sequential>
+  </macrodef>
 
   <!-- ALoops classpath -->
   <path id="loops.classpath">
@@ -168,102 +334,113 @@
   </path>
 
   <!-- 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.cite" value="The Java&amp;trade; Language Specification"/>
   <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
 
   <!-- Main targets -->
 
+  <property name="build.main.java.version" value="9"/>
+  <property name="build.main.javac" value="${javac9}"/>
+
   <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 dir">
 
-    <mkdir dir="${build.classes.dir}"/>
+    <local name="modules"/>
+    <condition property="modules">
+      <and>
+        <available file="${jdk9.home}/jmods" type="dir"/>
+        <equals arg1="9" arg2="${build.main.java.version}"/>
+      </and>
+    </condition>
+
+    <local name="destdir"/>
+    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
+    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
+
+    <mkdir dir="${destdir}"/>
 
     <javac srcdir="${src.dir}"
-           destdir="${build.classes.dir}"
+           destdir="${destdir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            classpath=""
            includeAntRuntime="false"
            includeJavaRuntime="false"
-           executable="${javac8}"
+           executable="${build.main.javac}"
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg line="${build.args}"/>
+      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
+      <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
-
-<!--
-      <exclude name="java/lang/**"/>
+      <compilerarg value="-Werror"/>
+      <compilerarg value="-Xdoclint:all/protected"/>
+      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
       <compilerarg line="${build.args}"/>
-      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
--->
 
     </javac>
-
   </target>
 
 
-
   <target name="jar"
           depends="compile"
           description="Builds library jar from compiled sources">
 
-    <mkdir dir="${build.lib.dir}"/>
-
     <jar destfile="${product.jar}">
       <fileset dir="${build.classes.dir}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
     </jar>
-
   </target>
 
 
-
-  <target name="test"
-          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 to dist dir">
 
-    <delete dir="${dist.javadocs.dir}"/>
-    <mkdir dir="${dist.javadocs.dir}"/>
+    <delete dir="${docs.dir}"/>
+    <mkdir dir="${docs.dir}"/>
 
     <!-- the packagenames="none" hack below prevents scanning the -->
     <!-- sourcepath for packages -->
 
-    <javadoc destdir="${dist.javadocs.dir}"
+    <javadoc destdir="${docs.dir}"
              packagenames="none"
-             link="${jdkapi8docs.url}"
+             link="${java9.api.url}"
              overview="${src.dir}/intro.html"
-             sourcepath="${src.dir}:${jdk8src.dir}"
+             access="${build.javadoc.access}"
+             sourcepath="${src.dir}:${jdk9src.dir}"
              classpath=""
-             executable="${javadoc8}">
-      <arg value="-XDignore.symbol.file=true"/>
-      <arg value="-tag"/>
-      <arg value="${javadoc.jls.option}"/>
+             executable="${javadoc9}">
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
+      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
+      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
+      <arg value="-XDignore.symbol.file=true"/>
+<!--  TODO     <arg value="-Xmodule:java.base"/> -->
+      <arg value="-tag"/>
+      <arg value="${javadoc.jls.option}"/>
+      <arg value="-tag"/>
+      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
+      <arg value="-tag"/>
+      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
+      <arg value="-tag"/>
+      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
     </javadoc>
-
   </target>
 
 
-
   <target name="dist"
-          depends="dist-clean, dist-jar, docs"
+          depends="dist-clean, dist-jar, dist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -281,186 +458,113 @@
       <exclude name="src/emulation/**"/>
       <exclude name="**/SyntaxTest.java"/>
       <exclude name="**/SuperfluousAbstract.java"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
     </jar>
-
   </target>
 
 
-
   <target name="clean"
           description="Removes all build products">
 
     <delete dir="${build.dir}"/>
-    <delete dir="${build.classes.dir}"/>
-    <delete dir="${build.lib.dir}"/>
 
   </target>
 
 
-
   <target name="dist-clean"
           description="Removes all build and distribution products">
 
+    <delete dir="${build.dir}"/>
     <delete dir="${dist.dir}"/>
 
   </target>
 
 
-
-  <!-- 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">
-
     <copy file="${product.jar}" todir="${dist.dir}"/>
-
   </target>
 
-
-  <target name="compile-tests"
-          depends="jar">
-
-    <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">
-
-      <compilerarg value="${bootclasspath.args}"/>
-      <compilerarg line="${build.args}"/>
-      <compilerarg value="-XDignore.symbol.file=true"/>
-
-      <classpath refid="test.classpath"/>
-
-    </javac>
-
-    <javac srcdir="${test.src.dir}"
-          destdir="${build.testcases.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
-
-      <include name="jsr166/test/**"/>
-
-      <compilerarg value="${bootclasspath.args}"/>
-      <compilerarg line="${build.args}"/>
-      <compilerarg value="-XDignore.symbol.file=true"/>
-
-      <classpath refid="test.classpath"/>
-
-    </javac>
-
-<!--
-    <javac srcdir="${jtreg.src.dir}"
-          destdir="${build.testcases.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
-
-      <compilerarg value="${bootclasspath.args}"/>
-      <compilerarg line="${build.args}"/>
-      <compilerarg value="-XDignore.symbol.file=true"/>
-
-      <classpath refid="test.classpath"/>
-
-    </javac>
--->
-
+  <target name="dist-docs"
+          depends="clean, docs">
+    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
   </target>
 
+  <target name="tck"
+	  depends="jar"
+          description="Runs tck tests for main directly">
 
-  <target name="run-tests"
-          depends="compile-tests">
-
-    <!-- May be overridden by user.properties -->
-    <property name="testcase" value="*"/>
-
-    <mkdir dir="${build.reports.dir}"/>
-
-    <junit printsummary="true"
-             showoutput="true"
-          errorProperty="junit.failed"
-        failureProperty="junit.failed"
-                    dir="${build.reports.dir}"
-                   fork="true">
-
-      <jvmarg value="${bootclasspath.args}"/>
-      <jvmarg value="-server"/>
-      <jvmarg value="-showversion"/>
-
-      <classpath refid="test.classpath"/>
+    <run-tck-tests
+      target="${build.main.java.version}"
+      workdir="${build.dir}"
+      classes="${product.jar}"/>
+  </target>
+
+  <target name="tck-parallelism-1"
+          description="Runs tck with given common pool parallelism">
+    <antcall target="tck">
+      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
+    </antcall>
+  </target>
+
+  <target name="tck-parallelism-0"
+          description="Runs tck with given common pool parallelism">
+    <antcall target="tck">
+      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
+    </antcall>
+  </target>
+
+  <target name="jtreg"
+	  depends="jar"
+          description="Runs jtreg tests for main using the jtreg ant task">
+    <run-jtreg-tests
+       target="${build.main.java.version}"
+       workdir="${build.dir}"
+       classes="${product.jar}"/>
+  </target>
 
-      <formatter type="xml"/>
+  <target name="test"
+          depends="tck, tck-parallelism-1, jtreg"
+          description="Runs tck and jtreg tests for main">
+  </target>
 
-      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
-        <fileset dir="${tck.src.dir}">
-          <include name="**/${testcase}Test.java"/>
-        </fileset>
-      </batchtest>
-
-      <batchtest todir="${build.reports.dir}" if="do.test.old">
-        <fileset dir="${test.src.dir}">
-          <include name="jsr166/test/**/${testcase}Test.java"/>
-        </fileset>
-      </batchtest>
-
-<!--
-      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
-        <fileset dir="${jtreg.src.dir}">
-          <include name="**/${testcase}Test.java"/>
-        </fileset>
-      </batchtest>
--->
+  <target name="jtreg8" description="Runs jtreg tests with jdk8">
 
-    </junit>
+    <antcall target="jtreg">
+      <param name="build.main.java.version" value="8"/>
+      <param name="build.main.javac" value="${javac8}"/>
+    </antcall>
 
   </target>
 
+  <target name="test89"
+          description="Runs tck and jtreg tests for main for multiple java versions">
 
-  <target name="report-tests"
-          depends="run-tests">
-
-    <!-- Sets junit.report.format to frames if redirection is present,
-         otherwise sets it to noframes. -->
-    <available property="junit.report.format"
-                  value="frames"
-              classname="org.apache.xalan.lib.Redirect"
-    />
-    <property name="junit.report.format" value="noframes"/>
-
-    <junitreport todir="${build.reports.dir}">
-      <fileset dir="${build.reports.dir}">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <report format="${junit.report.format}" todir="${build.reports.dir}"
-      />
-    </junitreport>
+    <antcall target="clean"/>
+    <antcall target="test">
+      <param name="build.main.java.version" value="8"/>
+      <param name="build.main.javac" value="${javac8}"/>
+    </antcall>
 
-    <fail message="Test Cases Failed" if="junit.failed"/>
+    <antcall target="clean"/>
+    <antcall target="test">
+      <param name="build.main.java.version" value="9"/>
+      <param name="build.main.javac" value="${javac9}"/>
+    </antcall>
 
   </target>
 
 
+
   <target name="configure-compiler">
+    <fail message="ant version too old">
+      <condition>
+	<not> <antversion atleast="1.9.1"/> </not>
+      </condition>
+    </fail>
 
     <property name="unchecked.option" value="-Xlint:unchecked"/>
 
@@ -477,29 +581,6 @@
   </target>
 
 
-  <target name="configure-tests"
-       depends="configure-compiler">
-
-    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
-    <available property="junit.available"
-               classname="junit.framework.Protectable"/>
-
-    <!-- Xalan -->
-    <available property="xalan.available"
-               classname="org.apache.xalan.Version"/>
-
-
-    <!-- Ant 1.6beta and later don't need or want this check -->
-    <!--
-    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
-          unless="junit.available"/>
-
-    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
-          unless="xalan.available"/>
-    -->
-
-  </target>
-
 
   <!-- Various demos and test programs -->
 
@@ -530,8 +611,33 @@
   </target>
 
 
-  <!-- jsr166 4jdk7 -->
+  <target name="compile-test-loops" depends="jar"
+          description="compile all the perf tests in src/test/loops">
 
+    <mkdir dir="${build.dir}/test/loops"/>
+
+    <javac srcdir="${basedir}/src/test/loops"
+           destdir="${build.dir}/test/loops"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac9}"
+           fork="true">
+
+      <include name="*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
+      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
+      <compilerarg line="${build.args}"/>
+
+    </javac>
+
+  </target>
+
+
+  <!-- jsr166 4jdk7 -->
 
   <target name="4jdk7compile"
           depends="configure-compiler"
@@ -544,7 +650,7 @@
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.6"
+           source="6"
            classpath=""
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
@@ -553,54 +659,87 @@
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg line="${build.args}"/>
+      <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
+  </target>
 
-    <mkdir dir="${build.4jdk7.lib.dir}"/>
-
-    <jar destfile="${4jdk7product.jar}" index="true">
-      <fileset dir="${build.4jdk7.classes.dir}"/>
-    </jar>
+  <target name="4jdk7doclint"
+          depends="configure-compiler"
+          description="Finds doclint warnings">
 
-    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
+    <mkdir dir="${build.4jdk7.classes.dir}"/>
 
-    <javac srcdir="${tck.src.dir}"
-           destdir="${build.4jdk7.tck.classes.dir}"
+    <javac srcdir="${4jdk7src.dir}"
+           destdir="${build.4jdk7.classes.dir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.6"
-           classpath="${junit.jar}"
-           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
+           source="6"
+           classpath=""
+           bootclasspath="${bootclasspath7}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
-           executable="${javac7}"
+           executable="${javac8}"
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg line="${build.args}"/>
+      <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+      <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Xdoclint:all/protected"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
+  </target>
+
+
+  <target name="4jdk7jar"
+          depends="4jdk7compile"
+          description="Builds library jar from compiled sources">
+
+    <jar destfile="${4jdk7product.jar}">
+      <fileset dir="${build.4jdk7.classes.dir}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
+    </jar>
 
   </target>
 
 
-  <target name="4jdk7-test-tck"
-	  depends="4jdk7compile"
+  <target name="4jdk7-tck"
+	  depends="4jdk7jar"
           description="Runs tck tests for jsr166-4jdk7 directly">
+
     <run-tck-tests
-      jvm="${java7}"
-      tck.classes="${build.4jdk7.tck.classes.dir}"
-      product.jar="${4jdk7product.jar}"/>
+      target="7"
+      workdir="${build.4jdk7.dir}"
+      classes="${4jdk7product.jar}">
+      <javac-elements>
+        <!-- JDK8+ test classes -->
+        <exclude name="*8Test.java"/>
+        <exclude name="*9Test.java"/>
+        <exclude name="*10Test.java"/>
+        <exclude name="DoubleAccumulatorTest.java"/>
+        <exclude name="DoubleAdderTest.java"/>
+        <exclude name="LongAccumulatorTest.java"/>
+        <exclude name="LongAdderTest.java"/>
+        <exclude name="CompletableFutureTest.java"/>
+        <exclude name="SplittableRandomTest.java"/>
+        <exclude name="StampedLockTest.java"/>
+        <exclude name="SubmissionPublisherTest.java"/>
+      </javac-elements>
+    </run-tck-tests>
   </target>
 
 
-  <target name="4jdk7-test-tck-junit"
+  <target name="4jdk7-tck-junit"
           depends="4jdk7compile"
           description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
 
@@ -622,162 +761,164 @@
 
       <formatter type="brief"/>
 
-      <test name="JSR166TestCase" haltonfailure="no">
+      <test name="${jsr166.tckTestClass}" haltonfailure="no">
       </test>
 
     </junit>
   </target>
 
+  <target name="4jdk7-jtreg"
+	  depends="4jdk7jar"
+          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
+    <run-jtreg-tests
+       target="7"
+       workdir="${build.4jdk7.dir}"
+       classes="${4jdk7product.jar}"/>
+  </target>
+
+
+  <target name="4jdk7-test"
+	  depends="4jdk7-tck, 4jdk7-jtreg"
+          description="Runs tck and jtreg tests for jsr166-4jdk7">
+  </target>
+
 
   <target name="4jdk7docs"
           description="Builds javadocs for src/jdk7 to dist dir">
 
-    <delete dir="${dist.4jdk7.docs.dir}"/>
-    <mkdir dir="${dist.4jdk7.docs.dir}"/>
+    <delete dir="${4jdk7docs.dir}"/>
+    <mkdir dir="${4jdk7docs.dir}"/>
 
-    <javadoc destdir="${dist.4jdk7.docs.dir}"
+    <javadoc destdir="${4jdk7docs.dir}"
              packagenames="none"
-             link="${jdkapi7docs.url}"
+             link="${java7.api.url}"
              overview="${4jdk7src.dir}/intro.html"
+             access="${build.javadoc.access}"
              sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
              classpath=""
              executable="${javadoc7}">
-      <arg value="-XDignore.symbol.file=true"/>
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
+      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
+      <arg value="-XDignore.symbol.file=true"/>
     </javadoc>
-
   </target>
 
 
   <target name="4jdk7dist"
-          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
+          depends="4jdk7dist-jar, 4jdk7dist-docs"
           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}"/>
 
   </target>
 
 
-
-  <target name="4jdk7dist-clean"
-          description="Removes all build and distribution products">
-
-  </target>
-
   <target name="4jdk7dist-jar"
-          depends="4jdk7clean, 4jdk7compile">
-
+          depends="4jdk7clean, 4jdk7jar">
     <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
+  </target>
+
 
+  <target name="4jdk7dist-docs"
+          depends="4jdk7clean, 4jdk7docs">
+    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
   </target>
 
-  <!-- jsr166x -->
 
+  <!-- jsr166x -->
 
   <target name="jsr166xcompile"
           depends="configure-compiler"
-          description="Compiles jsr166x sources">
+          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=""
+           bootclasspath="${bootclasspath6}"
+           source="5"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
 
-      <include name="**/*.java"/>
-      <compilerarg line="${build.args}"/>
+      <include name="jsr166x/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
+      <compilerarg value="-Werror"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
-
   </target>
 
 
-
   <target name="jsr166xjar"
           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}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
     </jar>
 
   </target>
 
 
-
   <target name="jsr166xdocs"
           description="Builds javadocs to dist dir">
 
-    <delete dir="${build.jsr166xjavadocs.dir}"/>
-    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
+    <delete dir="${jsr166xdocs.dir}"/>
+    <mkdir dir="${jsr166xdocs.dir}"/>
 
-    <javadoc destdir="${build.jsr166xjavadocs.dir}"
-             packagenames="jsr166x"
-             link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" />
+    <javadoc destdir="${jsr166xdocs.dir}"
+             packagenames="jsr166x.*"
+             link="${java.api.url}"
+             access="${build.javadoc.access}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             bootclasspath="${bootclasspath6}"
+             source="5"
+             executable="${javadoc7}">
+      <arg line="-Xdocrootparent ${java.docroot.url}"/>
+      <arg value="-XDignore.symbol.file=true"/>
 
+    </javadoc>
   </target>
 
 
   <target name="jsr166xdist"
-          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
+          depends="jsr166xdist-jar, jsr166xdist-docs"
           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>
 
 
-
-  <target name="jsr166xdist-clean"
-          description="Removes all build and distribution products">
-
-  </target>
-
-
-
-  <target name="jsr166xdist-docs"
-          description="Builds javadocs to dist dir">
-
-    <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="${jsr166x.jar}" todir="${dist.dir}"/>
+  </target>
 
-    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
-
+  <target name="jsr166xdist-docs"
+          depends="jsr166xclean, jsr166xdocs">
+    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
   </target>
 
   <!-- jsr166y -->
@@ -787,14 +928,15 @@
           depends="configure-compiler"
           description="Compiles jsr166y sources">
 
-    <mkdir dir="${build.jsr166y.dir}"/>
+    <mkdir dir="${build.jsr166y.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
-           destdir="${build.jsr166y.dir}"
+           destdir="${build.jsr166y.classes.dir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.6"
+           source="6"
+           target="6"
            classpath=""
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
@@ -803,9 +945,11 @@
            fork="true">
 
       <include name="jsr166y/**/*.java"/>
-      <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
+      <compilerarg line="${build.args}"/>
+
     </javac>
   </target>
 
@@ -814,73 +958,59 @@
           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}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
     </jar>
 
   </target>
 
 
-
   <target name="jsr166ydocs"
           description="Builds javadocs to dist dir">
 
-    <delete dir="${build.jsr166yjavadocs.dir}"/>
-    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
+    <delete dir="${jsr166ydocs.dir}"/>
+    <mkdir dir="${jsr166ydocs.dir}"/>
 
-    <javadoc destdir="${build.jsr166yjavadocs.dir}"
-             packagenames="jsr166y"
-             link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" />
+    <javadoc destdir="${jsr166ydocs.dir}"
+             packagenames="jsr166y.*"
+             link="${java.api.url}"
+             access="${build.javadoc.access}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             bootclasspath="${bootclasspath6}"
+             source="6"
+             executable="${javadoc7}">
+      <arg line="-Xdocrootparent ${java.docroot.url}"/>
+      <arg value="-XDignore.symbol.file=true"/>
 
+    </javadoc>
   </target>
 
 
   <target name="jsr166ydist"
-          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
+          depends="jsr166ydist-jar, jsr166ydist-docs"
           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>
 
 
-
-  <target name="jsr166ydist-clean"
-          description="Removes all build and distribution products">
-
-  </target>
-
-  <target name="jsr166ydist-docs"
-          description="Builds javadocs to dist dir">
-
-    <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="${jsr166y.jar}" todir="${dist.dir}"/>
+  </target>
 
-    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
-
+  <target name="jsr166ydist-docs"
+          depends="jsr166yclean, jsr166ydocs">
+    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
   </target>
 
 
@@ -891,212 +1021,261 @@
           depends="configure-compiler, jsr166yjar"
           description="Compiles extra166y sources">
 
-    <mkdir dir="${build.extra166y.dir}"/>
+    <mkdir dir="${build.extra166y.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
-           destdir="${build.extra166y.dir}"
+           destdir="${build.extra166y.classes.dir}"
            debug="${build.debug}"
-           classpath=""
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="1.6"
-           bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
+           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
+           classpath=""
+           source="6"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac7}"
            fork="true">
 
       <include name="extra166y/**/*.java"/>
-      <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
+      <compilerarg value="-Werror"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
-
   </target>
 
 
-
   <target name="extra166yjar"
           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}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
     </jar>
 
   </target>
 
 
-
   <target name="extra166ydocs"
-          description="Builds javadocs with custom tags to build dir">
+          description="Builds javadocs to build dir">
 
-    <delete dir="${build.extra166yjavadocs.dir}"/>
-    <mkdir dir="${build.extra166yjavadocs.dir}"/>
+    <delete dir="${extra166ydocs.dir}"/>
+    <mkdir dir="${extra166ydocs.dir}"/>
 
-    <javadoc destdir="${build.extra166yjavadocs.dir}"
-             packagenames="extra166y"
-             link="${jdkapidocs.url}"
-             source="${build.sourcelevel}"
-             sourcepath="${topsrc.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" />
+    <javadoc destdir="${extra166ydocs.dir}"
+             packagenames="extra166y.*"
+             link="${java.api.url}"
+             access="${build.javadoc.access}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             bootclasspath="${bootclasspath6}"
+             source="6"
+             executable="${javadoc7}">
+      <arg line="-Xdocrootparent ${java.docroot.url}"/>
+      <arg value="-XDignore.symbol.file=true"/>
 
+    </javadoc>
   </target>
 
 
   <target name="extra166ydist"
-          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
+          depends="extra166ydist-jar, extra166ydist-docs"
           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>
-
-
-
-  <target name="extra166ydist-clean"
-          description="Removes all build and distribution products">
 
   </target>
 
-  <target name="extra166ydist-docs"
-          description="Builds javadocs to dist dir">
-
-    <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="${extra166y.jar}" todir="${dist.dir}"/>
+  </target>
 
-    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
-
+  <target name="extra166ydist-docs"
+          depends="extra166yclean, extra166ydocs">
+    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
   </target>
 
   <!-- jsr166e -->
 
+  <property name="build.jsr166e.java.version" value="6"/>
+  <property name="build.jsr166e.javac" value="${javac6}"/>
+
   <target name="jsr166ecompile"
           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="${build.jsr166e.java.version}"
            classpath=""
            includeAntRuntime="false"
            includeJavaRuntime="false"
-           executable="${javac7}"
+           executable="${build.jsr166e.javac}"
            fork="true">
 
       <include name="jsr166e/**/*.java"/>
-      <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
-
   </target>
 
+  <!-- jsr166e: find doclint errors -->
+  <target name="jsr166edoclint">
+
+    <mkdir dir="${build.jsr166e.classes.dir}"/>
+
+    <javac srcdir="${topsrc.dir}"
+           destdir="${build.jsr166e.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="${build.jsr166e.java.version}"
+           classpath=""
+           bootclasspath="${bootclasspath7}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac8}"
+           fork="true">
+
+      <include name="jsr166e/**/*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
+      <compilerarg value="-Xdoclint:all/protected"/>
+
+    </javac>
+  </target>
 
 
   <target name="jsr166ejar"
           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}"/>
+      <manifest>
+        <attribute name="Built-By" value="${user.name}"/>
+        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
+      </manifest>
     </jar>
 
   </target>
 
 
-
   <target name="jsr166edocs"
-          description="Builds javadocs with custom tags to build dir">
+          description="Builds javadocs to build dir">
 
-    <delete dir="${build.jsr166ejavadocs.dir}"/>
-    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
+    <delete dir="${jsr166edocs.dir}"/>
+    <mkdir dir="${jsr166edocs.dir}"/>
+
+    <javadoc destdir="${jsr166edocs.dir}"
+             packagenames="jsr166e.*"
+             link="${java.api.url}"
+             access="${build.javadoc.access}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             source="${build.jsr166e.java.version}"
+             executable="${javadoc7}">
+      <arg line="-Xdocrootparent ${java.docroot.url}"/>
+      <arg value="-XDignore.symbol.file=true"/>
 
-    <javadoc destdir="${build.jsr166ejavadocs.dir}"
-             packagenames="jsr166e,jsr166e.extra"
-             link="${jdkapi7docs.url}"
-             source="1.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="jsr166e-tck-one-java-version"
+	  depends="jsr166ejar">
 
+    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
+
+    <run-tck-tests
+      tck.src.dir="${test.src.dir}/tck-jsr166e"
+      target="${build.jsr166e.java.version}"
+      workdir="${build.jsr166e.dir}"
+      classes="${jsr166e.jar}"/>
+  </target>
+
+  <target name="jsr166e-tck"
+          description="Runs tck tests for jsr166e for multiple java versions">
+
+<!--     <antcall target="clean"/> -->
+<!--     <antcall target="jsr166e-tck-one-java-version"> -->
+<!--       <param name="build.jsr166e.java.version" value="8"/> -->
+<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
+<!--     </antcall> -->
+
+    <antcall target="clean"/>
+    <antcall target="jsr166e-tck-one-java-version">
+      <param name="build.jsr166e.java.version" value="7"/>
+      <param name="build.jsr166e.javac" value="${javac7}"/>
+    </antcall>
+
+    <antcall target="clean"/>
+    <antcall target="jsr166e-tck-one-java-version">
+      <param name="build.jsr166e.java.version" value="6"/>
+      <param name="build.jsr166e.javac" value="${javac6}"/>
+    </antcall>
   </target>
 
 
+  <target name="jsr166e-test"
+	  depends="jsr166e-tck"
+          description="Runs all tests for jsr166e">
+  </target>
+
   <target name="jsr166edist"
-          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
+          depends="jsr166edist-jar, jsr166edist-docs"
           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 name="jsr166edist-jar"
+          depends="jsr166eclean, jsr166ejar">
+    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
   </target>
 
   <target name="jsr166edist-docs"
-          description="Builds javadocs to dist dir">
+          depends="jsr166eclean, jsr166edocs">
+    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
+  </target>
 
-    <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" />
+<!-- Find buglets that can be detected by static build tools -->
 
+  <target name="lint">
+    <antcall target="dists">
+      <param name="build.javadoc.access" value="public"/>
+    </antcall>
   </target>
 
-  <target name="jsr166edist-jar"
-          depends="jsr166eclean, jsr166ejar">
-
-    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
-
+<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
+  <target name="lint-private">
+    <antcall target="dist">
+      <param name="build.javadoc.access" value="private"/>
+    </antcall>
   </target>
 
+
 </project>