--- jsr166/build.xml 2013/01/19 21:40:04 1.104
+++ jsr166/build.xml 2013/01/20 06:11:07 1.115
@@ -35,7 +35,7 @@
-
+
@@ -45,31 +45,22 @@
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -124,24 +115,23 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -154,8 +144,15 @@
+
+
+
+
+
+
@@ -177,7 +174,7 @@
-
-
@@ -291,8 +286,6 @@
description="Removes all build products">
-
-
@@ -324,36 +317,43 @@
+ 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">
-
+
-
-
-
+
@@ -370,8 +370,6 @@
-
-
-->
@@ -391,9 +389,10 @@
errorProperty="junit.failed"
failureProperty="junit.failed"
dir="${build.reports.dir}"
+ jvm="${java8}"
fork="true">
-
+
@@ -534,7 +533,7 @@
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="1.6"
+ source="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -549,8 +548,6 @@
-
-
@@ -562,7 +559,7 @@
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="1.6"
+ source="6"
classpath="${junit.jar}"
bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
includeAntRuntime="false"
@@ -618,6 +615,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -648,7 +672,7 @@
+ description="Removes all 4jdk7 build products">
@@ -668,26 +692,32 @@
-
+
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
-
+
+
@@ -699,10 +729,8 @@
depends="jsr166xcompile"
description="Builds library jar from compiled sources">
-
-
-
-
+
+
@@ -712,30 +740,31 @@
-
-
+
+
-
+ source="5"
+ bootclasspath="${bootclasspath6}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true"/>
+ description="Removes all jsr166x build products">
-
@@ -747,26 +776,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -777,14 +790,14 @@
depends="configure-compiler"
description="Compiles jsr166y sources">
-
+
-
-
-
-
+
+
@@ -817,30 +828,31 @@
-
-
+
+
-
+ source="6"
+ bootclasspath="${bootclasspath6}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true"/>
+ description="Removes all jsr166y build products">
-
@@ -851,25 +863,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -881,16 +878,16 @@
depends="configure-compiler, jsr166yjar"
description="Compiles extra166y sources">
-
+
-
-
-
-
+
+
@@ -922,32 +917,33 @@
+ description="Builds javadocs to build dir">
-
-
+
+
-
+ source="6"
+ bootclasspath="${bootclasspath6}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true"/>
+ description="Removes all extra166y build products">
-
@@ -958,25 +954,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -986,14 +967,14 @@
depends="configure-compiler"
description="Compiles jsr166e sources">
-
+
-
-
-
-
+
+
@@ -1026,66 +1005,46 @@
+ description="Builds javadocs to build dir">
-
-
+
+
-
-
-
-
+ description="Removes all jsr166e build products">
-
-
-
-
-
-
-
-
-
-
-
-
+