--- jsr166/build.xml 2013/01/20 07:43:30 1.117
+++ jsr166/build.xml 2015/01/17 23:12:49 1.161
@@ -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,60 +93,37 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -141,13 +139,20 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -158,20 +163,24 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -184,20 +193,107 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -216,26 +312,21 @@
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
-
+
-
-
-
-
@@ -243,47 +334,46 @@
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -302,11 +392,9 @@
-
-
@@ -315,165 +403,83 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -491,29 +497,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -546,7 +529,6 @@
-
@@ -567,15 +549,45 @@
fork="true">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
@@ -587,13 +599,26 @@
+ classes="${4jdk7product.jar}">
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -619,31 +644,20 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -656,31 +670,31 @@
-
-
+
+
-
-
+
+
-
-
@@ -689,17 +703,15 @@
-
-
-
-
-
-
+ depends="4jdk7clean, 4jdk7jar">
+
+
+
+
@@ -717,24 +729,22 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
classpath=""
- source="5"
bootclasspath="${bootclasspath6}"
+ source="5"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
fork="true">
-
+
-
-
@@ -746,31 +756,32 @@
-
-
-
+
+
-
+ bootclasspath="${bootclasspath6}"
+ source="5"
+ executable="${javadoc7}">
+
+
+
-
@@ -779,18 +790,14 @@
-
-
-
-
-
-
-
+
+
+
@@ -816,9 +823,10 @@
fork="true">
-
+
+
@@ -834,31 +842,32 @@
-
-
-
+
+
-
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
+
-
@@ -867,17 +876,14 @@
-
-
-
-
-
-
+
+
+
@@ -895,25 +901,23 @@
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">
-
+
-
-
@@ -925,31 +929,32 @@
-
-
-
+
+
-
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
+
-
@@ -958,21 +963,21 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -984,22 +989,46 @@
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}">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+