--- jsr166/build.xml 2013/01/28 22:00:34 1.130
+++ jsr166/build.xml 2013/07/18 18:27:55 1.146
@@ -22,6 +22,7 @@
$HOME/jdk/src/jdk8
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.
------------------------------------------------------------------------------
@@ -43,6 +44,15 @@
+
+
+
+
+
+
+
+
+
@@ -169,11 +179,12 @@
-
+
+
@@ -183,27 +194,32 @@
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">
+
-
+
+
+
@@ -213,6 +229,34 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -246,8 +290,11 @@
fork="true">
+
+
+
@@ -264,11 +311,6 @@
-
-
-
@@ -289,9 +331,16 @@
+
+
+
+
+
+
+
@@ -335,9 +384,6 @@
-
-
-
@@ -349,143 +395,32 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
@@ -503,29 +438,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -578,6 +490,7 @@
fork="true">
+
@@ -604,7 +517,19 @@
+ classes="${4jdk7product.jar}">
+
+
+
+
+
+
+
+
+
+
+
+
@@ -630,31 +555,20 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -989,6 +903,9 @@
+
+
+
@@ -1000,11 +917,11 @@
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">
@@ -1037,8 +954,8 @@
packagenames="jsr166e.*"
link="${jdkapidocs.url}"
access="${build.javadoc.access}"
- sourcepath="${topsrc.dir}:${jdk7src.dir}"
- source="7"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ source="${build.jsr166e.java.version}"
executable="${javadoc7}">
@@ -1046,18 +963,41 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+