--- jsr166/build.xml 2013/01/16 07:39:51 1.98 +++ jsr166/build.xml 2013/01/19 01:37:44 1.99 @@ -16,7 +16,12 @@ $HOME/jdk/jdk6 $HOME/jdk/jdk7 $HOME/jdk/jdk8 - where each of the above is a JDK or a symlink to same. + 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. ------------------------------------------------------------------------------ @@ -44,11 +49,11 @@ - - - - - + + + + + @@ -72,11 +77,12 @@ - - - - - + + + + + + @@ -113,7 +119,7 @@ - + @@ -122,7 +128,7 @@ - + @@ -130,7 +136,7 @@ - + @@ -533,17 +539,17 @@ - + - + description="Compiles src/jdk7 sources, targeting jdk7"> - + - - + - - + + - + - + + tck.classes="${build.4jdk7.tck.classes.dir}" + product.jar="${4jdk7product.jar}"/> - + - + - + @@ -631,23 +638,21 @@ - - - + + - - + executable="${javadoc7}"> + + @@ -655,53 +660,51 @@ - - - + - - - - + + - + executable="${javadoc7}"> - + - + - + @@ -1070,7 +1073,7 @@ packagenames="jsr166e,jsr166e.extra" link="${jdkapi7docs.url}" source="1.7" - sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}" + sourcepath="${topsrc.dir}:${jdk7src.dir}" executable="${javadoc7}" additionalparam="-XDignore.symbol.file=true" >