--- jsr166/build.xml 2013/01/16 07:39:51 1.98
+++ jsr166/build.xml 2013/01/19 21:40:04 1.104
@@ -16,7 +16,12 @@
$HOME/jdk/jdk6
$HOME/jdk/jdk7
$HOME/jdk/jdk8
- where each of the above is a JDK or a symlink to same.
+ 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.
------------------------------------------------------------------------------
@@ -44,11 +49,11 @@
-
-
-
-
-
+
+
+
+
+
@@ -72,11 +77,12 @@
-
-
-
-
-
+
+
+
+
+
+
@@ -113,7 +119,7 @@
-
+
@@ -122,7 +128,7 @@
-
+
@@ -130,7 +136,7 @@
-
+
@@ -161,6 +167,12 @@
+
+
+
+
+
+
@@ -169,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}">
+
+
+
@@ -242,7 +263,7 @@
@@ -286,43 +307,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -507,7 +494,7 @@
-
@@ -533,17 +520,17 @@
-
+
-
+ description="Compiles src/jdk7 sources, targeting jdk7">
-
+
-
-
+
-
-
+
+
-
+
-
+
+ tck.classes="${build.4jdk7.tck.classes.dir}"
+ product.jar="${4jdk7product.jar}"/>
-
+
-
+
-
+
@@ -631,23 +619,21 @@
-
+
-
-
+
+
-
-
+ executable="${javadoc7}">
+
+
@@ -655,53 +641,30 @@
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -709,7 +672,7 @@
@@ -747,7 +710,7 @@
+ description="Builds javadocs to dist dir">
@@ -786,7 +749,7 @@
+ description="Builds javadocs to dist dir">
@@ -811,32 +774,32 @@
-
+
-
+
-
-
-
-
+
-
-
@@ -852,7 +815,7 @@
+ description="Builds javadocs to dist dir">
@@ -889,7 +852,7 @@
+ description="Builds javadocs to dist dir">
@@ -915,26 +878,28 @@
-
+
-
+
-
-
-
+
@@ -957,7 +922,7 @@
+ description="Builds javadocs with custom tags to build dir">
@@ -994,7 +959,7 @@
+ description="Builds javadocs to dist dir">
@@ -1061,7 +1026,7 @@
+ description="Builds javadocs with custom tags to build dir">
@@ -1070,7 +1035,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" >
@@ -1103,7 +1068,7 @@
+ description="Builds javadocs to dist dir">