--- jsr166/build.xml 2013/01/19 17:15:44 1.100
+++ jsr166/build.xml 2013/01/23 06:45:08 1.125
@@ -35,7 +35,7 @@
-
+
@@ -45,33 +45,24 @@
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -81,35 +72,36 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -124,27 +116,30 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -152,36 +147,87 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+ description="Compiles src/main sources to build dir">
@@ -197,72 +243,57 @@
fork="true">
-
-
-
-
-
-
-
-
-
-
+ description="Builds javadocs for src/main to dist dir">
-
-
+
+
-
-
-
-
+
+
+
-
-
@@ -281,22 +312,17 @@
-
-
-
-
-
@@ -305,25 +331,17 @@
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
-
+
+
+
@@ -333,36 +351,42 @@
+ 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">
-
-
+
-
-
+
+
-
-
+ 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">
-
-
+
-
-
+
+
@@ -375,11 +399,9 @@
source="${build.sourcelevel}"
fork="true">
-
-
+
-
-
+
-->
@@ -400,9 +422,10 @@
errorProperty="junit.failed"
failureProperty="junit.failed"
dir="${build.reports.dir}"
+ jvm="${java8}"
fork="true">
-
+
@@ -503,7 +526,7 @@
-
@@ -531,7 +554,6 @@
-
@@ -543,7 +565,7 @@
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="1.6"
+ source="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -552,50 +574,33 @@
fork="true">
-
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+ target="7"
+ workdir="${build.4jdk7.dir}"
+ classes="${4jdk7product.jar}"/>
@@ -627,280 +632,261 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ description="Builds javadocs for src/jdk7 to dist dir">
-
-
+
+
-
-
+
-
-
+ description="Removes all 4jdk7 build products">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ depends="4jdk7clean, 4jdk7-jar">
+
+
+
+
-
+
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
-
-
+
+
+
-
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ bootclasspath="${bootclasspath6}"
+ source="5"
+ executable="${javadoc7}">
+
+
-
+ description="Removes all jsr166x build products">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ depends="jsr166xclean, jsr166x-jar">
+
+
+
+
-
+
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
-
+ description="Removes all jsr166y build products">
-
-
-
-
-
-
-
-
-
-
-
-
-
+ depends="jsr166yclean, jsr166y-jar">
+
+
+
+
@@ -908,104 +894,89 @@
-
+
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to build dir">
-
-
+
+
-
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
-
+ description="Removes all extra166y build products">
-
-
-
-
-
-
-
-
-
-
-
-
-
+ depends="extra166yclean, extra166y-jar">
+
+
+
+
@@ -1014,14 +985,14 @@
depends="configure-compiler"
description="Compiles jsr166e sources">
-
+
-
+
-
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to build dir">
-
-
+
+
-
-
-
-
+ source="7"
+ executable="${javadoc7}">
+
+
+
+
+
+
+
-
-
+ description="Removes all jsr166e build products">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+ depends="jsr166eclean, jsr166e-jar">
+
+
+
+