--- jsr166/build.xml 2013/02/06 19:55:06 1.137
+++ jsr166/build.xml 2013/07/20 17:21:45 1.147
@@ -44,6 +44,15 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
@@ -170,8 +179,8 @@ As of 2013-02, the very latest lambda 8
-
+
@@ -185,12 +194,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 +211,15 @@ As of 2013-02, the very latest lambda 8
-
+
+
+
@@ -280,6 +293,8 @@ As of 2013-02, the very latest lambda 8
+
+
@@ -296,11 +311,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -321,9 +331,16 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
@@ -367,9 +384,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -381,69 +395,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -463,82 +414,11 @@ As of 2013-02, the very latest lambda 8
classes="${product.jar}"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -558,29 +438,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -664,7 +521,12 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
@@ -693,7 +555,7 @@ As of 2013-02, the very latest lambda 8
-
+
@@ -705,7 +567,8 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}"
+ jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
@@ -1040,6 +903,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1051,11 +917,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">
@@ -1088,8 +954,8 @@ As of 2013-02, the very latest lambda 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}">
@@ -1097,18 +963,46 @@ As of 2013-02, the very latest lambda 8
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+