--- jsr166/build.xml 2010/11/25 12:48:45 1.84 +++ jsr166/build.xml 2013/01/20 03:34:23 1.111 @@ -8,6 +8,20 @@ User-specific settings are read from user.properties. See user.properties.sample for an explanation of some useful settings. + + The repository contains all dependencies except for ant and the JDK + itself. Because the JDK version matters and because different + targets require different JDKs, we assume that users have created a + hierarchy containing: + $HOME/jdk/jdk6 + $HOME/jdk/jdk7 + $HOME/jdk/jdk8 + where each of the above is a JDK or a symlink to same, and + $HOME/jdk/src/jdk6 + $HOME/jdk/src/jdk7 + $HOME/jdk/src/jdk8 + where each of the above is a complete JDK source tree + (e.g. mercurial forest) or a symlink to same. ------------------------------------------------------------------------------ @@ -31,20 +45,56 @@ - - - - - - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -55,26 +105,44 @@ - - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + @@ -86,29 +154,40 @@ + + + + + + + depends="configure-compiler" + description="Compiles src/main sources to build dir"> + destdir="${build.classes.dir}" + debug="${build.debug}" + debuglevel="${build.debuglevel}" + deprecation="${build.deprecation}" + classpath="" + includeAntRuntime="false" + includeJavaRuntime="false" + executable="${javac8}" + fork="true"> + + + + + + + + + + @@ -163,7 +248,7 @@ @@ -191,8 +276,6 @@ description="Removes all build products"> - - @@ -207,57 +290,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Building JSR-166 version ${version} - java.home is ${java.home} - - - - @@ -272,34 +307,45 @@ + 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="${junit.jar}" + bootclasspath="${product.jar}:${bootclasspath6}" + includeAntRuntime="false" + includeJavaRuntime="false" + executable="${javac8}" + fork="true"> - + - + @@ -339,9 +385,10 @@ errorProperty="junit.failed" failureProperty="junit.failed" dir="${build.reports.dir}" + jvm="${java8}" fork="true"> - + @@ -442,7 +489,7 @@ - @@ -468,112 +515,240 @@ - + - + + + + + - + + + + - + + + + + + + + + + + + + - - + - - - + - + + + + + + + - + + + + + - - - - - - + + + + + + + + - - + - - + - + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + packagenames="jsr166x.*" + link="${jdkapidocs.url}" + source="5" + bootclasspath="${bootclasspath6}" + sourcepath="${topsrc.dir}:${jdk6src.dir}" + executable="${javadoc7}" + additionalparam="-XDignore.symbol.file=true" /> + + + + + - - - - + + + + + + + + + + + - + @@ -581,39 +756,37 @@ - + - + - - - - + - - - - - + @@ -622,36 +795,33 @@ - - - - - - - - + description="Builds javadocs to dist dir"> + + - + + description="Removes all jsr166y build products"> - @@ -662,55 +832,40 @@ - - - - - - - - - - - - - - + + - + - + - - - + @@ -722,9 +877,7 @@ depends="extra166ycompile" description="Builds library jar from compiled sources"> - - - + @@ -733,36 +886,33 @@ - - - - - - - - + description="Builds javadocs to build dir"> + + - + + description="Removes all extra166y build products"> - @@ -773,28 +923,97 @@ - + + + + + + + - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + +