--- jsr166/build.xml 2012/11/18 06:21:11 1.91 +++ jsr166/build.xml 2013/01/19 21:35:40 1.103 @@ -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 @@ + + + + + + + @@ -50,6 +71,45 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -59,14 +119,16 @@ - - - - + + + + + + @@ -74,6 +136,7 @@ + @@ -104,6 +167,12 @@ + + + + + + @@ -112,21 +181,26 @@ description="Builds all public jars and docs"/> + 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}"> + + + - + @@ -185,7 +263,7 @@ @@ -229,41 +307,17 @@ - - - - - - - - - - - - - - - - - - - + - - Building JSR-166 version ${version} - java.home is ${java.home} + + + - + - @@ -476,11 +530,159 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -518,7 +720,7 @@ + description="Builds javadocs to dist dir"> @@ -557,7 +759,7 @@ + description="Builds javadocs to dist dir"> @@ -582,32 +784,32 @@ - + - + - - - - + - - @@ -623,7 +825,7 @@ + description="Builds javadocs to dist dir"> @@ -660,7 +862,7 @@ + description="Builds javadocs to dist dir"> @@ -686,26 +888,28 @@ - + - + - - - + @@ -728,7 +932,7 @@ + description="Builds javadocs with custom tags to build dir"> @@ -765,7 +969,7 @@ + description="Builds javadocs to dist dir"> @@ -788,27 +992,28 @@ - - + classpath="" + includeAntRuntime="false" + includeJavaRuntime="false" + executable="${javac7}" + fork="true"> - + - - - + @@ -831,17 +1036,22 @@ + description="Builds javadocs with custom tags to build dir"> + sourcepath="${topsrc.dir}:${jdk7src.dir}" + executable="${javadoc7}" + additionalparam="-XDignore.symbol.file=true" > + + + + @@ -868,7 +1078,7 @@ + description="Builds javadocs to dist dir">