--- jsr166/build.xml 2015/09/13 02:09:35 1.178
+++ jsr166/build.xml 2016/04/02 16:09:42 1.208
@@ -7,6 +7,9 @@
Usage: ant [target]
+ See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
+ more details.
+
User-specific settings are read from user.properties.
See user.properties.sample for an explanation of some useful settings.
@@ -27,8 +30,11 @@
(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 2016-03, the sources in src/main are for jdk9+ only. The "docs"
+ target is currently broken.
------------------------------------------------------------------------------
@@ -52,17 +58,6 @@
-
-
-
-
-
-
@@ -75,6 +70,11 @@
+
+
+
+
+
@@ -91,26 +91,30 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
@@ -137,13 +141,14 @@
-
+
+
@@ -152,6 +157,7 @@
+
@@ -159,6 +165,7 @@
+
@@ -167,6 +174,7 @@
+
@@ -178,7 +186,7 @@
-
+
@@ -197,22 +205,34 @@
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
-
-
+
+
+
@@ -241,17 +262,17 @@
failonerror="true"
jvm="${java@{target}}"
fork="true">
-
+
+
-
+
+
+
-
-
-
@@ -283,6 +304,9 @@
+
+
+
@@ -290,23 +314,33 @@
+
+
+
+
+
+
+
+
+
+
-
-
-
+
+
-
+
+
@@ -326,17 +360,29 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -361,13 +408,13 @@
+ description="Builds library jar for src/main from compiled sources">
-
-
+
+
@@ -387,7 +434,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 +443,7 @@
+
@@ -404,6 +452,11 @@
+
+
+
+
+
@@ -428,8 +481,8 @@
-
-
+
+
@@ -464,7 +517,7 @@
+ description="Runs tck tests for src/main directly">
+ description="Runs tck with common pool parallelism 1">
+ description="Runs tck with common pool parallelism 0">
@@ -488,7 +541,7 @@
+ description="Runs jtreg tests for src/main using the jtreg ant task">
+ depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
+ description="Runs tck and jtreg tests for src/main">
-
+
-
-
-
-
+
+
+
+
-
+
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
@@ -549,8 +607,8 @@
-
+
+
@@ -560,6 +618,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.sourcelevel}"
+ target="${build.sourcelevel}"
fork="true">
@@ -601,6 +660,175 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
@@ -703,9 +933,9 @@
+
+ depends="4jdk7compile">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -811,6 +1042,7 @@
classpath=""
bootclasspath="${bootclasspath6}"
source="5"
+ target="5"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -833,8 +1065,8 @@
-
-
+
+
@@ -851,10 +1083,11 @@
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}">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -900,6 +1133,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -924,8 +1158,8 @@
-
-
+
+
@@ -942,10 +1176,11 @@
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}">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -994,6 +1229,7 @@
bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
classpath=""
source="6"
+ target="6"
includeAntRuntime="false"
includeJavaRuntime="false"
executable="${javac7}"
@@ -1016,8 +1252,8 @@
-
-
+
+
@@ -1034,7 +1270,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 +1321,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.jsr166e.java.version}"
+ target="${build.jsr166e.java.version}"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
@@ -1111,8 +1348,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 +1373,8 @@
-
-
+
+
@@ -1153,9 +1391,10 @@
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}">
+ executable="${javadoc7}"
+ failonerror = "true">