--- jsr166/build.xml 2013/01/19 17:30:36 1.101
+++ jsr166/build.xml 2013/01/20 07:43:30 1.117
@@ -35,7 +35,7 @@
-
+
@@ -45,31 +45,22 @@
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -93,20 +84,45 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ failonerror="true"
+ jvm="${java@{target}}"
+ fork="true">
-
+
+
@@ -124,24 +140,23 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -154,8 +169,15 @@
+
+
+
+
+
+
@@ -177,12 +199,12 @@
+ description="Compiles src/main sources to build dir">
@@ -218,8 +240,6 @@
depends="compile"
description="Builds library jar from compiled sources">
-
-
@@ -229,13 +249,13 @@
+ description="Builds javadocs for src/main to dist dir">
@@ -263,7 +283,7 @@
@@ -291,8 +311,6 @@
description="Removes all build products">
-
-
@@ -310,16 +328,6 @@
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -334,36 +342,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">
-
+
-
-
-
+
@@ -380,8 +395,6 @@
-
-
-->
@@ -401,9 +414,10 @@
errorProperty="junit.failed"
failureProperty="junit.failed"
dir="${build.reports.dir}"
+ jvm="${java8}"
fork="true">
-
+
@@ -504,7 +518,7 @@
-
@@ -544,7 +558,7 @@
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="1.6"
+ source="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -559,43 +573,26 @@
-
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
@@ -628,14 +625,41 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ description="Builds javadocs for src/jdk7 to dist dir">
-
-
+
+
-
+ description="Removes all 4jdk7 build products">
@@ -671,27 +695,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -699,26 +702,32 @@
-
+
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
-
+
+
@@ -730,10 +739,8 @@
depends="jsr166xcompile"
description="Builds library jar from compiled sources">
-
-
-
-
+
+
@@ -741,32 +748,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">
-
@@ -778,26 +786,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -805,40 +797,38 @@
-
+
-
+
-
+
-
-
-
-
+
-
-
-
-
-
-
+
+
@@ -846,32 +836,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">
-
@@ -882,25 +873,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -909,26 +885,28 @@
-
+
-
+
-
+
-
-
-
+
@@ -940,10 +918,8 @@
depends="extra166ycompile"
description="Builds library jar from compiled sources">
-
-
-
-
+
+
@@ -951,32 +927,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">
-
@@ -987,25 +964,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -1015,14 +977,14 @@
depends="configure-compiler"
description="Compiles jsr166e sources">
-
+
-
-
-
-
+
+
@@ -1055,66 +1015,46 @@
+ description="Builds javadocs to build dir">
-
-
+
+
-
-
-
-
+ description="Removes all jsr166e build products">
-
-
-
-
-
-
-
-
-
-
-
-
+