--- jsr166/build.xml	2015/09/02 02:14:59	1.168
+++ jsr166/build.xml	2015/09/30 15:30:46	1.184
@@ -1,4 +1,5 @@
-<project name="jsr166" default="usage">
+<project name="jsr166" default="usage"
+  xmlns:if="ant:if" xmlns:unless="ant:unless">
 
   <description>
 ------------------------------------------------------------------------------
@@ -28,6 +29,11 @@
   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>
 
@@ -38,6 +44,7 @@
     </java>
   </target>
 
+  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
 
   <!-- User-specific settings -->
   <property file="user.properties"/>
@@ -50,17 +57,6 @@
   <property name="build.deprecation"    value="false"/>
   <property name="build.javadoc.access" value="protected"/>
 
-  <!-- Tck options; see JSR166TestCase.java
-   To profile a single tck test class:
-   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
-   To stress test a single tck test class:
-   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
-  -->
-  <property name="jsr166.profileTests"     value="false"/>
-  <property name="jsr166.profileThreshold" value="100"/>
-  <property name="jsr166.runsPerTest"      value="1"/>
-  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
-
   <!-- Build locations -->
   <property name="build.dir"                   location="build"/>
   <property name="build.classes.dir"           location="${build.dir}/classes"/>
@@ -93,17 +89,25 @@
     <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.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
+    <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"/>
-    <path id="bootclasspath@{v}">
+    <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}}"/>
+    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
     </sequential>
   </macrodef>
 
@@ -129,7 +133,10 @@
   <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"/>
@@ -193,6 +200,15 @@
     <pathelement location="${junit.jar}"/>
   </path>
 
+  <!-- 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"/>
@@ -201,8 +217,14 @@
     <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}"
@@ -221,7 +243,8 @@
       <include name="*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
-      <compilerarg value="-Xbootclasspath/p:@{classes}"/>
+      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
+      <compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
       <compilerarg line="${build.args}"/>
       <javac-elements/>
 
@@ -231,17 +254,16 @@
           failonerror="true"
           jvm="${java@{target}}"
           fork="true">
-	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
+	<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 test-tck -->
-	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
+        <!-- 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>
 
-        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
-        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
-        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
 	<classpath>
 	  <pathelement location="${junit.jar}"/>
 	  <pathelement location="@{workdir}/tck-classes"/>
@@ -252,52 +274,53 @@
   </macrodef>
 
   <!-- Define jtreg test sets for different jdk versions -->
-  <fileset dir="${jtreg.src.dir}">
+  <fileset dir="${jtreg9.src.dir}">
     <patternset id="jdk9.jtreg.tests">
       <include name="**/*.java"/>
     </patternset>
   </fileset>
 
-  <fileset dir="${jtreg.src.dir}">
+  <fileset dir="${jtreg8.src.dir}">
     <patternset id="jdk8.jtreg.tests">
       <include name="**/*.java"/>
-      <exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
+      <exclude name="**/SpliteratorCharacteristics.java"/>
       <!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
-      <exclude name="util/WeakHashMap/GCDuringIteration.java"/>
+      <exclude name="**/GCDuringIteration.java"/>
     </patternset>
   </fileset>
 
-  <fileset dir="${jtreg.src.dir}">
+  <fileset dir="${jtreg7.src.dir}">
     <patternset id="jdk7.jtreg.tests">
       <include name="**/*.java"/>
-      <exclude name="util/Collection/CollectionDefaults.java"/>
-      <exclude name="util/List/ListDefaults.java"/>
-      <exclude name="util/Spliterator/**/*.java"/>
-      <exclude name="util/concurrent/CompletableFuture/**/*.java"/>
-      <exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
-      <exclude name="util/concurrent/locks/StampedLock/**/*.java"/>
     </patternset>
   </fileset>
 
   <macrodef name="run-jtreg-tests">
-    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
-    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
+    <!-- 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>
+
+    <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.src.dir}"
+    <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}"/>
+      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
+      <arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
       <arg value="-agentvm"/>
       <arg value="-v:nopass,fail"/>
       <arg value="-vmoptions:-esa -ea"/>
@@ -330,10 +353,22 @@
           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}"
@@ -344,6 +379,7 @@
            fork="true">
 
       <include name="**/*.java"/>
+      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
       <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
@@ -362,6 +398,10 @@
 
     <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>
 
@@ -389,6 +429,7 @@
       <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"/>
@@ -420,6 +461,10 @@
       <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>
 
@@ -451,8 +496,7 @@
     <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
   </target>
 
-  <target name="tck" depends="test-tck" description="alias for test-tck"/>
-  <target name="test-tck"
+  <target name="tck"
 	  depends="jar"
           description="Runs tck tests for main directly">
 
@@ -462,22 +506,21 @@
       classes="${product.jar}"/>
   </target>
 
-  <target name="test-tck-parallelism-1"
-          description="Runs test-tck with given common pool parallelism">
-    <antcall target="test-tck">
+  <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="test-tck-parallelism-0"
-          description="Runs test-tck with given common pool parallelism">
-    <antcall target="test-tck">
+  <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="test-jtreg" description="alias for test-jtreg"/>
-  <target name="test-jtreg"
+  <target name="jtreg"
 	  depends="jar"
           description="Runs jtreg tests for main using the jtreg ant task">
     <run-jtreg-tests
@@ -487,7 +530,7 @@
   </target>
 
   <target name="test"
-          depends="test-tck, test-tck-parallelism-1, test-jtreg"
+          depends="tck, tck-parallelism-1, jtreg"
           description="Runs tck and jtreg tests for main">
   </target>
 
@@ -520,6 +563,11 @@
 
 
   <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"/>
 
@@ -659,12 +707,16 @@
 
     <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"
+  <target name="4jdk7-tck"
 	  depends="4jdk7jar"
           description="Runs tck tests for jsr166-4jdk7 directly">
 
@@ -676,6 +728,7 @@
         <!-- 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"/>
@@ -683,12 +736,13 @@
         <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)">
 
@@ -716,7 +770,7 @@
     </junit>
   </target>
 
-  <target name="4jdk7-test-jtreg"
+  <target name="4jdk7-jtreg"
 	  depends="4jdk7jar"
           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
     <run-jtreg-tests
@@ -727,7 +781,7 @@
 
 
   <target name="4jdk7-test"
-	  depends="4jdk7-test-tck, 4jdk7-test-jtreg"
+	  depends="4jdk7-tck, 4jdk7-jtreg"
           description="Runs tck and jtreg tests for jsr166-4jdk7">
   </target>
 
@@ -817,6 +871,10 @@
 
     <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>
@@ -904,6 +962,10 @@
 
     <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>
@@ -992,6 +1054,10 @@
 
     <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>
@@ -1107,6 +1173,10 @@
 
     <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>
@@ -1132,7 +1202,7 @@
   </target>
 
 
-  <target name="jsr166e-test-tck-one-java-version"
+  <target name="jsr166e-tck-one-java-version"
 	  depends="jsr166ejar">
 
     <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
@@ -1144,23 +1214,23 @@
       classes="${jsr166e.jar}"/>
   </target>
 
-  <target name="jsr166e-test-tck"
+  <target name="jsr166e-tck"
           description="Runs tck tests for jsr166e for multiple java versions">
 
 <!--     <antcall target="clean"/> -->
-<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
+<!--     <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-test-tck-one-java-version">
+    <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-test-tck-one-java-version">
+    <antcall target="jsr166e-tck-one-java-version">
       <param name="build.jsr166e.java.version" value="6"/>
       <param name="build.jsr166e.javac" value="${javac6}"/>
     </antcall>
@@ -1168,7 +1238,7 @@
 
 
   <target name="jsr166e-test"
-	  depends="jsr166e-test-tck"
+	  depends="jsr166e-tck"
           description="Runs all tests for jsr166e">
   </target>