--- jsr166/build.xml 2009/08/02 00:11:59 1.81 +++ jsr166/build.xml 2013/01/20 07:43:30 1.117 @@ -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. ------------------------------------------------------------------------------ @@ -21,7 +35,7 @@ - + @@ -31,20 +45,86 @@ - - - - - - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -55,26 +135,49 @@ - - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -86,29 +189,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 +283,7 @@ @@ -191,8 +311,6 @@ description="Removes all build products"> - - @@ -207,57 +325,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Building JSR-166 version ${version} - java.home is ${java.home} - - - - @@ -272,34 +342,43 @@ + 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"> - + - - - + + @@ -314,8 +393,7 @@ - - + --> @@ -336,9 +414,10 @@ errorProperty="junit.failed" failureProperty="junit.failed" dir="${build.reports.dir}" + jvm="${java8}" fork="true"> - + @@ -439,7 +518,7 @@ - @@ -454,6 +533,7 @@ + @@ -464,111 +544,252 @@ - - + - - - - + + + + + + + + + + + - + - - - - + + + - + + + + - - + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - + - + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + packagenames="jsr166x.*" + link="${jdkapidocs.url}" + source="5" + bootclasspath="${bootclasspath6}" + sourcepath="${topsrc.dir}:${jdk6src.dir}" + executable="${javadoc7}" + additionalparam="-XDignore.symbol.file=true"/> + + - - - - + + + + + + + + + + + + + + - + @@ -576,39 +797,38 @@ - + - + - + - - - - + + - - - - - - + + @@ -616,36 +836,33 @@ - - - - - - - - + description="Builds javadocs to dist dir"> + + - + + description="Removes all jsr166y build products"> - @@ -656,54 +873,40 @@ - - - - - - - - - - - - - - + + - + - + - + - - - + + @@ -715,10 +918,8 @@ depends="extra166ycompile" description="Builds library jar from compiled sources"> - - - - + + @@ -726,36 +927,33 @@ - - - - - - - - + description="Builds javadocs to build dir"> + + - + + description="Removes all extra166y build products"> - @@ -766,28 +964,97 @@ - + - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + +