--- jsr166/build.xml	2013/01/21 01:05:01	1.118
+++ jsr166/build.xml	2013/01/23 07:17:13	1.129
@@ -25,8 +25,10 @@
 ------------------------------------------------------------------------------
   </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>
 
 
@@ -57,10 +59,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 +88,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 +119,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 +149,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) -->
@@ -146,29 +167,30 @@
   </path>
 
   <macrodef name="run-tck-tests">
+    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
+    <attribute name="source" default="6"/>
     <attribute name="target"/>
     <attribute name="workdir"/>
-    <attribute name="product.jar" default="${product.jar}"/>
+    <attribute name="classes"/>
     <attribute name="jvmflags" default=""/>
     <sequential>
 
     <mkdir dir="@{workdir}/tck-classes"/>
 
-    <javac srcdir="${tck.src.dir}"
+    <javac srcdir="@{tck.src.dir}"
            destdir="@{workdir}/tck-classes"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
-           source="6"
+           source="@{source}"
            classpath="${junit.jar}"
+           bootclasspath="@{classes}:${bootclasspath@{source}}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac@{target}}"
            fork="true">
 
-      <include name="**/*.java"/>
-      <bootclasspath path="@{product.jar}"/>
-      <bootclasspath path="${bootclasspath6}"/>
+      <include name="*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <compilerarg line="${build.args}"/>
@@ -179,7 +201,7 @@
           failonerror="true"
           jvm="${java@{target}}"
           fork="true">
-	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
+	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
 	<jvmarg line="@{jvmflags}"/>
 	<classpath>
 	  <pathelement location="${junit.jar}"/>
@@ -196,10 +218,7 @@
   </path>
 
   <!-- Support @jls tag, used in jdk8+ javadoc -->
-  <!-- TODO: How do we get &trade to work? -->
-  <!-- TODO: Why isn't @jls a "standard" tag? -->
-  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
-  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
+  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
   <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
 
   <!-- Main targets -->
@@ -252,32 +271,31 @@
   <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"
+             sourcepath="${src.dir}:${jdk8src.dir}"
              classpath=""
              executable="${javadoc8}">
-      <sourcepath path="${src.dir}"/>
-      <sourcepath path="${jdk8src.dir}"/>
-      <arg value="-XDignore.symbol.file=true"/>
-      <arg value="-tag"/>
-      <arg value="${javadoc.jls.option}"/>
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
+      <arg value="-XDignore.symbol.file=true"/>
+      <arg value="-tag"/>
+      <arg value="${javadoc.jls.option}"/>
     </javadoc>
   </target>
 
 
   <target name="dist"
-          depends="dist-clean, dist-jar, docs"
+          depends="dist-clean, dist-jar, dist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -320,9 +338,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>
 
 
@@ -338,14 +359,13 @@
            deprecation="${build.deprecation}"
            source="6"
            classpath="${junit.jar}"
+           bootclasspath="@{product.jar}:${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac8}"
            fork="true">
 
       <include name="**/*.java"/>
-      <bootclasspath path="@{product.jar}"/>
-      <bootclasspath path="${bootclasspath6}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <compilerarg line="${build.args}"/>
@@ -359,14 +379,13 @@
            deprecation="${build.deprecation}"
            source="6"
            classpath=""
+           bootclasspath="@{product.jar}:${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac8}"
            fork="true">
 
       <include name="jsr166/test/**/*.java"/>
-      <bootclasspath path="${product.jar}"/>
-      <bootclasspath path="${bootclasspath6}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
       <compilerarg line="${build.args}"/>
@@ -550,13 +569,13 @@
            deprecation="${build.deprecation}"
            source="6"
            classpath=""
+           bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac7}"
            fork="true">
 
       <include name="**/*.java"/>
-      <bootclasspath path="${bootclasspath6}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
       <compilerarg line="${build.args}"/>
@@ -565,7 +584,7 @@
   </target>
 
 
-  <target name="4jdk7-jar"
+  <target name="4jdk7jar"
           depends="4jdk7compile"
           description="Builds library jar from compiled sources">
 
@@ -577,13 +596,13 @@
 
 
   <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}"
-      product.jar="${4jdk7product.jar}"/>
+      classes="${4jdk7product.jar}"/>
   </target>
 
 
@@ -646,27 +665,26 @@
   <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"
+             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
              classpath=""
              executable="${javadoc7}">
-      <sourcepath path="${4jdk7src.dir}"/>
-      <sourcepath path="${jdk7src.dir}"/>
-      <arg value="-XDignore.symbol.file=true"/>
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
+      <arg value="-XDignore.symbol.file=true"/>
     </javadoc>
   </target>
 
 
   <target name="4jdk7dist"
-          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
+          depends="4jdk7dist-jar, 4jdk7dist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -684,10 +702,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>
 
 
@@ -705,6 +727,7 @@
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            classpath=""
+           bootclasspath="${bootclasspath6}"
            source="5"
            includeAntRuntime="false"
            includeJavaRuntime="false"
@@ -712,7 +735,6 @@
            fork="true">
 
       <include name="jsr166x/**/*.java"/>
-      <bootclasspath path="${bootclasspath6}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
       <compilerarg line="${build.args}"/>
@@ -721,7 +743,7 @@
   </target>
 
 
-  <target name="jsr166x-jar"
+  <target name="jsr166xjar"
           depends="jsr166xcompile"
           description="Builds library jar from compiled sources">
 
@@ -735,17 +757,16 @@
   <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}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             bootclasspath="${bootclasspath6}"
              source="5"
              executable="${javadoc7}">
-      <sourcepath path="${topsrc.dir}"/>
-      <sourcepath path="${jdk6src.dir}"/>
-      <bootclasspath path="${bootclasspath6}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
     </javadoc>
@@ -753,7 +774,7 @@
 
 
   <target name="jsr166xdist"
-          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
+          depends="jsr166xdist-jar, jsr166xdist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -772,10 +793,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 -->
@@ -794,13 +818,13 @@
            deprecation="${build.deprecation}"
            source="6"
            classpath=""
+           bootclasspath="${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac7}"
            fork="true">
 
       <include name="jsr166y/**/*.java"/>
-      <bootclasspath path="${bootclasspath6}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
       <compilerarg line="${build.args}"/>
@@ -809,7 +833,7 @@
   </target>
 
 
-  <target name="jsr166y-jar"
+  <target name="jsr166yjar"
           depends="jsr166ycompile"
           description="Builds library jar from compiled sources">
 
@@ -823,17 +847,16 @@
   <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}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             bootclasspath="${bootclasspath6}"
              source="6"
              executable="${javadoc7}">
-      <sourcepath path="${topsrc.dir}"/>
-      <sourcepath path="${jdk6src.dir}"/>
-      <bootclasspath path="${bootclasspath6}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
     </javadoc>
@@ -841,7 +864,7 @@
 
 
   <target name="jsr166ydist"
-          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
+          depends="jsr166ydist-jar, jsr166ydist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -859,10 +882,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>
 
 
@@ -870,7 +896,7 @@
 
 
   <target name="extra166ycompile"
-          depends="configure-compiler, jsr166y-jar"
+          depends="configure-compiler, jsr166yjar"
           description="Compiles extra166y sources">
 
     <mkdir dir="${build.extra166y.classes.dir}"/>
@@ -880,6 +906,7 @@
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
+           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
            classpath=""
            source="6"
            includeAntRuntime="false"
@@ -888,8 +915,6 @@
            fork="true">
 
       <include name="extra166y/**/*.java"/>
-      <bootclasspath path="${jsr166y.jar}"/>
-      <bootclasspath path="${bootclasspath6}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
       <compilerarg line="${build.args}"/>
@@ -898,7 +923,7 @@
   </target>
 
 
-  <target name="extra166y-jar"
+  <target name="extra166yjar"
           depends="extra166ycompile"
           description="Builds library jar from compiled sources">
 
@@ -912,17 +937,16 @@
   <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}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             bootclasspath="${bootclasspath6}"
              source="6"
              executable="${javadoc7}">
-      <sourcepath path="${topsrc.dir}"/>
-      <sourcepath path="${jdk6src.dir}"/>
-      <bootclasspath path="${bootclasspath6}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
     </javadoc>
@@ -930,7 +954,7 @@
 
 
   <target name="extra166ydist"
-          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
+          depends="extra166ydist-jar, extra166ydist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -948,10 +972,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 -->
@@ -983,7 +1010,7 @@
   </target>
 
 
-  <target name="jsr166e-jar"
+  <target name="jsr166ejar"
           depends="jsr166ecompile"
           description="Builds library jar from compiled sources">
 
@@ -997,32 +1024,42 @@
   <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}"
+             sourcepath="${topsrc.dir}:${jdk7src.dir}"
              source="7"
              executable="${javadoc7}">
-      <sourcepath path="${topsrc.dir}"/>
-      <sourcepath path="${jdk7src.dir}"/>
       <arg value="-XDignore.symbol.file=true"/>
 
     </javadoc>
   </target>
 
 
+  <target name="jsr166e-test-tck"
+	  depends="jsr166ejar"
+          description="Runs tck tests for jsr166e">
+
+    <run-tck-tests
+      tck.src.dir="${test.src.dir}/tck-jsr166e"
+      source="7"
+      target="8"
+      workdir="${build.jsr166e.dir}"
+      classes="${jsr166e.jar}"/>
+  </target>
+
+
   <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>
 
 
@@ -1032,10 +1069,13 @@
   </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>
 
 </project>