--- jsr166/build.xml	2002/12/13 07:09:11	1.17
+++ jsr166/build.xml	2011/05/29 16:00:20	1.88
@@ -1,72 +1,104 @@
-<project name="jsr166" default="jar">
+<project name="jsr166" default="usage">
 
   <description>
+------------------------------------------------------------------------------
+  Build file for JSR-166
 
-    Build file for JSR-166
-
-    Note that junit.jar must be in ${ant.home}/lib for the
-    test target to work. [FIXME: This should be automatically
-    enforced by this build file by failing with a message if
-    junit.jar is not in the right place.]
+  Usage: ant [target]
 
+  User-specific settings are read from user.properties.
+  See user.properties.sample for an explanation of some useful settings.
+------------------------------------------------------------------------------
   </description>
 
+  <target name="usage" description="Advises user to run with -projecthelp">
+    <echo>Run "ant -projecthelp" for full usage information.</echo>
+  </target>
+
+
+  <!-- User-specific settings -->
+  <property file="user.properties"/>
+
+
   <!-- Compilation options -->
-  <property name="build.sourcelevel"    value="1.5"/>
+  <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"/>
-  <!--
-  <property name="build.warnings"       value="true"/>
-  -->
 
   <!-- Build locations -->
-  <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.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.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}"/>
-  <property name="test.src.dir"         location="${basedir}/etc/testcases"/>
-  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
-  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
+  <property name="src.dir"              location="${basedir}/src/main"/>
+  <property name="test.src.dir"         location="${basedir}/src/test"/>
+  <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="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.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
 
   <!-- Jar locations -->
   <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
-  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
-  <property name="collect.jar"          location="${lib.dir}/collect.jar"/>
+  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
+  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.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"/>
 
-  <property name="javac.args"           value='-J-Xbootclasspath/p:${javac.jar}'/>
+  <!-- Bootclasspath argument -->
+  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
 
-  <path id="javac.bootclasspath">
-    <pathelement location="${collect.jar}"/>
-    <pathelement location="${rt.jar}"/>
+  <!-- Test classpath -->
+  <path id="test.classpath">
+    <pathelement location="${build.testcases.dir}"/>
+    <pathelement location="${junit.jar}"/>
   </path>
 
-  <path id="test.classpath">
-    <pathelement location="${product.jar}"/>
+  <!-- ALoops classpath -->
+  <path id="loops.classpath">
+    <pathelement location="${build.loops.dir}"/>
   </path>
 
 
   <!-- Main targets -->
 
-  <target name="compile" depends="init"
-          description="Compiles all sources to build folder">
+  <target name="dists"
+          depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
+          description="Builds all public jars and docs"/>
+
+  <target name="compile"
+          depends="init, configure-compiler"
+          description="Compiles main sources to build folder">
+
     <mkdir dir="${build.classes.dir}"/>
+
     <javac srcdir="${src.dir}"
           destdir="${build.classes.dir}"
             debug="${build.debug}"
@@ -75,225 +107,174 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${javac.args} ${build.warnings.option}"/>
+      <include name="**/*.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
 
-      <!-- need this because srcdir is basedir! -->
-      <include name="java/**/*.java"/>
+<!--
+      <exclude name="java/lang/**"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
+-->
 
     </javac>
+
   </target>
 
 
-  <target name="jar" depends="compile"
+
+  <target name="jar"
+          depends="compile"
           description="Builds library jar from compiled sources">
+
     <mkdir dir="${build.lib.dir}"/>
-    <jar basedir="${build.classes.dir}"
-        destfile="${product.jar}"
-    />
-  </target>
 
+    <jar destfile="${product.jar}">
+      <fileset dir="${build.classes.dir}"/>
+    </jar>
 
-  <target name="test" depends="init, report-tests"
-          description="Runs all tests"/>
+  </target>
 
 
-  <target name="checkstyle" depends="filter-src"
-          description="Reports on style errors in Java source">
-    <taskdef resource="checkstyletask.properties"
-            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
-
-    <checkstyle>
-      <formatter type="plain"/>  <!-- also available: type="xml" -->
-      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
-    </checkstyle>
-  </target>
 
+  <target name="test"
+          depends="init, configure-tests, report-tests"
+          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
 
-  <target name="doccheck" depends="filter-src"
-          description="Reports on javadoc style errors">
-    <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}">
-        <include name="java/**"/>
-      </packageset>
-    </javadoc>
-  </target>
 
 
-  <target name="docs" depends="filter-src"
+  <target name="docs"
           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.sourcelevel}">
-
-      <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}">
-        <include name="java/**"/>
-      </packageset>
 
+    <!-- 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}" >
+      <fileset dir="${src.dir}" defaultexcludes="yes">
+      <include name="**/*.java"/>
+      </fileset>
     </javadoc>
+
   </target>
 
 
-  <target name="strip" depends="init">
-    <mkdir dir="${build.stripped.dir}"/>
-    <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="${javac.args} ${build.warnings.option} -s"/>
+  <target name="dist"
+          depends="init, dist-clean, dist-jar, dist-docs"
+          description="Puts all distributable products in single hierarchy"/>
 
-      <!-- need this because srcdir is basedir! -->
-      <include name="java/**/*.java"/>
 
-    </javac>
-  </target>
+  <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">
+
     <delete dir="${build.dir}"/>
     <delete dir="${build.classes.dir}"/>
     <delete dir="${build.lib.dir}"/>
+
   </target>
 
 
+
   <target name="dist-clean"
           description="Removes all build and distribution products">
+
     <delete dir="${dist.dir}"/>
+
   </target>
 
 
-  <!-- Anthill targets -->
 
-  <!-- Should really run the tests instead of just the jar target -->
-  <target name="anthill-build" depends="jar, docs, dist-docs"
-          description="Build the jar and both the external and internal docs"/>
-
-  <target name="anthill-publish">
-    <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"/>
-  </target>
+  <target name="dist-docs"
+          description="Builds javadocs without custom tags to dist folder">
+
+    <delete dir="${dist.javadocs.dir}"/>
+    <mkdir dir="${dist.javadocs.dir}"/>
 
+    <!-- the packagenames="none" hack below prevents scanning the -->
+    <!-- sourcepath for packages -->
 
-  <!-- Internal targets -->
+    <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}" >
+      <fileset dir="${src.dir}" defaultexcludes="yes">
+      <include name="**/*.java"/>
+      </fileset>
+    </javadoc>
 
-  <target name="set-warnings-if" if="build.warnings">
-    <property name="build.warnings.option" value="-warnunchecked"/>
   </target>
 
 
-  <target name="set-warnings-unless" unless="build.warnings">
-    <property name="build.warnings.option" value=""/>
-  </target>
 
+  <!-- Internal targets -->
+
+
+  <target name="init">
 
-  <target name="init" depends="set-warnings-if, set-warnings-unless">
     <!-- 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="dist-jar" depends="clean, jar">
+  <target name="dist-jar"
+          depends="clean, jar">
+
     <copy file="${product.jar}" todir="${dist.dir}"/>
-  </target>
 
+  </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.sourcelevel}">
-
-      <packageset dir="${build.filter.src.dir}">
-        <include name="java/**"/>
-      </packageset>
 
-    </javadoc>
-  </target>
+  <target name="compile-tests"
+          depends="jar">
 
+    <mkdir dir="${build.testcases.dir}"/>
 
-  <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>
+    <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}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
 
-  <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="java/**/*.java"/>
-      </fileset>
-      <filterchain>
-        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
-                      classpath="${build.ant.dir}">
-          <!--
-           # These arguments are to get rid of angle-bracketed type
-           # parameters so that javadoc can run on the result. The
-           # following heuristic that 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.)
-           -->
-          <param name="notmatching" value="^\s+\*\s.*$"/>
-          <param name="pattern" value="&lt;[^|>()]+?>+"/>
-          <param name="replacement" value=" "/>
-        </filterreader>
-        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
-                      classpath="${build.ant.dir}">
-          <!--
-           # These arguments are to uncomment lines beginning with
-           # "//@" so that javadoc can see imports that are needed
-           # to resolve links but that shouldn't be in the compiled
-           # code.
-           -->
-          <param name="matching" value="^//@.*$"/>
-          <param name="pattern" value="^//@"/>
-          <param name="replacement" value=""/>
-        </filterreader>
-      </filterchain>
-    </copy>
-  </target>
+      <classpath refid="test.classpath"/>
 
+    </javac>
 
-  <target name="compile-tests" depends="jar">
-    <mkdir dir="${build.testcases.dir}"/>
     <javac srcdir="${test.src.dir}"
           destdir="${build.testcases.dir}"
             debug="${build.debug}"
@@ -302,17 +283,45 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <bootclasspath refid="javac.bootclasspath"/>
-      <compilerarg line="${javac.args} ${build.warnings.option}"/>
+      <include name="jsr166/test/**"/>
+
+      <compilerarg value="${bootclasspath.args}"/>
+      <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+
+      <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}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+
       <classpath refid="test.classpath"/>
-      <include name="**/*Test.java"/>
 
     </javac>
+-->
+
   </target>
 
 
-  <target name="run-tests" depends="compile-tests">
+  <target name="run-tests"
+          depends="compile-tests">
+
+    <!-- May be overridden by user.properties -->
+    <property name="testcase" value="*"/>
+
     <mkdir dir="${build.reports.dir}"/>
+
     <junit printsummary="true"
              showoutput="true"
           errorProperty="junit.failed"
@@ -320,27 +329,43 @@
                     dir="${build.reports.dir}"
                    fork="true">
 
-      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
+      <jvmarg value="${bootclasspath.args}"/>
+      <jvmarg value="-server"/>
+      <jvmarg value="-showversion"/>
 
-      <classpath>
-        <!-- <path refid="test.classpath"/> -->
-        <pathelement location="${build.testcases.dir}"/>
-      </classpath>
+      <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="**/*Test.java"/>
+          <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>
+
   </target>
 
 
-  <target name="report-tests" depends="run-tests">
-    <!-- Sets junit.report.format to frames if Xalan is present,
+  <target name="report-tests"
+          depends="run-tests">
+
+    <!-- Sets junit.report.format to frames if redirection is present,
          otherwise sets it to noframes. -->
     <available property="junit.report.format"
                   value="frames"
@@ -352,14 +377,386 @@
       <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>
 
     <fail message="Test Cases Failed" if="junit.failed"/>
+
+  </target>
+
+
+  <target name="configure-compiler">
+
+    <property name="unchecked.option" value="-Xlint:unchecked"/>
+
+    <condition property="warnunchecked.arg" value="${unchecked.option}">
+      <istrue value="${build.warnunchecked}"/>
+    </condition>
+
+    <property name="warnunchecked.arg" value=""/>
+
+
+    <!-- Common options in javac invocations -->
+    <property name="build.args" value="${warnunchecked.arg}"/>
+
   </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"/>
+
+    <!-- Xalan -->
+    <available property="xalan.available"
+               classname="org.apache.xalan.Version"/>
+
+
+    <!-- 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"/>
+
+    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
+          unless="xalan.available"/>
+    -->
+
+  </target>
+
+
+  <!-- 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>
+
+
+  <!-- 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="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}"
+             packagenames="jsr166x"
+             link="http://download.oracle.com/javase/7/docs/api/"
+             source="${build.sourcelevel}"
+             sourcepath="${topsrc.dir}:${jdksrc.dir}" />
+
+  </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}" />
+
+  </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}"/>
+
+<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
+
+    </javac>
+
+  </target>
+
+
+
+  <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>
+
+
+
+  <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}" />
+
+  </target>
+
+
+  <target name="jsr166ydist"
+          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
+          description="Puts all distributable products in single hierarchy"/>
+
+
+
+  <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}" />
+
+  </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}" />
+
+  </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}" />
+
+  </target>
+
+  <target name="extra166ydist-jar"
+          depends="extra166yclean, extra166yjar">
+
+    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
+
+  </target>
+
 </project>