--- jsr166/build.xml	2016/03/26 06:22:49	1.200
+++ jsr166/build.xml	2016/04/02 16:09:42	1.208
@@ -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.
 
@@ -30,10 +33,8 @@
   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.home="$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>
 
@@ -219,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>
@@ -323,10 +327,6 @@
 
     <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"
@@ -403,15 +403,12 @@
       <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">
 
     <jar destfile="${product.jar}">
       <fileset dir="${build.classes.dir}"/>
@@ -520,7 +517,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}"
@@ -529,14 +526,14 @@
   </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>
@@ -544,7 +541,7 @@
 
   <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}"
@@ -552,35 +549,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> -->
 
 
 
@@ -610,8 +607,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}"/>
 
@@ -787,7 +784,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>
@@ -935,9 +933,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"
@@ -992,7 +990,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>
@@ -1087,7 +1086,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"/>
 
@@ -1179,7 +1179,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"/>
 
@@ -1392,7 +1393,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"/>