--- jsr166/build.xml 2013/02/04 19:37:52 1.135
+++ jsr166/build.xml 2013/07/14 22:39:31 1.145
@@ -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
-
+
+
+
@@ -296,11 +309,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -324,6 +332,12 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
@@ -367,9 +381,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -381,69 +392,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -463,82 +411,11 @@ As of 2013-02, the very latest lambda 8
classes="${product.jar}"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -558,29 +435,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -663,6 +517,13 @@ As of 2013-02, the very latest lambda 8
classes="${4jdk7product.jar}">
+
+
+
+
+
+
+
@@ -691,7 +552,7 @@ As of 2013-02, the very latest lambda 8
-
+
@@ -703,7 +564,8 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}"
+ jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
@@ -1038,6 +900,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1049,11 +914,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">
@@ -1086,8 +951,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}">
@@ -1095,18 +960,41 @@ As of 2013-02, the very latest lambda 8
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+