--- jsr166/build.xml	2003/08/26 19:59:14	1.53
+++ jsr166/build.xml	2013/01/23 06:46:27	1.126
@@ -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>
 
@@ -21,749 +35,1045 @@
 
 
   <!-- Compilation options -->
-  <property name="build.sourcelevel"    value="1.5"/>
-  <property name="build.docsourcelevel" value="1.4"/>
+  <property name="build.sourcelevel"    value="6"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
 
   <!-- Build locations -->
-  <property name="build.dir"            location="build"/>
-  <property name="build.classes.dir"    location="${build.dir}/classes"/>
-  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
-  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
-  <property name="build.lib.dir"        location="${build.dir}/lib"/>
-  <property name="build.ant.dir"        location="${build.dir}/ant"/>
-  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
-  <property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
-  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
-  <property name="build.reports.dir"    location="${build.dir}/reports"/>
-  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
-  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
-  <property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
+  <property name="build.dir"                   location="build"/>
+  <property name="build.classes.dir"           location="${build.dir}/classes"/>
+  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
+  <property name="build.loops.dir"             location="${build.dir}/loops"/>
+  <property name="build.reports.dir"           location="${build.dir}/reports"/>
+
+  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
+  <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.jsr166y.dir"           location="${build.dir}/jsr166y"/>
+  <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"/>
+
+  <!-- JDK 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="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
+    <local name="boot.jar.dir"/>
+    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
+    <path id="bootclasspath@{v}">
+      <pathelement path="${boot.jar.dir}/resources.jar"/>
+      <pathelement path="${boot.jar.dir}/rt.jar"/>
+      <pathelement path="${boot.jar.dir}/jsse.jar"/>
+      <pathelement path="${boot.jar.dir}/jce.jar"/>
+      <pathelement path="${boot.jar.dir}/charsets.jar"/>
+    </path>
+    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
+    </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"/>
 
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
-  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
   <property name="test.src.dir"         location="${basedir}/src/test"/>
-  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
-  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
+  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
+  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
+  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
   <property name="lib.dir"              location="${basedir}/lib"/>
   <property name="dist.dir"             location="${basedir}/dist"/>
-
-  <!-- Distribution locations -->
-  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
+  <property name="topsrc.dir"           location="${basedir}/src"/>
+  <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"/>
+
+  <!-- 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"/>
 
   <!-- Jar locations -->
-  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
-  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
-  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
-  <property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
-
-
-  <!-- Files excluded from dist-docs and emulation jar -->
-  <patternset id="unsafe.exclusion">
-    <exclude name="java/util/Random.*"/>
-    <exclude name="sun/misc/Unsafe.*"/>
-  </patternset>
-
-  <!-- Files excludes from emulation jar -->
-  <patternset id="atomic.exclusion">
-    <exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
-    <exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
-    <exclude name="java/util/concurrent/atomic/AtomicLong*"/>
-    <exclude name="java/util/concurrent/atomic/AtomicReference*"/>
-    <exclude name="java/util/concurrent/locks/LockSupport*"/>
-    <exclude name="java/util/concurrent/locks/ReentrantLock*"/>
-  </patternset>
+  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
+  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
+  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
+  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
+  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
+  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
+  <property name="junit.jar"        location="${lib.dir}/junit.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 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) -->
+  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
+
+  <!-- Define the "jtreg" task -->
+  <!-- See the docs in "jtreg -onlineHelp" -->
+  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
+           classpath="${lib.dir}/jtreg.jar" />
+
+  <!-- Test classpath -->
+  <path id="test.classpath">
+    <pathelement location="${build.testcases.dir}"/>
+    <pathelement location="${junit.jar}"/>
+  </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="classes"/>
+    <attribute name="jvmflags" default=""/>
+    <sequential>
+
+    <mkdir dir="@{workdir}/tck-classes"/>
+
+    <javac srcdir="@{tck.src.dir}"
+           destdir="@{workdir}/tck-classes"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="@{source}"
+           classpath="${junit.jar}"
+           bootclasspath="@{classes}:${bootclasspath@{source}}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac@{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>
 
+    <java classname="JSR166TestCase"
+          failonerror="true"
+          jvm="${java@{target}}"
+          fork="true">
+	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
+	<jvmarg line="@{jvmflags}"/>
+	<classpath>
+	  <pathelement location="${junit.jar}"/>
+	  <pathelement location="@{workdir}/tck-classes"/>
+	</classpath>
+    </java>
 
-  <!-- Main targets -->
+    </sequential>
+  </macrodef>
 
-  <target name="compile"
-          depends="init, configure-compiler, prepare-src"
-          description="Compiles main sources to build folder">
+  <!-- ALoops classpath -->
+  <path id="loops.classpath">
+    <pathelement location="${build.loops.dir}"/>
+  </path>
+
+  <!-- Support @jls tag, used in jdk8+ javadoc -->
+  <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;:"/>
 
-    <property name="prepare.src.dir" value="${src.dir}"/>
+  <!-- Main targets -->
 
-    <mkdir dir="${build.classes.dir}"/>
+  <target name="dists"
+          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
+          description="Builds all public jars and docs"/>
 
-<!--
-    <echo>javac ${gjc.args}</echo>
-    <echo>bootclasspath=${compile.bootclasspath}</echo>
--->
+  <target name="compile"
+          depends="configure-compiler"
+          description="Compiles src/main sources to build dir">
 
-    <javac srcdir="${prepare.src.dir}"
-          destdir="${build.classes.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
+    <mkdir dir="${build.classes.dir}"/>
 
-<!--
-      <compilerarg    line="${gjc.args}"/>
-      <bootclasspath refid="compile.bootclasspath"/>
--->
+    <javac srcdir="${src.dir}"
+           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 value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
-
   </target>
 
 
   <target name="jar"
-          depends="configure-emulation, init-jar, native-jar, emulation-jar"
-          description="Builds library jar from compiled sources"/>
+          depends="compile"
+          description="Builds library jar from compiled sources">
+
+    <jar destfile="${product.jar}">
+      <fileset dir="${build.classes.dir}"/>
+    </jar>
+  </target>
 
 
   <target name="test"
-          depends="init, configure-tests, report-tests"
+          depends="configure-tests, report-tests"
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
 
 
-  <target name="checkstyle"
-          depends="filter-src"
-          description="Reports on style errors in Java source (verbose, mostly chaff)">
+  <target name="docs"
+          description="Builds javadocs for src/main to dist dir">
 
-    <taskdef resource="checkstyletask.properties"
-            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
+    <delete dir="${javadocs.dir}"/>
+    <mkdir dir="${javadocs.dir}"/>
 
-    <checkstyle>
-      <formatter type="plain"/>  <!-- also available: type="xml" -->
-      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
-    </checkstyle>
+    <!-- the packagenames="none" hack below prevents scanning the -->
+    <!-- sourcepath for packages -->
 
+    <javadoc destdir="${javadocs.dir}"
+             packagenames="none"
+             link="${jdkapi8docs.url}"
+             overview="${src.dir}/intro.html"
+             sourcepath="${src.dir}:${jdk8src.dir}"
+             classpath=""
+             executable="${javadoc8}">
+      <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="doccheck"
-          depends="filter-doccheck"
-          description="Reports on javadoc style errors">
+  <target name="dist"
+          depends="dist-clean, dist-jar, dist-docs"
+          description="Puts all distributable products in single hierarchy"/>
 
-    <delete dir="${build.doccheck.dir}"/>
-    <mkdir dir="${build.doccheck.dir}"/>
 
-    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
-         docletpath="${lib.dir}/doccheck.jar"
-            destdir="${build.doccheck.dir}">
-      <packageset dir="${build.filter.doccheck.dir}"/>
-    </javadoc>
+  <target name="release"
+          depends="dist"
+          description="Puts entire CVS tree, plus distribution productions, in a jar">
 
-    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
+    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
 
+    <jar basedir="${basedir}" destfile="${release.jar}">
+      <!-- <exclude name="build/**"/> -->
+      <exclude name="${release.jar}"/>
+      <exclude name="user.properties"/>
+      <exclude name="etc/notes/**"/>
+      <exclude name="src/emulation/**"/>
+      <exclude name="**/SyntaxTest.java"/>
+      <exclude name="**/SuperfluousAbstract.java"/>
+    </jar>
   </target>
 
 
-  <target name="docs"
-          depends="filter-src"
-          description="Builds javadocs with custom tags to build folder">
+  <target name="clean"
+          description="Removes all build products">
+
+    <delete dir="${build.dir}"/>
 
-    <delete dir="${build.javadocs.dir}"/>
-    <mkdir dir="${build.javadocs.dir}"/>
+  </target>
 
-    <javadoc destdir="${build.javadocs.dir}"
-                link="http://java.sun.com/j2se/1.4.1/docs/api"
-            overview="${src.dir}/intro.html"
-              source="${build.docsourcelevel}">
-
-      <tag name="revised" description="Last revised:"/>
-      <tag name="spec"    description="Specified by:"/>
-      <tag name="editor"  description="Last edited by:"/>
-      <tag name="fixme"   description="FIX ME:"/>
 
-      <packageset dir="${build.filter.src.dir}"/>
+  <target name="dist-clean"
+          description="Removes all build and distribution products">
 
-    </javadoc>
+    <delete dir="${dist.dir}"/>
 
   </target>
 
 
-  <target name="sinjdocs"
-          depends="configure-tests"
-          description="Builds javadocs with custom tags to build folder">
-
-    <delete dir="${build.sinjdocs.dir}"/>
-    <mkdir dir="${build.sinjdocs.dir}"/>
+  <!-- Internal targets -->
 
-    <java classname="net.cscott.sinjdoc.Main" fork="true">
 
-      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
+  <target name="dist-jar"
+          depends="clean, jar">
+    <copy file="${product.jar}" todir="${dist.dir}"/>
+  </target>
 
-      <classpath>
-        <pathelement location="${sinjdoc.jar}"/>
-        <pathelement location="${lib.dir}/jutil.jar"/>
-        <pathelement location="${lib.dir}/cup.jar"/>
-        <path refid="test.classpath"/>
-      </classpath>
+  <target name="dist-docs"
+          depends="clean, docs">
+    <mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
+  </target>
 
 
-      <arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
-      <arg value="-sourcepath"/> <arg value="${src.dir}"/>
-      <arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
-      <arg value="-source"/>     <arg value="${build.sourcelevel}"/>
-      <!-- <arg value="-verbose"/> -->
-      <!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
-      <arg value="java.lang"/>
-      <arg value="java.util"/>
-      <arg value="java.util.concurrent"/>
-      <arg value="java.util.concurrent.atomic"/>
-      <arg value="java.util.concurrent.locks"/>
-
-      <!--
-      <arg value="-help"/>
-      -->
+  <target name="compile-tests"
+          depends="jar">
 
-    </java>
+    <mkdir dir="${build.testcases.dir}"/>
 
-  </target>
+    <javac srcdir="${tck.src.dir}"
+           destdir="${build.testcases.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="6"
+           classpath="${junit.jar}"
+           bootclasspath="@{product.jar}:${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac8}"
+           fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+      <compilerarg line="${build.args}"/>
 
+    </javac>
 
-  <target name="strip"
-          depends="init, configure-compiler"
-          description="Strip generics from java source (not working yet)">
+    <javac srcdir="${test.src.dir}"
+           destdir="${build.testcases.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="6"
+           classpath=""
+           bootclasspath="@{product.jar}:${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac8}"
+           fork="true">
+
+      <include name="jsr166/test/**/*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+      <compilerarg line="${build.args}"/>
 
-    <mkdir dir="${build.stripped.dir}"/>
+    </javac>
 
-    <!--
-     # javac -s doesn't reliably generate compilable code. It generates
-     # bridge methods (marked as "synthetic") that can have identical
-     # signatures to existing methods except for the return value.
-     -->
-    <javac srcdir="${src.dir}"
-          destdir="${build.stripped.dir}"
+<!--
+    <javac srcdir="${jtreg.src.dir}"
+          destdir="${build.testcases.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
       deprecation="${build.deprecation}"
            source="${build.sourcelevel}"
              fork="true">
 
-    <!--
-      <compilerarg    line="${gjc.args} -s"/>
-      <bootclasspath refid="compile.bootclasspath"/>
-     -->
+      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
+-->
 
   </target>
 
 
-  <target name="dist"
-          depends="init, dist-clean, dist-jar, dist-docs"
-          description="Puts all distributable products in single hierarchy"/>
+  <target name="run-tests"
+          depends="compile-tests">
 
-  <target name="release"
-          depends="dist"
-          description="Puts entire CVS tree, plus distribution productions, in a jar">
+    <!-- May be overridden by user.properties -->
+    <property name="testcase" value="*"/>
 
-<!--
-    #keep build dir? - dl
-    <delete dir="${build.dir}"/>
--->
-    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
+    <mkdir dir="${build.reports.dir}"/>
 
-    <jar basedir="${basedir}" destfile="${release.jar}">
-      <exclude name="${release.jar}"/>
-      <exclude name="user.properties"/>
-      <exclude name="etc/notes/**"/>
-      <exclude name="lib/gjc/2.1/**"/>
-      <exclude name="**/SyntaxTest.java"/>
-    </jar>
+    <junit printsummary="true"
+             showoutput="true"
+          errorProperty="junit.failed"
+        failureProperty="junit.failed"
+                    dir="${build.reports.dir}"
+                    jvm="${java8}"
+                   fork="true">
 
-  </target>
+      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
+      <jvmarg value="-server"/>
+      <jvmarg value="-showversion"/>
 
-  <target name="clean"
-          description="Removes all build products">
+      <classpath refid="test.classpath"/>
 
-    <delete dir="${build.dir}"/>
-    <delete dir="${build.classes.dir}"/>
-    <delete dir="${build.lib.dir}"/>
+      <formatter type="xml"/>
 
-  </target>
+      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
+        <fileset dir="${tck.src.dir}">
+          <include name="**/${testcase}Test.java"/>
+        </fileset>
+      </batchtest>
 
+      <batchtest todir="${build.reports.dir}" if="do.test.old">
+        <fileset dir="${test.src.dir}">
+          <include name="jsr166/test/**/${testcase}Test.java"/>
+        </fileset>
+      </batchtest>
 
-  <target name="dist-clean"
-          description="Removes all build and distribution products">
+<!--
+      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
+        <fileset dir="${jtreg.src.dir}">
+          <include name="**/${testcase}Test.java"/>
+        </fileset>
+      </batchtest>
+-->
 
-    <delete dir="${dist.dir}"/>
+    </junit>
 
   </target>
 
 
-  <target name="dist-docs"
-          depends="filter-src"
-          description="Builds javadocs without custom tags to dist folder">
-
-    <delete dir="${dist.javadocs.dir}"/>
-    <mkdir dir="${dist.javadocs.dir}"/>
+  <target name="report-tests"
+          depends="run-tests">
 
-    <javadoc destdir="${dist.javadocs.dir}"
-                link="http://java.sun.com/j2se/1.4.1/docs/api"
-            overview="${src.dir}/intro.html"
-              source="${build.docsourcelevel}">
+    <!-- Sets junit.report.format to frames if redirection is present,
+         otherwise sets it to noframes. -->
+    <available property="junit.report.format"
+                  value="frames"
+              classname="org.apache.xalan.lib.Redirect"
+    />
+    <property name="junit.report.format" value="noframes"/>
 
-      <packageset dir="${build.filter.src.dir}"/>
+    <junitreport todir="${build.reports.dir}">
+      <fileset dir="${build.reports.dir}">
+        <include name="TEST-*.xml"/>
+      </fileset>
+      <report format="${junit.report.format}" todir="${build.reports.dir}"
+      />
+    </junitreport>
 
-    </javadoc>
+    <fail message="Test Cases Failed" if="junit.failed"/>
 
   </target>
 
 
+  <target name="configure-compiler">
 
-  <!-- Internal targets -->
+    <property name="unchecked.option" value="-Xlint:unchecked"/>
 
+    <condition property="warnunchecked.arg" value="${unchecked.option}">
+      <istrue value="${build.warnunchecked}"/>
+    </condition>
+
+    <property name="warnunchecked.arg" value=""/>
 
-  <target name="init">
 
-    <!-- Version is kept in a separate file -->
-    <loadfile property="version" srcFile="version.properties"/>
-    <echo>Building JSR-166 version ${version}</echo>
+    <!-- Common options in javac invocations -->
+    <property name="build.args" value="${warnunchecked.arg}"/>
 
   </target>
 
 
-  <target name="init-jar">
+  <target name="configure-tests"
+       depends="configure-compiler">
 
-    <mkdir dir="${build.lib.dir}"/>
+    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
+    <available property="junit.available"
+               classname="junit.framework.Protectable"/>
 
-  </target>
+    <!-- Xalan -->
+    <available property="xalan.available"
+               classname="org.apache.xalan.Version"/>
 
 
-  <target name="native-jar"
-          depends="compile"
-          unless="build.emulation.true">
+    <!-- Ant 1.6beta and later don't need or want this check -->
+    <!--
+    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
+          unless="junit.available"/>
 
-    <jar destfile="${product.jar}">
-      <fileset dir="${build.classes.dir}"/>
-    </jar>
+    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
+          unless="xalan.available"/>
+    -->
 
   </target>
 
 
-  <target name="compile-emulation"
-          depends="init, configure-compiler"
-          if="build.emulation.true">
+  <!-- Various demos and test programs -->
 
-    <mkdir dir="${build.emulation.dir}"/>
 
-    <javac srcdir="${emulation.src.dir}"
-          destdir="${build.emulation.dir}"
+  <target name="loops" depends="configure-compiler"
+          description="Benchmark from Doug Lea's AQS paper">
+
+    <mkdir dir="${build.loops.dir}"/>
+
+    <javac srcdir="${loops.src.dir}"
+          destdir="${build.loops.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
       deprecation="${build.deprecation}"
            source="${build.sourcelevel}"
              fork="true">
 
-      <compilerarg    line="${gjc.args}"/>
-      <bootclasspath refid="compile.bootclasspath"/>
+      <compilerarg line="${build.args}"/>
+      <classpath refid="loops.classpath"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
 
     </javac>
 
+    <java classname="ALoops" fork="true">
+      <classpath refid="loops.classpath"/>
+    </java>
+
   </target>
 
 
-  <target name="emulation-jar"
-          depends="compile-emulation"
-          if="build.emulation.true">
+  <!-- jsr166 4jdk7 -->
+
+  <target name="4jdk7compile"
+          depends="configure-compiler"
+          description="Compiles src/jdk7 sources, targeting jdk7">
 
+    <mkdir dir="${build.4jdk7.classes.dir}"/>
 
-    <jar destfile="${product.jar}" duplicate="add">
-      <fileset dir="${build.classes.dir}">
-        <patternset refid="atomic.exclusion"/>
-        <patternset refid="unsafe.exclusion"/>
-      </fileset>
-      <fileset dir="${build.emulation.dir}"/>
-    </jar>
+    <javac srcdir="${4jdk7src.dir}"
+           destdir="${build.4jdk7.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="6"
+           classpath=""
+           bootclasspath="${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all"/>
+      <compilerarg line="${build.args}"/>
 
+    </javac>
   </target>
 
 
-  <target name="dist-jar"
-          depends="clean, jar">
+  <target name="4jdk7-jar"
+          depends="4jdk7compile"
+          description="Builds library jar from compiled sources">
 
-    <copy file="${product.jar}" todir="${dist.dir}"/>
+    <jar destfile="${4jdk7product.jar}">
+      <fileset dir="${build.4jdk7.classes.dir}"/>
+    </jar>
 
   </target>
 
 
-  <target name="compile-ant-filter"
-          depends="init">
+  <target name="4jdk7-test-tck"
+	  depends="4jdk7-jar"
+          description="Runs tck tests for jsr166-4jdk7 directly">
 
-    <mkdir dir="${build.ant.dir}"/>
+    <run-tck-tests
+      target="7"
+      workdir="${build.4jdk7.dir}"
+      classes="${4jdk7product.jar}"/>
+  </target>
 
-    <javac srcdir="${ant.src.dir}"
-          destdir="${build.ant.dir}"
-           source="1.4"
-    />
 
+  <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="4jdk7-test-jtreg"
+	  depends="4jdk7compile"
+          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>
+  </target>
 
-  <target name="filter-src"
-          depends="compile-ant-filter">
 
-    <mkdir dir="${build.filter.src.dir}"/>
+  <target name="4jdk7-test"
+	  depends="4jdk7-test-tck, 4jdk7-test-jtreg"
+          description="Runs tck and jtreg tests for jsr166-4jdk7">
+  </target>
 
-    <copy todir="${build.filter.src.dir}">
-      <fileset dir="${src.dir}">
-        <include name="**/*.html"/>
-      </fileset>
-    </copy>
 
-    <copy todir="${build.filter.src.dir}">
-      <fileset dir="${src.dir}">
-        <exclude name="**/*.html"/>
-        <patternset refid="unsafe.exclusion"/>
+  <target name="4jdk7docs"
+          description="Builds javadocs for src/jdk7 to dist dir">
+
+    <delete dir="${4jdk7javadocs.dir}"/>
+    <mkdir dir="${4jdk7javadocs.dir}"/>
+
+    <javadoc destdir="${4jdk7javadocs.dir}"
+             packagenames="none"
+             link="${jdkapi7docs.url}"
+             overview="${4jdk7src.dir}/intro.html"
+             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
+             classpath=""
+             executable="${javadoc7}">
+      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
+        <include name="**/*.java"/>
       </fileset>
-      <filterchain>
+      <arg value="-XDignore.symbol.file=true"/>
+    </javadoc>
+  </target>
 
-        <!--
-         # This filter gets rid of angle-bracketed type parameters
-         # so that javadoc can run on the result. The following
-         # heuristic seems to work:
-         #
-         # For all lines not starting with space(s)-asterisk-space(s),
-         #   replace <something> with a space, where there may be more
-         #   than one right angle bracket at the end, and "something"
-         #   must not contain parens or pipes. (This may need some
-         #   tweaking.)
-         -->
-
-        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
-                      classpath="${build.ant.dir}">
-          <param name="notmatching" value="^\s+\*\s.*$"/>
-          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
-          <param name="replacement" value=" "/>
-        </filterreader>
-
-
-        <!--
-         # This filter uncomments lines beginning with "//@" so that
-         # javadoc can see imports that are needed to resolve links
-         # but that shouldn't be in the compiled code.
-         -->
-
-        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
-                      classpath="${build.ant.dir}">
-          <param name="matching"    value="^//@.*$"/>
-          <param name="pattern"     value="^//@"/>
-          <param name="replacement" value=""/>
-        </filterreader>
-      </filterchain>
-    </copy>
+
+  <target name="4jdk7dist"
+          depends="4jdk7dist-jar, 4jdk7dist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+  <target name="4jdk7clean"
+          description="Removes all 4jdk7 build products">
+
+    <delete dir="${build.4jdk7.dir}"/>
 
   </target>
 
 
+  <target name="4jdk7dist-clean"
+          description="Removes all build and distribution products">
 
+  </target>
 
-  <target name="filter-doccheck"
-          depends="filter-src">
+  <target name="4jdk7dist-jar"
+          depends="4jdk7clean, 4jdk7-jar">
+    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
+  </target>
 
-    <mkdir dir="${build.filter.doccheck.dir}"/>
 
-    <copy todir="${build.filter.doccheck.dir}">
-      <fileset dir="${build.filter.src.dir}">
-        <include name="**/*.html"/>
-      </fileset>
-    </copy>
+  <target name="4jdk7dist-docs"
+          depends="4jdk7clean, 4jdk7docs">
+    <mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
+  </target>
 
-    <property name="generic.declarations"
-             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
-    />
 
-    <copy todir="${build.filter.doccheck.dir}">
-      <fileset dir="${build.filter.src.dir}">
-        <exclude name="**/*.html"/>
-      </fileset>
-      <filterchain>
-        <!--
-         # These two filters try to make the source look like
-         # something that doccheck can process. The first removes
-         # -source 1.4 assertions and the second adds in a bunch
-         # of single letter public nested marker interfaces so that
-         # the generic type parameters are recognized.
-         -->
-
-        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
-                      classpath="${build.ant.dir}">
-          <param name="matching"    value="^\s*assert[\s ].*$"/>
-          <param name="pattern"     value="assert"/>
-          <param name="replacement" value="//assert"/>
-        </filterreader>
-
-        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
-                      classpath="${build.ant.dir}">
-          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
-          <param name="pattern"     value="$"/>
-          <param name="replacement" value=" ${generic.declarations}"/>
-        </filterreader>
+  <!-- jsr166x -->
 
-      </filterchain>
-    </copy>
+  <target name="jsr166xcompile"
+          depends="configure-compiler"
+          description="Compiles jsr166x sources to build dir">
+
+    <mkdir dir="${build.jsr166x.classes.dir}"/>
 
+    <javac srcdir="${topsrc.dir}"
+           destdir="${build.jsr166x.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           classpath=""
+           bootclasspath="${bootclasspath6}"
+           source="5"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
+
+      <include name="jsr166x/**/*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
+      <compilerarg line="${build.args}"/>
+
+    </javac>
   </target>
 
 
-  <target name="compile-tests"
-          depends="jar">
+  <target name="jsr166x-jar"
+          depends="jsr166xcompile"
+          description="Builds library jar from compiled sources">
 
-    <mkdir dir="${build.testcases.dir}"/>
+    <jar destfile="${jsr166x.jar}">
+      <fileset dir="${build.jsr166x.classes.dir}"/>
+    </jar>
 
-<!--
-    <echo>javac ${gjc.args}</echo>
-    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
-    <echo>classpath="${test.classpath}"</echo>
--->
+  </target>
 
-    <javac srcdir="${test.src.dir}"
-          destdir="${build.testcases.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
 
-<!--
-      <compilerarg    line="${gjc.args}"/>
--->
-      <bootclasspath refid="test.compile.bootclasspath"/>
-      <classpath     refid="test.classpath"/>
+  <target name="jsr166xdocs"
+          description="Builds javadocs to dist dir">
 
-    </javac>
+    <delete dir="${jsr166xjavadocs.dir}"/>
+    <mkdir dir="${jsr166xjavadocs.dir}"/>
 
+    <javadoc destdir="${jsr166xjavadocs.dir}"
+             packagenames="jsr166x.*"
+             link="${jdkapidocs.url}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             bootclasspath="${bootclasspath6}"
+             source="5"
+             executable="${javadoc7}">
+      <arg value="-XDignore.symbol.file=true"/>
+
+    </javadoc>
   </target>
 
 
-  <target name="run-tests"
-          depends="compile-tests">
+  <target name="jsr166xdist"
+          depends="jsr166xdist-jar, jsr166xdist-docs"
+          description="Puts all distributable products in single hierarchy"/>
 
-    <!-- May be overridden by user.properties -->
-    <property name="testcase" value="*"/>
 
-    <mkdir dir="${build.reports.dir}"/>
+  <target name="jsr166xclean"
+          description="Removes all jsr166x build products">
 
-    <junit printsummary="true"
-             showoutput="true"
-          errorProperty="junit.failed"
-        failureProperty="junit.failed"
-                    dir="${build.reports.dir}"
-                   fork="true">
+    <delete dir="${build.jsr166x.dir}"/>
 
-      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
+  </target>
 
-      <formatter type="xml"/>
 
-      <batchtest todir="${build.reports.dir}">
-        <fileset dir="${test.src.dir}">
-          <include name="**/${testcase}Test.java"/>
-        </fileset>
-      </batchtest>
+  <target name="jsr166xdist-clean"
+          description="Removes all build and distribution products">
 
-    </junit>
+  </target>
 
+
+  <target name="jsr166xdist-jar"
+          depends="jsr166xclean, jsr166x-jar">
+    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
   </target>
 
+  <target name="jsr166xdist-docs"
+          depends="jsr166xclean, jsr166xdocs">
+    <mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
+  </target>
 
-  <target name="report-tests"
-          depends="run-tests">
+  <!-- jsr166y -->
 
-    <!-- Sets junit.report.format to frames if Xalan is present,
-         otherwise sets it to noframes. -->
-    <available property="junit.report.format"
-                  value="frames"
-              classname="org.apache.xalan.lib.Redirect"
-    />
-    <property name="junit.report.format" value="noframes"/>
 
-    <junitreport todir="${build.reports.dir}">
-      <fileset dir="${build.reports.dir}">
-        <include name="TEST-*.xml"/>
-      </fileset>
-      <report styledir="${stylesheet.dir}"
-                format="${junit.report.format}"
-                 todir="${build.reports.dir}"
-      />
-    </junitreport>
+  <target name="jsr166ycompile"
+          depends="configure-compiler"
+          description="Compiles jsr166y sources">
 
-    <fail message="Test Cases Failed" if="junit.failed"/>
+    <mkdir dir="${build.jsr166y.classes.dir}"/>
+
+    <javac srcdir="${topsrc.dir}"
+           destdir="${build.jsr166y.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="6"
+           classpath=""
+           bootclasspath="${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
+
+      <include name="jsr166y/**/*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all"/>
+      <compilerarg line="${build.args}"/>
 
+    </javac>
   </target>
 
 
-  <target name="configure-compiler">
-<!--
-    <property name="gjc.version"
-             value="2.2"/>
+  <target name="jsr166y-jar"
+          depends="jsr166ycompile"
+          description="Builds library jar from compiled sources">
 
-    <condition property="novariance.arg" value="-novariance">
-      <and>
-        <equals arg1="${gjc.version}" arg2="2.0"/>
-        <or>
-          <not><isset property="gjc.novariance"/></not>
-          <istrue value="${gjc.novariance}"/>
-        </or>
-      </and>
-    </condition>
+    <jar destfile="${jsr166y.jar}" index="true">
+      <fileset dir="${build.jsr166y.classes.dir}"/>
+    </jar>
 
-    <property name="novariance.arg"
-             value=""/>
+  </target>
 
-    <property name="gjc.dir"
-             value="${lib.dir}/gjc"/>
 
-    <property name="javac.jar"
-          location="${gjc.dir}/${gjc.version}/javac.jar"/>
+  <target name="jsr166ydocs"
+          description="Builds javadocs to dist dir">
 
-    <property name="collect.jar"
-          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
+    <delete dir="${jsr166yjavadocs.dir}"/>
+    <mkdir dir="${jsr166yjavadocs.dir}"/>
 
--->
-    <condition property="warnunchecked.arg" value="-warnunchecked">
-      <istrue value="${gjc.warnunchecked}"/>
-    </condition>
+    <javadoc destdir="${jsr166yjavadocs.dir}"
+             packagenames="jsr166y.*"
+             link="${jdkapidocs.url}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             bootclasspath="${bootclasspath6}"
+             source="6"
+             executable="${javadoc7}">
+      <arg value="-XDignore.symbol.file=true"/>
 
-    <property name="warnunchecked.arg" value=""/>
+    </javadoc>
+  </target>
 
-    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
-      <istrue value="${build.nothreads}"/>
-    </condition>
 
+  <target name="jsr166ydist"
+          depends="jsr166ydist-jar, jsr166ydist-docs"
+          description="Puts all distributable products in single hierarchy"/>
 
-    <!--
-     ! Bootclasspath munging for source compilation.
-     -->
 
-    <path id="pre.bootclasspath">
-      <pathelement location="${javac.jar}"/>
-    </path>
+  <target name="jsr166yclean"
+          description="Removes all jsr166y build products">
 
-    <path id="compile.bootclasspath">
-      <pathelement location="${build.classes.dir}"/>
-      <pathelement location="${collect.jar}"/>
-      <pathelement location="${rt.jar}"/>
-    </path>
+    <delete dir="${build.jsr166y.dir}"/>
 
-    <!-- Flatten paths into platform-appropriate strings -->
-    <property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
-    <property name="compile.bootclasspath" refid="compile.bootclasspath"/>
+  </target>
 
 
-    <!-- Common options in javac invocations -->
-<!--
-    <property name="gjc.args"
-             value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
-    />
--->
+  <target name="jsr166ydist-clean"
+          description="Removes all build and distribution products">
 
   </target>
 
+  <target name="jsr166ydist-jar"
+          depends="jsr166yclean, jsr166y-jar">
+    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
+  </target>
 
-  <target name="prepare-src"
-          depends="configure-compiler"
-          if="prepare.src.dir">
+  <target name="jsr166ydist-docs"
+          depends="jsr166yclean, jsr166ydocs">
+    <mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
+  </target>
 
-    <mkdir dir="${prepare.src.dir}"/>
-    <copy todir="${prepare.src.dir}">
-      <fileset dir="${src.dir}">
-        <exclude name="java/lang/**"/>
-      </fileset>
-    </copy>
 
+  <!-- extra166y -->
+
+
+  <target name="extra166ycompile"
+          depends="configure-compiler, jsr166y-jar"
+          description="Compiles extra166y sources">
+
+    <mkdir dir="${build.extra166y.classes.dir}"/>
+
+    <javac srcdir="${topsrc.dir}"
+           destdir="${build.extra166y.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
+           classpath=""
+           source="6"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
+
+      <include name="extra166y/**/*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
+      <compilerarg line="${build.args}"/>
+
+    </javac>
   </target>
 
 
-  <target name="configure-emulation">
+  <target name="extra166y-jar"
+          depends="extra166ycompile"
+          description="Builds library jar from compiled sources">
 
-    <condition property="build.emulation.true">
-      <or>
-        <and>
-          <os family="windows"/>
-          <not>
-            <isset property="build.emulation"/>
-          </not>
-        </and>
-        <istrue value="${build.emulation}"/>
-      </or>
-    </condition>
+    <jar destfile="${extra166y.jar}" index="true">
+      <fileset dir="${build.extra166y.classes.dir}"/>
+    </jar>
 
   </target>
 
 
-  <target name="configure-tests"
-       depends="configure-compiler">
+  <target name="extra166ydocs"
+          description="Builds javadocs to build dir">
 
-    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
-    <available property="junit.available"
-               classname="junit.framework.Protectable"/>
+    <delete dir="${extra166yjavadocs.dir}"/>
+    <mkdir dir="${extra166yjavadocs.dir}"/>
 
-    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
-          unless="junit.available"/>
+    <javadoc destdir="${extra166yjavadocs.dir}"
+             packagenames="extra166y.*"
+             link="${jdkapidocs.url}"
+             sourcepath="${topsrc.dir}:${jdk6src.dir}"
+             bootclasspath="${bootclasspath6}"
+             source="6"
+             executable="${javadoc7}">
+      <arg value="-XDignore.symbol.file=true"/>
 
+    </javadoc>
+  </target>
 
-    <!--
-     ! Bootclasspath munging for testing, so JUnit can test our local
-     ! modifications to java.*.
-     -->
-
-    <path id="test.classpath">
-      <pathelement location="${product.jar}"/>
-      <pathelement location="${build.testcases.dir}"/>
-      <pathelement location="${junit.jar}"/>
-    </path>
 
-    <path id="test.compile.bootclasspath">
-      <pathelement location="${javac.jar}"/>
-      <pathelement location="${collect.jar}"/>
-      <pathelement location="${rt.jar}"/>
-    </path>
+  <target name="extra166ydist"
+          depends="extra166ydist-jar, extra166ydist-docs"
+          description="Puts all distributable products in single hierarchy"/>
 
-    <path id="test.run.bootclasspath">
-      <pathelement location="${javac.jar}"/>
-      <path refid="test.classpath"/>
-    </path>
 
-    <!-- Flatten test classpaths into platform-appropriate strings -->
-    <property name="test.classpath"             refid="test.classpath"/>
-    <property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
-    <property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
+  <target name="extra166yclean"
+          description="Removes all extra166y build products">
+
+    <delete dir="${build.extra166y.dir}"/>
 
   </target>
 
 
+  <target name="extra166ydist-clean"
+          description="Removes all build and distribution products">
 
-  <!-- Anthill targets -->
+  </target>
 
-  <target name="anthill-build"
-          depends="jar, test, docs, dist-docs"/>
+  <target name="extra166ydist-jar"
+          depends="extra166yclean, extra166y-jar">
+    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
+  </target>
 
-  <target name="anthill-publish">
+  <target name="extra166ydist-docs"
+          depends="extra166yclean, extra166ydocs">
+    <mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
+  </target>
 
-    <copy todir="${deployDir}/docs/private">
-      <fileset dir="${build.javadocs.dir}"/>
-    </copy>
+  <!-- jsr166e -->
 
-    <copy todir="${deployDir}/docs/public">
-      <fileset dir="${dist.javadocs.dir}"/>
-    </copy>
+  <target name="jsr166ecompile"
+          depends="configure-compiler"
+          description="Compiles jsr166e sources">
 
-    <copy tofile="${deployDir}/index.html"
-          file="${basedir}/etc/anthill-index.html"/>
+    <mkdir dir="${build.jsr166e.classes.dir}"/>
 
-    <copy todir="${deployDir}/notes">
-      <fileset dir="${basedir}/etc/notes"/>
-    </copy>
+    <javac srcdir="${topsrc.dir}"
+           destdir="${build.jsr166e.classes.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="7"
+           classpath=""
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac7}"
+           fork="true">
+
+      <include name="jsr166e/**/*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all"/>
+      <compilerarg line="${build.args}"/>
 
+    </javac>
   </target>
 
 
-  <target name="ng" depends="test">
-    <java classname="SuperfluousAbstract" fork="true">
+  <target name="jsr166e-jar"
+          depends="jsr166ecompile"
+          description="Builds library jar from compiled sources">
 
-      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
+    <jar destfile="${jsr166e.jar}" index="true">
+      <fileset dir="${build.jsr166e.classes.dir}"/>
+    </jar>
 
-    </java>
   </target>
 
 
+  <target name="jsr166edocs"
+          description="Builds javadocs to build dir">
+
+    <delete dir="${jsr166ejavadocs.dir}"/>
+    <mkdir dir="${jsr166ejavadocs.dir}"/>
+
+    <javadoc destdir="${jsr166ejavadocs.dir}"
+             packagenames="jsr166e.*"
+             link="${jdkapidocs.url}"
+             sourcepath="${topsrc.dir}:${jdk7src.dir}"
+             source="7"
+             executable="${javadoc7}">
+      <arg value="-XDignore.symbol.file=true"/>
+
+    </javadoc>
+  </target>
+
+
+  <target name="jsr166e-test-tck"
+	  depends="jsr166e-jar"
+          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-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>
+
+
+  <target name="jsr166edist-clean"
+          description="Removes all build and distribution products">
+
+  </target>
+
+  <target name="jsr166edist-jar"
+          depends="jsr166eclean, jsr166e-jar">
+    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
+  </target>
+
+  <target name="jsr166edist-docs"
+          depends="jsr166eclean, jsr166edocs">
+    <mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
+  </target>
+
 </project>