--- jsr166/build.xml 2013/01/19 22:23:57 1.106
+++ jsr166/build.xml 2013/01/22 20:22:00 1.123
@@ -35,7 +35,7 @@
-
+
@@ -45,33 +45,24 @@
-
-
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
@@ -81,10 +72,17 @@
-
-
+
+
+
+
+
+
+
+
+
+
@@ -92,24 +90,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -124,60 +104,106 @@
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
-
-
+
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
+
-
-
-
-
-
-
-
-
-
-
@@ -250,18 +263,16 @@
sourcepath="${src.dir}:${jdk8src.dir}"
classpath=""
executable="${javadoc8}">
-
-
-
+
+
+
-
-
@@ -282,22 +293,17 @@
-
-
-
-
-
@@ -306,7 +312,6 @@
-
@@ -324,36 +329,42 @@
+ destdir="${build.testcases.dir}"
+ debug="${build.debug}"
+ debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}"
+ source="6"
+ classpath="${junit.jar}"
+ bootclasspath="@{product.jar}:${bootclasspath6}"
+ includeAntRuntime="false"
+ includeJavaRuntime="false"
+ executable="${javac8}"
+ fork="true">
-
-
+
-
-
+
+
-
-
+ destdir="${build.testcases.dir}"
+ debug="${build.debug}"
+ debuglevel="${build.debuglevel}"
+ deprecation="${build.deprecation}"
+ source="6"
+ classpath=""
+ bootclasspath="@{product.jar}:${bootclasspath6}"
+ includeAntRuntime="false"
+ includeJavaRuntime="false"
+ executable="${javac8}"
+ fork="true">
-
-
+
-
-
+
+
@@ -366,11 +377,9 @@
source="${build.sourcelevel}"
fork="true">
-
-
+
-
-
+
-->
@@ -391,9 +400,10 @@
errorProperty="junit.failed"
failureProperty="junit.failed"
dir="${build.reports.dir}"
+ jvm="${java8}"
fork="true">
-
+
@@ -522,7 +532,6 @@
-
@@ -534,7 +543,7 @@
debug="${build.debug}"
debuglevel="${build.debuglevel}"
deprecation="${build.deprecation}"
- source="1.6"
+ source="6"
classpath=""
bootclasspath="${bootclasspath6}"
includeAntRuntime="false"
@@ -543,50 +552,33 @@
fork="true">
-
+
+
+
-
+
-
+
-
-
-
-
-
-
-
-
-
-
-
+
+ target="7"
+ workdir="${build.4jdk7.dir}"
+ classes="${4jdk7product.jar}"/>
@@ -618,6 +610,33 @@
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
@@ -632,12 +651,11 @@
sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
classpath=""
executable="${javadoc7}">
-
+
-
@@ -646,131 +664,108 @@
description="Puts all distributable products in single hierarchy"/>
-
+ description="Removes all 4jdk7 build products">
-
+ depends="4jdk7clean, 4jdk7-jar">
-
+
-
+
-
+
-
-
-
-
-
-
+
-
-
-
+
+
-
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ bootclasspath="${bootclasspath6}"
+ source="5"
+ executable="${javadoc7}">
+
+
-
+ description="Removes all jsr166x build products">
-
-
-
-
-
-
-
-
-
-
-
-
+ depends="jsr166xclean, jsr166x-jar">
@@ -783,14 +778,14 @@
depends="configure-compiler"
description="Compiles jsr166y sources">
-
+
-
+
+
-
-
-
-
+
-
-
-
+
+
-
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
-
+ description="Removes all jsr166y build products">
-
-
-
-
-
-
-
-
-
-
-
+ depends="jsr166yclean, jsr166y-jar">
@@ -884,103 +862,83 @@
-
+
-
+
-
-
-
-
-
-
+
-
+ description="Builds javadocs to build dir">
-
-
+
+
-
+ sourcepath="${topsrc.dir}:${jdk6src.dir}"
+ bootclasspath="${bootclasspath6}"
+ source="6"
+ executable="${javadoc7}">
+
+
-
+ description="Removes all extra166y build products">
-
-
-
-
-
-
-
-
-
-
-
+ depends="extra166yclean, extra166y-jar">
@@ -992,14 +950,14 @@
depends="configure-compiler"
description="Compiles jsr166e sources">
-
+
-
+
-
-
-
-
-
-
+
-
+ description="Builds javadocs to build dir">
-
-
+
+
-
-
-
-
+ source="7"
+ executable="${javadoc7}">
+
+
+
+
+
+
+
-
+ description="Removes all jsr166e build products">
-
-
-
-
-
-
-
-
-
-
-
+ depends="jsr166eclean, jsr166e-jar">