--- jsr166/build.xml	2003/06/09 14:11:43	1.42
+++ jsr166/build.xml	2011/07/15 13:21:07	1.90
@@ -21,76 +21,92 @@
 
 
   <!-- Compilation options -->
-  <property name="build.sourcelevel"    value="1.5"/>
-  <property name="build.docsourcelevel" value="1.4"/>
+  <property name="build.sourcelevel"    value="1.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.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.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.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.jsr166x.dir"           location="${build.dir}/jsr166x"/>
+  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
+  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
+
+  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
+  <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"/>
 
   <!-- 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"/>
-
+  <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="jsr166esrc.dir"       location="${basedir}/src/jsr166e"/>
+  <property name="extra166ysrc.dir"     location="${basedir}/src/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.javadocs.dir"           location="${dist.dir}/docs"/>
+  <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="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"/>
-  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
-
 
+  <!-- Bootclasspath argument -->
+  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.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*"/>
-  </patternset>
-
+  <!-- Test classpath -->
+  <path id="test.classpath">
+    <pathelement location="${build.testcases.dir}"/>
+    <pathelement location="${junit.jar}"/>
+  </path>
+
+  <!-- ALoops classpath -->
+  <path id="loops.classpath">
+    <pathelement location="${build.loops.dir}"/>
+  </path>
 
 
   <!-- Main targets -->
 
+  <target name="dists"
+          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
+          description="Builds all public jars and docs"/>
+
   <target name="compile"
-          depends="init, configure-compiler, prepare-src"
+          depends="init, configure-compiler"
           description="Compiles main sources to build folder">
 
-    <property name="prepare.src.dir" value="${src.dir}"/>
-
     <mkdir dir="${build.classes.dir}"/>
 
-<!--
-    <echo>javac ${gjc.args}</echo>
-    <echo>bootclasspath=${compile.bootclasspath}</echo>
--->
-
-    <javac srcdir="${prepare.src.dir}"
+    <javac srcdir="${src.dir}"
           destdir="${build.classes.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
@@ -98,126 +114,90 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <compilerarg    line="${gjc.args}"/>
-      <bootclasspath refid="compile.bootclasspath"/>
+      <include name="**/*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+
+<!--
+      <exclude name="java/lang/**"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
+-->
 
     </javac>
 
   </target>
 
 
-  <target name="jar"
-          depends="configure-emulation, init-jar, native-jar, emulation-jar"
-          description="Builds library jar from compiled sources"/>
-
-
-  <target name="test"
-          depends="init, configure-tests, report-tests"
-          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
 
+  <target name="jar"
+          depends="compile"
+          description="Builds library jar from compiled sources">
 
-  <target name="checkstyle"
-          depends="filter-src"
-          description="Reports on style errors in Java source (verbose, mostly chaff)">
-
-    <taskdef resource="checkstyletask.properties"
-            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
+    <mkdir dir="${build.lib.dir}"/>
 
-    <checkstyle>
-      <formatter type="plain"/>  <!-- also available: type="xml" -->
-      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
-    </checkstyle>
+    <jar destfile="${product.jar}">
+      <fileset dir="${build.classes.dir}"/>
+    </jar>
 
   </target>
 
 
-  <target name="doccheck"
-          depends="filter-src"
-          description="Reports on javadoc style errors (not working yet)">
-
-    <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.src.dir}"/>
-    </javadoc>
+  <target name="test"
+          depends="init, configure-tests, report-tests"
+          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
 
-  </target>
 
 
   <target name="docs"
-          depends="filter-src"
           description="Builds javadocs with custom tags to build folder">
 
     <delete dir="${build.javadocs.dir}"/>
     <mkdir dir="${build.javadocs.dir}"/>
 
-    <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}"/>
+    <!-- the packagenames="none" hack below prevents scanning the -->
+    <!-- sourcepath for packages -->
 
+    <javadoc destdir="${build.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>
 
 
-  <target name="strip"
-          depends="init, configure-compiler"
-          description="Strip generics from java source (not working yet)">
-
-    <mkdir dir="${build.stripped.dir}"/>
-
-    <!--
-     # 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}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
-
-      <compilerarg    line="${gjc.args} -s"/>
-      <bootclasspath refid="compile.bootclasspath"/>
-
-    </javac>
-
-  </target>
-
 
   <target name="dist"
           depends="init, dist-clean, dist-jar, dist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
+
   <target name="release"
           depends="dist"
           description="Puts entire CVS tree, plus distribution productions, in a jar">
 
-    <delete dir="${build.dir}"/>
-
     <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="clean"
           description="Removes all build products">
 
@@ -228,6 +208,7 @@
   </target>
 
 
+
   <target name="dist-clean"
           description="Removes all build and distribution products">
 
@@ -236,20 +217,25 @@
   </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}"/>
 
-    <javadoc destdir="${dist.javadocs.dir}"
-                link="http://java.sun.com/j2se/1.4.1/docs/api"
-            overview="${src.dir}/intro.html"
-              source="${build.docsourcelevel}">
-
-      <packageset dir="${build.filter.src.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>
@@ -264,189 +250,60 @@
     <!-- Version is kept in a separate file -->
     <loadfile property="version" srcFile="version.properties"/>
     <echo>Building JSR-166 version ${version}</echo>
+    <echo>java.home is ${java.home}</echo>
 
   </target>
 
 
-  <target name="init-jar">
-
-    <mkdir dir="${build.lib.dir}"/>
-
-  </target>
-
-
-  <target name="native-jar"
-          depends="compile"
-          unless="build.emulation.true">
+  <target name="dist-jar"
+          depends="clean, jar">
 
-    <jar destfile="${product.jar}">
-      <fileset dir="${build.classes.dir}"/>
-    </jar>
+    <copy file="${product.jar}" todir="${dist.dir}"/>
 
   </target>
 
 
-  <target name="compile-emulation"
-          depends="init, configure-compiler"
-          if="build.emulation.true">
+  <target name="compile-tests"
+          depends="jar">
 
-    <mkdir dir="${build.emulation.dir}"/>
+    <mkdir dir="${build.testcases.dir}"/>
 
-    <javac srcdir="${emulation.src.dir}"
-          destdir="${build.emulation.dir}"
+    <javac srcdir="${tck.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="compile.bootclasspath"/>
-
-    </javac>
-
-  </target>
-
+      <compilerarg value="${bootclasspath.args}"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
 
-  <target name="emulation-jar"
-          depends="compile-emulation"
-          if="build.emulation.true">
-
-
-    <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>
-
-  </target>
-
-
-  <target name="dist-jar"
-          depends="clean, jar">
-
-    <copy file="${product.jar}" todir="${dist.dir}"/>
+      <classpath refid="test.classpath"/>
 
-  </target>
-
-
-  <target name="compile-ant-filter"
-          depends="init">
-
-    <mkdir dir="${build.ant.dir}"/>
-
-    <javac srcdir="${ant.src.dir}"
-          destdir="${build.ant.dir}"
-           source="1.4"
-    />
-
-  </target>
-
-
-  <target name="filter-src"
-          depends="compile-ant-filter">
-
-    <mkdir dir="${build.filter.src.dir}"/>
-
-    <copy todir="${build.filter.src.dir}">
-      <fileset dir="${src.dir}">
-        <include name="**/*.html"/>
-      </fileset>
-    </copy>
-
-    <!-- Not needed now, used for doccheck filtering:
-    <property name="generic.declarations"
-             value="public interface E {} public interface T {} public interface K {} public interface V {}"
-    />
-    -->
-
-    <copy todir="${build.filter.src.dir}">
-      <fileset dir="${src.dir}">
-        <exclude name="**/*.html"/>
-        <patternset refid="unsafe.exclusion"/>
-      </fileset>
-      <filterchain>
-
-        <!--
-         # 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>
-
-
-        <!--
-         # The next 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.
-         #
-         # Currently commented out because doccheck doesn't work. :-(
-         -->
-
-        <!--
-        <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>
-        -->
+    </javac>
 
-      </filterchain>
-    </copy>
+    <javac srcdir="${test.src.dir}"
+          destdir="${build.testcases.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
 
-  </target>
+      <include name="jsr166/test/**"/>
 
+      <compilerarg value="${bootclasspath.args}"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
 
-  <target name="compile-tests"
-          depends="jar">
+      <classpath refid="test.classpath"/>
 
-    <mkdir dir="${build.testcases.dir}"/>
+    </javac>
 
 <!--
-    <echo>javac ${gjc.args}</echo>
-    <echo>bootclasspath=${test.compile.bootclasspath}</echo>
-    <echo>classpath="${test.classpath}"</echo>
--->
-
-    <javac srcdir="${test.src.dir}"
+    <javac srcdir="${jtreg.src.dir}"
           destdir="${build.testcases.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
@@ -454,11 +311,14 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <compilerarg    line="${gjc.args}"/>
-      <bootclasspath refid="test.compile.bootclasspath"/>
-      <classpath     refid="test.classpath"/>
+      <compilerarg value="${bootclasspath.args}"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+
+      <classpath refid="test.classpath"/>
 
     </javac>
+-->
 
   </target>
 
@@ -478,15 +338,33 @@
                     dir="${build.reports.dir}"
                    fork="true">
 
-      <jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
+      <jvmarg value="${bootclasspath.args}"/>
+      <jvmarg value="-server"/>
+      <jvmarg value="-showversion"/>
+
+      <classpath refid="test.classpath"/>
 
       <formatter type="xml"/>
 
-      <batchtest todir="${build.reports.dir}">
+      <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>
+
+<!--
+      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
+        <fileset dir="${jtreg.src.dir}">
           <include name="**/${testcase}Test.java"/>
         </fileset>
       </batchtest>
+-->
 
     </junit>
 
@@ -496,7 +374,7 @@
   <target name="report-tests"
           depends="run-tests">
 
-    <!-- Sets junit.report.format to frames if Xalan is present,
+    <!-- Sets junit.report.format to frames if redirection is present,
          otherwise sets it to noframes. -->
     <available property="junit.report.format"
                   value="frames"
@@ -508,9 +386,7 @@
       <fileset dir="${build.reports.dir}">
         <include name="TEST-*.xml"/>
       </fileset>
-      <report styledir="${stylesheet.dir}"
-                format="${junit.report.format}"
-                 todir="${build.reports.dir}"
+      <report format="${junit.report.format}" todir="${build.reports.dir}"
       />
     </junitreport>
 
@@ -521,166 +397,485 @@
 
   <target name="configure-compiler">
 
-    <property name="gjc.version"
-             value="2.0"/>
+    <property name="unchecked.option" value="-Xlint:unchecked"/>
 
-    <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 property="warnunchecked.arg" value="${unchecked.option}">
+      <istrue value="${build.warnunchecked}"/>
     </condition>
 
-    <property name="novariance.arg"
-             value=""/>
+    <property name="warnunchecked.arg" value=""/>
 
-    <property name="gjc.dir"
-             value="${lib.dir}/gjc"/>
 
-    <property name="javac.jar"
-          location="${gjc.dir}/${gjc.version}/javac.jar"/>
+    <!-- Common options in javac invocations -->
+    <property name="build.args" value="${warnunchecked.arg}"/>
 
-    <property name="collect.jar"
-          location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
+  </target>
 
 
-    <condition property="warnunchecked.arg" value="-warnunchecked">
-      <istrue value="${gjc.warnunchecked}"/>
-    </condition>
+  <target name="configure-tests"
+       depends="configure-compiler">
 
-    <property name="warnunchecked.arg" value=""/>
+    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
+    <available property="junit.available"
+               classname="junit.framework.Protectable"/>
 
-    <condition property="prepare.src.dir" value="${build.dir}/prepare-src">
-      <istrue value="${build.nothreads}"/>
-    </condition>
+    <!-- Xalan -->
+    <available property="xalan.available"
+               classname="org.apache.xalan.Version"/>
 
 
+    <!-- Ant 1.6beta and later don't need or want this check -->
     <!--
-     ! Bootclasspath munging for source compilation.
-     -->
+    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
+          unless="junit.available"/>
+
+    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
+          unless="xalan.available"/>
+    -->
 
-    <path id="pre.bootclasspath">
-      <pathelement location="${javac.jar}"/>
-    </path>
-
-    <path id="compile.bootclasspath">
-      <pathelement location="${build.classes.dir}"/>
-      <pathelement location="${collect.jar}"/>
-      <pathelement location="${rt.jar}"/>
-    </path>
-
-    <!-- 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}"
-    />
+  <!-- Various demos and test programs -->
+
+
+  <target name="loops" depends="init, 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="${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="prepare-src"
-          depends="configure-compiler"
-          if="prepare.src.dir">
-
-    <mkdir dir="${prepare.src.dir}"/>
-    <copy todir="${prepare.src.dir}">
-      <fileset dir="${src.dir}">
-        <exclude name="java/lang/**"/>
-      </fileset>
-    </copy>
+  <!-- jsr166x -->
+
+
+  <target name="jsr166xcompile"
+          depends="init, configure-compiler"
+          description="Compiles jsr166x sources">
+
+    <mkdir dir="${build.jsr166x.dir}"/>
+
+    <javac srcdir="${jsr166xsrc.dir}"
+          destdir="${build.jsr166x.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+
+    </javac>
 
   </target>
 
 
-  <target name="configure-emulation">
 
-    <condition property="build.emulation.true">
-      <or>
-        <and>
-          <os family="windows"/>
-          <not>
-            <isset property="build.emulation"/>
-          </not>
-        </and>
-        <istrue value="${build.emulation}"/>
-      </or>
-    </condition>
+  <target name="jsr166xjar"
+          depends="jsr166xcompile"
+          description="Builds library jar from compiled sources">
+
+    <mkdir dir="${build.jsr166xlib.dir}"/>
+
+    <jar destfile="${jsr166xproduct.jar}">
+      <fileset dir="${build.jsr166x.dir}"/>
+    </jar>
 
   </target>
 
 
-  <target name="configure-tests"
-       depends="configure-compiler">
 
-    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
-    <available property="junit.available"
-               classname="junit.framework.Protectable"/>
+  <target name="jsr166xdocs"
+          description="Builds javadocs with custom tags to build folder">
 
-    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
-          unless="junit.available"/>
+    <delete dir="${build.jsr166xjavadocs.dir}"/>
+    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
 
+    <javadoc destdir="${build.jsr166xjavadocs.dir}"
+             packagenames="jsr166x"
+             link="http://download.oracle.com/javase/7/docs/api/"
+             source="${build.sourcelevel}"
+             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             additionalparam="-XDignore.symbol.file=true" />
 
-    <!--
-     ! Bootclasspath munging for testing, so JUnit can test our local
-     ! modifications to java.*.
-     -->
+  </target>
+
+
+  <target name="jsr166xdist"
+          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+
+  <target name="jsr166xclean"
+          description="Removes all build products">
+
+    <delete dir="${build.jsr166x.dir}"/>
+    <delete dir="${build.jsr166xlib.dir}"/>
+
+  </target>
+
+
+
+  <target name="jsr166xdist-clean"
+          description="Removes all build and distribution products">
+
+  </target>
+
+
+
+  <target name="jsr166xdist-docs"
+          description="Builds javadocs without custom tags to dist folder">
+
+    <delete dir="${dist.jsr166xjavadocs.dir}"/>
+    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
+
+    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
+             packagenames="jsr166x"
+             link="http://download.oracle.com/javase/7/docs/api/"
+             source="${build.sourcelevel}"
+             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             additionalparam="-XDignore.symbol.file=true" />
+
+  </target>
+
+  <target name="jsr166xdist-jar"
+          depends="jsr166xclean, jsr166xjar">
+
+    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
+
+  </target>
+
+  <!-- jsr166y -->
+
+
+  <target name="jsr166ycompile"
+          depends="init, configure-compiler"
+          description="Compiles jsr166y sources">
+
+    <mkdir dir="${build.jsr166y.dir}"/>
+
+    <javac srcdir="${jsr166ysrc.dir}"
+          destdir="${build.jsr166y.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="${bootclasspath.args}"/>
 
-    <path id="test.classpath">
-      <pathelement location="${product.jar}"/>
-      <pathelement location="${build.testcases.dir}"/>
-      <pathelement location="${junit.jar}"/>
-    </path>
+<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
+
+    </javac>
+
+  </target>
 
-    <path id="test.compile.bootclasspath">
-      <pathelement location="${javac.jar}"/>
-      <pathelement location="${collect.jar}"/>
-      <pathelement location="${rt.jar}"/>
-    </path>
 
-    <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="jsr166yjar"
+          depends="jsr166ycompile"
+          description="Builds library jar from compiled sources">
+
+    <mkdir dir="${build.jsr166ylib.dir}"/>
+
+    <jar destfile="${jsr166yproduct.jar}" index="true">
+      <fileset dir="${build.jsr166y.dir}"/>
+    </jar>
 
   </target>
 
 
 
-  <!-- Anthill targets -->
+  <target name="jsr166ydocs"
+          description="Builds javadocs with custom tags to build folder">
+
+    <delete dir="${build.jsr166yjavadocs.dir}"/>
+    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
+
+    <javadoc destdir="${build.jsr166yjavadocs.dir}"
+             packagenames="jsr166y"
+             link="http://download.oracle.com/javase/7/docs/api/"
+             source="${build.sourcelevel}"
+             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             additionalparam="-XDignore.symbol.file=true" />
 
-  <target name="anthill-build"
-          depends="jar, test, docs, dist-docs"/>
+  </target>
 
-  <target name="anthill-publish">
 
-    <copy todir="${deployDir}/docs/private">
-      <fileset dir="${build.javadocs.dir}"/>
-    </copy>
+  <target name="jsr166ydist"
+          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
+          description="Puts all distributable products in single hierarchy"/>
 
-    <copy todir="${deployDir}/docs/public">
-      <fileset dir="${dist.javadocs.dir}"/>
-    </copy>
 
-    <copy tofile="${deployDir}/index.html"
-          file="${basedir}/etc/anthill-index.html"/>
 
-    <copy todir="${deployDir}/notes">
-      <fileset dir="${basedir}/etc/notes"/>
-    </copy>
+  <target name="jsr166yclean"
+          description="Removes all build products">
+
+    <delete dir="${build.jsr166y.dir}"/>
+    <delete dir="${build.jsr166ylib.dir}"/>
+
+  </target>
+
+
+
+  <target name="jsr166ydist-clean"
+          description="Removes all build and distribution products">
 
   </target>
 
+  <target name="jsr166ydist-docs"
+          description="Builds javadocs without custom tags to dist folder">
+
+    <delete dir="${dist.jsr166yjavadocs.dir}"/>
+    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
+
+    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
+             packagenames="jsr166y"
+             link="http://download.oracle.com/javase/7/docs/api/"
+             source="${build.sourcelevel}"
+             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             additionalparam="-XDignore.symbol.file=true" />
+
+  </target>
+
+  <target name="jsr166ydist-jar"
+          depends="jsr166yclean, jsr166yjar">
+
+    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
+
+  </target>
+
+
+  <!-- extra166y -->
+
+
+  <target name="extra166ycompile"
+          depends="init, configure-compiler, jsr166ycompile"
+          description="Compiles extra166y sources">
+
+    <mkdir dir="${build.extra166y.dir}"/>
+
+    <javac srcdir="${extra166ysrc.dir}"
+          destdir="${build.extra166y.dir}"
+            debug="${build.debug}"
+            classpath="${jsr166yproduct.jar}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="${bootclasspath.args}"/>
+
+<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
+
+    </javac>
+
+  </target>
+
+
+
+  <target name="extra166yjar"
+          depends="extra166ycompile"
+          description="Builds library jar from compiled sources">
+
+    <mkdir dir="${build.extra166ylib.dir}"/>
+
+    <jar destfile="${extra166yproduct.jar}" index="true">
+      <fileset dir="${build.extra166y.dir}"/>
+    </jar>
+
+  </target>
+
+
+
+  <target name="extra166ydocs"
+          description="Builds javadocs with custom tags to build folder">
+
+    <delete dir="${build.extra166yjavadocs.dir}"/>
+    <mkdir dir="${build.extra166yjavadocs.dir}"/>
+
+    <javadoc destdir="${build.extra166yjavadocs.dir}"
+             packagenames="extra166y"
+             link="http://download.oracle.com/javase/7/docs/api/"
+             source="${build.sourcelevel}"
+             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             additionalparam="-XDignore.symbol.file=true" />
+
+  </target>
+
+
+  <target name="extra166ydist"
+          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+
+  <target name="extra166yclean"
+          description="Removes all build products">
+
+    <delete dir="${build.extra166y.dir}"/>
+    <delete dir="${build.extra166ylib.dir}"/>
+
+  </target>
+
+
+
+  <target name="extra166ydist-clean"
+          description="Removes all build and distribution products">
+
+  </target>
+
+  <target name="extra166ydist-docs"
+          description="Builds javadocs without custom tags to dist folder">
+
+    <delete dir="${dist.extra166yjavadocs.dir}"/>
+    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
+
+    <javadoc destdir="${dist.extra166yjavadocs.dir}"
+             packagenames="extra166y"
+             link="http://download.oracle.com/javase/7/docs/api/"
+             source="${build.sourcelevel}"
+             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             additionalparam="-XDignore.symbol.file=true" />
+
+  </target>
+
+  <target name="extra166ydist-jar"
+          depends="extra166yclean, extra166yjar">
+
+    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
+
+  </target>
+
+  <!-- jsr166e -->
+
+
+  <target name="jsr166ecompile"
+          depends="init, configure-compiler"
+          description="Compiles jsr166e sources">
+
+    <mkdir dir="${build.jsr166e.dir}"/>
+
+    <javac srcdir="${jsr166esrc.dir}"
+          destdir="${build.jsr166e.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="1.7"
+             fork="true">
+
+      <include name="**/*.java"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="${bootclasspath.args}"/>
+
+<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
+
+    </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="http://download.oracle.com/javase/7/docs/api/"
+             source="1.7"
+             sourcepath="${topsrc.dir}:${jdksrc.dir}"
+             additionalparam="-XDignore.symbol.file=true" />
+
+  </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="http://download.oracle.com/javase/7/docs/api/"
+             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>