--- jsr166/build.xml 2009/08/02 00:11:59 1.81 +++ jsr166/build.xml 2013/01/19 23:40:04 1.107 @@ -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. ------------------------------------------------------------------------------ @@ -34,6 +48,13 @@ + + + + + + + @@ -42,10 +63,53 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -55,26 +119,45 @@ - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + @@ -86,29 +169,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 +265,7 @@ @@ -207,57 +309,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Building JSR-166 version ${version} - java.home is ${java.home} - - - - @@ -281,6 +335,7 @@ + @@ -298,6 +353,7 @@ + @@ -314,6 +370,7 @@ + @@ -439,7 +496,7 @@ - @@ -454,6 +511,7 @@ + @@ -464,25 +522,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + depends="configure-compiler" + description="Compiles jsr166x sources to build dir"> - + - + + + @@ -496,7 +709,7 @@ - + @@ -505,21 +718,19 @@ + description="Builds javadocs to dist dir"> - - - - - - + packagenames="jsr166x.*" + link="${jdkapidocs.url}" + source="5" + bootclasspath="${bootclasspath6}" + sourcepath="${topsrc.dir}:${jdk6src.dir}" + executable="${javadoc7}" + additionalparam="-XDignore.symbol.file=true" /> @@ -548,27 +759,25 @@ + description="Builds javadocs to dist dir"> - - - - - - + packagenames="jsr166x.*" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdk6src.dir}" + executable="${javadoc7}" + additionalparam="-XDignore.symbol.file=true" /> - + @@ -576,38 +785,39 @@ - + - + - - - - + + - - - + @@ -616,21 +826,19 @@ + description="Builds javadocs to dist dir"> - - - - - - + packagenames="jsr166y.*" + link="${jdkapidocs.url}" + source="6" + bootclasspath="${bootclasspath6}" + sourcepath="${topsrc.dir}:${jdk6src.dir}" + executable="${javadoc7}" + additionalparam="-XDignore.symbol.file=true" /> @@ -657,53 +865,55 @@ + description="Builds javadocs to dist dir"> - - - - + packagenames="jsr166y.*" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdk6src.dir}" + executable="${javadoc7}" + additionalparam="-XDignore.symbol.file=true" /> - + + - + - + - - - + + @@ -717,7 +927,7 @@ - + @@ -726,21 +936,19 @@ + description="Builds javadocs to build dir"> - - - - - - + packagenames="extra166y.*" + link="${jdkapidocs.url}" + source="6" + bootclasspath="${bootclasspath6}" + sourcepath="${topsrc.dir}:${jdk6src.dir}" + executable="${javadoc7}" + additionalparam="-XDignore.symbol.file=true" /> @@ -767,27 +975,132 @@ + description="Builds javadocs to dist dir"> - - - - + packagenames="extra166y.*" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdk6src.dir}" + executable="${javadoc7}" + additionalparam="-XDignore.symbol.file=true" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +