--- jsr166/build.xml 2016/03/26 16:49:22 1.203
+++ jsr166/build.xml 2016/09/17 21:02:01 1.219
@@ -38,7 +38,7 @@
------------------------------------------------------------------------------
-
+
@@ -186,9 +186,9 @@
-
+
-
+
@@ -245,6 +245,7 @@
classpath="${junit.jar}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac@{compile-target}}"
fork="true">
@@ -252,7 +253,7 @@
-
+
@@ -263,10 +264,12 @@
jvm="${java@{target}}"
fork="true">
-
+
+
+
-
+
@@ -327,17 +330,13 @@
-
-
-
-
-
+
@@ -393,6 +392,7 @@
classpath=""
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${build.main.javac}"
fork="true">
@@ -407,20 +407,16 @@
-
-
-
-
+ description="Builds library jar for src/main from compiled sources">
+
+
-
+
@@ -438,12 +434,14 @@
+
+
@@ -452,7 +450,7 @@
-
+
@@ -526,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">
-
+
-
-
-
-
+
+
+
+
-
+
-
+
+
-
-
-
-
-
+
+
+
+
+
-
-
-
-
-
+
+
+
+
+
-
+
@@ -628,6 +633,7 @@
deprecation="${build.deprecation}"
source="${build.sourcelevel}"
target="${build.sourcelevel}"
+ encoding="ASCII"
fork="true">
@@ -655,6 +661,7 @@
deprecation="${build.deprecation}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac9}"
fork="true">
@@ -688,6 +695,7 @@
bootclasspath="${bootclasspath8}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac8}"
fork="true">
@@ -718,6 +726,7 @@
bootclasspath="${bootclasspath8}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac8}"
fork="true">
@@ -793,7 +802,8 @@
access="${build.javadoc.access}"
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
classpath=""
- executable="${javadoc8}">
+ executable="${javadoc8}"
+ failonerror = "true">
@@ -856,6 +866,7 @@
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -886,6 +897,7 @@
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac8}"
fork="true">
@@ -998,7 +1010,8 @@
access="${build.javadoc.access}"
sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
classpath=""
- executable="${javadoc7}">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -1052,6 +1065,7 @@
target="5"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -1093,7 +1107,8 @@
sourcepath="${topsrc.dir}:${jdk6.src.dir}"
bootclasspath="${bootclasspath6}"
source="5"
- executable="${javadoc7}">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -1144,6 +1159,7 @@
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -1185,7 +1201,8 @@
sourcepath="${topsrc.dir}:${jdk6.src.dir}"
bootclasspath="${bootclasspath6}"
source="6"
- executable="${javadoc7}">
+ executable="${javadoc7}"
+ failonerror = "true">
@@ -1237,6 +1254,7 @@
target="6"
includeAntRuntime="false"
includeJavaRuntime="false"
+ encoding="ASCII"
executable="${javac7}"
fork="true">
@@ -1398,7 +1416,8 @@
access="${build.javadoc.access}"
sourcepath="${topsrc.dir}:${jdk6.src.dir}"
source="${build.jsr166e.java.version}"
- executable="${javadoc7}">
+ executable="${javadoc7}"
+ failonerror = "true">