--- jsr166/build.xml	2013/01/21 23:09:26	1.122
+++ jsr166/build.xml	2013/02/06 19:55:06	1.137
@@ -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,7 @@
   <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"/>
 
   <!-- Build locations -->
   <property name="build.dir"                   location="build"/>
@@ -57,10 +61,10 @@
   <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
   <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
 
-  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
-  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
-  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
-  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
+  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
+  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
+  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
+  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
 
   <!-- JDK locations -->
   <property name="jdks.home"  location="${user.home}/jdk"/>
@@ -86,6 +90,18 @@
     </sequential>
   </macrodef>
 
+  <macrodef name="mirror-dir">
+    <attribute name="src"/>
+    <attribute name="dst"/>
+    <sequential>
+    <delete dir="@{dst}"/>
+    <mkdir dir="@{dst}"/>
+    <copy todir="@{dst}" preservelastmodified="true">
+      <fileset dir="@{src}"/>
+    </copy>
+    </sequential>
+  </macrodef>
+
   <defjdklocations v="6"/>
   <defjdklocations v="7"/>
   <defjdklocations v="8"/>
@@ -105,13 +121,20 @@
   <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
   <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
 
-  <!-- Distribution locations -->
-  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
-  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
-  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
-  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
-  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
-  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
+  <!-- Javadoc locations -->
+  <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"/>
@@ -128,7 +151,7 @@
   <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
 
   <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
-  <!-- The below does not yet exist as of 2012-11 -->
+  <!-- The below does not yet exist as of 2013-01 -->
   <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
 
   <!-- Default jdk api doc location (latest stable release seems best) -->
@@ -152,6 +175,7 @@
     <attribute name="workdir"/>
     <attribute name="classes"/>
     <attribute name="jvmflags" default=""/>
+    <element name="javac-elements" optional="true"/>
     <sequential>
 
     <mkdir dir="@{workdir}/tck-classes"/>
@@ -173,6 +197,7 @@
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <compilerarg line="${build.args}"/>
+      <javac-elements/>
 
     </javac>
 
@@ -191,6 +216,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}"/>
@@ -224,6 +277,7 @@
            fork="true">
 
       <include name="**/*.java"/>
+      <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
       <compilerarg line="${build.args}"/>
@@ -250,16 +304,17 @@
   <target name="docs"
           description="Builds javadocs for src/main to dist dir">
 
-    <delete dir="${dist.javadocs.dir}"/>
-    <mkdir dir="${dist.javadocs.dir}"/>
+    <delete dir="${docs.dir}"/>
+    <mkdir dir="${docs.dir}"/>
 
     <!-- the packagenames="none" hack below prevents scanning the -->
     <!-- sourcepath for packages -->
 
-    <javadoc destdir="${dist.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}">
@@ -274,7 +329,7 @@
 
 
   <target name="dist"
-          depends="dist-clean, dist-jar, docs"
+          depends="dist-clean, dist-jar, dist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -317,9 +372,12 @@
 
   <target name="dist-jar"
           depends="clean, jar">
-
     <copy file="${product.jar}" todir="${dist.dir}"/>
+  </target>
 
+  <target name="dist-docs"
+          depends="clean, docs">
+    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
   </target>
 
 
@@ -386,6 +444,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">
@@ -552,6 +633,7 @@
            fork="true">
 
       <include name="**/*.java"/>
+      <compilerarg value="-Xprefer:source"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
       <compilerarg line="${build.args}"/>
@@ -560,7 +642,7 @@
   </target>
 
 
-  <target name="4jdk7-jar"
+  <target name="4jdk7jar"
           depends="4jdk7compile"
           description="Builds library jar from compiled sources">
 
@@ -572,13 +654,20 @@
 
 
   <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="CompletableFutureTest.java"/>
+        <exclude name="StampedLockTest.java"/>
+      </javac-elements>
+    </run-tck-tests>
   </target>
 
 
@@ -611,24 +700,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>
 
 
@@ -641,13 +718,14 @@
   <target name="4jdk7docs"
           description="Builds javadocs for src/jdk7 to dist dir">
 
-    <delete dir="${dist.4jdk7.docs.dir}"/>
-    <mkdir dir="${dist.4jdk7.docs.dir}"/>
+    <delete dir="${4jdk7docs.dir}"/>
+    <mkdir dir="${4jdk7docs.dir}"/>
 
-    <javadoc destdir="${dist.4jdk7.docs.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}">
@@ -660,7 +738,7 @@
 
 
   <target name="4jdk7dist"
-          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
+          depends="4jdk7dist-jar, 4jdk7dist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -678,10 +756,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="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
   </target>
 
 
@@ -715,7 +797,7 @@
   </target>
 
 
-  <target name="jsr166x-jar"
+  <target name="jsr166xjar"
           depends="jsr166xcompile"
           description="Builds library jar from compiled sources">
 
@@ -729,12 +811,13 @@
   <target name="jsr166xdocs"
           description="Builds javadocs to dist dir">
 
-    <delete dir="${dist.jsr166xjavadocs.dir}"/>
-    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
+    <delete dir="${jsr166xdocs.dir}"/>
+    <mkdir dir="${jsr166xdocs.dir}"/>
 
-    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
+    <javadoc destdir="${jsr166xdocs.dir}"
              packagenames="jsr166x.*"
              link="${jdkapidocs.url}"
+             access="${build.javadoc.access}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              bootclasspath="${bootclasspath6}"
              source="5"
@@ -746,7 +829,7 @@
 
 
   <target name="jsr166xdist"
-          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
+          depends="jsr166xdist-jar, jsr166xdist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -765,10 +848,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="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
   </target>
 
   <!-- jsr166y -->
@@ -802,7 +888,7 @@
   </target>
 
 
-  <target name="jsr166y-jar"
+  <target name="jsr166yjar"
           depends="jsr166ycompile"
           description="Builds library jar from compiled sources">
 
@@ -816,12 +902,13 @@
   <target name="jsr166ydocs"
           description="Builds javadocs to dist dir">
 
-    <delete dir="${dist.jsr166yjavadocs.dir}"/>
-    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
+    <delete dir="${jsr166ydocs.dir}"/>
+    <mkdir dir="${jsr166ydocs.dir}"/>
 
-    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
+    <javadoc destdir="${jsr166ydocs.dir}"
              packagenames="jsr166y.*"
              link="${jdkapidocs.url}"
+             access="${build.javadoc.access}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              bootclasspath="${bootclasspath6}"
              source="6"
@@ -833,7 +920,7 @@
 
 
   <target name="jsr166ydist"
-          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
+          depends="jsr166ydist-jar, jsr166ydist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -851,10 +938,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="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
   </target>
 
 
@@ -862,7 +952,7 @@
 
 
   <target name="extra166ycompile"
-          depends="configure-compiler, jsr166y-jar"
+          depends="configure-compiler, jsr166yjar"
           description="Compiles extra166y sources">
 
     <mkdir dir="${build.extra166y.classes.dir}"/>
@@ -889,7 +979,7 @@
   </target>
 
 
-  <target name="extra166y-jar"
+  <target name="extra166yjar"
           depends="extra166ycompile"
           description="Builds library jar from compiled sources">
 
@@ -903,12 +993,13 @@
   <target name="extra166ydocs"
           description="Builds javadocs to build dir">
 
-    <delete dir="${dist.extra166yjavadocs.dir}"/>
-    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
+    <delete dir="${extra166ydocs.dir}"/>
+    <mkdir dir="${extra166ydocs.dir}"/>
 
-    <javadoc destdir="${dist.extra166yjavadocs.dir}"
+    <javadoc destdir="${extra166ydocs.dir}"
              packagenames="extra166y.*"
              link="${jdkapidocs.url}"
+             access="${build.javadoc.access}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
              bootclasspath="${bootclasspath6}"
              source="6"
@@ -920,7 +1011,7 @@
 
 
   <target name="extra166ydist"
-          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
+          depends="extra166ydist-jar, extra166ydist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -938,10 +1029,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="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
   </target>
 
   <!-- jsr166e -->
@@ -973,7 +1067,7 @@
   </target>
 
 
-  <target name="jsr166e-jar"
+  <target name="jsr166ejar"
           depends="jsr166ecompile"
           description="Builds library jar from compiled sources">
 
@@ -987,12 +1081,13 @@
   <target name="jsr166edocs"
           description="Builds javadocs to build dir">
 
-    <delete dir="${dist.jsr166ejavadocs.dir}"/>
-    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
+    <delete dir="${jsr166edocs.dir}"/>
+    <mkdir dir="${jsr166edocs.dir}"/>
 
-    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
+    <javadoc destdir="${jsr166edocs.dir}"
              packagenames="jsr166e.*"
              link="${jdkapidocs.url}"
+             access="${build.javadoc.access}"
              sourcepath="${topsrc.dir}:${jdk7src.dir}"
              source="7"
              executable="${javadoc7}">
@@ -1003,7 +1098,7 @@
 
 
   <target name="jsr166e-test-tck"
-	  depends="jsr166e-jar"
+	  depends="jsr166ejar"
           description="Runs tck tests for jsr166e">
 
     <run-tck-tests
@@ -1016,15 +1111,13 @@
 
 
   <target name="jsr166edist"
-          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
+          depends="jsr166edist-jar, jsr166edist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
   <target name="jsr166eclean"
           description="Removes all jsr166e build products">
-
     <delete dir="${build.jsr166e.dir}"/>
-
   </target>
 
 
@@ -1034,10 +1127,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="${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>