--- jsr166/build.xml	2015/09/30 18:12:20	1.186
+++ jsr166/build.xml	2016/03/26 12:35:25	1.201
@@ -27,12 +27,12 @@
   (e.g. mercurial forest) or a symlink to same.
 
   Alternatively, define ant variables thus:
-  ant -Djdk$N.home=...
+  ant -Djdk$N.home=... -Djdk$N.src.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
+  ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
   "docs" target is still broken.
 ------------------------------------------------------------------------------
   </description>
@@ -69,6 +69,11 @@
   <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.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
+  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
+  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
+  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
+
   <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
   <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
   <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
@@ -85,16 +90,17 @@
   <macrodef name="defjdklocations">
     <attribute name="v"/>
     <sequential>
-    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
-    <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="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
+    <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="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
     <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"
+      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
+    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/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"
+    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
       unless:set="have.java.base"/>
     <local name="modules"/>
     <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
@@ -134,13 +140,14 @@
   <property name="loops.src.dir"        location="${basedir}/src/loops"/>
   <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
   <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
-  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
+  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
   <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"/>
   <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
+  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
   <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
   <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
   <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
@@ -149,6 +156,7 @@
   <!-- Javadoc locations -->
   <property name="docs.dir"          location="${build.dir}/docs"/>
   <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
+  <property name="4jdk8docs.dir"     location="${build.4jdk8.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"/>
@@ -156,6 +164,7 @@
 
   <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
   <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
+  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
   <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"/>
@@ -164,6 +173,7 @@
   <!-- Jar locations -->
   <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
   <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
+  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.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"/>
@@ -175,7 +185,7 @@
   <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 -->
+  <!-- The expected canonical location does not yet exist as of 2016-03 -->
   <!-- <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) -->
@@ -209,7 +219,10 @@
     <attribute name="compile-target" default="@{target}"/>
     <attribute name="workdir"/>
     <attribute name="classes"/>
-    <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
+    <!--
+        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
+    -->
+        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
     <element name="javac-elements" optional="true"/>
 
     <sequential>
@@ -236,9 +249,9 @@
 
       <include name="*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+      <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 value="-Xpatch:${build.classes.dir}" if:set="modules"/>
       <compilerarg line="${build.args}"/>
       <javac-elements/>
 
@@ -249,13 +262,14 @@
           jvm="${java@{target}}"
           fork="true">
 	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-	<jvmarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
+	<jvmarg value="-Xpatch:${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."/>
+	  <propertyref name="test.timeout.factor"/>
 	</syspropertyset>
 
 	<classpath>
@@ -289,6 +303,9 @@
     </patternset>
   </fileset>
 
+  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
+  <property name="jtreg.flags" value=""/>
+
   <macrodef name="run-jtreg-tests">
     <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
     <attribute name="source" default="7"/>
@@ -299,6 +316,9 @@
 
     <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"/>
@@ -307,20 +327,23 @@
     <delete dir="@{workdir}/JTwork"   quiet="true"/>
     <delete dir="@{workdir}/JTreport" quiet="true"/>
     <mkdir dir="@{workdir}/JTwork/scratch"/>
-    <mkdir dir="@{workdir}/JTreport"/>
+    <!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
+    <mkdir dir="@{workdir}/JTreport/html"/>
+    <mkdir dir="@{workdir}/JTreport/text"/>
     <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="-Xpatch:${build.classes.dir}" if:set="modules"/>
       <arg value="-agentvm"/>
-      <arg value="-verbose:nopass,fail,error"/>
+      <arg value="-verbose:${jtreg.verbose}"/>
       <arg value="-vmoptions:-esa -ea"/>
       <arg value="-automatic"/>
       <arg value="-k:!ignore"/>
       <arg line="@{jtregflags}"/>
+      <arg line="${jtreg.flags}"/>
     </jtreg>
     </sequential>
   </macrodef>
@@ -340,7 +363,7 @@
   <property name="build.main.javac" value="${javac9}"/>
 
   <target name="dists"
-          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
+          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
           description="Builds all public jars and docs"/>
 
   <target name="compile"
@@ -383,6 +406,11 @@
       <compilerarg line="${build.args}"/>
 
     </javac>
+
+    <!-- We need jdk9's Contended annotation, but at compile time only -->
+    <!--
+        <delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
+    -->
   </target>
 
 
@@ -414,7 +442,7 @@
              link="${java9.api.url}"
              overview="${src.dir}/intro.html"
              access="${build.javadoc.access}"
-             sourcepath="${src.dir}:${jdk9src.dir}"
+             sourcepath="${src.dir}:${jdk9.src.dir}"
              classpath=""
              executable="${javadoc9}">
       <fileset dir="${src.dir}" defaultexcludes="yes">
@@ -432,6 +460,11 @@
       <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;"/>
+<!-- tags added in jdk9 -->
+      <arg value="-tag"/>
+      <arg value="revised:X"/>
+      <arg value="-tag"/>
+      <arg value="spec:X"/>
     </javadoc>
   </target>
 
@@ -593,6 +626,7 @@
        debuglevel="${build.debuglevel}"
       deprecation="${build.deprecation}"
            source="${build.sourcelevel}"
+           target="${build.sourcelevel}"
              fork="true">
 
       <compilerarg line="${build.args}"/>
@@ -634,6 +668,174 @@
   </target>
 
 
+  <!-- jsr166 4jdk8 -->
+
+  <target name="4jdk8compile"
+          depends="configure-compiler"
+          description="Compiles src/jdk8 sources, targeting jdk8">
+
+    <mkdir dir="${build.4jdk8.classes.dir}"/>
+
+    <javac srcdir="${4jdk8src.dir}"
+           destdir="${build.4jdk8.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="8"
+           target="8"
+           classpath=""
+           bootclasspath="${bootclasspath8}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac8}"
+           fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg value="-Xprefer:source"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Werror"/>
+      <compilerarg line="${build.args}"/>
+
+    </javac>
+  </target>
+
+  <target name="4jdk8doclint"
+          depends="configure-compiler"
+          description="Finds doclint warnings">
+
+    <mkdir dir="${build.4jdk8.classes.dir}"/>
+
+    <javac srcdir="${4jdk8src.dir}"
+           destdir="${build.4jdk8.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="8"
+           target="8"
+           classpath=""
+           bootclasspath="${bootclasspath8}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac8}"
+           fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg value="-Xprefer:source"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all"/>
+      <compilerarg value="-Xdoclint:all/protected"/>
+      <compilerarg line="${build.args}"/>
+
+    </javac>
+  </target>
+
+
+  <target name="4jdk8jar"
+          depends="4jdk8compile"
+          description="Builds library jar from compiled sources">
+
+    <jar destfile="${4jdk8product.jar}">
+      <fileset dir="${build.4jdk8.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="4jdk8-tck"
+	  depends="4jdk8jar"
+          description="Runs tck tests for jsr166-4jdk8 directly">
+
+    <run-tck-tests
+      target="8"
+      workdir="${build.4jdk8.dir}"
+      classes="${4jdk8product.jar}">
+      <javac-elements>
+        <!-- JDK9+ test classes -->
+        <exclude name="*9Test.java"/>
+        <exclude name="*10Test.java"/>
+      </javac-elements>
+    </run-tck-tests>
+  </target>
+
+
+  <target name="4jdk8-jtreg"
+	  depends="4jdk8jar"
+          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
+    <run-jtreg-tests
+       target="8"
+       workdir="${build.4jdk8.dir}"
+       classes="${4jdk8product.jar}"/>
+  </target>
+
+
+  <target name="4jdk8-test"
+	  depends="4jdk8-tck, 4jdk8-jtreg"
+          description="Runs tck and jtreg tests for jsr166-4jdk8">
+  </target>
+
+
+  <target name="4jdk8docs"
+          description="Builds javadocs for src/jdk8 to dist dir">
+
+    <delete dir="${4jdk8docs.dir}"/>
+    <mkdir dir="${4jdk8docs.dir}"/>
+
+    <javadoc destdir="${4jdk8docs.dir}"
+             packagenames="none"
+             link="${java8.api.url}"
+             overview="${4jdk8src.dir}/intro.html"
+             access="${build.javadoc.access}"
+             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
+             classpath=""
+             executable="${javadoc8}">
+      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
+        <include name="**/*.java"/>
+      </fileset>
+      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
+      <arg value="-XDignore.symbol.file=true"/>
+      <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="4jdk8dist"
+          depends="4jdk8dist-jar, 4jdk8dist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+  <target name="4jdk8clean"
+          description="Removes all 4jdk8 build products">
+
+    <delete dir="${build.4jdk8.dir}"/>
+
+  </target>
+
+
+  <target name="4jdk8dist-jar"
+          depends="4jdk8clean, 4jdk8jar">
+    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
+  </target>
+
+
+  <target name="4jdk8dist-docs"
+          depends="4jdk8clean, 4jdk8docs">
+    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
+  </target>
+
+
+
   <!-- jsr166 4jdk7 -->
 
   <target name="4jdk7compile"
@@ -648,6 +850,7 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            source="6"
+           target="6"
            classpath=""
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
@@ -677,8 +880,9 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            source="6"
+           target="6"
            classpath=""
-           bootclasspath="${bootclasspath7}"
+           bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac8}"
@@ -791,7 +995,7 @@
              link="${java7.api.url}"
              overview="${4jdk7src.dir}/intro.html"
              access="${build.javadoc.access}"
-             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
+             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
              classpath=""
              executable="${javadoc7}">
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
@@ -844,6 +1048,7 @@
            classpath=""
            bootclasspath="${bootclasspath6}"
            source="5"
+           target="5"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac7}"
@@ -884,7 +1089,7 @@
              packagenames="jsr166x.*"
              link="${java.api.url}"
              access="${build.javadoc.access}"
-             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
              bootclasspath="${bootclasspath6}"
              source="5"
              executable="${javadoc7}">
@@ -933,6 +1138,7 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            source="6"
+           target="6"
            classpath=""
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
@@ -975,7 +1181,7 @@
              packagenames="jsr166y.*"
              link="${java.api.url}"
              access="${build.javadoc.access}"
-             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
              bootclasspath="${bootclasspath6}"
              source="6"
              executable="${javadoc7}">
@@ -1027,6 +1233,7 @@
            bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
            classpath=""
            source="6"
+           target="6"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac7}"
@@ -1067,7 +1274,7 @@
              packagenames="extra166y.*"
              link="${java.api.url}"
              access="${build.javadoc.access}"
-             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
              bootclasspath="${bootclasspath6}"
              source="6"
              executable="${javadoc7}">
@@ -1118,6 +1325,7 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            source="${build.jsr166e.java.version}"
+           target="${build.jsr166e.java.version}"
            classpath=""
            includeAntRuntime="false"
            includeJavaRuntime="false"
@@ -1144,8 +1352,9 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            source="${build.jsr166e.java.version}"
+           target="${build.jsr166e.java.version}"
            classpath=""
-           bootclasspath="${bootclasspath7}"
+           bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac8}"
@@ -1186,7 +1395,7 @@
              packagenames="jsr166e.*"
              link="${java.api.url}"
              access="${build.javadoc.access}"
-             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
              source="${build.jsr166e.java.version}"
              executable="${javadoc7}">
       <arg line="-Xdocrootparent ${java.docroot.url}"/>