--- jsr166/build.xml 2013/01/15 01:15:02 1.97
+++ jsr166/build.xml 2013/01/19 17:15:44 1.100
@@ -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,11 +49,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -63,11 +77,12 @@
-
-
-
-
-
+
+
+
+
+
+
@@ -104,7 +119,7 @@
-
+
@@ -113,7 +128,7 @@
-
+
@@ -121,7 +136,7 @@
-
+
@@ -152,6 +167,11 @@
+
+
+
+
+
@@ -160,21 +180,26 @@
description="Builds all public jars and docs"/>
+ depends="configure-compiler"
+ description="Compiles src/main sources to build folder">
+ 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}">
+
+
+
@@ -233,7 +262,7 @@
@@ -277,30 +306,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -524,17 +529,17 @@
-
+
-
+ description="Compiles src/jdk7 sources, targeting jdk7">
-
+
-
-
+
-
-
+
+
-
+
-
+
+ tck.classes="${build.4jdk7.tck.classes.dir}"
+ product.jar="${4jdk7product.jar}"/>
-
+
-
+
-
+
@@ -622,23 +628,21 @@
-
-
-
+
+
-
-
+ executable="${javadoc7}">
+
+
@@ -646,53 +650,51 @@
-
-
-
+
-
-
-
-
+
+
-
+ executable="${javadoc7}">
-
+
-
+
-
+
@@ -1061,7 +1063,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" >