--- jsr166/build.xml	2007/09/13 11:19:25	1.74
+++ jsr166/build.xml	2011/07/15 13:21:07	1.90
@@ -21,59 +21,63 @@
 
 
   <!-- 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"/>
 
   <!-- 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.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.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.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.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="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"/>
   <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="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
 
   <!-- Bootclasspath argument -->
   <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
@@ -89,19 +93,12 @@
     <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="dists"
+          depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
+          description="Builds all public jars and docs"/>
 
   <target name="compile"
           depends="init, configure-compiler"
@@ -118,7 +115,7 @@
              fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg value="-XDignore.symbol.file"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
 
 <!--
       <exclude name="java/lang/**"/>
@@ -158,58 +155,20 @@
     <delete dir="${build.javadocs.dir}"/>
     <mkdir dir="${build.javadocs.dir}"/>
 
-    <javadoc destdir="${build.javadocs.dir}"
-                link="http://java.sun.com/javase/6/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>
-
+    <!-- the packagenames="none" hack below prevents scanning the -->
+    <!-- sourcepath for packages -->
 
-
-  <target name="doccheck"
-          depends="filter-doccheck"
-          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.dc-filter.dir}"/>
+    <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>
 
-    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
-
-  </target>
-
-
-
-  <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-3.1.jar"/>
-
-    <mkdir dir="${build.checkstyle.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>
-
-    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
-          out="${build.checkstyle.dir}/checkstyle-report.html"
-        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
-
   </target>
 
 
@@ -219,7 +178,6 @@
           description="Puts all distributable products in single hierarchy"/>
 
 
-
   <target name="release"
           depends="dist"
           description="Puts entire CVS tree, plus distribution productions, in a jar">
@@ -266,31 +224,17 @@
     <delete dir="${dist.javadocs.dir}"/>
     <mkdir dir="${dist.javadocs.dir}"/>
 
-    <javadoc destdir="${dist.javadocs.dir}"
-            link="http://java.sun.com/javase/6/docs/api/"
-            overview="${src.dir}/intro.html"
+    <!-- the packagenames="none" hack below prevents scanning the -->
+    <!-- sourcepath for packages -->
 
-            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/concurrent/*.java"/>
-      <include name="main/java/util/concurrent/atomic/*.java"/>
-      <include name="main/java/util/concurrent/locks/*.java"/>
-      <include name="main/java/util/*.java"/>
-<!--
-      <include name="main/java/util/concurrent/*.html"/>
-      <include name="main/java/util/concurrent/atomic/*.html"/>
-      <include name="main/java/util/concurrent/locks/*.html"/>
-      <include name="main/java/util/*.html"/>
--->
-<!--      <include name="jsr166x/*.java"/> -->
+    <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>
 
@@ -319,117 +263,6 @@
   </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>
-
-    <copy todir="${build.filter.src.dir}">
-      <fileset dir="${src.dir}">
-        <exclude name="**/*.html"/>
-        <!-- 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
-         # 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>
-        -->
-
-      <!--
-      </filterchain>
-      -->
-    </copy>
-
-  </target>
-
-
-  <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>
-        <!--
-         # These two filters try to make the source look like
-         # something that doccheck can process. The first removes
-         # -source 1.4 assertions and the second adds in a bunch
-         # of single letter public nested marker interfaces so that
-         # the generic type parameters are recognized.
-         -->
-
-        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
-                      classpath="${build.ant.dir}">
-          <param name="matching"    value="^\s*assert[\s ].*$"/>
-          <param name="pattern"     value="assert"/>
-          <param name="replacement" value="//assert"/>
-        </filterreader>
-
-        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
-                      classpath="${build.ant.dir}">
-          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
-          <param name="pattern"     value="$"/>
-          <param name="replacement" value=" ${generic.declarations}"/>
-        </filterreader>
-
-      </filterchain>
-    </copy>
-
-  </target>
-
-
   <target name="compile-tests"
           depends="jar">
 
@@ -445,6 +278,7 @@
 
       <compilerarg value="${bootclasspath.args}"/>
       <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
 
       <classpath refid="test.classpath"/>
 
@@ -462,6 +296,7 @@
 
       <compilerarg value="${bootclasspath.args}"/>
       <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
 
       <classpath refid="test.classpath"/>
 
@@ -478,6 +313,7 @@
 
       <compilerarg value="${bootclasspath.args}"/>
       <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
 
       <classpath refid="test.classpath"/>
 
@@ -550,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>
 
@@ -602,90 +436,9 @@
   </target>
 
 
-
-  <!-- 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="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"/>
-
-    <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="loops" depends="init, configure-compiler"
           description="Benchmark from Doug Lea's AQS paper">
 
@@ -701,6 +454,7 @@
 
       <compilerarg line="${build.args}"/>
       <classpath refid="loops.classpath"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
 
     </javac>
 
@@ -711,290 +465,225 @@
   </target>
 
 
-  <target name="compile-j1" depends="init, configure-compiler, compile">
+  <!-- jsr166x -->
+
+
+  <target name="jsr166xcompile"
+          depends="init, configure-compiler"
+          description="Compiles jsr166x sources">
 
-    <mkdir dir="${build.j1.dir}"/>
+    <mkdir dir="${build.jsr166x.dir}"/>
 
-    <javac srcdir="${j1.src.dir}"
-          destdir="${build.j1.dir}"
+    <javac srcdir="${jsr166xsrc.dir}"
+          destdir="${build.jsr166x.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
       deprecation="${build.deprecation}"
-           source="${build.sourcelevel}" >
+           source="${build.sourcelevel}"
+             fork="true">
 
       <include name="**/*.java"/>
-      <exclude name="**/dijkstra/**"/>
-
       <compilerarg line="${build.args}"/>
-      <classpath refid="j1.classpath"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
 
     </javac>
 
   </target>
 
 
-  <target name="sw" depends="compile-j1"
-          description="Runs the SwingWorker demo">
 
-    <!--
-    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
-      <classpath refid="j1.classpath"/>
-    </java>
-    -->
+  <target name="jsr166xjar"
+          depends="jsr166xcompile"
+          description="Builds library jar from compiled sources">
 
-    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
+    <mkdir dir="${build.jsr166xlib.dir}"/>
 
-    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
-      <arg value="${build.j1.dir}/SwingWorker.html"/>
-    </exec>
+    <jar destfile="${jsr166xproduct.jar}">
+      <fileset dir="${build.jsr166x.dir}"/>
+    </jar>
 
   </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"/>
+  <target name="jsr166xdocs"
+          description="Builds javadocs with custom tags to build folder">
 
-      <!-- WebCrawler args -->
-      <!--
-      <arg value="jsr166.webcrawler.WebCrawler3"/>
-      <arg value="http://www.priorartisans.com"/>
-      <arg value="25"/>
-      -->
+    <delete dir="${build.jsr166xjavadocs.dir}"/>
+    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
 
-    </java>
+    <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" />
 
   </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>
+  <target name="jsr166xdist"
+          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
+          description="Puts all distributable products in single hierarchy"/>
 
-    </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>
+  <target name="jsr166xclean"
+          description="Removes all build products">
 
-    <fail message="Test Cases Failed" if="junit.failed"/>
+    <delete dir="${build.jsr166x.dir}"/>
+    <delete dir="${build.jsr166xlib.dir}"/>
 
   </target>
 
 
 
-  <!-- C++ and JNI definitions and demos -->
-
-  <target name="configure-cpp">
+  <target name="jsr166xdist-clean"
+          description="Removes all build and distribution products">
 
-    <!-- Define tasks and types -->
+  </target>
 
-    <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"/>
 
-    <!-- Set platform property for JNI includes -->
 
-    <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="jsr166xdist-docs"
+          description="Builds javadocs without custom tags to dist folder">
 
+    <delete dir="${dist.jsr166xjavadocs.dir}"/>
+    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
 
-  <target name="cppdemo" depends="configure-cpp">
+    <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" />
 
-    <mkdir dir="${build.dir}"/>
+  </target>
 
-    <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="jsr166xdist-jar"
+          depends="jsr166xclean, jsr166xjar">
 
-    <exec executable="${build.dir}/CppDemo">
-      <arg line="count in word frequency of word in command line count"/>
-    </exec>
+    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
 
   </target>
 
+  <!-- jsr166y -->
 
-  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
 
-    <mkdir dir="${build.testcases.dir}"/>
+  <target name="jsr166ycompile"
+          depends="init, configure-compiler"
+          description="Compiles jsr166y sources">
 
-    <javac srcdir="${test.src.dir}"
-          destdir="${build.testcases.dir}"
+    <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">
-      <compilerarg value="${bootclasspath.args}"/>
+
+      <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>
-      <classpath refid="test.classpath"/>
-      <include name="JniDemo.java"/>
-    </javac>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="${bootclasspath.args}"/>
 
-    <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>
+<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
+
+    </javac>
 
   </target>
 
 
 
-  <!-- Backward compatibility, work in progress (some files not checked in) -->
+  <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>
 
 
-  <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">
+  <target name="jsr166ydocs"
+          description="Builds javadocs with custom tags to build folder">
 
-    <delete dir="${pretiger.src.dir}"/>
-    <mkdir dir="${pretiger.src.dir}"/>
+    <delete dir="${build.jsr166yjavadocs.dir}"/>
+    <mkdir dir="${build.jsr166yjavadocs.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>
+    <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>
 
-  <target name="compile-pretiger"
-          depends="init, configure-compiler, defang"
-          description="Compiles pre-Tiger sources to build folder">
 
-    <mkdir dir="${build.pretiger.dir}"/>
+  <target name="jsr166ydist"
+          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
+          description="Puts all distributable products in single hierarchy"/>
 
-    <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 name="jsr166yclean"
+          description="Removes all build products">
+
+    <delete dir="${build.jsr166y.dir}"/>
+    <delete dir="${build.jsr166ylib.dir}"/>
 
   </target>
 
-  <target name="pretiger" depends="compile-pretiger">
 
-    <mkdir dir="${build.lib.dir}"/>
 
-    <jar destfile="${pretiger.jar}">
-      <fileset dir="${build.pretiger.dir}">
-      </fileset>
-    </jar>
+  <target name="jsr166ydist-clean"
+          description="Removes all build and distribution products">
 
   </target>
 
-  <!-- jsr166x -->
+  <target name="jsr166ydist-docs"
+          description="Builds javadocs without custom tags to dist folder">
 
+    <delete dir="${dist.jsr166yjavadocs.dir}"/>
+    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
 
-  <target name="jsr166xcompile"
-          depends="init, configure-compiler"
-          description="Compiles jsr166x sources">
+    <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" />
 
-    <mkdir dir="${build.jsr166x.dir}"/>
+  </target>
 
-    <javac srcdir="${jsr166xsrc.dir}"
-          destdir="${build.jsr166x.dir}"
+  <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}"
@@ -1002,6 +691,10 @@
 
       <include name="**/*.java"/>
       <compilerarg line="${build.args}"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="${bootclasspath.args}"/>
+
+<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
 
     </javac>
 
@@ -1009,109 +702,99 @@
 
 
 
-  <target name="jsr166xjar"
-          depends="jsr166xcompile"
+  <target name="extra166yjar"
+          depends="extra166ycompile"
           description="Builds library jar from compiled sources">
 
-    <mkdir dir="${build.jsr166xlib.dir}"/>
+    <mkdir dir="${build.extra166ylib.dir}"/>
 
-    <jar destfile="${jsr166xproduct.jar}">
-      <fileset dir="${build.jsr166x.dir}"/>
+    <jar destfile="${extra166yproduct.jar}" index="true">
+      <fileset dir="${build.extra166y.dir}"/>
     </jar>
 
   </target>
 
 
 
-  <target name="jsr166xdocs"
+  <target name="extra166ydocs"
           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/javase/6/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>
+    <delete dir="${build.extra166yjavadocs.dir}"/>
+    <mkdir dir="${build.extra166yjavadocs.dir}"/>
 
-
-    </javadoc>
+    <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="jsr166xdist"
-          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
+  <target name="extra166ydist"
+          depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
 
-  <target name="jsr166xclean"
+  <target name="extra166yclean"
           description="Removes all build products">
 
-    <delete dir="${build.jsr166x.dir}"/>
-    <delete dir="${build.jsr166xlib.dir}"/>
+    <delete dir="${build.extra166y.dir}"/>
+    <delete dir="${build.extra166ylib.dir}"/>
 
   </target>
 
 
 
-  <target name="jsr166xdist-clean"
+  <target name="extra166ydist-clean"
           description="Removes all build and distribution products">
 
   </target>
 
-
-
-  <target name="jsr166xdist-docs"
+  <target name="extra166ydist-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/javase/6/docs/api/"
-              source="${build.sourcelevel}">
-
-      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
-      <include name="jsr166x"/>
-      </packageset>
+    <delete dir="${dist.extra166yjavadocs.dir}"/>
+    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
 
-    </javadoc>
+    <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="jsr166xdist-jar"
-          depends="jsr166xclean, jsr166xjar">
+  <target name="extra166ydist-jar"
+          depends="extra166yclean, extra166yjar">
 
-    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
 
   </target>
 
-  <!-- jsr166y -->
+  <!-- jsr166e -->
 
 
-  <target name="jsr166ycompile"
+  <target name="jsr166ecompile"
           depends="init, configure-compiler"
-          description="Compiles jsr166y sources">
+          description="Compiles jsr166e sources">
 
-    <mkdir dir="${build.jsr166y.dir}"/>
+    <mkdir dir="${build.jsr166e.dir}"/>
 
-    <javac srcdir="${jsr166ysrc.dir}"
-          destdir="${build.jsr166y.dir}"
+    <javac srcdir="${jsr166esrc.dir}"
+          destdir="${build.jsr166e.dir}"
             debug="${build.debug}"
        debuglevel="${build.debuglevel}"
       deprecation="${build.deprecation}"
-           source="${build.sourcelevel}"
+           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"/> -->
@@ -1122,83 +805,76 @@
 
 
 
-  <target name="jsr166yjar"
-          depends="jsr166ycompile"
+  <target name="jsr166ejar"
+          depends="jsr166ecompile"
           description="Builds library jar from compiled sources">
 
-    <mkdir dir="${build.jsr166ylib.dir}"/>
+    <mkdir dir="${build.jsr166elib.dir}"/>
 
-    <jar destfile="${jsr166yproduct.jar}">
-      <fileset dir="${build.jsr166y.dir}"/>
+    <jar destfile="${jsr166eproduct.jar}" index="true">
+      <fileset dir="${build.jsr166e.dir}"/>
     </jar>
 
   </target>
 
 
 
-  <target name="jsr166ydocs"
+  <target name="jsr166edocs"
           description="Builds javadocs with custom tags to build folder">
 
-    <delete dir="${build.jsr166yjavadocs.dir}"/>
-    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
+    <delete dir="${build.jsr166ejavadocs.dir}"/>
+    <mkdir dir="${build.jsr166ejavadocs.dir}"/>
 
-    <javadoc destdir="${build.jsr166yjavadocs.dir}"
-                link="http://java.sun.com/javase/6/docs/api/"
-            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
-
-    >
-      <packageset dir="${topsrc.dir}" defaultexcludes="no">
-      <include name="jsr166y"/>
-      </packageset>
-
-
-    </javadoc>
+    <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="jsr166ydist"
-          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
+  <target name="jsr166edist"
+          depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
           description="Puts all distributable products in single hierarchy"/>
 
 
 
-  <target name="jsr166yclean"
+  <target name="jsr166eclean"
           description="Removes all build products">
 
-    <delete dir="${build.jsr166y.dir}"/>
-    <delete dir="${build.jsr166ylib.dir}"/>
+    <delete dir="${build.jsr166e.dir}"/>
+    <delete dir="${build.jsr166elib.dir}"/>
 
   </target>
 
 
 
-  <target name="jsr166ydist-clean"
+  <target name="jsr166edist-clean"
           description="Removes all build and distribution products">
 
   </target>
 
-  <target name="jsr166ydist-docs"
+  <target name="jsr166edist-docs"
           description="Builds javadocs without custom tags to dist folder">
 
-    <delete dir="${dist.jsr166yjavadocs.dir}"/>
-    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
+    <delete dir="${dist.jsr166ejavadocs.dir}"/>
+    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
 
-    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
-                link="http://java.sun.com/javase/6/docs/api/"
-              source="${build.sourcelevel}">
-      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
-      <include name="jsr166y/*.java"/>
-      <include name="jsr166y/forkjoin/*.java"/>
-            </fileset>
-    </javadoc>
+    <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="jsr166ydist-jar"
-          depends="jsr166yclean, jsr166yjar">
+  <target name="jsr166edist-jar"
+          depends="jsr166eclean, jsr166ejar">
 
-    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
+    <copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
 
   </target>