--- jsr166/build.xml 2015/09/13 02:09:35 1.178
+++ jsr166/build.xml 2016/03/25 03:36:15 1.199
@@ -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 @@
-
-
-
-
-
-
@@ -91,26 +85,30 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
@@ -178,7 +176,7 @@
-
+
@@ -197,12 +195,15 @@
-
-
-
-
-
-
+
+
@@ -211,8 +212,14 @@
+
+
+
+
+
+
-
-
+
+
+
@@ -241,17 +249,17 @@
failonerror="true"
jvm="${java@{target}}"
fork="true">
-
+
+
-
+
+
+
-
-
-
@@ -283,6 +291,9 @@
+
+
+
@@ -290,23 +301,37 @@
+
+
+
+
+
+
+
+
+
+
-
+
+
+
-
+
+
-
+
+
@@ -333,10 +358,22 @@
depends="configure-compiler"
description="Compiles src/main sources to build dir">
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -356,6 +394,9 @@
+
+
+
@@ -366,8 +407,8 @@
-
-
+
+
@@ -387,7 +428,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}">
@@ -396,6 +437,7 @@
+
@@ -404,6 +446,11 @@
+
+
+
+
+
@@ -428,8 +475,8 @@
-
-
+
+
@@ -529,6 +576,11 @@
+
+
+
+
+
@@ -560,6 +612,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.sourcelevel}"
+ target="${build.sourcelevel}"
fork="true">
@@ -615,6 +668,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -644,8 +698,9 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
- bootclasspath="${bootclasspath7}"
+ bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac8}"
@@ -669,8 +724,8 @@
-
-
+
+
@@ -758,7 +813,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}">
@@ -811,6 +866,7 @@
classpath=""
bootclasspath="${bootclasspath6}"
source="5"
+ target="5"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -833,8 +889,8 @@
-
-
+
+
@@ -851,7 +907,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}">
@@ -900,6 +956,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -924,8 +981,8 @@
-
-
+
+
@@ -942,7 +999,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}">
@@ -994,6 +1051,7 @@
bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
classpath=""
source="6"
+ target="6"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -1016,8 +1074,8 @@
-
-
+
+
@@ -1034,7 +1092,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}">
@@ -1085,6 +1143,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.jsr166e.java.version}"
+ target="${build.jsr166e.java.version}"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
@@ -1111,8 +1170,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}"
@@ -1135,8 +1195,8 @@
-
-
+
+
@@ -1153,7 +1213,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}">