--- jsr166/build.xml 2013/01/16 07:39:51 1.98
+++ jsr166/build.xml 2013/01/20 07:43:30 1.117
@@ -16,7 +16,12 @@
$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.
------------------------------------------------------------------------------
@@ -30,7 +35,7 @@
-
+
@@ -40,31 +45,22 @@
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
@@ -72,11 +68,12 @@
-
-
-
-
-
+
+
+
+
+
+
@@ -87,20 +84,45 @@
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+ failonerror="true"
+ jvm="${java@{target}}"
+ fork="true">
-
+
+
@@ -113,29 +135,28 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -148,8 +169,15 @@
+
+
+
+
+
+
@@ -161,29 +189,40 @@
+
+
+
+
+
+
+ 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">
+
+
-
+ sourcepath="${src.dir}:${jdk8src.dir}"
+ classpath=""
+ executable="${javadoc8}">
+
+
+
@@ -242,7 +283,7 @@
@@ -270,8 +311,6 @@
description="Removes all build products">
-
-
@@ -286,43 +325,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -337,36 +342,43 @@
+ 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">
-
+
-
-
-
+
@@ -383,8 +395,6 @@
-
-
-->
@@ -404,9 +414,10 @@
errorProperty="junit.failed"
failureProperty="junit.failed"
dir="${build.reports.dir}"
+ jvm="${java8}"
fork="true">
-
+
@@ -507,7 +518,7 @@
-
@@ -533,21 +544,21 @@
-
+
-
+ description="Compiles src/jdk7 sources, targeting jdk7">
-
+
-
-
-
-
-
-
-
-
-
-
+
-
-
-
-
+
-
+
+
+
-
+
+
+ target="7"
+ workdir="${build.4jdk7.dir}"
+ product.jar="${4jdk7product.jar}"/>
-
+
-
+
-
+
@@ -630,24 +625,49 @@
+
+
+
+
+
+
-
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
-
+ executable="${javadoc7}">
+
+
@@ -655,76 +675,59 @@
-
-
+
-
+
-
-
-
-
-
+
-
-
-
-
-
-
+
-
-
-
-
-
-
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
-
+
+
@@ -736,10 +739,8 @@
depends="jsr166xcompile"
description="Builds library jar from compiled sources">
-
-
-
-
+
+
@@ -747,32 +748,33 @@
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+ source="5"
+ bootclasspath="${bootclasspath6}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true"/>
+ description="Removes all jsr166x build products">
-
@@ -784,26 +786,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -811,40 +797,38 @@
-
+
-
+
-
+
-
-
-
-
+
-
-
-
-
-
-
+
+
@@ -852,32 +836,33 @@
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+ source="6"
+ bootclasspath="${bootclasspath6}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true"/>
+ description="Removes all jsr166y build products">
-
@@ -888,25 +873,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -915,26 +885,28 @@
-
+
-
+
-
+
-
-
-
+
@@ -946,10 +918,8 @@
depends="extra166ycompile"
description="Builds library jar from compiled sources">
-
-
-
-
+
+
@@ -957,32 +927,33 @@
+ description="Builds javadocs to build dir">
-
-
+
+
-
+ source="6"
+ bootclasspath="${bootclasspath6}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true"/>
+ description="Removes all extra166y build products">
-
@@ -993,25 +964,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -1021,14 +977,14 @@
depends="configure-compiler"
description="Compiles jsr166e sources">
-
+
-
-
-
-
+
+
@@ -1061,66 +1015,46 @@
+ description="Builds javadocs to build dir">
-
-
+
+
-
-
-
-
+ description="Removes all jsr166e build products">
-
-
-
-
-
-
-
-
-
-
-
-
+