--- jsr166/build.xml 2013/01/14 08:58:47 1.93
+++ jsr166/build.xml 2013/01/20 01:09:12 1.110
@@ -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.
------------------------------------------------------------------------------
@@ -31,30 +45,17 @@
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
@@ -62,11 +63,13 @@
-
-
-
-
-
+
+
+
+
+
+
@@ -75,6 +78,24 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -84,29 +105,28 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -119,6 +139,8 @@
+
+
@@ -132,29 +154,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 +248,7 @@
@@ -241,8 +276,6 @@
description="Removes all build products">
-
-
@@ -257,43 +290,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -478,7 +477,7 @@
-
@@ -504,26 +503,26 @@
-
+
-
+ description="Compiles src/jdk7 sources, targeting jdk7">
-
+
-
@@ -533,41 +532,89 @@
-
+
+
+
+
+
+
+
+
+
+
-
+
-
+
-
-
-
+
+
+
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
+
+
+
-
+ executable="${javadoc7}">
+
+
@@ -575,76 +622,59 @@
-
-
+
-
+
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
+
@@ -656,9 +686,7 @@
depends="jsr166xcompile"
description="Builds library jar from compiled sources">
-
-
-
+
@@ -667,32 +695,33 @@
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+ description="Removes all jsr166x build products">
-
@@ -704,26 +733,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -731,39 +744,37 @@
-
+
-
+
-
-
-
-
+
-
-
-
-
-
+
@@ -772,32 +783,33 @@
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+ description="Removes all jsr166y build products">
-
@@ -808,25 +820,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -835,26 +832,28 @@
-
+
-
+
-
-
-
+
@@ -866,9 +865,7 @@
depends="extra166ycompile"
description="Builds library jar from compiled sources">
-
-
-
+
@@ -877,32 +874,33 @@
+ description="Builds javadocs to build dir">
-
-
+
+
-
+ description="Removes all extra166y build products">
-
@@ -913,51 +911,37 @@
-
-
-
-
-
-
-
-
-
-
+
-
-
+
-
+
-
-
-
+
@@ -969,9 +953,7 @@
depends="jsr166ecompile"
description="Builds library jar from compiled sources">
-
-
-
+
@@ -980,61 +962,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">
-
-
-
-
-
-
-
-
-
-
-
-
+