--- jsr166/build.xml	2016/03/26 15:10:14	1.202
+++ jsr166/build.xml	2016/11/24 01:58:04	1.224
@@ -38,7 +38,7 @@
 ------------------------------------------------------------------------------
   </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" />
@@ -63,7 +63,6 @@
   <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.reports.dir"           location="${build.dir}/reports"/>
 
   <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
   <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
@@ -186,9 +185,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 2016-03 -->
+  <!-- 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}"/>
 
@@ -245,6 +244,7 @@
            classpath="${junit.jar}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac@{compile-target}}"
            fork="true">
 
@@ -252,7 +252,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/>
 
@@ -263,10 +263,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."/>
@@ -326,19 +328,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"/>
@@ -393,6 +391,7 @@
            classpath=""
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${build.main.javac}"
            fork="true">
 
@@ -407,20 +406,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."/>
@@ -438,12 +433,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}:${jdk9.src.dir}"
+             sourcepath="${src.dir}"
              classpath=""
              executable="${javadoc9}">
       <fileset dir="${src.dir}" defaultexcludes="yes">
@@ -452,20 +449,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="-tag"/>
-      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
+      <arg value="implSpec:a:Implementation Requirements:"/>
       <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"/>
+      <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>
 
@@ -526,7 +524,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}"
@@ -535,22 +533,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}"
@@ -558,35 +563,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> -->
 
 
 
@@ -616,8 +621,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}"/>
 
@@ -628,6 +633,7 @@
       deprecation="${build.deprecation}"
            source="${build.sourcelevel}"
            target="${build.sourcelevel}"
+         encoding="ASCII"
              fork="true">
 
       <compilerarg line="${build.args}"/>
@@ -655,6 +661,7 @@
            deprecation="${build.deprecation}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac9}"
            fork="true">
 
@@ -688,6 +695,7 @@
            bootclasspath="${bootclasspath8}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac8}"
            fork="true">
 
@@ -718,6 +726,7 @@
            bootclasspath="${bootclasspath8}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac8}"
            fork="true">
 
@@ -793,7 +802,8 @@
              access="${build.javadoc.access}"
              sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
              classpath=""
-             executable="${javadoc8}">
+             executable="${javadoc8}"
+             failonerror = "true">
       <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
@@ -801,8 +811,9 @@
       <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;"/>
+<!-- @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"/>
@@ -856,6 +867,7 @@
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -886,6 +898,7 @@
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac8}"
            fork="true">
 
@@ -941,9 +954,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"
@@ -998,7 +1011,8 @@
              access="${build.javadoc.access}"
              sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
              classpath=""
-             executable="${javadoc7}">
+             executable="${javadoc7}"
+             failonerror = "true">
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
@@ -1052,6 +1066,7 @@
            target="5"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -1093,7 +1108,8 @@
              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"/>
 
@@ -1144,6 +1160,7 @@
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -1185,7 +1202,8 @@
              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"/>
 
@@ -1237,6 +1255,7 @@
            target="6"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -1398,7 +1417,8 @@
              access="${build.javadoc.access}"
              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"/>