--- jsr166/build.xml 2013/01/16 07:39:51 1.98
+++ jsr166/build.xml 2013/01/19 23:58:12 1.108
@@ -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.
------------------------------------------------------------------------------
@@ -41,30 +46,25 @@
-
-
-
-
-
-
+
+
+
+
+
-
-
-
-
@@ -72,11 +72,12 @@
-
-
-
-
-
+
+
+
+
+
+
@@ -113,7 +114,7 @@
-
+
@@ -121,21 +122,21 @@
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -148,6 +149,8 @@
+
+
@@ -161,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}">
+
+
+
@@ -242,7 +260,7 @@
@@ -286,43 +304,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -507,7 +491,7 @@
-
@@ -533,21 +517,21 @@
-
+
-
+ description="Compiles src/jdk7 sources, targeting jdk7">
-
+
-
-
+
-
-
+
+
-
+
-
+
+ tck.classes="${build.4jdk7.tck.classes.dir}"
+ product.jar="${4jdk7product.jar}"/>
-
+
-
+
-
+
@@ -631,23 +616,21 @@
-
+
-
-
+
+
-
-
+ executable="${javadoc7}">
+
+
@@ -655,53 +638,30 @@
-
-
-
+
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
@@ -709,22 +669,28 @@
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
+
@@ -738,7 +704,7 @@
-
+
@@ -747,23 +713,25 @@
+ description="Builds javadocs to dist dir">
-
-
+
+
-
@@ -784,26 +752,10 @@
-
-
-
-
-
-
-
-
-
-
-
+
@@ -811,39 +763,39 @@
-
+
-
+
-
-
-
-
+
-
-
-
+
@@ -852,23 +804,25 @@
+ description="Builds javadocs to dist dir">
-
-
+
+
-
@@ -888,25 +842,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -915,26 +854,28 @@
-
+
-
+
-
-
-
+
@@ -948,7 +889,7 @@
-
+
@@ -957,23 +898,25 @@
+ description="Builds javadocs to build dir">
-
-
+
+
-
@@ -993,25 +936,10 @@
-
-
-
-
-
-
-
-
-
-
+
@@ -1028,7 +956,7 @@
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="1.7"
+ source="7"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
@@ -1052,7 +980,7 @@
-
+
@@ -1061,28 +989,25 @@
+ description="Builds javadocs to build dir">
-
-
+
+
-
-
-
-
@@ -1096,31 +1021,15 @@
-
-
-
-
-
-
-
-
-
-
-
+