--- jsr166/build.xml 2016/03/26 06:22:49 1.200
+++ jsr166/build.xml 2016/11/24 01:53:50 1.223
@@ -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.
@@ -30,14 +33,12 @@
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.home="$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.
------------------------------------------------------------------------------
-
+
@@ -185,9 +186,9 @@
-
+
-
+
@@ -219,7 +220,10 @@
-
+
+
@@ -241,6 +245,7 @@
classpath="${junit.jar}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac@{compile-target}}"
fork="true">
@@ -248,7 +253,7 @@
-
+
@@ -259,10 +264,12 @@
jvm="${java@{target}}"
fork="true">
-
+
+
+
-
+
@@ -322,19 +329,15 @@
-
-
-
-
-
+ workDir="@{workdir}/JTwork">
-
+
+
+
@@ -389,6 +392,7 @@
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${build.main.javac}"
fork="true">
@@ -403,18 +407,16 @@
-
-
-
-
+ description="Builds library jar for src/main from compiled sources">
+
+
-
+
@@ -432,12 +434,14 @@
+
+
@@ -446,20 +450,21 @@
-
+
+
+
+
-
-
-
-
-
-
-
-
+
-
+
+
+
+
+
+
@@ -520,7 +525,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">
-
+
-
-
-
-
+
+
+
+
-
+
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
@@ -610,8 +622,8 @@
-
+
+
@@ -622,6 +634,7 @@
deprecation="${build.deprecation}"
source="${build.sourcelevel}"
target="${build.sourcelevel}"
+ encoding="ASCII"
fork="true">
@@ -649,6 +662,7 @@
deprecation="${build.deprecation}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac9}"
fork="true">
@@ -682,6 +696,7 @@
bootclasspath="${bootclasspath8}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac8}"
fork="true">
@@ -712,6 +727,7 @@
bootclasspath="${bootclasspath8}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac8}"
fork="true">
@@ -787,7 +803,8 @@
access="${build.javadoc.access}"
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
classpath=""
- executable="${javadoc8}">
+ executable="${javadoc8}"
+ failonerror = "true">
@@ -795,8 +812,9 @@
-
-
+
+
+
@@ -850,6 +868,7 @@
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -880,6 +899,7 @@
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac8}"
fork="true">
@@ -935,9 +955,9 @@
+
+ depends="4jdk7compile">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -1046,6 +1067,7 @@
target="5"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -1087,7 +1109,8 @@
sourcepath="${topsrc.dir}:${jdk6.src.dir}"
bootclasspath="${bootclasspath6}"
source="5"
- executable="${javadoc7}">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -1138,6 +1161,7 @@
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -1179,7 +1203,8 @@
sourcepath="${topsrc.dir}:${jdk6.src.dir}"
bootclasspath="${bootclasspath6}"
source="6"
- executable="${javadoc7}">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -1231,6 +1256,7 @@
target="6"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -1392,7 +1418,8 @@
access="${build.javadoc.access}"
sourcepath="${topsrc.dir}:${jdk6.src.dir}"
source="${build.jsr166e.java.version}"
- executable="${javadoc7}">
+ executable="${javadoc7}"
+ failonerror = "true">