--- jsr166/build.xml 2016/03/26 12:35:25 1.201
+++ jsr166/build.xml 2016/12/17 22:18:25 1.227
@@ -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.
------------------------------------------------------------------------------
-
+
@@ -62,7 +63,6 @@
-
@@ -185,9 +185,9 @@
-
+
-
+
@@ -244,6 +244,7 @@
classpath="${junit.jar}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac@{compile-target}}"
fork="true">
@@ -251,7 +252,7 @@
-
+
@@ -262,10 +263,16 @@
jvm="${java@{target}}"
fork="true">
-
+
+
+
+
+
+
+
-
+
@@ -292,8 +299,6 @@
-
-
@@ -325,19 +330,15 @@
-
-
-
-
-
+ workDir="@{workdir}/JTwork">
-
+
+
+
@@ -392,6 +393,7 @@
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${build.main.javac}"
fork="true">
@@ -406,20 +408,16 @@
-
-
-
-
+ description="Builds library jar for src/main from compiled sources">
+
+
-
+
@@ -437,12 +435,17 @@
+
+
+
+
+
@@ -451,20 +454,21 @@
-
+
+
+
+
-
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -525,7 +529,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">
-
+
-
-
-
-
+
+
+
+
-
+
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
@@ -615,8 +626,8 @@
-
+
+
@@ -627,6 +638,7 @@
deprecation="${build.deprecation}"
source="${build.sourcelevel}"
target="${build.sourcelevel}"
+ encoding="ASCII"
fork="true">
@@ -654,6 +666,7 @@
deprecation="${build.deprecation}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac9}"
fork="true">
@@ -687,6 +700,7 @@
bootclasspath="${bootclasspath8}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac8}"
fork="true">
@@ -717,6 +731,7 @@
bootclasspath="${bootclasspath8}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac8}"
fork="true">
@@ -792,7 +807,8 @@
access="${build.javadoc.access}"
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
classpath=""
- executable="${javadoc8}">
+ executable="${javadoc8}"
+ failonerror = "true">
@@ -800,8 +816,9 @@
-
-
+
+
+
@@ -855,6 +872,7 @@
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -885,6 +903,7 @@
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac8}"
fork="true">
@@ -940,9 +959,9 @@
+
+ depends="4jdk7compile">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -1051,6 +1071,7 @@
target="5"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -1092,7 +1113,8 @@
sourcepath="${topsrc.dir}:${jdk6.src.dir}"
bootclasspath="${bootclasspath6}"
source="5"
- executable="${javadoc7}">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -1143,6 +1165,7 @@
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -1184,7 +1207,8 @@
sourcepath="${topsrc.dir}:${jdk6.src.dir}"
bootclasspath="${bootclasspath6}"
source="6"
- executable="${javadoc7}">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -1236,6 +1260,7 @@
target="6"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -1397,7 +1422,8 @@
access="${build.javadoc.access}"
sourcepath="${topsrc.dir}:${jdk6.src.dir}"
source="${build.jsr166e.java.version}"
- executable="${javadoc7}">
+ executable="${javadoc7}"
+ failonerror = "true">