--- jsr166/build.xml 2013/01/16 07:39:51 1.98 +++ jsr166/build.xml 2014/07/12 17:29:12 1.158 @@ -16,12 +16,22 @@ $HOME/jdk/jdk6 $HOME/jdk/jdk7 $HOME/jdk/jdk8 - where each of the above is a JDK or a symlink to same. + $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. ------------------------------------------------------------------------------ - - Run "ant -projecthelp" for full usage information. + + + + + @@ -30,80 +40,86 @@ - + + + + + + + + - - - - - - - + + + + - - - - - - - - - - - - + + + + + + - - - - - - + + + + + + + + + + + + + + + - - - - - - - - - + + + - - - - - - - - + + + + + + + + + + @@ -113,42 +129,59 @@ - + - - - - - - - - + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - - + + + + + + + + + + @@ -156,93 +189,181 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 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}"> + + + + + + + + + + + - - @@ -261,208 +382,80 @@ - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - Building JSR-166 version ${version} - java.home is ${java.home} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + - + + - - - - - - - - - - + - + + + + + + + + + + + + @@ -480,34 +473,11 @@ - - - - - - - - - - - - - - - @@ -533,21 +503,20 @@ - - + - + description="Compiles src/jdk7 sources, targeting jdk7"> - + - - + + + - - - - - + - + - - + - + + + + + + + + + + + - + + + target="7" + workdir="${build.4jdk7.dir}" + classes="${4jdk7product.jar}"> + + + + + + + + + + + + + - + - + - + - + + + + + + + + + - + - - + + - - + executable="${javadoc7}"> + + + - - + - - - + - - - + + - - - - - - - - - - - + + - - - - - - + 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"> - - - - - - - - - - - - - - - + + - - + + @@ -915,213 +867,246 @@ - + - + - - + - - - + + - - - - - - + + - + 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"> + - - + + + + + +