--- jsr166/build.xml 2013/01/19 01:37:44 1.99 +++ jsr166/build.xml 2015/09/02 02:14:59 1.168 @@ -16,17 +16,26 @@ $HOME/jdk/jdk6 $HOME/jdk/jdk7 $HOME/jdk/jdk8 + $HOME/jdk/jdk9 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 + $HOME/jdk/src/jdk9 where each of the above is a complete JDK source tree (e.g. mercurial forest) or a symlink to same. + + Alternatively, define ant variables thus: + ant -Djdk$N.home=... + for $N in 6 7 8 9 ... ------------------------------------------------------------------------------ - - Run "ant -projecthelp" for full usage information. + + + + + @@ -35,43 +44,46 @@ - + + + + + + + + - - - - - - - + + + + - - - - - - - - - - - - + + + + + + @@ -81,35 +93,37 @@ - - + + + + + + + + + + - - - - - - - - - + + + - - - - - - - - + + + + + + + + + + @@ -124,37 +138,54 @@ - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + @@ -162,93 +193,216 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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="${build.main.javac}" + fork="true"> + - - - - - - - - - - - - + description="Builds javadocs for src/main to dist dir"> - - + + - + access="${build.javadoc.access}" + sourcepath="${src.dir}:${jdk9src.dir}" + classpath="" + executable="${javadoc9}"> + + + + + + + + + + + - - @@ -267,208 +421,104 @@ - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - Building JSR-166 version ${version} - java.home is ${java.home} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + - + + - - - - - - - - - - - - - + - + + + + + - + + + + + - - - - - - - - - - - - + + + + + + @@ -486,34 +536,11 @@ - - - - - - - - - - - - - - - @@ -539,9 +566,34 @@ - + + + + + + + + + + + + + + + + + @@ -553,7 +605,7 @@ debug="${build.debug}" debuglevel="${build.debuglevel}" deprecation="${build.deprecation}" - source="1.6" + source="6" classpath="" bootclasspath="${bootclasspath6}" includeAntRuntime="false" @@ -562,50 +614,77 @@ fork="true"> - + + + + - - - - - + - + - - + - + + + + + + + + + + + + + target="7" + workdir="${build.4jdk7.dir}" + classes="${4jdk7product.jar}"> + + + + + + + + + + + + + @@ -631,286 +710,247 @@ - + + + + + + + + + + description="Builds javadocs for src/jdk7 to dist dir"> - - + + - - + + - - + description="Removes all 4jdk7 build products"> - - - + + - - - - - - - - - - - + + - - - - - - + depends="configure-compiler" + description="Compiles jsr166x sources to build dir"> - + - + - - + + + + - - - - - - + + - + description="Builds javadocs to dist dir"> - - + + - + + + + - + description="Removes all jsr166x build products"> - - - - - - - - - - - - - - - - - + + - - + + - + - + - - + - - - + + + - - - - - - + + - + description="Builds javadocs to dist dir"> - - + + - + + + + - + description="Removes all jsr166y build products"> - - - - - - - - - - - - - - - + + - - + + @@ -918,213 +958,256 @@ - + - + - - + - - - + + + - - - - - - + + - + description="Builds javadocs to build dir"> - - + + - + + + + - + description="Removes all extra166y build products"> - - - - - - - - - - - - - - - + + - - + + + + + - + - + + - + + + + + + + + + + + + + + + - - - - + + - + description="Builds javadocs to build dir"> - - + + + + + + - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + description="Removes all jsr166e build products"> - - - - - + + + depends="jsr166eclean, jsr166edocs"> + + - - - + + + + + - - - - + + + + + +