--- jsr166/build.xml 2013/01/19 17:15:44 1.100
+++ jsr166/build.xml 2015/02/02 07:30:53 1.162
@@ -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,43 +44,46 @@
-
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -81,35 +93,37 @@
-
-
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -124,37 +138,54 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
@@ -162,26 +193,114 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+ description="Compiles src/main sources to build dir">
@@ -193,76 +312,68 @@
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+ description="Builds javadocs for src/main to dist dir">
-
-
+
+
-
-
-
-
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
+
+
+
-
-
@@ -281,184 +392,94 @@
-
-
-
-
-
+
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
@@ -476,34 +497,11 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -531,7 +529,6 @@
-
@@ -543,7 +540,7 @@
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="1.6"
+ source="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -552,50 +549,76 @@
fork="true">
-
+
+
+
-
-
-
-
-
+
-
+
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+ target="7"
+ workdir="${build.4jdk7.dir}"
+ classes="${4jdk7product.jar}">
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -621,286 +644,246 @@
-
+
+
+
+
+
+
+
+
+
+ description="Builds javadocs for src/jdk7 to dist dir">
-
-
+
+
-
-
+
+
-
-
+ description="Removes all 4jdk7 build products">
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
-
-
+
+
+
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+
+
+
+
-
+ description="Removes all jsr166x build products">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+
+
+
+
-
+ description="Removes all jsr166y build products">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -908,213 +891,253 @@
-
+
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to build dir">
-
-
+
+
-
+
+
+
+
-
+ description="Removes all extra166y build products">
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
+
+
+
-
+
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
+
-
+ description="Builds javadocs to build dir">
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+ description="Removes all jsr166e build products">
-
-
-
-
-
+
+
+ depends="jsr166eclean, jsr166edocs">
+
+
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+