--- jsr166/build.xml	2016/05/21 00:35:58	1.212
+++ jsr166/build.xml	2016/11/24 01:58:04	1.224
@@ -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"/>
@@ -188,7 +187,7 @@
   <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
   <!-- 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://http://download.java.net/java/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:java.base=${build.classes.dir}/java.base" 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:java.base=${build.classes.dir}/java.base" 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,15 +328,15 @@
     </condition>
 
     <delete dir="@{workdir}/JTwork"   quiet="true"/>
-    <delete dir="@{workdir}/JTreport" quiet="true"/>
     <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="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" 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"/>
@@ -389,6 +391,7 @@
            classpath=""
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${build.main.javac}"
            fork="true">
 
@@ -430,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">
@@ -444,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="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;"/>
-<!-- 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>
 
@@ -540,6 +546,13 @@
     </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 src/main using the jtreg ant task">
@@ -620,6 +633,7 @@
       deprecation="${build.deprecation}"
            source="${build.sourcelevel}"
            target="${build.sourcelevel}"
+         encoding="ASCII"
              fork="true">
 
       <compilerarg line="${build.args}"/>
@@ -647,6 +661,7 @@
            deprecation="${build.deprecation}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac9}"
            fork="true">
 
@@ -680,6 +695,7 @@
            bootclasspath="${bootclasspath8}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac8}"
            fork="true">
 
@@ -710,6 +726,7 @@
            bootclasspath="${bootclasspath8}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac8}"
            fork="true">
 
@@ -794,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"/>
@@ -849,6 +867,7 @@
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -879,6 +898,7 @@
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac8}"
            fork="true">
 
@@ -1046,6 +1066,7 @@
            target="5"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -1139,6 +1160,7 @@
            bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">
 
@@ -1233,6 +1255,7 @@
            target="6"
            includeAntRuntime="false"
            includeJavaRuntime="false"
+           encoding="ASCII"
            executable="${javac7}"
            fork="true">