--- jsr166/build.xml	2016/03/04 21:00:45	1.197
+++ jsr166/build.xml	2016/11/24 01:53:50	1.223
@@ -7,6 +7,9 @@
 
   Usage: ant [target]
 
+  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
+  more details.
+
   User-specific settings are read from user.properties.
   See user.properties.sample for an explanation of some useful settings.
 
@@ -27,17 +30,15 @@
   (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
-  "docs" target is still broken.
+  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
+  target is currently broken.
 ------------------------------------------------------------------------------
   </description>
 
-  <!-- Display main targets by running 'ant -projecthelp' -->
+  <!-- Run 'ant -projecthelp' (default target) -->
   <target name="usage">
     <java classname="org.apache.tools.ant.Main">
       <arg value="-projecthelp" />
@@ -69,6 +70,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 +91,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 +141,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 +157,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 +165,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 +174,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,9 +186,9 @@
   <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 2015-11 -->
+  <!-- The expected canonical location does not yet exist as of 2016-04 -->
   <!-- <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"/>
+  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
   <!-- Default jdk doc location (latest stable release seems best) -->
   <property name="java.docroot.url"       value="${java8.docroot.url}"/>
 
@@ -209,7 +220,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>
@@ -231,6 +245,7 @@
            classpath="${junit.jar}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac@{compile-target}}"
            fork="true">
 
@@ -238,7 +253,7 @@
       <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="-Xpatch:${build.classes.dir}" if:set="modules"/>
+      <compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
       <compilerarg line="${build.args}"/>
       <javac-elements/>
 
@@ -249,10 +264,12 @@
           jvm="${java@{target}}"
           fork="true">
 	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
+	<jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
 	<jvmarg line="@{jvmflags}"/>
+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
 
-        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
+	<!-- 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."/>
@@ -312,19 +329,15 @@
     </condition>
 
     <delete dir="@{workdir}/JTwork"   quiet="true"/>
-    <delete dir="@{workdir}/JTreport" quiet="true"/>
-    <mkdir dir="@{workdir}/JTwork/scratch"/>
-    <!-- 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">
+           workDir="@{workdir}/JTwork">
       <patternset refid="jdk@{target}.jtreg.tests"/>
       <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
-      <arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
+      <arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
+      <arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
       <arg value="-agentvm"/>
+      <arg value="-noreport"/>
       <arg value="-verbose:${jtreg.verbose}"/>
       <arg value="-vmoptions:-esa -ea"/>
       <arg value="-automatic"/>
@@ -350,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"
@@ -379,6 +392,7 @@
            classpath=""
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${build.main.javac}"
            fork="true">
 
@@ -393,18 +407,16 @@
       <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>
 
 
   <target name="jar"
           depends="compile"
-          description="Builds library jar from compiled sources">
-
+          description="Builds library jar for src/main from compiled sources">
+    <local name="subdir"/>
+    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
     <jar destfile="${product.jar}">
-      <fileset dir="${build.classes.dir}"/>
+      <fileset dir="${build.classes.dir}${subdir}"/>
       <manifest>
         <attribute name="Built-By" value="${user.name}"/>
         <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
@@ -422,12 +434,14 @@
     <!-- the packagenames="none" hack below prevents scanning the -->
     <!-- sourcepath for packages -->
 
+<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
+<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
     <javadoc destdir="${docs.dir}"
              packagenames="none"
              link="${java9.api.url}"
              overview="${src.dir}/intro.html"
              access="${build.javadoc.access}"
-             sourcepath="${src.dir}:${jdk9src.dir}"
+             sourcepath="${src.dir}"
              classpath=""
              executable="${javadoc9}">
       <fileset dir="${src.dir}" defaultexcludes="yes">
@@ -436,15 +450,21 @@
       <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="-Xmodule:java.base"/>
       <arg value="-tag"/>
       <arg value="${javadoc.jls.option}"/>
+<!-- @apiNote currently unused -->
+<!--       <arg value="-tag"/> -->
+<!--       <arg value="apiNote:a:API Note:"/> -->
       <arg value="-tag"/>
-      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
+      <arg value="implSpec:a:Implementation Requirements:"/>
       <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;"/>
+      <arg value="implNote:a:Implementation Note:"/>
+<!-- tags added in jdk9: currently unused -->
+<!--       <arg value="-tag"/> -->
+<!--       <arg value="revised:X"/> -->
+<!--       <arg value="-tag"/> -->
+<!--       <arg value="spec:X"/> -->
     </javadoc>
   </target>
 
@@ -505,7 +525,7 @@
 
   <target name="tck"
 	  depends="jar"
-          description="Runs tck tests for main directly">
+          description="Runs tck tests for src/main directly">
 
     <run-tck-tests
       target="${build.main.java.version}"
@@ -514,22 +534,29 @@
   </target>
 
   <target name="tck-parallelism-1"
-          description="Runs tck with given common pool parallelism">
+          description="Runs tck with common pool parallelism 1">
     <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">
+          description="Runs tck with common pool parallelism 0">
     <antcall target="tck">
       <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
     </antcall>
   </target>
 
+  <target name="tck-security-manager"
+          description="Runs tck with a security manager">
+    <antcall target="tck">
+      <param name="jsr166.useSecurityManager" value="true"/>
+    </antcall>
+  </target>
+
   <target name="jtreg"
 	  depends="jar"
-          description="Runs jtreg tests for main using the jtreg ant task">
+          description="Runs jtreg tests for src/main using the jtreg ant task">
     <run-jtreg-tests
        target="${build.main.java.version}"
        workdir="${build.dir}"
@@ -537,35 +564,35 @@
   </target>
 
   <target name="test"
-          depends="tck, tck-parallelism-1, jtreg"
-          description="Runs tck and jtreg tests for main">
+          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
+          description="Runs tck and jtreg tests for src/main">
   </target>
 
-  <target name="jtreg8" description="Runs jtreg tests with jdk8">
+<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
 
-    <antcall target="jtreg">
-      <param name="build.main.java.version" value="8"/>
-      <param name="build.main.javac" value="${javac8}"/>
-    </antcall>
+<!--     <antcall target="jtreg"> -->
+<!--       <param name="build.main.java.version" value="8"/> -->
+<!--       <param name="build.main.javac" value="${javac8}"/> -->
+<!--     </antcall> -->
 
-  </target>
+<!--   </target> -->
 
-  <target name="test89"
-          description="Runs tck and jtreg tests for main for multiple java versions">
+<!--   <target name="test89" -->
+<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
 
-    <antcall target="clean"/>
-    <antcall target="test">
-      <param name="build.main.java.version" value="8"/>
-      <param name="build.main.javac" value="${javac8}"/>
-    </antcall>
+<!--     <antcall target="clean"/> -->
+<!--     <antcall target="test"> -->
+<!--       <param name="build.main.java.version" value="8"/> -->
+<!--       <param name="build.main.javac" value="${javac8}"/> -->
+<!--     </antcall> -->
 
-    <antcall target="clean"/>
-    <antcall target="test">
-      <param name="build.main.java.version" value="9"/>
-      <param name="build.main.javac" value="${javac9}"/>
-    </antcall>
+<!--     <antcall target="clean"/> -->
+<!--     <antcall target="test"> -->
+<!--       <param name="build.main.java.version" value="9"/> -->
+<!--       <param name="build.main.javac" value="${javac9}"/> -->
+<!--     </antcall> -->
 
-  </target>
+<!--   </target> -->
 
 
 
@@ -595,8 +622,8 @@
   <!-- Various demos and test programs -->
 
 
-  <target name="loops" depends="configure-compiler"
-          description="Benchmark from Doug Lea's AQS paper">
+  <!-- description="Benchmark from Doug Lea's AQS paper" -->
+  <target name="loops" depends="configure-compiler">
 
     <mkdir dir="${build.loops.dir}"/>
 
@@ -607,6 +634,7 @@
       deprecation="${build.deprecation}"
            source="${build.sourcelevel}"
            target="${build.sourcelevel}"
+         encoding="ASCII"
              fork="true">
 
       <compilerarg line="${build.args}"/>
@@ -634,6 +662,7 @@
            deprecation="${build.deprecation}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac9}"
            fork="true">
 
@@ -648,6 +677,178 @@
   </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"
+           encoding="ASCII"
+           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"
+           encoding="ASCII"
+           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}"
+             failonerror = "true">
+      <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}"/>
+<!-- @apiNote currently unused -->
+<!--       <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"
@@ -667,6 +868,7 @@
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -697,6 +899,7 @@
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac8}"
            fork="true">
 
@@ -752,9 +955,9 @@
   </target>
 
 
+  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
   <target name="4jdk7-tck-junit"
-          depends="4jdk7compile"
-          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
+          depends="4jdk7compile">
 
     <junit printsummary="true"
            showoutput="true"
@@ -807,9 +1010,10 @@
              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}">
+             executable="${javadoc7}"
+             failonerror = "true">
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
@@ -863,6 +1067,7 @@
            target="5"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -901,10 +1106,11 @@
              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}">
+             executable="${javadoc7}"
+             failonerror = "true">
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
@@ -955,6 +1161,7 @@
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -993,10 +1200,11 @@
              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}">
+             executable="${javadoc7}"
+             failonerror = "true">
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
@@ -1048,6 +1256,7 @@
            target="6"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -1086,7 +1295,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}">
@@ -1207,9 +1416,10 @@
              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}">
+             executable="${javadoc7}"
+             failonerror = "true">
       <arg line="-Xdocrootparent ${java.docroot.url}"/>
       <arg value="-XDignore.symbol.file=true"/>