--- jsr166/build.xml	2013/01/23 06:46:27	1.126
+++ jsr166/build.xml	2013/05/02 21:38:03	1.139
@@ -22,11 +22,14 @@
   $HOME/jdk/src/jdk8
   where each of the above is a complete JDK source tree
   (e.g. mercurial forest) or a symlink to same.
+As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
 ------------------------------------------------------------------------------
   </description>
 
-  <target name="usage" description="Advises user to run with -projecthelp">
-    <echo>Run "ant -projecthelp" for full usage information.</echo>
+  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
+    <java classname="org.apache.tools.ant.Main">
+      <arg value="-projecthelp" />
+    </java>
   </target>
 
 
@@ -39,6 +42,13 @@
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
+  <property name="build.javadoc.access" value="protected"/>
+
+  <!-- Tck options; see JSR166TestCase.java -->
+  <!-- Use via, e.g. ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
+  <property name="jsr166.profileTests"     value="false"/>
+  <property name="jsr166.profileThreshold" value="100"/>
+  <property name="jsr166.runsPerTest"      value="1"/>
 
   <!-- Build locations -->
   <property name="build.dir"                   location="build"/>
@@ -118,19 +128,19 @@
   <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
 
   <!-- Javadoc locations -->
-  <property name="javadocs.dir"          location="${build.dir}/javadocs"/>
-  <property name="4jdk7javadocs.dir"     location="${build.4jdk7.dir}/javadocs"/>
-  <property name="jsr166xjavadocs.dir"   location="${build.jsr166x.dir}/javadocs"/>
-  <property name="jsr166yjavadocs.dir"   location="${build.jsr166y.dir}/javadocs"/>
-  <property name="jsr166ejavadocs.dir"   location="${build.jsr166e.dir}/javadocs"/>
-  <property name="extra166yjavadocs.dir" location="${build.extra166y.dir}/javadocs"/>
-
-  <property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
-  <property name="dist.4jdk7javadocs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
-  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
-  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
-  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
-  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
+  <property name="docs.dir"          location="${build.dir}/docs"/>
+  <property name="4jdk7docs.dir"     location="${build.4jdk7.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"/>
+  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
+
+  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
+  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
+  <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"/>
+  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
 
   <!-- Jar locations -->
   <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
@@ -166,11 +176,12 @@
 
   <macrodef name="run-tck-tests">
     <attribute name="tck.src.dir" default="${tck.src.dir}"/>
-    <attribute name="source" default="6"/>
     <attribute name="target"/>
+    <attribute name="compile-target" default="@{target}"/>
     <attribute name="workdir"/>
     <attribute name="classes"/>
     <attribute name="jvmflags" default=""/>
+    <element name="javac-elements" optional="true"/>
     <sequential>
 
     <mkdir dir="@{workdir}/tck-classes"/>
@@ -180,18 +191,20 @@
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="@{source}"
+           source="@{compile-target}"
+           target="@{compile-target}"
            classpath="${junit.jar}"
-           bootclasspath="@{classes}:${bootclasspath@{source}}"
+           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
-           executable="${javac@{target}}"
+           executable="${javac@{compile-target}}"
            fork="true">
 
       <include name="*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <compilerarg line="${build.args}"/>
+      <javac-elements/>
 
     </javac>
 
@@ -201,6 +214,9 @@
           fork="true">
 	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
 	<jvmarg line="@{jvmflags}"/>
+        <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"/>
@@ -210,6 +226,34 @@
     </sequential>
   </macrodef>
 
+  <macrodef name="run-jtreg-tests">
+    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
+    <attribute name="source" default="7"/>
+    <attribute name="target"/>
+    <attribute name="workdir"/>
+    <attribute name="classes"/>
+    <attribute name="jtregflags" default=""/>
+    <sequential>
+    <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}"
+           jdk="${jdk@{target}.home}"
+           workDir="@{workdir}/JTwork"
+           reportDir="@{workdir}/JTreport">
+
+      <arg value="-Xbootclasspath/p:@{classes}"/>
+      <arg value="-agentvm"/>
+      <arg value="-v:nopass,fail"/>
+      <arg value="-vmoptions:-esa -ea"/>
+      <arg value="-automatic"/>
+      <arg value="-k:!ignore"/>
+      <arg line="@{jtregflags}"/>
+    </jtreg>
+    </sequential>
+  </macrodef>
+
   <!-- ALoops classpath -->
   <path id="loops.classpath">
     <pathelement location="${build.loops.dir}"/>
@@ -243,6 +287,7 @@
            fork="true">
 
       <include name="**/*.java"/>
+      <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
       <compilerarg line="${build.args}"/>
@@ -269,16 +314,17 @@
   <target name="docs"
           description="Builds javadocs for src/main to dist dir">
 
-    <delete dir="${javadocs.dir}"/>
-    <mkdir dir="${javadocs.dir}"/>
+    <delete dir="${docs.dir}"/>
+    <mkdir dir="${docs.dir}"/>
 
     <!-- the packagenames="none" hack below prevents scanning the -->
     <!-- sourcepath for packages -->
 
-    <javadoc destdir="${javadocs.dir}"
+    <javadoc destdir="${docs.dir}"
              packagenames="none"
              link="${jdkapi8docs.url}"
              overview="${src.dir}/intro.html"
+             access="${build.javadoc.access}"
              sourcepath="${src.dir}:${jdk8src.dir}"
              classpath=""
              executable="${javadoc8}">
@@ -341,7 +387,7 @@
 
   <target name="dist-docs"
           depends="clean, docs">
-    <mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
+    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
   </target>
 
 
@@ -408,6 +454,29 @@
 
   </target>
 
+  <target name="test-tck"
+	  depends="jar"
+          description="Runs tck tests for main directly">
+
+    <run-tck-tests
+      target="8"
+      workdir="${build.dir}"
+      classes="${product.jar}"/>
+  </target>
+
+  <target name="test-jtreg"
+	  depends="jar"
+          description="Runs jtreg tests for main using the jtreg ant task">
+    <run-jtreg-tests
+       target="8"
+       workdir="${build.dir}"
+       classes="${product.jar}"/>
+  </target>
+
+  <target name="test-ng"
+          depends="test-tck, test-jtreg"
+          description="Runs tck and jtreg tests for main">
+  </target>
 
   <target name="run-tests"
           depends="compile-tests">
@@ -574,6 +643,7 @@
            fork="true">
 
       <include name="**/*.java"/>
+      <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
       <compilerarg line="${build.args}"/>
@@ -582,7 +652,7 @@
   </target>
 
 
-  <target name="4jdk7-jar"
+  <target name="4jdk7jar"
           depends="4jdk7compile"
           description="Builds library jar from compiled sources">
 
@@ -594,13 +664,24 @@
 
 
   <target name="4jdk7-test-tck"
-	  depends="4jdk7-jar"
+	  depends="4jdk7jar"
           description="Runs tck tests for jsr166-4jdk7 directly">
 
     <run-tck-tests
       target="7"
       workdir="${build.4jdk7.dir}"
-      classes="${4jdk7product.jar}"/>
+      classes="${4jdk7product.jar}">
+      <javac-elements>
+        <!-- JDK8+ test classes -->
+        <exclude name="*8Test.java"/>
+        <exclude name="DoubleAccumulatorTest.java"/>
+        <exclude name="DoubleAdderTest.java"/>
+        <exclude name="LongAccumulatorTest.java"/>
+        <exclude name="LongAdderTest.java"/>
+        <exclude name="CompletableFutureTest.java"/>
+        <exclude name="StampedLockTest.java"/>
+      </javac-elements>
+    </run-tck-tests>
   </target>
 
 
@@ -633,24 +714,12 @@
   </target>
 
   <target name="4jdk7-test-jtreg"
-	  depends="4jdk7compile"
+	  depends="4jdk7jar"
           description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
-    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
-    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
-    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
-    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
-    <jtreg dir="${jtreg.src.dir}"
-           jdk="${jdk7.home}"
-           workDir="${build.4jdk7.dir}/JTwork"
-           reportDir="${build.4jdk7.dir}/JTreport">
-
-      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
-      <arg value="-agentvm"/>
-      <arg value="-v:nopass,fail"/>
-      <arg value="-vmoptions:-esa -ea"/>
-      <arg value="-automatic"/>
-      <arg value="-k:!ignore"/>
-    </jtreg>
+    <run-jtreg-tests
+       target="7"
+       workdir="${build.4jdk7.dir}"
+       classes="${4jdk7product.jar}"/>
   </target>
 
 
@@ -663,13 +732,14 @@
   <target name="4jdk7docs"
           description="Builds javadocs for src/jdk7 to dist dir">
 
-    <delete dir="${4jdk7javadocs.dir}"/>
-    <mkdir dir="${4jdk7javadocs.dir}"/>
+    <delete dir="${4jdk7docs.dir}"/>
+    <mkdir dir="${4jdk7docs.dir}"/>
 
-    <javadoc destdir="${4jdk7javadocs.dir}"
+    <javadoc destdir="${4jdk7docs.dir}"
              packagenames="none"
              link="${jdkapi7docs.url}"
              overview="${4jdk7src.dir}/intro.html"
+             access="${build.javadoc.access}"
              sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
              classpath=""
              executable="${javadoc7}">
@@ -700,14 +770,14 @@
   </target>
 
   <target name="4jdk7dist-jar"
-          depends="4jdk7clean, 4jdk7-jar">
+          depends="4jdk7clean, 4jdk7jar">
     <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
   </target>
 
 
   <target name="4jdk7dist-docs"
           depends="4jdk7clean, 4jdk7docs">
-    <mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
+    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
   </target>
 
 
@@ -741,7 +811,7 @@
   </target>
 
 
-  <target name="jsr166x-jar"
+  <target name="jsr166xjar"
           depends="jsr166xcompile"
           description="Builds library jar from compiled sources">
 
@@ -755,12 +825,13 @@
   <target name="jsr166xdocs"
           description="Builds javadocs to dist dir">
 
-    <delete dir="${jsr166xjavadocs.dir}"/>
-    <mkdir dir="${jsr166xjavadocs.dir}"/>
+    <delete dir="${jsr166xdocs.dir}"/>
+    <mkdir dir="${jsr166xdocs.dir}"/>
 
-    <javadoc destdir="${jsr166xjavadocs.dir}"
+    <javadoc destdir="${jsr166xdocs.dir}"
              packagenames="jsr166x.*"
              link="${jdkapidocs.url}"
+             access="${build.javadoc.access}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              bootclasspath="${bootclasspath6}"
              source="5"
@@ -791,13 +862,13 @@
 
 
   <target name="jsr166xdist-jar"
-          depends="jsr166xclean, jsr166x-jar">
+          depends="jsr166xclean, jsr166xjar">
     <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
   </target>
 
   <target name="jsr166xdist-docs"
           depends="jsr166xclean, jsr166xdocs">
-    <mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
+    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
   </target>
 
   <!-- jsr166y -->
@@ -831,7 +902,7 @@
   </target>
 
 
-  <target name="jsr166y-jar"
+  <target name="jsr166yjar"
           depends="jsr166ycompile"
           description="Builds library jar from compiled sources">
 
@@ -845,12 +916,13 @@
   <target name="jsr166ydocs"
           description="Builds javadocs to dist dir">
 
-    <delete dir="${jsr166yjavadocs.dir}"/>
-    <mkdir dir="${jsr166yjavadocs.dir}"/>
+    <delete dir="${jsr166ydocs.dir}"/>
+    <mkdir dir="${jsr166ydocs.dir}"/>
 
-    <javadoc destdir="${jsr166yjavadocs.dir}"
+    <javadoc destdir="${jsr166ydocs.dir}"
              packagenames="jsr166y.*"
              link="${jdkapidocs.url}"
+             access="${build.javadoc.access}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              bootclasspath="${bootclasspath6}"
              source="6"
@@ -880,13 +952,13 @@
   </target>
 
   <target name="jsr166ydist-jar"
-          depends="jsr166yclean, jsr166y-jar">
+          depends="jsr166yclean, jsr166yjar">
     <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
   </target>
 
   <target name="jsr166ydist-docs"
           depends="jsr166yclean, jsr166ydocs">
-    <mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
+    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
   </target>
 
 
@@ -894,7 +966,7 @@
 
 
   <target name="extra166ycompile"
-          depends="configure-compiler, jsr166y-jar"
+          depends="configure-compiler, jsr166yjar"
           description="Compiles extra166y sources">
 
     <mkdir dir="${build.extra166y.classes.dir}"/>
@@ -921,7 +993,7 @@
   </target>
 
 
-  <target name="extra166y-jar"
+  <target name="extra166yjar"
           depends="extra166ycompile"
           description="Builds library jar from compiled sources">
 
@@ -935,12 +1007,13 @@
   <target name="extra166ydocs"
           description="Builds javadocs to build dir">
 
-    <delete dir="${extra166yjavadocs.dir}"/>
-    <mkdir dir="${extra166yjavadocs.dir}"/>
+    <delete dir="${extra166ydocs.dir}"/>
+    <mkdir dir="${extra166ydocs.dir}"/>
 
-    <javadoc destdir="${extra166yjavadocs.dir}"
+    <javadoc destdir="${extra166ydocs.dir}"
              packagenames="extra166y.*"
              link="${jdkapidocs.url}"
+             access="${build.javadoc.access}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              bootclasspath="${bootclasspath6}"
              source="6"
@@ -970,13 +1043,13 @@
   </target>
 
   <target name="extra166ydist-jar"
-          depends="extra166yclean, extra166y-jar">
+          depends="extra166yclean, extra166yjar">
     <copy file="${extra166y.jar}" todir="${dist.dir}"/>
   </target>
 
   <target name="extra166ydist-docs"
           depends="extra166yclean, extra166ydocs">
-    <mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
+    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
   </target>
 
   <!-- jsr166e -->
@@ -1008,7 +1081,7 @@
   </target>
 
 
-  <target name="jsr166e-jar"
+  <target name="jsr166ejar"
           depends="jsr166ecompile"
           description="Builds library jar from compiled sources">
 
@@ -1022,12 +1095,13 @@
   <target name="jsr166edocs"
           description="Builds javadocs to build dir">
 
-    <delete dir="${jsr166ejavadocs.dir}"/>
-    <mkdir dir="${jsr166ejavadocs.dir}"/>
+    <delete dir="${jsr166edocs.dir}"/>
+    <mkdir dir="${jsr166edocs.dir}"/>
 
-    <javadoc destdir="${jsr166ejavadocs.dir}"
+    <javadoc destdir="${jsr166edocs.dir}"
              packagenames="jsr166e.*"
              link="${jdkapidocs.url}"
+             access="${build.javadoc.access}"
              sourcepath="${topsrc.dir}:${jdk7src.dir}"
              source="7"
              executable="${javadoc7}">
@@ -1038,13 +1112,12 @@
 
 
   <target name="jsr166e-test-tck"
-	  depends="jsr166e-jar"
+	  depends="jsr166ejar"
           description="Runs tck tests for jsr166e">
 
     <run-tck-tests
       tck.src.dir="${test.src.dir}/tck-jsr166e"
-      source="7"
-      target="8"
+      target="7"
       workdir="${build.jsr166e.dir}"
       classes="${jsr166e.jar}"/>
   </target>
@@ -1067,13 +1140,23 @@
   </target>
 
   <target name="jsr166edist-jar"
-          depends="jsr166eclean, jsr166e-jar">
+          depends="jsr166eclean, jsr166ejar">
     <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
   </target>
 
   <target name="jsr166edist-docs"
           depends="jsr166eclean, jsr166edocs">
-    <mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
+    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
   </target>
 
+
+<!-- Find buglets that can be detected by static build tools -->
+
+  <target name="lint">
+    <antcall target="dists">
+      <param name="build.javadoc.access" value="private"/>
+    </antcall>
+  </target>
+
+
 </project>