--- jsr166/build.xml 2013/02/04 19:37:52 1.135
+++ jsr166/build.xml 2015/01/17 23:12:49 1.161
@@ -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,11 @@ As of 2013-02, the very latest lambda 8
-
+
-
+
@@ -185,12 +210,13 @@ 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}}"
+ bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac@{target}}"
+ executable="${javac@{compile-target}}"
fork="true">
@@ -201,12 +227,21 @@ As of 2013-02, the very latest lambda 8
-
+
+
+
+
+
+
+
+
+
@@ -217,6 +252,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -255,6 +291,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -273,13 +312,15 @@ As of 2013-02, the very latest lambda 8
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
- executable="${javac8}"
+ executable="${build.main.javac}"
fork="true">
+
+
@@ -296,11 +337,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -312,18 +348,26 @@ As of 2013-02, the very latest lambda 8
+ executable="${javadoc9}">
+
+
+
+
+
+
+
+
@@ -362,14 +406,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -381,165 +423,62 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -558,29 +497,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -641,6 +557,35 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -691,7 +644,7 @@ As of 2013-02, the very latest lambda 8
-
+
@@ -703,7 +656,8 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}"
+ jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
@@ -721,7 +675,7 @@ As of 2013-02, the very latest lambda 8
+
@@ -748,11 +703,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -814,12 +764,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -839,12 +790,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -905,12 +850,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -930,11 +876,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -996,12 +937,13 @@ As of 2013-02, the very latest lambda 8
+
@@ -1021,11 +963,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1038,6 +975,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1049,11 +989,11 @@ 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">
@@ -1064,6 +1004,32 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
@@ -1139,6 +1128,13 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+