--- jsr166/build.xml 2013/01/14 21:06:16 1.96
+++ jsr166/build.xml 2013/01/19 21:54:53 1.105
@@ -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 @@
-
-
-
-
+
+
+
+
+
@@ -62,11 +77,13 @@
-
-
-
-
-
+
+
+
+
+
+
@@ -75,6 +92,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -84,7 +119,7 @@
-
+
@@ -93,7 +128,7 @@
-
+
@@ -101,7 +136,7 @@
-
+
@@ -132,6 +167,12 @@
+
+
+
+
+
+
@@ -140,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}">
+
+
+
@@ -213,7 +263,7 @@
@@ -257,43 +307,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -478,7 +494,7 @@
-
@@ -504,17 +520,17 @@
-
+
-
+ description="Compiles src/jdk7 sources, targeting jdk7">
-
+
-
@@ -533,41 +549,91 @@
-
+
+
+
+
+
-
+
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+ executable="${javadoc7}">
+
+
@@ -575,53 +641,30 @@
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -629,22 +672,28 @@
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
+
@@ -667,7 +716,7 @@
+ description="Builds javadocs to dist dir">
@@ -706,7 +755,7 @@
+ description="Builds javadocs to dist dir">
@@ -731,32 +780,32 @@
-
+
-
+
-
-
-
-
+
-
-
@@ -772,7 +821,7 @@
+ description="Builds javadocs to dist dir">
@@ -809,7 +858,7 @@
+ description="Builds javadocs to dist dir">
@@ -835,26 +884,28 @@
-
+
-
+
-
-
-
+
@@ -877,7 +928,7 @@
+ description="Builds javadocs with custom tags to build dir">
@@ -914,7 +965,7 @@
+ description="Builds javadocs to dist dir">
@@ -981,7 +1032,7 @@
+ description="Builds javadocs with custom tags to build dir">
@@ -990,7 +1041,7 @@
packagenames="jsr166e,jsr166e.extra"
link="${jdkapi7docs.url}"
source="1.7"
- sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"
+ sourcepath="${topsrc.dir}:${jdk7src.dir}"
executable="${javadoc7}"
additionalparam="-XDignore.symbol.file=true" >
@@ -1023,7 +1074,7 @@
+ description="Builds javadocs to dist dir">