--- jsr166/build.xml	2013/01/20 01:06:24	1.109
+++ jsr166/build.xml	2013/01/21 02:31:40	1.119
@@ -35,7 +35,7 @@
 
 
   <!-- Compilation options -->
-  <property name="build.sourcelevel"    value="1.6"/>
+  <property name="build.sourcelevel"    value="6"/>
   <property name="build.debug"          value="true"/>
   <property name="build.debuglevel"     value="source,lines,vars"/>
   <property name="build.deprecation"    value="false"/>
@@ -49,7 +49,7 @@
 
   <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
   <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
-  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
+  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
   <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
 
   <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
@@ -57,7 +57,12 @@
   <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
   <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
 
-  <!-- JDK binary locations -->
+  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
+  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
+  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
+  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
+
+  <!-- JDK locations -->
   <property name="jdks.home"  location="${user.home}/jdk"/>
 
   <macrodef name="defjdklocations">
@@ -67,10 +72,17 @@
     <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
     <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
     <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
-    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
     <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
-    <property name="bootclasspath@{v}"
-     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
+    <local name="boot.jar.dir"/>
+    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
+    <path id="bootclasspath@{v}">
+      <pathelement path="${boot.jar.dir}/resources.jar"/>
+      <pathelement path="${boot.jar.dir}/rt.jar"/>
+      <pathelement path="${boot.jar.dir}/jsse.jar"/>
+      <pathelement path="${boot.jar.dir}/jce.jar"/>
+      <pathelement path="${boot.jar.dir}/charsets.jar"/>
+    </path>
+    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
     </sequential>
   </macrodef>
 
@@ -78,24 +90,6 @@
   <defjdklocations v="7"/>
   <defjdklocations v="8"/>
 
-  <macrodef name="run-tck-tests">
-    <attribute name="jvm"/>
-    <attribute name="tck.classes"/>
-    <attribute name="product.jar" default="${product.jar}"/>
-    <attribute name="jvmflags" default=""/>
-    <sequential>
-    <java classname="JSR166TestCase"
-          jvm="@{jvm}" fork="true">
-	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
-	<jvmarg line="@{jvmflags}"/>
-	<classpath>
-	  <pathelement location="${junit.jar}"/>
-	  <pathelement location="@{tck.classes}"/>
-	</classpath>
-    </java>
-    </sequential>
-  </macrodef>
-
   <!-- Source locations -->
   <property name="src.dir"              location="${basedir}/src/main"/>
   <property name="test.src.dir"         location="${basedir}/src/test"/>
@@ -110,7 +104,6 @@
   <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
   <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
   <property name="extra166ysrc.dir"     location="${topsrc.dir}/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}/jsr166.docs"/>
@@ -129,9 +122,6 @@
   <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
   <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
 
-  <!-- Bootclasspath argument -->
-  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
-
   <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
   <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
   <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
@@ -144,12 +134,61 @@
   <!-- Default jdk api doc location (latest stable release seems best) -->
   <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
 
+  <!-- Define the "jtreg" task -->
+  <!-- See the docs in "jtreg -onlineHelp" -->
+  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
+           classpath="${lib.dir}/jtreg.jar" />
+
   <!-- Test classpath -->
   <path id="test.classpath">
     <pathelement location="${build.testcases.dir}"/>
     <pathelement location="${junit.jar}"/>
   </path>
 
+  <macrodef name="run-tck-tests">
+    <attribute name="target"/>
+    <attribute name="workdir"/>
+    <attribute name="product.jar" default="${product.jar}"/>
+    <attribute name="jvmflags" default=""/>
+    <sequential>
+
+    <mkdir dir="@{workdir}/tck-classes"/>
+
+    <javac srcdir="${tck.src.dir}"
+           destdir="@{workdir}/tck-classes"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="6"
+           classpath="${junit.jar}"
+           bootclasspath="@{product.jar}:${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac@{target}}"
+           fork="true">
+
+      <include name="JSR166TestCase.java"/>
+      <compilerarg value="-XDignore.symbol.file=true"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+      <compilerarg line="${build.args}"/>
+
+    </javac>
+
+    <java classname="JSR166TestCase"
+          failonerror="true"
+          jvm="${java@{target}}"
+          fork="true">
+	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
+	<jvmarg line="@{jvmflags}"/>
+	<classpath>
+	  <pathelement location="${junit.jar}"/>
+	  <pathelement location="@{workdir}/tck-classes"/>
+	</classpath>
+    </java>
+
+    </sequential>
+  </macrodef>
+
   <!-- ALoops classpath -->
   <path id="loops.classpath">
     <pathelement location="${build.loops.dir}"/>
@@ -186,22 +225,14 @@
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
-
-<!--
-      <exclude name="java/lang/**"/>
       <compilerarg line="${build.args}"/>
-      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
--->
 
     </javac>
-
   </target>
 
 
-
   <target name="jar"
           depends="compile"
           description="Builds library jar from compiled sources">
@@ -209,17 +240,14 @@
     <jar destfile="${product.jar}">
       <fileset dir="${build.classes.dir}"/>
     </jar>
-
   </target>
 
 
-
   <target name="test"
           depends="configure-tests, report-tests"
           description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
 
 
-
   <target name="docs"
           description="Builds javadocs for src/main to dist dir">
 
@@ -236,18 +264,16 @@
              sourcepath="${src.dir}:${jdk8src.dir}"
              classpath=""
              executable="${javadoc8}">
-      <arg value="-XDignore.symbol.file=true"/>
-      <arg value="-tag"/>
-      <arg value="${javadoc.jls.option}"/>
       <fileset dir="${src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
+      <arg value="-XDignore.symbol.file=true"/>
+      <arg value="-tag"/>
+      <arg value="${javadoc.jls.option}"/>
     </javadoc>
-
   </target>
 
 
-
   <target name="dist"
           depends="dist-clean, dist-jar, docs"
           description="Puts all distributable products in single hierarchy"/>
@@ -268,11 +294,9 @@
       <exclude name="**/SyntaxTest.java"/>
       <exclude name="**/SuperfluousAbstract.java"/>
     </jar>
-
   </target>
 
 
-
   <target name="clean"
           description="Removes all build products">
 
@@ -281,7 +305,6 @@
   </target>
 
 
-
   <target name="dist-clean"
           description="Removes all build and distribution products">
 
@@ -290,7 +313,6 @@
   </target>
 
 
-
   <!-- Internal targets -->
 
 
@@ -308,36 +330,42 @@
     <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">
+           destdir="${build.testcases.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="6"
+           classpath="${junit.jar}"
+           bootclasspath="@{product.jar}:${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac8}"
+           fork="true">
 
-      <compilerarg value="${bootclasspath.args}"/>
-      <compilerarg line="${build.args}"/>
+      <include name="**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-
-      <classpath refid="test.classpath"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
 
     <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/**"/>
+           destdir="${build.testcases.dir}"
+           debug="${build.debug}"
+           debuglevel="${build.debuglevel}"
+           deprecation="${build.deprecation}"
+           source="6"
+           classpath=""
+           bootclasspath="@{product.jar}:${bootclasspath6}"
+           includeAntRuntime="false"
+           includeJavaRuntime="false"
+           executable="${javac8}"
+           fork="true">
 
-      <compilerarg value="${bootclasspath.args}"/>
-      <compilerarg line="${build.args}"/>
+      <include name="jsr166/test/**/*.java"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-
-      <classpath refid="test.classpath"/>
+      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
 
@@ -350,11 +378,9 @@
            source="${build.sourcelevel}"
              fork="true">
 
-      <compilerarg value="${bootclasspath.args}"/>
-      <compilerarg line="${build.args}"/>
+      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
-
-      <classpath refid="test.classpath"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
 -->
@@ -375,9 +401,10 @@
           errorProperty="junit.failed"
         failureProperty="junit.failed"
                     dir="${build.reports.dir}"
+                    jvm="${java8}"
                    fork="true">
 
-      <jvmarg value="${bootclasspath.args}"/>
+      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
       <jvmarg value="-server"/>
       <jvmarg value="-showversion"/>
 
@@ -506,7 +533,6 @@
 
   <!-- jsr166 4jdk7 -->
 
-
   <target name="4jdk7compile"
           depends="configure-compiler"
           description="Compiles src/jdk7 sources, targeting jdk7">
@@ -527,47 +553,32 @@
            fork="true">
 
       <include name="**/*.java"/>
-      <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
+  </target>
 
-    <jar destfile="${4jdk7product.jar}" index="true">
-      <fileset dir="${build.4jdk7.classes.dir}"/>
-    </jar>
-
-    <mkdir dir="${build.4jdk7.tck.classes.dir}"/>
 
-    <javac srcdir="${tck.src.dir}"
-           destdir="${build.4jdk7.tck.classes.dir}"
-           debug="${build.debug}"
-           debuglevel="${build.debuglevel}"
-           deprecation="${build.deprecation}"
-           source="6"
-           classpath="${junit.jar}"
-           bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
-           includeAntRuntime="false"
-           includeJavaRuntime="false"
-           executable="${javac7}"
-           fork="true">
-
-      <include name="**/*.java"/>
-      <compilerarg line="${build.args}"/>
-      <compilerarg value="-XDignore.symbol.file=true"/>
-      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
+  <target name="4jdk7-jar"
+          depends="4jdk7compile"
+          description="Builds library jar from compiled sources">
 
-    </javac>
+    <jar destfile="${4jdk7product.jar}">
+      <fileset dir="${build.4jdk7.classes.dir}"/>
+    </jar>
 
   </target>
 
 
   <target name="4jdk7-test-tck"
-	  depends="4jdk7compile"
+	  depends="4jdk7-jar"
           description="Runs tck tests for jsr166-4jdk7 directly">
+
     <run-tck-tests
-      jvm="${java7}"
-      tck.classes="${build.4jdk7.tck.classes.dir}"
+      target="7"
+      workdir="${build.4jdk7.dir}"
       product.jar="${4jdk7product.jar}"/>
   </target>
 
@@ -600,6 +611,33 @@
     </junit>
   </target>
 
+  <target name="4jdk7-test-jtreg"
+	  depends="4jdk7compile"
+          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
+    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
+    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
+    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
+    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
+    <jtreg dir="${jtreg.src.dir}"
+           jdk="${jdk7.home}"
+           workDir="${build.4jdk7.dir}/JTwork"
+           reportDir="${build.4jdk7.dir}/JTreport">
+
+      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
+      <arg value="-agentvm"/>
+      <arg value="-v:nopass,fail"/>
+      <arg value="-vmoptions:-esa -ea"/>
+      <arg value="-automatic"/>
+      <arg value="-k:!ignore"/>
+    </jtreg>
+  </target>
+
+
+  <target name="4jdk7-test"
+	  depends="4jdk7-test-tck, 4jdk7-test-jtreg"
+          description="Runs tck and jtreg tests for jsr166-4jdk7">
+  </target>
+
 
   <target name="4jdk7docs"
           description="Builds javadocs for src/jdk7 to dist dir">
@@ -614,12 +652,11 @@
              sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
              classpath=""
              executable="${javadoc7}">
-      <arg value="-XDignore.symbol.file=true"/>
       <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
         <include name="**/*.java"/>
       </fileset>
+      <arg value="-XDignore.symbol.file=true"/>
     </javadoc>
-
   </target>
 
 
@@ -628,7 +665,6 @@
           description="Puts all distributable products in single hierarchy"/>
 
 
-
   <target name="4jdk7clean"
           description="Removes all 4jdk7 build products">
 
@@ -637,14 +673,13 @@
   </target>
 
 
-
   <target name="4jdk7dist-clean"
           description="Removes all build and distribution products">
 
   </target>
 
   <target name="4jdk7dist-jar"
-          depends="4jdk7clean, 4jdk7compile">
+          depends="4jdk7clean, 4jdk7-jar">
 
     <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
 
@@ -657,44 +692,41 @@
           depends="configure-compiler"
           description="Compiles jsr166x sources to build dir">
 
-    <mkdir dir="${build.jsr166x.dir}"/>
+    <mkdir dir="${build.jsr166x.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
-           destdir="${build.jsr166x.dir}"
+           destdir="${build.jsr166x.classes.dir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
            classpath=""
-           source="5"
            bootclasspath="${bootclasspath6}"
+           source="5"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac7}"
            fork="true">
 
       <include name="jsr166x/**/*.java"/>
-      <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
-
   </target>
 
 
-
-  <target name="jsr166xjar"
+  <target name="jsr166x-jar"
           depends="jsr166xcompile"
           description="Builds library jar from compiled sources">
 
     <jar destfile="${jsr166x.jar}">
-      <fileset dir="${build.jsr166x.dir}"/>
+      <fileset dir="${build.jsr166x.classes.dir}"/>
     </jar>
 
   </target>
 
 
-
   <target name="jsr166xdocs"
           description="Builds javadocs to dist dir">
 
@@ -704,12 +736,13 @@
     <javadoc destdir="${dist.jsr166xjavadocs.dir}"
              packagenames="jsr166x.*"
              link="${jdkapidocs.url}"
-             source="5"
-             bootclasspath="${bootclasspath6}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
-             executable="${javadoc7}"
-             additionalparam="-XDignore.symbol.file=true" />
+             bootclasspath="${bootclasspath6}"
+             source="5"
+             executable="${javadoc7}">
+      <arg value="-XDignore.symbol.file=true"/>
 
+    </javadoc>
   </target>
 
 
@@ -718,7 +751,6 @@
           description="Puts all distributable products in single hierarchy"/>
 
 
-
   <target name="jsr166xclean"
           description="Removes all jsr166x build products">
 
@@ -727,7 +759,6 @@
   </target>
 
 
-
   <target name="jsr166xdist-clean"
           description="Removes all build and distribution products">
 
@@ -735,7 +766,7 @@
 
 
   <target name="jsr166xdist-jar"
-          depends="jsr166xclean, jsr166xjar">
+          depends="jsr166xclean, jsr166x-jar">
 
     <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
 
@@ -748,10 +779,10 @@
           depends="configure-compiler"
           description="Compiles jsr166y sources">
 
-    <mkdir dir="${build.jsr166y.dir}"/>
+    <mkdir dir="${build.jsr166y.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
-           destdir="${build.jsr166y.dir}"
+           destdir="${build.jsr166y.classes.dir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
@@ -764,25 +795,25 @@
            fork="true">
 
       <include name="jsr166y/**/*.java"/>
-      <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg line="${build.args}"/>
+
     </javac>
   </target>
 
 
-  <target name="jsr166yjar"
+  <target name="jsr166y-jar"
           depends="jsr166ycompile"
           description="Builds library jar from compiled sources">
 
     <jar destfile="${jsr166y.jar}" index="true">
-      <fileset dir="${build.jsr166y.dir}"/>
+      <fileset dir="${build.jsr166y.classes.dir}"/>
     </jar>
 
   </target>
 
 
-
   <target name="jsr166ydocs"
           description="Builds javadocs to dist dir">
 
@@ -792,12 +823,13 @@
     <javadoc destdir="${dist.jsr166yjavadocs.dir}"
              packagenames="jsr166y.*"
              link="${jdkapidocs.url}"
-             source="6"
-             bootclasspath="${bootclasspath6}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
-             executable="${javadoc7}"
-             additionalparam="-XDignore.symbol.file=true" />
+             bootclasspath="${bootclasspath6}"
+             source="6"
+             executable="${javadoc7}">
+      <arg value="-XDignore.symbol.file=true"/>
 
+    </javadoc>
   </target>
 
 
@@ -806,7 +838,6 @@
           description="Puts all distributable products in single hierarchy"/>
 
 
-
   <target name="jsr166yclean"
           description="Removes all jsr166y build products">
 
@@ -815,14 +846,13 @@
   </target>
 
 
-
   <target name="jsr166ydist-clean"
           description="Removes all build and distribution products">
 
   </target>
 
   <target name="jsr166ydist-jar"
-          depends="jsr166yclean, jsr166yjar">
+          depends="jsr166yclean, jsr166y-jar">
 
     <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
 
@@ -833,47 +863,44 @@
 
 
   <target name="extra166ycompile"
-          depends="configure-compiler, jsr166yjar"
+          depends="configure-compiler, jsr166y-jar"
           description="Compiles extra166y sources">
 
-    <mkdir dir="${build.extra166y.dir}"/>
+    <mkdir dir="${build.extra166y.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
-           destdir="${build.extra166y.dir}"
+           destdir="${build.extra166y.classes.dir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
+           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
            classpath=""
            source="6"
-           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
            includeAntRuntime="false"
            includeJavaRuntime="false"
            executable="${javac7}"
            fork="true">
 
       <include name="extra166y/**/*.java"/>
-      <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
-
   </target>
 
 
-
-  <target name="extra166yjar"
+  <target name="extra166y-jar"
           depends="extra166ycompile"
           description="Builds library jar from compiled sources">
 
     <jar destfile="${extra166y.jar}" index="true">
-      <fileset dir="${build.extra166y.dir}"/>
+      <fileset dir="${build.extra166y.classes.dir}"/>
     </jar>
 
   </target>
 
 
-
   <target name="extra166ydocs"
           description="Builds javadocs to build dir">
 
@@ -883,12 +910,13 @@
     <javadoc destdir="${dist.extra166yjavadocs.dir}"
              packagenames="extra166y.*"
              link="${jdkapidocs.url}"
-             source="6"
-             bootclasspath="${bootclasspath6}"
              sourcepath="${topsrc.dir}:${jdk6src.dir}"
-             executable="${javadoc7}"
-             additionalparam="-XDignore.symbol.file=true" />
+             bootclasspath="${bootclasspath6}"
+             source="6"
+             executable="${javadoc7}">
+      <arg value="-XDignore.symbol.file=true"/>
 
+    </javadoc>
   </target>
 
 
@@ -897,7 +925,6 @@
           description="Puts all distributable products in single hierarchy"/>
 
 
-
   <target name="extra166yclean"
           description="Removes all extra166y build products">
 
@@ -906,14 +933,13 @@
   </target>
 
 
-
   <target name="extra166ydist-clean"
           description="Removes all build and distribution products">
 
   </target>
 
   <target name="extra166ydist-jar"
-          depends="extra166yclean, extra166yjar">
+          depends="extra166yclean, extra166y-jar">
 
     <copy file="${extra166y.jar}" todir="${dist.dir}"/>
 
@@ -925,10 +951,10 @@
           depends="configure-compiler"
           description="Compiles jsr166e sources">
 
-    <mkdir dir="${build.jsr166e.dir}"/>
+    <mkdir dir="${build.jsr166e.classes.dir}"/>
 
     <javac srcdir="${topsrc.dir}"
-           destdir="${build.jsr166e.dir}"
+           destdir="${build.jsr166e.classes.dir}"
            debug="${build.debug}"
            debuglevel="${build.debuglevel}"
            deprecation="${build.deprecation}"
@@ -940,28 +966,25 @@
            fork="true">
 
       <include name="jsr166e/**/*.java"/>
-      <compilerarg line="${build.args}"/>
       <compilerarg value="-XDignore.symbol.file=true"/>
       <compilerarg value="-Xlint:all"/>
+      <compilerarg line="${build.args}"/>
 
     </javac>
-
   </target>
 
 
-
-  <target name="jsr166ejar"
+  <target name="jsr166e-jar"
           depends="jsr166ecompile"
           description="Builds library jar from compiled sources">
 
     <jar destfile="${jsr166e.jar}" index="true">
-      <fileset dir="${build.jsr166e.dir}"/>
+      <fileset dir="${build.jsr166e.classes.dir}"/>
     </jar>
 
   </target>
 
 
-
   <target name="jsr166edocs"
           description="Builds javadocs to build dir">
 
@@ -971,12 +994,12 @@
     <javadoc destdir="${dist.jsr166ejavadocs.dir}"
              packagenames="jsr166e.*"
              link="${jdkapidocs.url}"
-             source="7"
              sourcepath="${topsrc.dir}:${jdk7src.dir}"
-             executable="${javadoc7}"
-             additionalparam="-XDignore.symbol.file=true" >
-    </javadoc>
+             source="7"
+             executable="${javadoc7}">
+      <arg value="-XDignore.symbol.file=true"/>
 
+    </javadoc>
   </target>
 
 
@@ -985,7 +1008,6 @@
           description="Puts all distributable products in single hierarchy"/>
 
 
-
   <target name="jsr166eclean"
           description="Removes all jsr166e build products">
 
@@ -1000,7 +1022,7 @@
   </target>
 
   <target name="jsr166edist-jar"
-          depends="jsr166eclean, jsr166ejar">
+          depends="jsr166eclean, jsr166e-jar">
 
     <copy file="${jsr166e.jar}" todir="${dist.dir}"/>