--- jsr166/build.xml 2015/09/11 18:43:46 1.177
+++ jsr166/build.xml 2016/03/26 06:22:49 1.200
@@ -27,8 +27,13 @@
(e.g. mercurial forest) or a symlink to same.
Alternatively, define ant variables thus:
- ant -Djdk$N.home=...
+ ant -Djdk$N.home=... -Djdk$N.src.home=...
for $N in 6 7 8 9 ...
+
+ As of 2015-09, there is incomplete hacky support for jigsaw
+ Build for jigsaw using something like:
+ ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
+ "docs" target is still broken.
------------------------------------------------------------------------------
@@ -52,17 +57,6 @@
-
-
-
-
-
-
@@ -75,6 +69,11 @@
+
+
+
+
+
@@ -91,26 +90,30 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
@@ -137,13 +140,14 @@
-
+
+
@@ -152,6 +156,7 @@
+
@@ -159,6 +164,7 @@
+
@@ -167,6 +173,7 @@
+
@@ -178,7 +185,7 @@
-
+
@@ -197,12 +204,15 @@
-
-
-
-
-
-
+
+
@@ -211,8 +221,14 @@
+
+
+
+
+
+
-
-
+
+
+
@@ -241,17 +258,17 @@
failonerror="true"
jvm="${java@{target}}"
fork="true">
-
+
+
-
+
+
+
-
-
-
@@ -283,6 +300,9 @@
+
+
+
@@ -290,23 +310,37 @@
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+
+
-
+
+
@@ -326,17 +360,29 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -356,6 +403,9 @@
+
+
+
@@ -365,6 +415,10 @@
+
+
+
+
@@ -383,7 +437,7 @@
link="${java9.api.url}"
overview="${src.dir}/intro.html"
access="${build.javadoc.access}"
- sourcepath="${src.dir}:${jdk9src.dir}"
+ sourcepath="${src.dir}:${jdk9.src.dir}"
classpath=""
executable="${javadoc9}">
@@ -392,6 +446,7 @@
+
@@ -400,6 +455,11 @@
+
+
+
+
+
@@ -423,6 +483,10 @@
+
+
+
+
@@ -521,6 +585,11 @@
+
+
+
+
+
@@ -552,6 +621,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.sourcelevel}"
+ target="${build.sourcelevel}"
fork="true">
@@ -593,6 +663,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -746,7 +990,7 @@
link="${java7.api.url}"
overview="${4jdk7src.dir}/intro.html"
access="${build.javadoc.access}"
- sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
+ sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
classpath=""
executable="${javadoc7}">
@@ -799,6 +1043,7 @@
classpath=""
bootclasspath="${bootclasspath6}"
source="5"
+ target="5"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -820,6 +1065,10 @@
+
+
+
+
@@ -835,7 +1084,7 @@
packagenames="jsr166x.*"
link="${java.api.url}"
access="${build.javadoc.access}"
- sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ sourcepath="${topsrc.dir}:${jdk6.src.dir}"
bootclasspath="${bootclasspath6}"
source="5"
executable="${javadoc7}">
@@ -884,6 +1133,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -907,6 +1157,10 @@
+
+
+
+
@@ -922,7 +1176,7 @@
packagenames="jsr166y.*"
link="${java.api.url}"
access="${build.javadoc.access}"
- sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ sourcepath="${topsrc.dir}:${jdk6.src.dir}"
bootclasspath="${bootclasspath6}"
source="6"
executable="${javadoc7}">
@@ -974,6 +1228,7 @@
bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
classpath=""
source="6"
+ target="6"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -995,6 +1250,10 @@
+
+
+
+
@@ -1010,7 +1269,7 @@
packagenames="extra166y.*"
link="${java.api.url}"
access="${build.javadoc.access}"
- sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ sourcepath="${topsrc.dir}:${jdk6.src.dir}"
bootclasspath="${bootclasspath6}"
source="6"
executable="${javadoc7}">
@@ -1061,6 +1320,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.jsr166e.java.version}"
+ target="${build.jsr166e.java.version}"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
@@ -1087,8 +1347,9 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.jsr166e.java.version}"
+ target="${build.jsr166e.java.version}"
classpath=""
- bootclasspath="${bootclasspath7}"
+ bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac8}"
@@ -1110,6 +1371,10 @@
+
+
+
+
@@ -1125,7 +1390,7 @@
packagenames="jsr166e.*"
link="${java.api.url}"
access="${build.javadoc.access}"
- sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ sourcepath="${topsrc.dir}:${jdk6.src.dir}"
source="${build.jsr166e.java.version}"
executable="${javadoc7}">