--- jsr166/build.xml 2013/01/14 19:22:27 1.95
+++ jsr166/build.xml 2013/01/19 23:40:04 1.107
@@ -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 @@
-
+
@@ -92,21 +127,21 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -119,6 +154,8 @@
+
+
@@ -132,29 +169,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}">
+
+
+
@@ -213,7 +265,7 @@
@@ -257,43 +309,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -478,7 +496,7 @@
-
@@ -504,26 +522,26 @@
-
+
-
+ description="Compiles src/jdk7 sources, targeting jdk7">
-
+
-
@@ -533,41 +551,91 @@
-
+
+
+
+
+
-
+
-
+
+
+
+
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
+
+
+
+
-
-
-
+
+
+
+
+
-
+ executable="${javadoc7}">
+
+
@@ -575,53 +643,30 @@
-
-
-
+
-
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -629,22 +674,28 @@
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
+
@@ -658,7 +709,7 @@
-
+
@@ -667,16 +718,18 @@
+ description="Builds javadocs to dist dir">
@@ -706,16 +759,17 @@
+ description="Builds javadocs to dist dir">
@@ -723,7 +777,7 @@
-
+
@@ -731,39 +785,39 @@
-
+
-
+
-
-
-
-
+
-
-
-
+
@@ -772,16 +826,18 @@
+ description="Builds javadocs to dist dir">
@@ -809,16 +865,17 @@
+ description="Builds javadocs to dist dir">
@@ -826,7 +883,7 @@
-
+
@@ -835,26 +892,28 @@
-
+
-
+
-
-
-
+
@@ -868,7 +927,7 @@
-
+
@@ -877,16 +936,18 @@
+ description="Builds javadocs to build dir">
@@ -914,16 +975,17 @@
+ description="Builds javadocs to dist dir">
@@ -931,7 +993,7 @@
-
+
@@ -948,7 +1010,7 @@
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="1.7"
+ source="7"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
@@ -972,7 +1034,7 @@
-
+
@@ -981,17 +1043,19 @@
+ description="Builds javadocs to build dir">
+ source="7"
+ sourcepath="${topsrc.dir}:${jdk7src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true" >
+
@@ -1018,16 +1082,17 @@
+ description="Builds javadocs to dist dir">
@@ -1035,7 +1100,7 @@
-
+