--- jsr166/build.xml 2015/09/13 17:46:07 1.182
+++ jsr166/build.xml 2016/03/26 12:35:25 1.201
@@ -27,12 +27,12 @@
(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.dir="$HOME/jdk/src/jigsaw" clean test dist
+ ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
"docs" target is still broken.
------------------------------------------------------------------------------
@@ -57,17 +57,6 @@
-
-
-
-
-
-
@@ -80,6 +69,11 @@
+
+
+
+
+
@@ -96,16 +90,17 @@
-
-
-
-
+
+
+
+
+
-
+
-
@@ -145,13 +140,14 @@
-
+
+
@@ -160,6 +156,7 @@
+
@@ -167,6 +164,7 @@
+
@@ -175,6 +173,7 @@
+
@@ -186,7 +185,7 @@
-
+
@@ -205,19 +204,25 @@
-
-
-
-
-
-
+
+
-
+
+
@@ -244,9 +249,9 @@
-
+
-
+
@@ -257,17 +262,16 @@
jvm="${java@{target}}"
fork="true">
-
+
-
+
+
+
-
-
-
@@ -299,6 +303,9 @@
+
+
+
@@ -309,6 +316,9 @@
+
+
+
@@ -317,20 +327,23 @@
-
+
+
+
-
+
-
+
+
@@ -350,7 +363,7 @@
+
+
+
@@ -424,7 +442,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}">
@@ -442,6 +460,11 @@
+
+
+
+
+
@@ -603,6 +626,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.sourcelevel}"
+ target="${build.sourcelevel}"
fork="true">
@@ -644,6 +668,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -854,6 +1048,7 @@
classpath=""
bootclasspath="${bootclasspath6}"
source="5"
+ target="5"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -894,7 +1089,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}">
@@ -943,6 +1138,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -985,7 +1181,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}">
@@ -1037,6 +1233,7 @@
bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
classpath=""
source="6"
+ target="6"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -1077,7 +1274,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}">
@@ -1128,6 +1325,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.jsr166e.java.version}"
+ target="${build.jsr166e.java.version}"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
@@ -1154,8 +1352,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}"
@@ -1196,7 +1395,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}">