--- jsr166/build.xml 2009/07/23 13:06:55 1.77 +++ jsr166/build.xml 2013/01/19 17:15:44 1.100 @@ -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,80 @@ - + - - - - - - - - + + + + + + + + + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -55,26 +119,43 @@ - - - + + + + + + - + + - + + + - + + + + + + + + + + + + @@ -86,26 +167,39 @@ + + + + + + + depends="configure-compiler" + description="Compiles src/main sources to build folder"> + destdir="${build.classes.dir}" + debug="${build.debug}" + debuglevel="${build.debuglevel}" + deprecation="${build.deprecation}" + classpath="" + includeAntRuntime="false" + includeJavaRuntime="false" + executable="${javac8}" + fork="true"> - + + + + + + + + + + + @@ -160,11 +262,10 @@ - @@ -205,44 +306,6 @@ - - - - - - - - - - - - - - - - - - - - - @@ -279,6 +342,7 @@ + @@ -296,6 +360,7 @@ + @@ -312,6 +377,7 @@ + @@ -452,6 +518,7 @@ + @@ -462,6 +529,175 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -481,6 +717,7 @@ + @@ -509,17 +746,11 @@ - - - - - - + packagenames="jsr166x" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdksrc.dir}" + additionalparam="-XDignore.symbol.file=true" /> @@ -554,14 +785,11 @@ - - - - - - + packagenames="jsr166x" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdksrc.dir}" + additionalparam="-XDignore.symbol.file=true" /> @@ -591,6 +819,7 @@ + @@ -622,16 +851,11 @@ - - - - - - + packagenames="jsr166y" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdksrc.dir}" + additionalparam="-XDignore.symbol.file=true" /> @@ -664,12 +888,11 @@ - - - - + packagenames="jsr166y" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdksrc.dir}" + additionalparam="-XDignore.symbol.file=true" /> @@ -680,6 +903,7 @@ + @@ -700,6 +924,7 @@ + @@ -731,16 +956,11 @@ - - - - - - + packagenames="extra166y" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdksrc.dir}" + additionalparam="-XDignore.symbol.file=true" /> @@ -773,12 +993,11 @@ - - - - + packagenames="extra166y" + link="${jdkapidocs.url}" + source="${build.sourcelevel}" + sourcepath="${topsrc.dir}:${jdksrc.dir}" + additionalparam="-XDignore.symbol.file=true" /> @@ -789,4 +1008,113 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +