--- jsr166/build.xml 2013/01/19 01:37:44 1.99
+++ 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 @@
+
+
+
+
+
+
@@ -167,29 +164,40 @@
+
+
+
+
+
+
+ depends="configure-compiler"
+ description="Compiles src/main sources to build dir">
+ destdir="${build.classes.dir}"
+ debug="${build.debug}"
+ debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}"
+ classpath=""
+ includeAntRuntime="false"
+ includeJavaRuntime="false"
+ executable="${javac8}"
+ fork="true">
+
+
-
+ sourcepath="${src.dir}:${jdk8src.dir}"
+ classpath=""
+ executable="${javadoc8}">
+
+
+
@@ -248,7 +258,7 @@
@@ -276,8 +286,6 @@
description="Removes all build products">
-
-
@@ -292,43 +300,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -343,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">
-
+
-
-
-
+
@@ -389,8 +370,6 @@
-
-
-->
@@ -410,9 +389,10 @@
errorProperty="junit.failed"
failureProperty="junit.failed"
dir="${build.reports.dir}"
+ jvm="${java8}"
fork="true">
-
+
@@ -513,7 +493,7 @@
-
@@ -553,7 +533,7 @@
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="1.6"
+ source="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -568,8 +548,6 @@
-
-
@@ -581,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"
@@ -637,14 +615,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ description="Builds javadocs for src/jdk7 to dist dir">
-
-
+
+
-
+ description="Removes all 4jdk7 build products">
@@ -680,27 +685,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -708,26 +692,32 @@
-
+
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
-
+
+
@@ -739,10 +729,8 @@
depends="jsr166xcompile"
description="Builds library jar from compiled sources">
-
-
-
-
+
+
@@ -750,32 +738,33 @@
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+ source="5"
+ bootclasspath="${bootclasspath6}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true"/>
+ description="Removes all jsr166x build products">
-
@@ -787,26 +776,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -814,40 +787,38 @@
-
+
-
+
-
+
-
-
-
-
+
-
-
-
-
-
-
+
+
@@ -855,32 +826,33 @@
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+ source="6"
+ bootclasspath="${bootclasspath6}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true"/>
+ description="Removes all jsr166y build products">
-
@@ -891,25 +863,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -918,26 +875,28 @@
-
+
-
+
-
+
-
-
-
+
@@ -949,10 +908,8 @@
depends="extra166ycompile"
description="Builds library jar from compiled sources">
-
-
-
-
+
+
@@ -960,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">
-
@@ -996,25 +954,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -1024,14 +967,14 @@
depends="configure-compiler"
description="Compiles jsr166e sources">
-
+
-
-
-
-
+
+
@@ -1064,66 +1005,46 @@
+ description="Builds javadocs to build dir">
-
-
+
+
-
-
-
-
+ description="Removes all jsr166e build products">
-
-
-
-
-
-
-
-
-
-
-
-
+