--- jsr166/build.xml 2013/01/20 06:11:07 1.115
+++ jsr166/build.xml 2014/02/16 14:25:46 1.151
@@ -16,17 +16,22 @@
$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.
------------------------------------------------------------------------------
-
- Run "ant -projecthelp" for full usage information.
+
+
+
+
+
@@ -39,6 +44,16 @@
+
+
+
+
+
+
+
+
+
+
@@ -57,12 +72,12 @@
-
-
-
-
+
+
+
+
-
+
@@ -72,35 +87,37 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -116,13 +133,20 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -133,18 +157,19 @@
-
-
-
-
+
+
+
+
+
@@ -159,20 +184,100 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -191,26 +296,21 @@
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
-
+
-
-
-
-
@@ -218,47 +318,45 @@
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
+
+
-
-
@@ -277,11 +375,9 @@
-
-
@@ -290,165 +386,69 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -466,29 +466,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -521,7 +498,6 @@
-
@@ -542,48 +518,76 @@
fork="true">
-
+
+
+
-
-
-
+
-
+
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ target="7"
+ workdir="${build.4jdk7.dir}"
+ classes="${4jdk7product.jar}">
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -609,31 +613,20 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -646,31 +639,30 @@
-
-
+
+
-
-
+
-
-
@@ -679,17 +671,15 @@
-
-
-
-
-
-
+ depends="4jdk7clean, 4jdk7jar">
+
+
+
+
@@ -707,24 +697,22 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
classpath=""
- source="5"
bootclasspath="${bootclasspath6}"
+ source="5"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
fork="true">
-
+
-
-
@@ -736,31 +724,31 @@
-
-
-
+
+
-
+ bootclasspath="${bootclasspath6}"
+ source="5"
+ executable="${javadoc7}">
+
+
-
@@ -769,18 +757,14 @@
-
-
-
-
-
-
-
+
+
+
@@ -806,9 +790,10 @@
fork="true">
-
+
+
@@ -824,31 +809,31 @@
-
-
-
+
+
-
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
-
@@ -857,17 +842,14 @@
-
-
-
-
-
-
+
+
+
@@ -885,25 +867,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">
-
+
-
-
@@ -915,31 +895,31 @@
-
-
-
+
+
-
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
-
@@ -948,21 +928,21 @@
-
-
-
-
-
-
+
+
+
+
+
+
@@ -974,22 +954,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">
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
+ access="${build.javadoc.access}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ source="${build.jsr166e.java.version}"
+ executable="${javadoc7}">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+