--- jsr166/build.xml 2013/01/14 07:08:06 1.92
+++ jsr166/build.xml 2013/01/19 21:40:04 1.104
@@ -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.
------------------------------------------------------------------------------
@@ -35,10 +49,11 @@
-
-
-
-
+
+
+
+
+
@@ -58,21 +73,42 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -83,7 +119,7 @@
-
+
@@ -92,7 +128,7 @@
-
+
@@ -100,7 +136,7 @@
-
+
@@ -131,6 +167,12 @@
+
+
+
+
+
+
@@ -139,21 +181,26 @@
description="Builds all public jars and docs"/>
+ 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}">
+
+
+
@@ -212,7 +263,7 @@
@@ -256,43 +307,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -477,7 +494,7 @@
-
@@ -503,17 +520,17 @@
-
+
-
+ description="Compiles src/jdk7 sources, targeting jdk7">
-
+
-
@@ -532,41 +549,91 @@
-
+
+
+
+
+
-
+
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+ executable="${javadoc7}">
+
+
@@ -574,53 +641,30 @@
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -628,7 +672,7 @@
@@ -666,7 +710,7 @@
+ description="Builds javadocs to dist dir">
@@ -705,7 +749,7 @@
+ description="Builds javadocs to dist dir">
@@ -730,32 +774,32 @@
-
+
-
+
-
-
-
-
+
-
-
@@ -771,7 +815,7 @@
+ description="Builds javadocs to dist dir">
@@ -808,7 +852,7 @@
+ description="Builds javadocs to dist dir">
@@ -834,26 +878,28 @@
-
+
-
+
-
-
-
+
@@ -876,7 +922,7 @@
+ description="Builds javadocs with custom tags to build dir">
@@ -913,7 +959,7 @@
+ description="Builds javadocs to dist dir">
@@ -936,27 +982,28 @@
-
-
+ classpath=""
+ includeAntRuntime="false"
+ includeJavaRuntime="false"
+ executable="${javac7}"
+ fork="true">
-
+
-
-
-
+
@@ -979,17 +1026,22 @@
+ description="Builds javadocs with custom tags to build dir">
+ sourcepath="${topsrc.dir}:${jdk7src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true" >
+
+
+
+
@@ -1016,7 +1068,7 @@
+ description="Builds javadocs to dist dir">