--- jsr166/build.xml 2013/01/14 07:08:06 1.92
+++ jsr166/build.xml 2013/01/19 23:58:12 1.108
@@ -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.
------------------------------------------------------------------------------
@@ -32,47 +46,64 @@
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -83,7 +114,7 @@
-
+
@@ -91,21 +122,21 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -118,6 +149,8 @@
+
+
@@ -131,29 +164,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}">
+
+
+
@@ -212,7 +260,7 @@
@@ -256,43 +304,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -477,7 +491,7 @@
-
@@ -503,26 +517,26 @@
-
+
-
+ description="Compiles src/jdk7 sources, targeting jdk7">
-
+
-
@@ -532,41 +546,91 @@
-
+
+
+
+
+
-
+
-
+
+
+
+
-
-
-
+
+
+
+
+
-
+
-
-
+
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+ executable="${javadoc7}">
+
+
@@ -574,53 +638,30 @@
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -628,22 +669,28 @@
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
+
@@ -657,7 +704,7 @@
-
+
@@ -666,23 +713,25 @@
+ description="Builds javadocs to dist dir">
-
-
+
+
-
@@ -703,26 +752,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -730,39 +763,39 @@
-
+
-
+
-
-
-
-
+
-
-
-
+
@@ -771,23 +804,25 @@
+ description="Builds javadocs to dist dir">
-
-
+
+
-
@@ -807,25 +842,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -834,26 +854,28 @@
-
+
-
+
-
-
-
+
@@ -867,7 +889,7 @@
-
+
@@ -876,23 +898,25 @@
+ description="Builds javadocs to build dir">
-
-
+
+
-
@@ -912,51 +936,37 @@
-
-
-
-
-
-
-
-
-
-
+
-
-
+
-
+
-
-
-
+
@@ -970,7 +980,7 @@
-
+
@@ -979,23 +989,25 @@
+ description="Builds javadocs to build dir">
-
-
+
+
-
+ source="7"
+ sourcepath="${topsrc.dir}:${jdk7src.dir}"
+ executable="${javadoc7}"
+ additionalparam="-XDignore.symbol.file=true" >
+
@@ -1009,31 +1021,15 @@
-
-
-
-
-
-
-
-
-
-
-
+