--- jsr166/build.xml 2013/01/20 04:44:26 1.114
+++ jsr166/build.xml 2015/09/04 19:37:34 1.175
@@ -16,17 +16,26 @@
$HOME/jdk/jdk6
$HOME/jdk/jdk7
$HOME/jdk/jdk8
+ $HOME/jdk/jdk9
where each of the above is a JDK or a symlink to same, and
$HOME/jdk/src/jdk6
$HOME/jdk/src/jdk7
$HOME/jdk/src/jdk8
+ $HOME/jdk/src/jdk9
where each of the above is a complete JDK source tree
(e.g. mercurial forest) or a symlink to same.
+
+ Alternatively, define ant variables thus:
+ ant -Djdk$N.home=...
+ for $N in 6 7 8 9 ...
------------------------------------------------------------------------------
-
- Run "ant -projecthelp" for full usage information.
+
+
+
+
+
@@ -39,6 +48,18 @@
+
+
+
+
+
+
+
@@ -57,12 +78,12 @@
-
-
-
-
+
+
+
+
-
+
@@ -72,41 +93,46 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
@@ -116,13 +142,20 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -133,20 +166,29 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -154,20 +196,128 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -186,26 +336,22 @@
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
-
+
-
-
-
-
@@ -213,47 +359,46 @@
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -272,11 +417,9 @@
-
-
@@ -285,165 +428,91 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
@@ -461,29 +530,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -514,8 +560,33 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
-
-
-
+
-
+
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
-
+
+ target="7"
+ workdir="${build.4jdk7.dir}"
+ classes="${4jdk7product.jar}">
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -604,41 +704,56 @@
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
@@ -647,17 +762,15 @@
-
-
-
-
-
-
+ depends="4jdk7clean, 4jdk7jar">
+
+
+
+
@@ -675,24 +788,23 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
classpath=""
- source="5"
bootclasspath="${bootclasspath6}"
+ source="5"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
fork="true">
-
+
+
-
-
@@ -704,31 +816,32 @@
-
-
-
+
+
-
+ bootclasspath="${bootclasspath6}"
+ source="5"
+ executable="${javadoc7}">
+
+
+
-
@@ -737,18 +850,14 @@
-
-
-
-
-
-
-
+
+
+
@@ -774,9 +883,11 @@
fork="true">
-
+
+
+
@@ -792,31 +903,32 @@
-
-
-
+
+
-
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
+
-
@@ -825,17 +937,14 @@
-
-
-
-
-
-
+
+
+
@@ -853,25 +962,24 @@
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
+ bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
classpath=""
source="6"
- bootclasspath="${jsr166y.jar}:${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
fork="true">
-
+
+
-
-
@@ -883,31 +991,32 @@
-
-
-
+
+
-
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
+
-
@@ -916,21 +1025,21 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -942,22 +1051,48 @@
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="7"
+ source="${build.jsr166e.java.version}"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac7}"
+ executable="${build.jsr166e.javac}"
fork="true">
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
+ link="${java.api.url}"
+ access="${build.javadoc.access}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ source="${build.jsr166e.java.version}"
+ executable="${javadoc7}">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+