--- jsr166/build.xml 2012/11/18 06:21:11 1.91
+++ 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,7 +35,7 @@
-
+
@@ -31,24 +45,86 @@
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -59,26 +135,28 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -91,8 +169,15 @@
+
+
+
+
+
+
@@ -104,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}">
+
+
+
-
+
@@ -185,7 +283,7 @@
@@ -213,8 +311,6 @@
description="Removes all build products">
-
-
@@ -229,43 +325,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -280,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">
-
+
-
-
-
+
@@ -326,8 +395,6 @@
-
-
-->
@@ -347,9 +414,10 @@
errorProperty="junit.failed"
failureProperty="junit.failed"
dir="${build.reports.dir}"
+ jvm="${java8}"
fork="true">
-
+
@@ -450,7 +518,7 @@
-
@@ -476,26 +544,190 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
-
+
+
@@ -507,10 +739,8 @@
depends="jsr166xcompile"
description="Builds library jar from compiled sources">
-
-
-
-
+
+
@@ -518,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">
-
@@ -555,26 +786,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -582,40 +797,38 @@
-
+
-
+
-
+
-
-
-
-
+
-
-
-
-
-
-
+
+
@@ -623,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">
-
@@ -659,25 +873,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -686,26 +885,28 @@
-
+
-
+
-
+
-
-
-
+
@@ -717,10 +918,8 @@
depends="extra166ycompile"
description="Builds library jar from compiled sources">
-
-
-
-
+
+
@@ -728,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">
-
@@ -764,51 +964,37 @@
-
-
-
-
-
-
-
-
-
-
+
-
-
+
-
+
-
+
-
-
-
+
@@ -820,10 +1006,8 @@
depends="jsr166ecompile"
description="Builds library jar from compiled sources">
-
-
-
-
+
+
@@ -831,61 +1015,46 @@
+ description="Builds javadocs to build dir">
-
-
+
+
-
+ source="7"
+ sourcepath="${topsrc.dir}:${jdk7src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true" >
+
+ description="Removes all jsr166e build products">
-
-
-
-
-
-
-
-
-
-
-
-
+