--- jsr166/build.xml 2007/09/18 12:46:40 1.75 +++ jsr166/build.xml 2013/01/19 21:40:04 1.104 @@ -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,27 +35,81 @@ - + - - - - - - - - + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -51,23 +119,43 @@ - - + + + + + + - + + + + + + + + + + + + + + + + + @@ -79,26 +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"> - + + + + + + + + + + + @@ -153,11 +263,10 @@ - @@ -198,57 +307,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Building JSR-166 version ${version} - java.home is ${java.home} - - - - @@ -272,6 +333,7 @@ + @@ -289,6 +351,7 @@ + @@ -305,6 +368,7 @@ + @@ -430,7 +494,7 @@ - @@ -445,6 +509,7 @@ + @@ -455,11 +520,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -474,6 +687,7 @@ + @@ -496,23 +710,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" /> @@ -541,20 +749,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" /> @@ -569,38 +774,39 @@ - + - + - - - - + + - - - + @@ -609,22 +815,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" /> @@ -651,19 +852,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" /> @@ -674,4 +873,220 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +