--- jsr166/build.xml 2013/01/16 07:39:51 1.98
+++ jsr166/build.xml 2013/01/19 23:40:04 1.107
@@ -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 @@
-
+
@@ -121,21 +127,21 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -148,6 +154,8 @@
+
+
@@ -161,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}">
+
+
+
@@ -242,7 +265,7 @@
@@ -286,43 +309,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -507,7 +496,7 @@
-
@@ -533,21 +522,21 @@
-
+
-
+ description="Compiles src/jdk7 sources, targeting jdk7">
-
+
-
-
+
-
-
+
+
-
+
-
+
+ tck.classes="${build.4jdk7.tck.classes.dir}"
+ product.jar="${4jdk7product.jar}"/>
-
+
-
+
-
+
@@ -631,23 +621,21 @@
-
+
-
-
+
+
-
-
+ executable="${javadoc7}">
+
+
@@ -655,53 +643,30 @@
-
-
-
+
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
@@ -709,22 +674,28 @@
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
+
@@ -738,7 +709,7 @@
-
+
@@ -747,16 +718,18 @@
+ description="Builds javadocs to dist dir">
@@ -786,16 +759,17 @@
+ description="Builds javadocs to dist dir">
@@ -803,7 +777,7 @@
-
+
@@ -811,39 +785,39 @@
-
+
-
+
-
-
-
-
+
-
-
-
+
@@ -852,16 +826,18 @@
+ description="Builds javadocs to dist dir">
@@ -889,16 +865,17 @@
+ description="Builds javadocs to dist dir">
@@ -906,7 +883,7 @@
-
+
@@ -915,26 +892,28 @@
-
+
-
+
-
-
-
+
@@ -948,7 +927,7 @@
-
+
@@ -957,16 +936,18 @@
+ description="Builds javadocs to build dir">
@@ -994,16 +975,17 @@
+ description="Builds javadocs to dist dir">
@@ -1011,7 +993,7 @@
-
+
@@ -1028,7 +1010,7 @@
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="1.7"
+ source="7"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
@@ -1052,7 +1034,7 @@
-
+
@@ -1061,21 +1043,18 @@
+ description="Builds javadocs to build dir">
-
-
-
@@ -1103,16 +1082,17 @@
+ description="Builds javadocs to dist dir">
@@ -1120,7 +1100,7 @@
-
+