--- jsr166/build.xml 2011/06/10 18:07:30 1.89 +++ 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"> + + - + sourcepath="${src.dir}:${jdk8src.dir}" + classpath="" + executable="${javadoc8}"> + + + - + @@ -167,7 +265,7 @@ @@ -211,43 +309,9 @@ - - - - - - - - - - - - - - - - - - - - - - - Building JSR-166 version ${version} - java.home is ${java.home} - - - - @@ -432,7 +496,7 @@ - @@ -458,26 +522,180 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + depends="configure-compiler" + description="Compiles jsr166x sources to build dir"> - + - + + @@ -491,7 +709,7 @@ - + @@ -500,16 +718,18 @@ + description="Builds javadocs to dist dir"> @@ -539,16 +759,17 @@ + description="Builds javadocs to dist dir"> @@ -556,7 +777,7 @@ - + @@ -564,39 +785,39 @@ - + - + - - - - + - - - + @@ -605,16 +826,18 @@ + description="Builds javadocs to dist dir"> @@ -642,16 +865,17 @@ + description="Builds javadocs to dist dir"> @@ -659,34 +883,37 @@ - + + - + - + - - - + @@ -700,7 +927,7 @@ - + @@ -709,16 +936,18 @@ + description="Builds javadocs to build dir"> @@ -746,16 +975,17 @@ + description="Builds javadocs to dist dir"> @@ -763,7 +993,114 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +