--- jsr166/build.xml 2013/02/06 19:55:06 1.137
+++ jsr166/build.xml 2013/07/20 20:40:24 1.149
@@ -26,7 +26,8 @@ As of 2013-02, the very latest lambda 8
------------------------------------------------------------------------------
-
+
+
@@ -44,6 +45,15 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
@@ -170,8 +180,8 @@ As of 2013-02, the very latest lambda 8
-
+
@@ -185,12 +195,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 +212,15 @@ As of 2013-02, the very latest lambda 8
-
+
+
+
@@ -280,6 +294,8 @@ As of 2013-02, the very latest lambda 8
+
+
@@ -296,11 +312,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
@@ -321,9 +332,16 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
@@ -362,14 +380,12 @@ As of 2013-02, the very latest lambda 8
+
-
-
-
@@ -381,69 +397,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -463,82 +416,11 @@ As of 2013-02, the very latest lambda 8
classes="${product.jar}"/>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -558,29 +440,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -641,6 +500,35 @@ As of 2013-02, the very latest lambda 8
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -693,7 +586,7 @@ As of 2013-02, the very latest lambda 8
-
+
@@ -705,7 +598,8 @@ As of 2013-02, the very latest lambda 8
+ classes="${4jdk7product.jar}"
+ jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
@@ -750,11 +644,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -841,12 +730,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
-
@@ -932,11 +815,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1023,11 +901,6 @@ As of 2013-02, the very latest lambda 8
-
-
-
-
@@ -1040,6 +913,9 @@ As of 2013-02, the very latest lambda 8
+
+
+
@@ -1051,11 +927,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 +964,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 +973,45 @@ As of 2013-02, the very latest lambda 8
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-