--- jsr166/build.xml 2009/01/06 16:31:52 1.76 +++ jsr166/build.xml 2013/01/19 23:58:12 1.108 @@ -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,30 +35,75 @@ - + - - - - - - - - + + + + + + + + + + + + + + - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -55,26 +114,45 @@ - - - + + + + + + - - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + @@ -86,26 +164,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"> - + + + + + + + + + + + @@ -160,11 +260,10 @@ - @@ -205,57 +304,9 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - Building JSR-166 version ${version} - java.home is ${java.home} - - - - @@ -279,6 +330,7 @@ + @@ -296,6 +348,7 @@ + @@ -312,6 +365,7 @@ + @@ -437,7 +491,7 @@ - @@ -452,6 +506,7 @@ + @@ -462,113 +517,245 @@ - + - + + + + + - + + + + - + + + + + + + + + + + + + + + + - - - - - - + - + + + + + + + - + - - + + - + - sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes" - > - - - + + + + + + + + - - - - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + + packagenames="jsr166x.*" + link="${jdkapidocs.url}" + source="5" + bootclasspath="${bootclasspath6}" + sourcepath="${topsrc.dir}:${jdk6src.dir}" + executable="${javadoc7}" + additionalparam="-XDignore.symbol.file=true" /> + + - - - - + + + + + + + + + + + + + + + - + @@ -576,38 +763,39 @@ - + - + - - - - + + - - - + @@ -616,28 +804,25 @@ - - - - - - - - + description="Builds javadocs to dist dir"> + + - + @@ -657,51 +842,40 @@ - - - - - - - - - - - - - - + + - + - + - - - + + @@ -715,7 +889,7 @@ - + @@ -724,28 +898,25 @@ - - - - - - - - + description="Builds javadocs to build dir"> + + - + @@ -765,26 +936,100 @@ - + - - + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + +