--- jsr166/build.xml 2016/03/04 21:00:45 1.197
+++ jsr166/build.xml 2016/06/04 23:49:29 1.213
@@ -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,17 +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 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
- "docs" target is still broken.
+ As of 2016-03, the sources in src/main are for jdk9+ only. The "docs"
+ target is currently broken.
------------------------------------------------------------------------------
-
+
@@ -69,6 +70,11 @@
+
+
+
+
+
@@ -85,16 +91,17 @@
-
-
-
-
+
+
+
+
+
-
+
-
@@ -134,13 +141,14 @@
-
+
+
@@ -149,6 +157,7 @@
+
@@ -156,6 +165,7 @@
+
@@ -164,6 +174,7 @@
+
@@ -175,9 +186,9 @@
-
+
-
+
@@ -209,7 +220,10 @@
-
+
+
@@ -238,7 +252,7 @@
-
+
@@ -249,7 +263,7 @@
jvm="${java@{target}}"
fork="true">
-
+
@@ -313,17 +327,13 @@
-
-
-
-
-
+
@@ -350,7 +360,7 @@
-
-
-
-
+ description="Builds library jar for src/main from compiled sources">
+
+
-
+
@@ -427,7 +435,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}">
@@ -445,6 +453,11 @@
+
+
+
+
+
@@ -505,7 +518,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">
-
+
-
-
-
-
+
+
+
+
-
+
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
@@ -595,8 +615,8 @@
-
+
+
@@ -648,6 +668,175 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ depends="4jdk7compile">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -901,10 +1091,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">
@@ -993,10 +1184,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">
@@ -1086,7 +1278,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}">
@@ -1207,9 +1399,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">