--- jsr166/build.xml	2003/05/29 17:29:08	1.36
+++ jsr166/build.xml	2005/11/08 00:13:41	1.73
@@ -22,7 +22,6 @@
 
   <!-- Compilation options -->
   <property name="build.sourcelevel"    value="1.5"/>
-  <property name="build.docsourcelevel" value="1.4"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
@@ -30,54 +29,80 @@
   <!-- 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.j1.dir"         location="${build.dir}/j1"/>
+  <property name="build.loops.dir"      location="${build.dir}/loops"/>
   <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.checkstyle.dir" location="${build.dir}/checkstyle"/>
   <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
   <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
+  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
+  <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"/>
 
   <!-- 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="j1.src.dir"           location="${basedir}/src/javaone"/>
+  <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="ant.src.dir"          location="${basedir}/etc/ant"/>
   <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
   <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"/>
 
   <!-- Distribution locations -->
   <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
+  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
 
   <!-- Jar locations -->
   <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
+  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
   <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
-  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
+  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
 
+  <!-- Bootclasspath argument -->
+  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
 
-
-  <!-- Files excluded from emulation and dist-docs -->
-  <patternset id="emulation.excludes">
-    <exclude name="java/util/Random.*"/>
-    <exclude name="sun/misc/Unsafe.*"/>
-  </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>
+
+  <!-- J1 classpath -->
+  <path id="j1.classpath">
+    <pathelement location="${build.classes.dir}"/>
+    <pathelement location="${build.j1.dir}"/>
+    <pathelement location="${junit.jar}"/>
+
+    <!-- Include dl.u.c for BoundedBuffer comparison -->
+    <pathelement location="${concurrent.jar}"/>
+  </path>
 
 
   <!-- Main targets -->
 
+
   <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}"/>
 
-    <javac srcdir="${prepare.src.dir}"
+    <javac srcdir="${src.dir}"
           destdir="${build.classes.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
@@ -85,17 +110,31 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${build.javac.args}"/>
+      <include name="**/*.java"/>
+<!--
+      <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"/>
+          depends="compile"
+          description="Builds library jar from compiled sources">
+
+    <mkdir dir="${build.lib.dir}"/>
+
+    <jar destfile="${product.jar}">
+      <fileset dir="${build.classes.dir}"/>
+    </jar>
+
+  </target>
+
 
 
   <target name="test"
@@ -103,24 +142,30 @@
           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)">
 
-    <taskdef resource="checkstyletask.properties"
-            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
+  <target name="docs"
+          description="Builds javadocs with custom tags to build folder">
 
-    <checkstyle>
-      <formatter type="plain"/>  <!-- also available: type="xml" -->
-      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
-    </checkstyle>
+    <delete dir="${build.javadocs.dir}"/>
+    <mkdir dir="${build.javadocs.dir}"/>
+
+    <javadoc destdir="${build.javadocs.dir}"
+                link="http://java.sun.com/j2se/1.5.0/docs/api"
+            overview="${src.dir}/intro.html"
+            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
+    >           
+
+      <packageset dir="${src.dir}"/>
+
+    </javadoc>
 
   </target>
 
 
+
   <target name="doccheck"
-          depends="filter-src"
-          description="Reports on javadoc style errors (not working yet)">
+          depends="filter-doccheck"
+          description="Reports on javadoc style errors">
 
     <delete dir="${build.doccheck.dir}"/>
     <mkdir dir="${build.doccheck.dir}"/>
@@ -128,67 +173,63 @@
     <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
          docletpath="${lib.dir}/doccheck.jar"
             destdir="${build.doccheck.dir}">
-      <packageset dir="${build.filter.src.dir}"/>
+      <packageset dir="${build.dc-filter.dir}"/>
     </javadoc>
 
+    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
+
   </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}"/>
+  <target name="checkstyle"
+          depends="filter-src"
+          description="Reports on style errors in Java source (verbose, mostly chaff)">
 
-    <javadoc destdir="${build.javadocs.dir}"
-                link="http://java.sun.com/j2se/1.4.1/docs/api"
-            overview="${src.dir}/intro.html"
-              source="${build.docsourcelevel}">
+    <taskdef resource="checkstyletask.properties"
+            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
 
-      <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:"/>
+    <mkdir dir="${build.checkstyle.dir}"/>
 
-      <packageset dir="${build.filter.src.dir}"/>
+    <checkstyle config="etc/checkstyle/sun_checks.xml"
+       failOnViolation="false">
+      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
+      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
+    </checkstyle>
 
-    </javadoc>
+    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
+          out="${build.checkstyle.dir}/checkstyle-report.html"
+        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
 
   </target>
 
 
-  <target name="strip"
-          depends="init, configure-compiler"
-          description="Strip generics from java source (not working yet)">
 
-    <mkdir dir="${build.stripped.dir}"/>
+  <target name="dist"
+          depends="init, dist-clean, dist-jar, dist-docs"
+          description="Puts all distributable products in single hierarchy"/>
 
-    <!--
-     # 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">
 
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${build.javac.args} -s"/>
 
-    </javac>
+  <target name="release"
+          depends="dist"
+          description="Puts entire CVS tree, plus distribution productions, in a jar">
+
+    <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="dist"
-          depends="init, dist-clean, dist-jar, dist-docs"
-          description="Puts all distributable products in single hierarchy"/>
-
 
   <target name="clean"
           description="Removes all build products">
@@ -200,6 +241,7 @@
   </target>
 
 
+
   <target name="dist-clean"
           description="Removes all build and distribution products">
 
@@ -208,20 +250,29 @@
   </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"
+              link="http://java.sun.com/j2se/1.5.0/docs/api"
             overview="${src.dir}/intro.html"
-              source="${build.docsourcelevel}">
-
-      <packageset dir="${build.filter.src.dir}"/>
 
+            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
+     >
+      <packageset dir="${src.dir}" defaultexcludes="yes">
+      <include name="java/util/concurrent"/>
+      <include name="java/util/concurrent/atomic"/>
+      <include name="java/util/concurrent/locks"/>
+      </packageset>
+      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
+      <include name="main/java/util/*.java"/>
+      <include name="main/java/util/*.html"/>
+<!--      <include name="jsr166x/*.java"/> -->
+      </fileset>
     </javadoc>
 
   </target>
@@ -236,61 +287,7 @@
     <!-- Version is kept in a separate file -->
     <loadfile property="version" srcFile="version.properties"/>
     <echo>Building JSR-166 version ${version}</echo>
-
-  </target>
-
-
-  <target name="init-jar">
-
-    <mkdir dir="${build.lib.dir}"/>
-
-  </target>
-
-
-  <target name="native-jar"
-          depends="compile"
-          unless="build.emulation.true">
-
-    <jar destfile="${product.jar}">
-      <fileset dir="${build.classes.dir}"/>
-    </jar>
-
-  </target>
-
-
-  <target name="compile-emulation"
-          depends="init, configure-compiler"
-          if="build.emulation.true">
-
-    <mkdir dir="${build.emulation.dir}"/>
-
-    <javac srcdir="${emulation.src.dir}"
-          destdir="${build.emulation.dir}"
-            debug="${build.debug}"
-       debuglevel="${build.debuglevel}"
-      deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
-             fork="true">
-
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${build.javac.args}"/>
-
-    </javac>
-
-  </target>
-
-
-  <target name="emulation-jar"
-          depends="compile-emulation"
-          if="build.emulation.true">
-
-
-    <jar destfile="${product.jar}" duplicate="add">
-      <fileset dir="${build.classes.dir}">
-        <patternset refid="emulation.excludes"/>
-      </fileset>
-      <fileset dir="${build.emulation.dir}"/>
-    </jar>
+    <echo>java.home is ${java.home}</echo>
 
   </target>
 
@@ -310,8 +307,7 @@
 
     <javac srcdir="${ant.src.dir}"
           destdir="${build.ant.dir}"
-           source="1.4"
-    />
+           source="1.4"/>
 
   </target>
 
@@ -327,18 +323,16 @@
       </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="emulation.excludes"/>
+        <!-- Files excluded from dist-docs -->
+        <exclude name="java/util/Random.*"/>
+        <exclude name="sun/misc/Unsafe.*"/>
       </fileset>
+      <!--
       <filterchain>
+      -->
 
         <!--
          # This filter gets rid of angle-bracketed type parameters
@@ -352,39 +346,51 @@
          #   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>
+        -->
 
+      <!--
+      </filterchain>
+      -->
+    </copy>
 
-        <!--
-         # 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.
-         -->
+  </target>
 
-        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
-                      classpath="${build.ant.dir}">
-          <param name="matching"    value="^//@.*$"/>
-          <param name="pattern"     value="^//@"/>
-          <param name="replacement" value=""/>
-        </filterreader>
 
+  <target name="filter-doccheck"
+          depends="filter-src">
+
+    <mkdir dir="${build.dc-filter.dir}"/>
 
+    <copy todir="${build.dc-filter.dir}">
+      <fileset dir="${build.filter.src.dir}">
+        <include name="**/*.html"/>
+      </fileset>
+    </copy>
+
+    <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.dc-filter.dir}">
+      <fileset dir="${build.filter.src.dir}">
+        <exclude name="**/*.html"/>
+      </fileset>
+      <filterchain>
         <!--
-         # The next two filters try to make the source look like
+         # 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.
-         #
-         # 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 ].*$"/>
@@ -394,11 +400,10 @@
 
         <filterreader classname="jsr166.ant.filters.ReplaceFilter"
                       classpath="${build.ant.dir}">
-          <param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
+          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
           <param name="pattern"     value="$"/>
           <param name="replacement" value=" ${generic.declarations}"/>
         </filterreader>
-        -->
 
       </filterchain>
     </copy>
@@ -411,6 +416,21 @@
 
     <mkdir dir="${build.testcases.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 value="${bootclasspath.args}"/>
+      <compilerarg line="${build.args}"/>
+
+      <classpath refid="test.classpath"/>
+
+    </javac>
+
     <javac srcdir="${test.src.dir}"
           destdir="${build.testcases.dir}"
             debug="${build.debug}"
@@ -419,11 +439,31 @@
            source="${build.sourcelevel}"
              fork="true">
 
+      <include name="jsr166/test/**"/>
+
+      <compilerarg value="${bootclasspath.args}"/>
+      <compilerarg line="${build.args}"/>
+
+      <classpath refid="test.classpath"/>
+
+    </javac>
+
+<!--
+    <javac srcdir="${jtreg.src.dir}"
+          destdir="${build.testcases.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+
+      <compilerarg value="${bootclasspath.args}"/>
+      <compilerarg line="${build.args}"/>
+
       <classpath refid="test.classpath"/>
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${build.javac.args}"/>
 
     </javac>
+-->
 
   </target>
 
@@ -443,15 +483,33 @@
                     dir="${build.reports.dir}"
                    fork="true">
 
-      <jvmarg value="${test.bootclasspath.arg}"/>
+      <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>
 
@@ -461,7 +519,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"
@@ -486,166 +544,533 @@
 
   <target name="configure-compiler">
 
-    <property name="gjc.version"
-             value="2.0"/>
+    <property name="unchecked.option" value="-Xlint:unchecked"/>
 
-    <condition property="build.novariance" 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="build.novariance"
-             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${build.novariance}.jar"/>
+  </target>
 
 
-    <condition property="build.warnunchecked" value="-warnunchecked">
-      <istrue value="${gjc.warnunchecked}"/>
-    </condition>
+  <target name="configure-tests"
+       depends="configure-compiler">
 
-    <property name="build.warnunchecked" 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"/>
 
-    <path id="javac.bootclasspath.prefix">
-      <!-- <pathelement location="${src.dir}"/> -->
-      <pathelement location="${javac.jar}"/>
-    </path>
+    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
+          unless="xalan.available"/>
+    -->
 
-    <path id="javac.bootclasspath">
-      <!-- <pathelement location="${src.dir}"/> -->
-      <pathelement location="${collect.jar}"/>
-      <pathelement location="${rt.jar}"/>
-    </path>
+  </target>
 
-    <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
-    <property name="javac.bootclasspath.prefix"
-             refid="javac.bootclasspath.prefix"/>
-
-    <!-- Turn the flattened bootclasspath prefix into a javac argument -->
-    <property name="build.bootclasspath.arg"
-             value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
-
-    <!-- Flatten bootclasspath for trace message -->
-    <property name="javac.bootclasspath"
-             refid="javac.bootclasspath"/>
 
-    <!-- Common options in javac invocations -->
-    <property name="build.javac.args"
-             value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
 
-    <echo>javac ${build.javac.args}</echo>
-    <echo>bootclasspath=${javac.bootclasspath}</echo>
+  <!-- Anthill targets -->
+
+  <target name="anthill-build">
+
+    <!-- Override this in user.properties -->
+    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
 
+    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
+      <arg value="-Xmx256000000"/>
+      <!-- classpath of new JVM -->
+      <arg value="-classpath"/> <arg path="${java.class.path}"/>
+      <!-- location of Ant home directory -->
+      <arg value="-Dant.home=${ant.home}"/>
+      <!-- the Ant main class -->
+      <arg value="org.apache.tools.ant.Main"/>
+      <!-- The build file -->
+      <arg value="-buildfile"/>  <arg value="build.xml"/>
+      <!-- the target to build on the new Ant instance -->
+      <arg value="-DJAVA_HOME=${tiger.home}"/>
+      <arg value="do-anthill-build"/>
+    </exec>
   </target>
 
+  <target name="do-anthill-build"
+          depends="jar, test, docs, dist-docs"/>
 
-  <target name="prepare-src"
-          depends="configure-compiler"
-          if="prepare.src.dir">
+  <target name="anthill-publish">
 
-    <mkdir dir="${prepare.src.dir}"/>
-    <copy todir="${prepare.src.dir}">
-      <fileset dir="${src.dir}">
-        <exclude name="java/lang/**"/>
+    <copy todir="${deployDir}/docs/private">
+      <fileset dir="${build.javadocs.dir}"/>
+    </copy>
+
+    <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>
+
+
+
+  <!-- Various demos and test programs -->
+
+
+  <target name="sample" depends="init, configure-compiler"
+          description="Standalone demo program">
+
+    <mkdir dir="${build.testcases.dir}"/>
+
+    <javac srcdir="${test.src.dir}"
+          destdir="${build.testcases.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+
+      <include name="jsr166/test/Sample.java"/>
+
+    </javac>
+
+    <copy todir="${build.testcases.dir}">
+      <fileset dir="${test.src.dir}">
+        <include name="**/*.properties"/>
       </fileset>
     </copy>
 
+
+    <java classname="jsr166.test.Sample" fork="true">
+      <classpath refid="test.classpath"/>
+      <!-- <jvmarg value="-ea"/> -->
+      <!-- <jvmarg value="-server"/> -->
+      <!-- <arg value="1000"/> -->
+    </java>
   </target>
 
 
-  <target name="configure-emulation">
+  <target name="loops" depends="init, configure-compiler"
+          description="Benchmark from Doug Lea's AQS paper">
 
-    <condition property="build.emulation.true">
-      <or>
-        <and>
-          <os family="windows"/>
-          <not>
-            <isset property="build.emulation"/>
-          </not>
-        </and>
-        <istrue value="${build.emulation}"/>
-      </or>
-    </condition>
+    <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"/>
+
+    </javac>
+
+    <java classname="ALoops" fork="true">
+      <classpath refid="loops.classpath"/>
+    </java>
 
   </target>
 
 
-  <target name="configure-tests">
+  <target name="compile-j1" depends="init, configure-compiler, compile">
 
-    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
-    <available property="junit.available"
-               classname="junit.framework.Protectable"/>
+    <mkdir dir="${build.j1.dir}"/>
+
+    <javac srcdir="${j1.src.dir}"
+          destdir="${build.j1.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}" >
+
+      <include name="**/*.java"/>
+      <exclude name="**/dijkstra/**"/>
+
+      <compilerarg line="${build.args}"/>
+      <classpath refid="j1.classpath"/>
+
+    </javac>
+
+  </target>
 
-    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
-          unless="junit.available"/>
 
+  <target name="sw" depends="compile-j1"
+          description="Runs the SwingWorker demo">
 
     <!--
-     ! 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}"/>
+    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
+      <classpath refid="j1.classpath"/>
+    </java>
+    -->
+
+    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
+
+    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
+      <arg value="${build.j1.dir}/SwingWorker.html"/>
+    </exec>
+
+  </target>
+
+  <target name="j1" depends="compile-j1"
+          description="Runs a standalone JavaOne program">
+
+    <java classname="${j1.test}" fork="true">
+      <classpath refid="j1.classpath"/>
+      <jvmarg value="-client"/>
+
+      <!-- TestPseudoRandom args -->
+      <arg value="2"/>
+      <arg value="25"/>
+      <arg value="100000"/>
+
+      <!-- WebCrawler args -->
+      <!--
+      <arg value="jsr166.webcrawler.WebCrawler3"/>
+      <arg value="http://www.priorartisans.com"/>
+      <arg value="25"/>
+      -->
+
+    </java>
+
+  </target>
+
+
+  <target name="test-j1" depends="compile-j1"
+          description="Runs testcases from the JavaOne source directories">
+
+    <junit printsummary="true"
+             showoutput="true"
+          errorProperty="junit.failed"
+        failureProperty="junit.failed"
+                    dir="${build.j1.dir}"
+                   fork="true">
+
+      <!-- <jvmarg value="-server"/> -->
+      <classpath refid="j1.classpath"/>
+      <formatter type="xml"/>
+
+      <batchtest todir="${build.j1.dir}">
+        <fileset dir="${j1.src.dir}">
+          <include name="**/*Test.java"/>
+        </fileset>
+      </batchtest>
+
+    </junit>
+
+    <available property="junit.report.format"
+                  value="frames"
+              classname="org.apache.xalan.lib.Redirect"/>
+    <property name="junit.report.format" value="noframes"/>
+
+    <junitreport todir="${build.j1.dir}">
+      <fileset dir="${build.j1.dir}">
+        <include name="TEST-*.xml"/>
+      </fileset>
+      <report styledir="${stylesheet.dir}"
+                format="${junit.report.format}"
+                 todir="${build.j1.dir}"
+      />
+    </junitreport>
+
+    <fail message="Test Cases Failed" if="junit.failed"/>
+
+  </target>
+
+
+
+  <!-- C++ and JNI definitions and demos -->
+
+  <target name="configure-cpp">
+
+    <!-- Define tasks and types -->
+
+    <path id="cpptasks.path">
+      <pathelement location="${lib.dir}/cpptasks.jar"/>
     </path>
+    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
+    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
 
-    <!-- Flatten test classpath into a platform-appropriate string -->
-    <property name="test.classpath" refid="test.classpath"/>
+    <!-- Set platform property for JNI includes -->
 
-    <!-- Turn the flattened test classpath into a javac argument -->
-    <property name="test.bootclasspath.arg"
-             value='-Xbootclasspath/p:${test.classpath}'/>
+    <condition property="platform" value="linux">
+      <os name="Linux"/>
+    </condition>
+    <condition property="platform" value="win32">
+      <os family="windows"/>
+    </condition>
+    <condition property="platform" value="solaris">
+      <os name="SunOS"/>
+    </condition>
 
   </target>
 
 
+  <target name="cppdemo" depends="configure-cpp">
 
-  <!-- Anthill targets -->
+    <mkdir dir="${build.dir}"/>
 
-  <target name="anthill-build"
-          depends="jar, test, docs, dist-docs"/>
+    <cc multithreaded="true"
+                 name="g++"
+               objdir="${build.dir}"
+              outfile="${build.dir}/CppDemo">
+      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
+      <libset libs="stdc++"/>
+    </cc>
 
-  <target name="anthill-publish">
+    <exec executable="${build.dir}/CppDemo">
+      <arg line="count in word frequency of word in command line count"/>
+    </exec>
 
-    <copy todir="${deployDir}/docs/private">
-      <fileset dir="${build.javadocs.dir}"/>
-    </copy>
+  </target>
 
-    <copy todir="${deployDir}/docs/public">
-      <fileset dir="${dist.javadocs.dir}"/>
-    </copy>
 
-    <copy tofile="${deployDir}/index.html"
-          file="${basedir}/etc/anthill-index.html"/>
+  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
 
-    <copy todir="${deployDir}/notes">
-      <fileset dir="${basedir}/etc/notes"/>
-    </copy>
+    <mkdir dir="${build.testcases.dir}"/>
+
+    <javac srcdir="${test.src.dir}"
+          destdir="${build.testcases.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${build.sourcelevel}"
+             fork="true">
+      <compilerarg value="${bootclasspath.args}"/>
+      <compilerarg line="${build.args}"/>
+      <classpath refid="test.classpath"/>
+      <include name="JniDemo.java"/>
+    </javac>
+
+    <javah destdir="${build.testcases.dir}"
+      classpathref="test.classpath">
+      <class name="JniDemo"/>
+    </javah>
+
+    <cc multithreaded="true"
+                 name="g++"
+               objdir="${build.dir}"
+              outfile="${build.dir}/JniDemo"
+              outtype="shared">
+
+      <compiler>
+        <defineset>
+          <define name="__int64" value="long long"/>
+        </defineset>
+        <includepath location="${java.home}/../include"/>
+        <includepath location="${java.home}/../include/${platform}"/>
+        <compilerarg value="-mno-cygwin"/>
+      </compiler>
+
+      <linker>
+        <linkerarg value="--add-stdcall-alias"/>
+      </linker>
+
+      <includepath location="${build.testcases.dir}"/>
+
+      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
+
+      <libset libs="stdc++"/>
+
+    </cc>
+
+    <!-- Necessary if windows, harmless if not -->
+    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
+
+    <java classname="JniDemo" fork="true">
+      <!-- Watch out: path separator hardwired to semicolon here! -->
+      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
+      <classpath refid="test.classpath"/>
+      <arg line="count in word frequency of word in command line count"/>
+    </java>
+
+  </target>
+
+
+
+  <!-- Backward compatibility, work in progress (some files not checked in) -->
+
+
+
+  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
+  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
+  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
+  <property name="pretiger.sourcelevel" value="1.4"/>
+
+  <target name="defang"
+       depends="init"
+   description="Generates pre-Tiger compatible source">
+
+    <delete dir="${pretiger.src.dir}"/>
+    <mkdir dir="${pretiger.src.dir}"/>
+
+    <exec executable="perl">
+      <arg file="etc/defang.pl"/>
+      <!-- <arg value="-v"/> -->
+      <arg value="-s"/> <arg file="${src.dir}"/>
+      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
+    </exec>
+
+  </target>
+
+  <target name="compile-pretiger"
+          depends="init, configure-compiler, defang"
+          description="Compiles pre-Tiger sources to build folder">
+
+    <mkdir dir="${build.pretiger.dir}"/>
+
+    <javac srcdir="${pretiger.src.dir}"
+          destdir="${build.pretiger.dir}"
+            debug="${build.debug}"
+       debuglevel="${build.debuglevel}"
+      deprecation="${build.deprecation}"
+           source="${pretiger.sourcelevel}"
+             fork="true">
+
+      <compilerarg line="${build.args}"/>
+      <exclude name="**/Thread.java"/>
+
+    </javac>
 
   </target>
 
+  <target name="pretiger" depends="compile-pretiger">
+
+    <mkdir dir="${build.lib.dir}"/>
+
+    <jar destfile="${pretiger.jar}">
+      <fileset dir="${build.pretiger.dir}">
+      </fileset>
+    </jar>
+
+  </target>
+
+  <!-- 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}"/>
+
+    </javac>
+
+  </target>
+
+
+
+  <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="jsr166xdocs"
+          description="Builds javadocs with custom tags to build folder">
+
+    <delete dir="${build.jsr166xjavadocs.dir}"/>
+    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
+
+    <javadoc destdir="${build.jsr166xjavadocs.dir}"
+                link="http://java.sun.com/j2se/1.5.0/docs/api/"
+            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
+
+    >
+      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
+      <include name="jsr166x"/>
+      </packageset>
+
+
+    </javadoc>
+
+  </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}"
+                link="http://java.sun.com/j2se/1.5.0/docs/api/"
+              source="${build.sourcelevel}">
+
+      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
+      <include name="jsr166x"/>
+      </packageset>
+
+    </javadoc>
+
+  </target>
+
+  <target name="jsr166xdist-jar"
+          depends="jsr166xclean, jsr166xjar">
+
+    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
+
+  </target>
 
 </project>