--- jsr166/build.xml 2013/01/19 23:58:12 1.108
+++ jsr166/build.xml 2013/01/21 01:05:01 1.118
@@ -35,7 +35,7 @@
-
+
@@ -45,28 +45,24 @@
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -76,10 +72,17 @@
-
-
+
+
+
+
+
+
+
+
+
+
@@ -87,24 +90,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -119,28 +104,24 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
@@ -153,12 +134,62 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -195,42 +226,29 @@
fork="true">
-
-
-
-
-
-
-
-
-
-
@@ -244,9 +262,10 @@
packagenames="none"
link="${jdkapi8docs.url}"
overview="${src.dir}/intro.html"
- sourcepath="${src.dir}:${jdk8src.dir}"
classpath=""
executable="${javadoc8}">
+
+
@@ -254,11 +273,9 @@
-
-
@@ -279,22 +296,17 @@
-
-
-
-
-
@@ -303,7 +315,6 @@
-
@@ -321,36 +332,44 @@
+ destdir="${build.testcases.dir}"
+ debug="${build.debug}"
+ debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}"
+ source="6"
+ classpath="${junit.jar}"
+ includeAntRuntime="false"
+ includeJavaRuntime="false"
+ executable="${javac8}"
+ fork="true">
-
-
+
+
+
-
-
+
+
-
-
+ destdir="${build.testcases.dir}"
+ debug="${build.debug}"
+ debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}"
+ source="6"
+ classpath=""
+ includeAntRuntime="false"
+ includeJavaRuntime="false"
+ executable="${javac8}"
+ fork="true">
-
-
+
+
+
-
-
+
+
@@ -363,11 +382,9 @@
source="${build.sourcelevel}"
fork="true">
-
-
+
-
-
+
-->
@@ -388,9 +405,10 @@
errorProperty="junit.failed"
failureProperty="junit.failed"
dir="${build.reports.dir}"
+ jvm="${java8}"
fork="true">
-
+
@@ -519,7 +537,6 @@
-
@@ -533,56 +550,39 @@
deprecation="${build.deprecation}"
source="6"
classpath=""
- bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
fork="true">
-
+
+
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
@@ -615,6 +615,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -626,15 +653,15 @@
packagenames="none"
link="${jdkapi7docs.url}"
overview="${4jdk7src.dir}/intro.html"
- sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
classpath=""
executable="${javadoc7}">
+
+
-
@@ -643,75 +670,68 @@
description="Puts all distributable products in single hierarchy"/>
-
+ description="Removes all 4jdk7 build products">
-
+ depends="4jdk7clean, 4jdk7-jar">
-
+
-
+
-
+
+
-
-
-
-
-
-
+
-
@@ -722,11 +742,13 @@
packagenames="jsr166x.*"
link="${jdkapidocs.url}"
source="5"
- bootclasspath="${bootclasspath6}"
- sourcepath="${topsrc.dir}:${jdk6src.dir}"
- executable="${javadoc7}"
- additionalparam="-XDignore.symbol.file=true" />
+ executable="${javadoc7}">
+
+
+
+
+
@@ -735,17 +757,14 @@
description="Puts all distributable products in single hierarchy"/>
-
+ description="Removes all jsr166x build products">
-
-
@@ -753,7 +772,7 @@
+ depends="jsr166xclean, jsr166x-jar">
@@ -766,43 +785,41 @@
depends="configure-compiler"
description="Compiles jsr166y sources">
-
+
-
+
+
+
-
-
-
-
+
-
@@ -813,11 +830,13 @@
packagenames="jsr166y.*"
link="${jdkapidocs.url}"
source="6"
- bootclasspath="${bootclasspath6}"
- sourcepath="${topsrc.dir}:${jdk6src.dir}"
- executable="${javadoc7}"
- additionalparam="-XDignore.symbol.file=true" />
+ executable="${javadoc7}">
+
+
+
+
+
@@ -826,24 +845,21 @@
description="Puts all distributable products in single hierarchy"/>
-
+ description="Removes all jsr166y build products">
-
-
+ depends="jsr166yclean, jsr166y-jar">
@@ -854,49 +870,45 @@
-
+
-
+
+
+
-
-
-
-
-
-
+
-
@@ -907,11 +919,13 @@
packagenames="extra166y.*"
link="${jdkapidocs.url}"
source="6"
- bootclasspath="${bootclasspath6}"
- sourcepath="${topsrc.dir}:${jdk6src.dir}"
- executable="${javadoc7}"
- additionalparam="-XDignore.symbol.file=true" />
+ executable="${javadoc7}">
+
+
+
+
+
@@ -920,24 +934,21 @@
description="Puts all distributable products in single hierarchy"/>
-
+ description="Removes all extra166y build products">
-
-
+ depends="extra166yclean, extra166y-jar">
@@ -949,10 +960,10 @@
depends="configure-compiler"
description="Compiles jsr166e sources">
-
+
-
+
-
-
-
-
-
-
+
-
@@ -998,11 +1004,12 @@
packagenames="jsr166e.*"
link="${jdkapidocs.url}"
source="7"
- sourcepath="${topsrc.dir}:${jdk7src.dir}"
- executable="${javadoc7}"
- additionalparam="-XDignore.symbol.file=true" >
-
+ executable="${javadoc7}">
+
+
+
+
@@ -1011,12 +1018,10 @@
description="Puts all distributable products in single hierarchy"/>
-
+ description="Removes all jsr166e build products">
-
@@ -1027,7 +1032,7 @@
+ depends="jsr166eclean, jsr166e-jar">