--- jsr166/build.xml 2013/01/19 23:58:12 1.108
+++ jsr166/build.xml 2013/01/21 02:31:40 1.119
@@ -35,7 +35,7 @@
-
+
@@ -45,28 +45,24 @@
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -76,10 +72,17 @@
-
-
+
+
+
+
+
+
+
+
+
+
@@ -87,24 +90,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -119,28 +104,24 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
@@ -153,12 +134,61 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -195,42 +225,29 @@
fork="true">
-
-
-
-
-
-
-
-
-
-
@@ -247,18 +264,16 @@
sourcepath="${src.dir}:${jdk8src.dir}"
classpath=""
executable="${javadoc8}">
-
-
-
+
+
+
-
-
@@ -279,22 +294,17 @@
-
-
-
-
-
@@ -303,7 +313,6 @@
-
@@ -321,36 +330,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">
-
-
+
-
-
+
+
@@ -363,11 +378,9 @@
source="${build.sourcelevel}"
fork="true">
-
-
+
-
-
+
-->
@@ -388,9 +401,10 @@
errorProperty="junit.failed"
failureProperty="junit.failed"
dir="${build.reports.dir}"
+ jvm="${java8}"
fork="true">
-
+
@@ -519,7 +533,6 @@
-
@@ -540,49 +553,32 @@
fork="true">
-
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
@@ -615,6 +611,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -629,12 +652,11 @@
sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
classpath=""
executable="${javadoc7}">
-
+
-
@@ -643,75 +665,68 @@
description="Puts all distributable products in single hierarchy"/>
-
+ description="Removes all 4jdk7 build products">
-
+ depends="4jdk7clean, 4jdk7-jar">
-
+
-
+
-
+
-
-
-
-
-
-
+
-
@@ -721,12 +736,13 @@
+ bootclasspath="${bootclasspath6}"
+ source="5"
+ executable="${javadoc7}">
+
+
@@ -735,17 +751,14 @@
description="Puts all distributable products in single hierarchy"/>
-
+ description="Removes all jsr166x build products">
-
-
@@ -753,7 +766,7 @@
+ depends="jsr166xclean, jsr166x-jar">
@@ -766,10 +779,10 @@
depends="configure-compiler"
description="Compiles jsr166y sources">
-
+
-
+
+
-
-
-
-
+
-
@@ -812,12 +823,13 @@
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
@@ -826,24 +838,21 @@
description="Puts all distributable products in single hierarchy"/>
-
+ description="Removes all jsr166y build products">
-
-
+ depends="jsr166yclean, jsr166y-jar">
@@ -854,49 +863,44 @@
-
+
-
+
-
-
-
-
-
-
+
-
@@ -906,12 +910,13 @@
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
@@ -920,24 +925,21 @@
description="Puts all distributable products in single hierarchy"/>
-
+ description="Removes all extra166y build products">
-
-
+ depends="extra166yclean, extra166y-jar">
@@ -949,10 +951,10 @@
depends="configure-compiler"
description="Compiles jsr166e sources">
-
+
-
+
-
-
-
-
-
-
+
-
@@ -997,12 +994,12 @@
-
+ source="7"
+ executable="${javadoc7}">
+
+
@@ -1011,12 +1008,10 @@
description="Puts all distributable products in single hierarchy"/>
-
+ description="Removes all jsr166e build products">
-
@@ -1027,7 +1022,7 @@
+ depends="jsr166eclean, jsr166e-jar">