--- jsr166/build.xml 2009/08/01 13:05:44 1.78
+++ jsr166/build.xml 2013/01/20 07:43:30 1.117
@@ -8,6 +8,20 @@
User-specific settings are read from user.properties.
See user.properties.sample for an explanation of some useful settings.
+
+ The repository contains all dependencies except for ant and the JDK
+ itself. Because the JDK version matters and because different
+ targets require different JDKs, we assume that users have created a
+ hierarchy containing:
+ $HOME/jdk/jdk6
+ $HOME/jdk/jdk7
+ $HOME/jdk/jdk8
+ 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.
------------------------------------------------------------------------------
@@ -21,30 +35,96 @@
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -55,26 +135,49 @@
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -86,26 +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">
-
+
+
+
+
+
+
+
+
+
+
+
@@ -160,11 +283,10 @@
-
@@ -189,8 +311,6 @@
description="Removes all build products">
-
-
@@ -205,57 +325,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -270,34 +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">
-
+
-
-
-
+
+
@@ -312,8 +393,7 @@
-
-
+
-->
@@ -334,9 +414,10 @@
errorProperty="junit.failed"
failureProperty="junit.failed"
dir="${build.reports.dir}"
+ jvm="${java8}"
fork="true">
-
+
@@ -437,7 +518,7 @@
-
@@ -452,6 +533,7 @@
+
@@ -462,113 +544,252 @@
-
-
-
-
+
-
-
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
-
-
+
+
+
-
+
-
-
+
+
-
+
+
+
- sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
+
- >
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+ packagenames="jsr166x.*"
+ link="${jdkapidocs.url}"
+ source="5"
+ bootclasspath="${bootclasspath6}"
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true"/>
-
-
-
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
@@ -576,39 +797,38 @@
-
+
-
+
-
+
-
-
-
-
+
+
-
-
-
-
-
-
+
+
@@ -616,37 +836,33 @@
-
-
-
-
-
-
-
-
+ description="Builds javadocs to dist dir">
+
+
-
+
+ description="Removes all jsr166y build products">
-
@@ -657,54 +873,40 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
-
+
-
+
-
+
-
-
-
+
+
@@ -716,10 +918,8 @@
depends="extra166ycompile"
description="Builds library jar from compiled sources">
-
-
-
-
+
+
@@ -727,37 +927,33 @@
-
-
-
-
-
-
-
-
+ description="Builds javadocs to build dir">
+
+
-
+
+ description="Removes all extra166y build products">
-
@@ -768,28 +964,97 @@
-
+
+
+
+
+
+
+
-
-
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+