--- jsr166/build.xml 2015/09/11 18:43:46 1.177
+++ jsr166/build.xml 2016/11/24 01:58:04 1.224
@@ -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,12 +30,15 @@
(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,29 +58,22 @@
-
-
-
-
-
-
-
+
+
+
+
+
@@ -91,26 +90,30 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
-
+
@@ -137,13 +140,14 @@
-
+
+
@@ -152,6 +156,7 @@
+
@@ -159,6 +164,7 @@
+
@@ -167,6 +173,7 @@
+
@@ -178,9 +185,9 @@
-
+
-
+
@@ -197,22 +204,34 @@
-
-
-
-
-
-
+
+
-
+
+
+
+
+
+
+
+
-
-
+
+
+
@@ -241,17 +262,19 @@
failonerror="true"
jvm="${java@{target}}"
fork="true">
-
+
+
+
+
-
-
+
+
+
+
-
-
-
@@ -283,6 +306,9 @@
+
+
+
@@ -290,23 +316,33 @@
+
+
+
+
+
+
+
+
+
+
-
-
-
+ workDir="@{workdir}/JTwork">
-
+
+
+
-
+
+
+
@@ -326,27 +362,41 @@
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -361,10 +411,15 @@
-
+ description="Builds library jar for src/main from compiled sources">
+
+
-
+
+
+
+
+
@@ -378,12 +433,14 @@
+
+
@@ -392,14 +449,21 @@
+
+
+
+
-
-
-
+
-
+
+
+
+
+
+
@@ -423,6 +487,10 @@
+
+
+
+
@@ -456,7 +524,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">
+
+
+
+
+
+
+ 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">
-
+
-
-
-
-
+
+
+
+
-
+
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
+
+
+
+
+
@@ -541,8 +621,8 @@
-
+
+
@@ -552,6 +632,8 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.sourcelevel}"
+ target="${build.sourcelevel}"
+ encoding="ASCII"
fork="true">
@@ -579,6 +661,7 @@
deprecation="${build.deprecation}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac9}"
fork="true">
@@ -593,6 +676,178 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -636,10 +893,12 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
- bootclasspath="${bootclasspath7}"
+ bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac8}"
fork="true">
@@ -660,6 +919,10 @@
+
+
+
+
@@ -691,9 +954,9 @@
+
+ depends="4jdk7compile">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -799,8 +1063,10 @@
classpath=""
bootclasspath="${bootclasspath6}"
source="5"
+ target="5"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -820,6 +1086,10 @@
+
+
+
+
@@ -835,10 +1105,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">
@@ -884,10 +1155,12 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="6"
+ target="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -907,6 +1180,10 @@
+
+
+
+
@@ -922,10 +1199,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">
@@ -974,8 +1252,10 @@
bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
classpath=""
source="6"
+ target="6"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -995,6 +1275,10 @@
+
+
+
+
@@ -1010,7 +1294,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 +1345,7 @@
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
source="${build.jsr166e.java.version}"
+ target="${build.jsr166e.java.version}"
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
@@ -1087,8 +1372,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 +1396,10 @@
+
+
+
+
@@ -1125,9 +1415,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">