--- jsr166/build.xml 2013/01/19 23:58:12 1.108
+++ jsr166/build.xml 2015/09/02 03:53:43 1.170
@@ -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.
+
+
+
+
+
@@ -35,38 +44,46 @@
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -76,35 +93,37 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -119,39 +138,54 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -159,20 +193,137 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
+
+
@@ -191,76 +342,69 @@
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -279,174 +423,104 @@
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -464,29 +538,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -517,9 +568,34 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -540,50 +616,77 @@
fork="true">
-
+
+
+
+
-
-
-
-
-
+
-
+
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ target="7"
+ workdir="${build.4jdk7.dir}"
+ classes="${4jdk7product.jar}">
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -609,154 +712,160 @@
-
+
+
+
+
+
+
+
+
+
-
-
+
+
-
-
+
+
-
-
+ description="Removes all 4jdk7 build products">
-
-
-
-
-
-
+ depends="4jdk7clean, 4jdk7jar">
+
+
+
+
-
+
-
+
-
+
+
-
-
-
-
-
+
-
-
-
+
+
-
+ bootclasspath="${bootclasspath6}"
+ source="5"
+ executable="${javadoc7}">
+
+
+
-
+ description="Removes all jsr166x build products">
-
-
-
-
-
-
-
-
+
+
+
@@ -766,10 +875,10 @@
depends="configure-compiler"
description="Compiles jsr166y sources">
-
+
-
+
+
+
@@ -793,60 +904,55 @@
depends="jsr166ycompile"
description="Builds library jar from compiled sources">
-
-
-
+
-
-
-
+
+
-
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
+
-
+ description="Removes all jsr166y build products">
-
-
-
-
-
-
-
+
+
+
@@ -857,180 +963,253 @@
depends="configure-compiler, jsr166yjar"
description="Compiles extra166y sources">
-
+
-
+
+
-
-
-
-
-
+
-
-
-
+
+
-
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
+
-
+ description="Removes all extra166y build products">
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
-
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
-
-
-
+
+
-
+ link="${java.api.url}"
+ access="${build.javadoc.access}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ source="${build.jsr166e.java.version}"
+ executable="${javadoc7}">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ description="Removes all jsr166e build products">
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+