--- jsr166/build.xml 2010/11/25 12:48:45 1.84 +++ jsr166/build.xml 2013/01/19 22:23:57 1.106 @@ -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,43 @@ - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + + @@ -86,29 +167,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 +263,7 @@ @@ -207,57 +307,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Building JSR-166 version ${version} - java.home is ${java.home} - - - - @@ -442,7 +494,7 @@ - @@ -468,26 +520,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + depends="configure-compiler" + description="Compiles jsr166x sources to build dir"> - + - + + @@ -501,7 +707,7 @@ - + @@ -510,21 +716,17 @@ + description="Builds javadocs to dist dir"> - - - - - - + packagenames="jsr166x" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdksrc.dir}" + additionalparam="-XDignore.symbol.file=true" /> @@ -553,27 +755,24 @@ + description="Builds javadocs to dist dir"> - - - - - - + packagenames="jsr166x" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdksrc.dir}" + additionalparam="-XDignore.symbol.file=true" /> - + @@ -581,39 +780,39 @@ - + - + - - - - + - - - + @@ -622,21 +821,17 @@ + description="Builds javadocs to dist dir"> - - - - - - + packagenames="jsr166y" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdksrc.dir}" + additionalparam="-XDignore.symbol.file=true" /> @@ -663,54 +858,54 @@ + description="Builds javadocs to dist dir"> - - - - + packagenames="jsr166y" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdksrc.dir}" + additionalparam="-XDignore.symbol.file=true" /> - + + - + - + - - - + @@ -724,7 +919,7 @@ - + @@ -733,21 +928,17 @@ + description="Builds javadocs with custom tags to build dir"> - - - - - - + packagenames="extra166y" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdksrc.dir}" + additionalparam="-XDignore.symbol.file=true" /> @@ -774,27 +965,133 @@ + description="Builds javadocs to dist dir"> - - - - + packagenames="extra166y" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdksrc.dir}" + additionalparam="-XDignore.symbol.file=true" /> - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +