--- jsr166/build.xml 2013/01/15 01:15:02 1.97
+++ jsr166/build.xml 2013/01/21 01:05:01 1.118
@@ -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.
------------------------------------------------------------------------------
@@ -21,7 +35,7 @@
-
+
@@ -31,45 +45,44 @@
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -77,24 +90,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -104,32 +99,28 @@
-
+
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
@@ -139,101 +130,154 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 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">
-
-
-
-
-
-
-
-
-
+ description="Builds javadocs for src/main to dist dir">
-
-
+
+
-
+ classpath=""
+ executable="${javadoc8}">
+
+
+
+
+
-
-
@@ -252,22 +296,17 @@
-
-
-
-
-
@@ -276,44 +315,9 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Building JSR-166 version ${version}
- java.home is ${java.home}
-
-
-
-
@@ -328,36 +332,44 @@
+ destdir="${build.testcases.dir}"
+ debug="${build.debug}"
+ debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}"
+ source="6"
+ classpath="${junit.jar}"
+ includeAntRuntime="false"
+ includeJavaRuntime="false"
+ executable="${javac8}"
+ fork="true">
-
-
+
+
+
-
-
+
+
-
-
+ destdir="${build.testcases.dir}"
+ debug="${build.debug}"
+ debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}"
+ source="6"
+ classpath=""
+ includeAntRuntime="false"
+ includeJavaRuntime="false"
+ executable="${javac8}"
+ fork="true">
-
-
+
+
+
-
-
+
+
@@ -370,11 +382,9 @@
source="${build.sourcelevel}"
fork="true">
-
-
+
-
-
+
-->
@@ -395,9 +405,10 @@
errorProperty="junit.failed"
failureProperty="junit.failed"
dir="${build.reports.dir}"
+ jvm="${java8}"
fork="true">
-
+
@@ -498,7 +509,7 @@
-
@@ -524,78 +535,61 @@
-
+
-
-
+ description="Compiles src/jdk7 sources, targeting jdk7">
-
+
-
-
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
+
+
+
-
+
+
+ target="7"
+ workdir="${build.4jdk7.dir}"
+ product.jar="${4jdk7product.jar}"/>
-
+
-
+
-
+
@@ -621,180 +615,166 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
+
-
-
+
+
-
-
+ executable="${javadoc7}">
+
+
+
+
-
-
+
-
-
-
+
-
-
-
+
-
-
-
-
-
-
-
-
-
+
-
-
-
-
-
-
+ depends="configure-compiler"
+ description="Compiles jsr166x sources to build dir">
-
+
-
+
-
-
+
+
+
+
-
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+ source="5"
+ executable="${javadoc7}">
+
+
+
+
+
-
+ description="Removes all jsr166x build products">
-
-
-
-
-
-
-
-
-
-
-
-
+ depends="jsr166xclean, jsr166x-jar">
-
+
@@ -802,102 +782,86 @@
-
+
-
+
-
-
+
+
-
-
-
+
+
-
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to dist dir">
-
-
+
+
-
+ source="6"
+ executable="${javadoc7}">
+
+
+
+
+
-
+ description="Removes all jsr166y build products">
-
-
-
-
-
-
-
-
-
-
-
+ depends="jsr166yclean, jsr166y-jar">
-
+
@@ -906,103 +870,87 @@
-
+
-
+
-
-
+
+
+
-
-
-
+
+
-
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to build dir">
-
-
+
+
-
+ source="6"
+ executable="${javadoc7}">
+
+
+
+
+
-
+ description="Removes all extra166y build products">
-
-
-
-
-
-
-
-
-
-
-
+ depends="extra166yclean, extra166y-jar">
-
+
@@ -1012,14 +960,14 @@
depends="configure-compiler"
description="Compiles jsr166e sources">
-
+
-
+
-
-
-
-
-
-
-
+
+
-
+ description="Builds javadocs to build dir">
-
-
+
+
-
-
-
-
-
+
+
+
+
+
-
+ description="Removes all jsr166e build products">
-
-
-
-
-
-
-
-
-
-
-
+ depends="jsr166eclean, jsr166e-jar">
-
+