--- jsr166/build.xml 2010/11/25 12:48:45 1.84 +++ jsr166/build.xml 2013/02/01 21:58:27 1.132 @@ -8,11 +8,28 @@ 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. +As of 2013-02, the very latest lambda 8 jdk is needed for jdk8. ------------------------------------------------------------------------------ - - Run "ant -projecthelp" for full usage information. + + + + @@ -21,30 +38,73 @@ - + + - - - - - - - - + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -55,25 +115,52 @@ - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + @@ -81,89 +168,139 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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"> - - - - - - - - - - - - + description="Builds javadocs for src/main to dist dir"> - + + - + + + + + + + + + - - @@ -182,22 +319,17 @@ - - - - - @@ -206,63 +338,17 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Building JSR-166 version ${version} - java.home is ${java.home} - - - - - + + + @@ -272,36 +358,42 @@ + destdir="${build.testcases.dir}" + debug="${build.debug}" + debuglevel="${build.debuglevel}" + deprecation="${build.deprecation}" + source="6" + classpath="${junit.jar}" + bootclasspath="@{product.jar}:${bootclasspath6}" + includeAntRuntime="false" + includeJavaRuntime="false" + executable="${javac8}" + fork="true"> - - + - - + + - - + destdir="${build.testcases.dir}" + debug="${build.debug}" + debuglevel="${build.debuglevel}" + deprecation="${build.deprecation}" + source="6" + classpath="" + bootclasspath="@{product.jar}:${bootclasspath6}" + includeAntRuntime="false" + includeJavaRuntime="false" + executable="${javac8}" + fork="true"> - - + - - + + @@ -314,17 +406,24 @@ source="${build.sourcelevel}" fork="true"> - - + - - + --> + + + + @@ -339,9 +438,10 @@ errorProperty="junit.failed" failureProperty="junit.failed" dir="${build.reports.dir}" + jvm="${java8}" fork="true"> - + @@ -442,7 +542,7 @@ - @@ -468,334 +568,547 @@ - - - - + - - - + + + + + - + + - - - - - - - + + + + + + + + + + - - - + - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + - + + + - - + + + + + - + + + + + + + + + + + + + + + + + + + - + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + - - + + - + - + - - + - - - + + - - - - - - + + - - - - + description="Builds javadocs to dist dir"> - - - - + + + + - - + description="Removes all jsr166y build products"> - - - - - - - - - - - - - - - + + - - + + + - + - + - - + - - - + + - - - - - - + + - - - - + description="Builds javadocs to build dir"> - - - - + + + + - - + description="Removes all extra166y build products"> - - + + + + + depends="extra166yclean, extra166ydocs"> + + + + + + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + +