--- jsr166/build.xml 2013/01/16 07:39:51 1.98
+++ jsr166/build.xml 2013/02/01 18:31:17 1.131
@@ -16,12 +16,20 @@
$HOME/jdk/jdk6
$HOME/jdk/jdk7
$HOME/jdk/jdk8
- where each of the above is a JDK or a symlink to same.
+ 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
+ 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.
------------------------------------------------------------------------------
-
- Run "ant -projecthelp" for full usage information.
+
+
+
+
@@ -30,80 +38,74 @@
-
+
+
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
@@ -113,32 +115,35 @@
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -146,103 +151,154 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ depends="configure-compiler"
+ description="Compiles src/main sources to build dir">
+ destdir="${build.classes.dir}"
+ debug="${build.debug}"
+ debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}"
+ classpath=""
+ includeAntRuntime="false"
+ includeJavaRuntime="false"
+ executable="${javac8}"
+ fork="true">
-
-
-
-
-
-
-
-
-
+ description="Builds javadocs for src/main to dist dir">
-
-
+
+
-
+ access="${build.javadoc.access}"
+ sourcepath="${src.dir}:${jdk8src.dir}"
+ classpath=""
+ executable="${javadoc8}">
+
+
+
-
-
@@ -261,22 +317,17 @@
-
-
-
-
-
@@ -285,49 +336,17 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
-
+
+
+
@@ -337,36 +356,42 @@
+ destdir="${build.testcases.dir}"
+ debug="${build.debug}"
+ debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}"
+ source="6"
+ classpath="${junit.jar}"
+ bootclasspath="@{product.jar}:${bootclasspath6}"
+ includeAntRuntime="false"
+ includeJavaRuntime="false"
+ executable="${javac8}"
+ fork="true">
-
-
+
-
-
+
+
-
-
+ destdir="${build.testcases.dir}"
+ debug="${build.debug}"
+ debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}"
+ source="6"
+ classpath=""
+ bootclasspath="@{product.jar}:${bootclasspath6}"
+ includeAntRuntime="false"
+ includeJavaRuntime="false"
+ executable="${javac8}"
+ fork="true">
-
-
+
-
-
+
+
@@ -379,17 +404,24 @@
source="${build.sourcelevel}"
fork="true">
-
-
+
-
-
+
-->
+
+
+
+
@@ -404,9 +436,10 @@
errorProperty="junit.failed"
failureProperty="junit.failed"
dir="${build.reports.dir}"
+ jvm="${java8}"
fork="true">
-
+
@@ -507,7 +540,7 @@
-
@@ -533,21 +566,20 @@
-
-
+
-
+ description="Compiles src/jdk7 sources, targeting jdk7">
-
+
-
-
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
-
+
+
+ target="7"
+ workdir="${build.4jdk7.dir}"
+ classes="${4jdk7product.jar}"/>
-
+
-
+
-
+
@@ -630,284 +646,264 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+ executable="${javadoc7}">
+
+
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
-
+
+
-
+
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
-
-
+
+
+
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+ access="${build.javadoc.access}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ bootclasspath="${bootclasspath6}"
+ source="5"
+ executable="${javadoc7}">
+
+
-
+ description="Removes all jsr166x build products">
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
-
+
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+ access="${build.javadoc.access}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
-
+ description="Removes all jsr166y build products">
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -915,104 +911,90 @@
-
+
-
+
-
-
+
-
-
-
+
+
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to build dir">
-
-
+
+
-
+ access="${build.javadoc.access}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
-
+ description="Removes all extra166y build products">
-
-
-
-
-
-
-
-
-
-
-
+
+
-
-
+
+
@@ -1021,14 +1003,14 @@
depends="configure-compiler"
description="Compiles jsr166e sources">
-
+
-
+
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to build dir">
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
-
-
+ description="Removes all jsr166e build products">
-
-
-
-
-
-
-
-
-
+
+
+
+
+
-
-
+
+
+
+
+
+