--- jsr166/build.xml 2013/01/14 19:22:27 1.95 +++ jsr166/build.xml 2013/07/10 17:09:45 1.143 @@ -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,53 +38,76 @@ - + + + + + + + + + + + - - - - - - + + + + - - - - - - - - - - - - + + + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -84,32 +124,35 @@ - + - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + @@ -117,103 +160,190 @@ - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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"> - - + + - + access="${build.javadoc.access}" + sourcepath="${src.dir}:${jdk8src.dir}" + classpath="" + executable="${javadoc8}"> + + + + + + + + + - - @@ -232,22 +362,17 @@ - - - - - @@ -256,184 +381,43 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - Building JSR-166 version ${version} - java.home is ${java.home} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - - - - - - - - - - - - - - - + + @@ -451,34 +435,11 @@ - - - - - - - - - - - - - - - @@ -504,330 +465,345 @@ - - + - + description="Compiles src/jdk7 sources, targeting jdk7"> - + - - + + + + + + + + + + + + + + + + + + + + + + + + + - - + - - - + + + + + + + + + + + + + + + + + + + + + - - - + - + + + - + executable="${javadoc7}"> + + - - + - - - + - - - - - - - - - - - - - - + + - - - + + - + + depends="configure-compiler" + description="Compiles jsr166x sources to build dir"> - + - + - - + + + - - - - - - + + - + description="Builds javadocs to dist dir"> - - + + - + access="${build.javadoc.access}" + sourcepath="${topsrc.dir}:${jdk6src.dir}" + bootclasspath="${bootclasspath6}" + source="5" + executable="${javadoc7}"> + + - + description="Removes all jsr166x build products"> - - - - - - - - - - - - + + - - + + - + - + - - + - - - + + - - - - - - + + - + description="Builds javadocs to dist dir"> - - + + - + access="${build.javadoc.access}" + sourcepath="${topsrc.dir}:${jdk6src.dir}" + bootclasspath="${bootclasspath6}" + source="6" + executable="${javadoc7}"> + + - + description="Removes all jsr166y build products"> - - - - - - - - - - - + + - - + + @@ -835,104 +811,90 @@ - + - + - - + - - - + + - - - - - - + + - + description="Builds javadocs to build dir"> - - + + - + access="${build.javadoc.access}" + sourcepath="${topsrc.dir}:${jdk6src.dir}" + bootclasspath="${bootclasspath6}" + source="6" + executable="${javadoc7}"> + + - + description="Removes all extra166y build products"> - - - - - - - - - - - + + - - + + @@ -941,14 +903,14 @@ depends="configure-compiler" description="Compiles jsr166e sources"> - + - + - - - - - - + + - + description="Builds javadocs to build dir"> - - + + - + access="${build.javadoc.access}" + sourcepath="${topsrc.dir}:${jdk7src.dir}" + source="7" + executable="${javadoc7}"> + + + + + + + + - - + description="Removes all jsr166e build products"> - - - - - - - - - + + + + + - - + + + + + +