--- jsr166/build.xml 2013/02/01 18:31:17 1.131
+++ jsr166/build.xml 2015/08/10 06:32:23 1.166
@@ -16,17 +16,23 @@
$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.
-As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
+
+ Alternatively, define ant variables thus:
+ ant -Djdk$N.home=...
+ for $N in 6 7 8 9 ...
------------------------------------------------------------------------------
-
+
+
@@ -44,6 +50,17 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
@@ -105,6 +122,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -145,17 +163,24 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
@@ -170,11 +195,12 @@ As of 2013-02, the very latest lambda 8
-
+
-
+
+
@@ -184,27 +210,38 @@ As of 2013-02, the very latest lambda 8
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="@{source}"
+ source="@{compile-target}"
+ target="@{compile-target}"
classpath="${junit.jar}"
- bootclasspath="@{classes}:${bootclasspath@{source}}"
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac@{target}}"
+ executable="${javac@{compile-target}}"
fork="true">
+
+
-
+
+
+
+
+
+
+
+
+
@@ -214,6 +251,61 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -225,6 +317,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -243,12 +338,16 @@ As of 2013-02, the very latest lambda 8
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
+
+
+
+
@@ -265,11 +364,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -281,18 +375,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -331,14 +433,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -349,153 +449,66 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
+
+
+
+
+
+
@@ -513,29 +526,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -566,6 +556,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -614,7 +661,20 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}">
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -640,31 +700,19 @@ As of 2013-02, the very latest lambda 8
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -682,7 +730,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -709,11 +758,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -750,6 +794,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -775,12 +820,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -800,12 +846,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -841,6 +881,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -866,12 +907,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -891,11 +933,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -932,6 +969,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -957,12 +995,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -982,11 +1021,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -999,6 +1033,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1010,21 +1047,49 @@ As of 2013-02, the very latest lambda 8
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">
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -1100,6 +1188,13 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+