--- jsr166/build.xml 2015/12/11 23:58:52 1.193
+++ jsr166/build.xml 2016/03/26 17:35:47 1.205
@@ -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,13 +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 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,7 +186,7 @@
-
+
@@ -209,7 +220,10 @@
-
+
+
@@ -238,7 +252,7 @@
-
+
@@ -249,13 +263,14 @@
jvm="${java@{target}}"
fork="true">
-
+
+
@@ -289,6 +304,9 @@
+
+
+
@@ -319,13 +337,14 @@
reportDir="@{workdir}/JTreport">
-
+
+
@@ -345,7 +364,7 @@
+ description="Builds library jar for src/main from compiled sources">
@@ -419,7 +438,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}">
@@ -437,6 +456,11 @@
+
+
+
+
+
@@ -497,7 +521,7 @@
+ description="Runs tck tests for src/main directly">
+ description="Runs jtreg tests for src/main using the jtreg ant task">
+ description="Runs tck and jtreg tests for src/main">
-
+
-
-
-
-
+
+
+
+
-
+
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
@@ -587,8 +611,8 @@
-
+
+
@@ -640,6 +664,174 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ depends="4jdk7compile">
@@ -893,7 +1085,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}">
@@ -985,7 +1177,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}">
@@ -1078,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}">
@@ -1199,7 +1391,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}">