--- jsr166/build.xml	2011/06/10 18:07:30	1.89
+++ jsr166/build.xml	2013/01/19 17:30:36	1.101
@@ -8,6 +8,20 @@
 
   User-specific settings are read from user.properties.
   See user.properties.sample for an explanation of some useful settings.
+
+  The repository contains all dependencies except for ant and the JDK
+  itself.  Because the JDK version matters and because different
+  targets require different JDKs, we assume that users have created a
+  hierarchy containing:
+  $HOME/jdk/jdk6
+  $HOME/jdk/jdk7
+  $HOME/jdk/jdk8
+  where each of the above is a JDK or a symlink to same, and
+  $HOME/jdk/src/jdk6
+  $HOME/jdk/src/jdk7
+  $HOME/jdk/src/jdk8
+  where each of the above is a complete JDK source tree
+  (e.g. mercurial forest) or a symlink to same.
 ------------------------------------------------------------------------------
   </description>
 
@@ -34,6 +48,13 @@
   <property name="build.lib.dir"               location="${build.dir}/lib"/>
   <property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
   <property name="build.reports.dir"           location="${build.dir}/reports"/>
+
+  <property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
+  <property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
+  <property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
+  <property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
+  <property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
+
   <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
   <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
   <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
@@ -42,10 +63,53 @@
   <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
   <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
 
+  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
+  <property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
+  <property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
+
   <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
   <property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
   <property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
 
+  <!-- JDK binary locations -->
+  <property name="jdks.home"  location="${user.home}/jdk"/>
+
+  <macrodef name="defjdklocations">
+    <attribute name="v"/>
+    <sequential>
+    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
+    <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="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
+    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
+    <property name="bootclasspath@{v}"
+     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
+    </sequential>
+  </macrodef>
+
+  <defjdklocations v="6"/>
+  <defjdklocations v="7"/>
+  <defjdklocations v="8"/>
+
+  <macrodef name="run-tck-tests">
+    <attribute name="jvm"/>
+    <attribute name="tck.classes"/>
+    <attribute name="product.jar" default="${product.jar}"/>
+    <attribute name="jvmflags" default=""/>
+    <sequential>
+    <java classname="JSR166TestCase"
+          jvm="@{jvm}" fork="true">
+	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
+	<jvmarg line="@{jvmflags}"/>
+	<classpath>
+	  <pathelement location="${junit.jar}"/>
+	  <pathelement location="@{tck.classes}"/>
+	</classpath>
+    </java>
+    </sequential>
+  </macrodef>
+
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
   <property name="test.src.dir"         location="${basedir}/src/test"/>
@@ -55,26 +119,43 @@
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
   <property name="topsrc.dir"           location="${basedir}/src"/>
-  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
-  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
-  <property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
+  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
+  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
+  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
+  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
+  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
   <property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
+
   <!-- Distribution locations -->
   <property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
+  <property name="dist.4jdk7.docs.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"/>
 
   <!-- Jar locations -->
   <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
+  <property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
   <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
   <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
+  <property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
   <property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
   <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
 
   <!-- Bootclasspath argument -->
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
 
+  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
+  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
+  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
+  <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 -->
+  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
+  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
+
   <!-- Test classpath -->
   <path id="test.classpath">
     <pathelement location="${build.testcases.dir}"/>
@@ -86,29 +167,40 @@
     <pathelement location="${build.loops.dir}"/>
   </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.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
 
   <!-- Main targets -->
 
   <target name="dists"
-          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
+          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
           description="Builds all public jars and docs"/>
 
   <target name="compile"
-          depends="init, configure-compiler"
-          description="Compiles main sources to build folder">
+          depends="configure-compiler"
+          description="Compiles src/main sources to build folder">
 
     <mkdir dir="${build.classes.dir}"/>
 
     <javac srcdir="${src.dir}"
-          destdir="${build.classes.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
+           destdir="${build.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           classpath=""
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac8}"
+           fork="true">
 
       <include name="**/*.java"/>
+      <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all"/>
 
 <!--
       <exclude name="java/lang/**"/>
@@ -143,22 +235,26 @@
 
 
   <target name="docs"
-          description="Builds javadocs with custom tags to build folder">
+          description="Builds javadocs for src/main">
 
-    <delete dir="${build.javadocs.dir}"/>
-    <mkdir dir="${build.javadocs.dir}"/>
+    <delete dir="${dist.javadocs.dir}"/>
+    <mkdir dir="${dist.javadocs.dir}"/>
 
     <!-- the packagenames="none" hack below prevents scanning the -->
     <!-- sourcepath for packages -->
 
-    <javadoc destdir="${build.javadocs.dir}"
+    <javadoc destdir="${dist.javadocs.dir}"
              packagenames="none"
-             link="http://download.oracle.com/javase/7/docs/api/"
+             link="${jdkapi8docs.url}"
              overview="${src.dir}/intro.html"
-             sourcepath="${src.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" >
+             sourcepath="${src.dir}:${jdk8src.dir}"
+             classpath=""
+             executable="${javadoc8}">
+      <arg value="-XDignore.symbol.file=true"/>
+      <arg value="-tag"/>
+      <arg value="${javadoc.jls.option}"/>
       <fileset dir="${src.dir}" defaultexcludes="yes">
-      <include name="**/*.java"/>
+        <include name="**/*.java"/>
       </fileset>
     </javadoc>
 
@@ -167,7 +263,7 @@
 
 
   <target name="dist"
-          depends="init, dist-clean, dist-jar, dist-docs"
+          depends="init, dist-clean, dist-jar, docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
@@ -211,30 +307,6 @@
 
 
 
-  <target name="dist-docs"
-          description="Builds javadocs without custom tags to dist folder">
-
-    <delete dir="${dist.javadocs.dir}"/>
-    <mkdir dir="${dist.javadocs.dir}"/>
-
-    <!-- the packagenames="none" hack below prevents scanning the -->
-    <!-- sourcepath for packages -->
-
-    <javadoc destdir="${dist.javadocs.dir}"
-             packagenames="none"
-             link="http://download.oracle.com/javase/7/docs/api/"
-             overview="${src.dir}/intro.html"
-             sourcepath="${src.dir}:${jdksrc.dir}"
-             additionalparam="-XDignore.symbol.file=true" >
-      <fileset dir="${src.dir}" defaultexcludes="yes">
-      <include name="**/*.java"/>
-      </fileset>
-    </javadoc>
-
-  </target>
-
-
-
   <!-- Internal targets -->
 
 
@@ -458,6 +530,175 @@
   </target>
 
 
+  <!-- jsr166 4jdk7 -->
+
+
+  <target name="4jdk7compile"
+          depends="configure-compiler"
+          description="Compiles src/jdk7 sources, targeting jdk7">
+
+    <mkdir dir="${build.4jdk7.classes.dir}"/>
+
+    <javac srcdir="${4jdk7src.dir}"
+           destdir="${build.4jdk7.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="1.6"
+           classpath=""
+           bootclasspath="${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all"/>
+
+    </javac>
+
+    <mkdir dir="${build.4jdk7.lib.dir}"/>
+
+    <jar destfile="${4jdk7product.jar}" index="true">
+      <fileset dir="${build.4jdk7.classes.dir}"/>
+    </jar>
+
+    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
+
+    <javac srcdir="${tck.src.dir}"
+           destdir="${build.4jdk7.tck.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="1.6"
+           classpath="${junit.jar}"
+           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+
+    </javac>
+
+  </target>
+
+
+  <target name="4jdk7-test-tck"
+	  depends="4jdk7compile"
+          description="Runs tck tests for jsr166-4jdk7 directly">
+    <run-tck-tests
+      jvm="${java7}"
+      tck.classes="${build.4jdk7.tck.classes.dir}"
+      product.jar="${4jdk7product.jar}"/>
+  </target>
+
+
+  <target name="4jdk7-test-tck-junit"
+          depends="4jdk7compile"
+          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
+
+    <junit printsummary="true"
+           showoutput="true"
+           errorProperty="junit.failed"
+           failureProperty="junit.failed"
+           includeantruntime="true"
+           jvm="${java7}"
+           fork="true">
+
+      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
+      <jvmarg value="-server"/>
+
+      <classpath>
+        <pathelement location="${junit.jar}"/>
+        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
+      </classpath>
+
+      <formatter type="brief"/>
+
+      <test name="JSR166TestCase" haltonfailure="no">
+      </test>
+
+    </junit>
+  </target>
+
+
+  <target name="4jdk7docs"
+          description="Builds javadocs with custom tags to build folder">
+
+    <delete dir="${build.4jdk7.docs.dir}"/>
+    <mkdir dir="${build.4jdk7.docs.dir}"/>
+
+    <javadoc destdir="${build.4jdk7.docs.dir}"
+             packagenames="none"
+             link="${jdkapi7docs.url}"
+             overview="${4jdk7src.dir}/intro.html"
+             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
+             classpath=""
+             executable="${javadoc7}">
+      <arg value="-XDignore.symbol.file=true"/>
+      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
+        <include name="**/*.java"/>
+      </fileset>
+    </javadoc>
+
+  </target>
+
+
+  <target name="4jdk7dist"
+          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+
+  <target name="4jdk7clean"
+          description="Removes all build products">
+
+    <delete dir="${build.4jdk7.dir}"/>
+
+  </target>
+
+
+
+  <target name="4jdk7dist-clean"
+          description="Removes all build and distribution products">
+
+  </target>
+
+  <target name="4jdk7dist-docs"
+          description="Builds javadocs without custom tags to dist folder">
+
+    <delete dir="${dist.4jdk7.docs.dir}"/>
+    <mkdir dir="${dist.4jdk7.docs.dir}"/>
+
+    <javadoc destdir="${dist.4jdk7.docs.dir}"
+             packagenames="none"
+             link="${jdkapi7docs.url}"
+             overview="${4jdk7src.dir}/intro.html"
+             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
+             classpath=""
+             executable="${javadoc7}">
+      <arg value="-XDignore.symbol.file=true"/>
+      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
+        <include name="**/*.java"/>
+      </fileset>
+    </javadoc>
+
+  </target>
+
+  <target name="4jdk7dist-jar"
+          depends="4jdk7clean, 4jdk7compile">
+
+    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
+
+  </target>
+
   <!-- jsr166x -->
 
 
@@ -507,7 +748,7 @@
 
     <javadoc destdir="${build.jsr166xjavadocs.dir}"
              packagenames="jsr166x"
-             link="http://download.oracle.com/javase/7/docs/api/"
+             link="${jdkapidocs.url}"
              source="${build.sourcelevel}"
              sourcepath="${topsrc.dir}:${jdksrc.dir}"
              additionalparam="-XDignore.symbol.file=true" />
@@ -546,7 +787,7 @@
 
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"
              packagenames="jsr166x"
-             link="http://download.oracle.com/javase/7/docs/api/"
+             link="${jdkapidocs.url}"
              source="${build.sourcelevel}"
              sourcepath="${topsrc.dir}:${jdksrc.dir}"
              additionalparam="-XDignore.symbol.file=true" />
@@ -612,7 +853,7 @@
 
     <javadoc destdir="${build.jsr166yjavadocs.dir}"
              packagenames="jsr166y"
-             link="http://download.oracle.com/javase/7/docs/api/"
+             link="${jdkapidocs.url}"
              source="${build.sourcelevel}"
              sourcepath="${topsrc.dir}:${jdksrc.dir}"
              additionalparam="-XDignore.symbol.file=true" />
@@ -649,7 +890,7 @@
 
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"
              packagenames="jsr166y"
-             link="http://download.oracle.com/javase/7/docs/api/"
+             link="${jdkapidocs.url}"
              source="${build.sourcelevel}"
              sourcepath="${topsrc.dir}:${jdksrc.dir}"
              additionalparam="-XDignore.symbol.file=true" />
@@ -663,6 +904,7 @@
 
   </target>
 
+
   <!-- extra166y -->
 
 
@@ -716,7 +958,7 @@
 
     <javadoc destdir="${build.extra166yjavadocs.dir}"
              packagenames="extra166y"
-             link="http://download.oracle.com/javase/7/docs/api/"
+             link="${jdkapidocs.url}"
              source="${build.sourcelevel}"
              sourcepath="${topsrc.dir}:${jdksrc.dir}"
              additionalparam="-XDignore.symbol.file=true" />
@@ -753,7 +995,7 @@
 
     <javadoc destdir="${dist.extra166yjavadocs.dir}"
              packagenames="extra166y"
-             link="http://download.oracle.com/javase/7/docs/api/"
+             link="${jdkapidocs.url}"
              source="${build.sourcelevel}"
              sourcepath="${topsrc.dir}:${jdksrc.dir}"
              additionalparam="-XDignore.symbol.file=true" />
@@ -767,4 +1009,113 @@
 
   </target>
 
+  <!-- jsr166e -->
+
+  <target name="jsr166ecompile"
+          depends="configure-compiler"
+          description="Compiles jsr166e sources">
+
+    <mkdir dir="${build.jsr166e.dir}"/>
+
+    <javac srcdir="${topsrc.dir}"
+           destdir="${build.jsr166e.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="1.7"
+           classpath=""
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
+
+      <include name="jsr166e/**/*.java"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all"/>
+
+    </javac>
+
+  </target>
+
+
+
+  <target name="jsr166ejar"
+          depends="jsr166ecompile"
+          description="Builds library jar from compiled sources">
+
+    <mkdir dir="${build.jsr166elib.dir}"/>
+
+    <jar destfile="${jsr166eproduct.jar}" index="true">
+      <fileset dir="${build.jsr166e.dir}"/>
+    </jar>
+
+  </target>
+
+
+
+  <target name="jsr166edocs"
+          description="Builds javadocs with custom tags to build folder">
+
+    <delete dir="${build.jsr166ejavadocs.dir}"/>
+    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
+
+    <javadoc destdir="${build.jsr166ejavadocs.dir}"
+             packagenames="jsr166e,jsr166e.extra"
+             link="${jdkapi7docs.url}"
+             source="1.7"
+             sourcepath="${topsrc.dir}:${jdk7src.dir}"
+             executable="${javadoc7}"
+             additionalparam="-XDignore.symbol.file=true" >
+      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
+        <include name="jsr166e/**/*.java"/>
+      </fileset>
+    </javadoc>
+
+  </target>
+
+
+  <target name="jsr166edist"
+          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+
+  <target name="jsr166eclean"
+          description="Removes all build products">
+
+    <delete dir="${build.jsr166e.dir}"/>
+    <delete dir="${build.jsr166elib.dir}"/>
+
+  </target>
+
+
+
+  <target name="jsr166edist-clean"
+          description="Removes all build and distribution products">
+
+  </target>
+
+  <target name="jsr166edist-docs"
+          description="Builds javadocs without custom tags to dist folder">
+
+    <delete dir="${dist.jsr166ejavadocs.dir}"/>
+    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
+
+    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
+             packagenames="jsr166e,jsr166e.extra"
+             link="${jdkapidocs.url}"
+             source="1.7"
+             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             additionalparam="-XDignore.symbol.file=true" />
+
+  </target>
+
+  <target name="jsr166edist-jar"
+          depends="jsr166eclean, jsr166ejar">
+
+    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
+
+  </target>
+
 </project>