--- jsr166/build.xml 2013/07/20 17:21:45 1.147 +++ jsr166/build.xml 2015/09/02 03:53:43 1.170 @@ -16,17 +16,23 @@ $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. -As of 2013-02, the very latest lambda 8 jdk is needed for jdk8. + + Alternatively, define ant variables thus: + ant -Djdk$N.home=... + for $N in 6 7 8 9 ... ------------------------------------------------------------------------------ - + + @@ -44,13 +50,15 @@ As of 2013-02, the very latest lambda 8 - - + - - @@ -114,6 +122,7 @@ As of 2013-02, the very latest lambda 8 + @@ -154,17 +163,24 @@ As of 2013-02, the very latest lambda 8 - - - - - - - - + + + + + + + + + + - - + + + + + + + @@ -183,7 +199,7 @@ As of 2013-02, the very latest lambda 8 - + @@ -197,7 +213,6 @@ As of 2013-02, the very latest lambda 8 source="@{compile-target}" target="@{compile-target}" classpath="${junit.jar}" - bootclasspath="@{classes}:${bootclasspath@{compile-target}}" includeAntRuntime="false" includeJavaRuntime="false" executable="${javac@{compile-target}}" @@ -206,6 +221,7 @@ As of 2013-02, the very latest lambda 8 + @@ -217,6 +233,12 @@ As of 2013-02, the very latest lambda 8 fork="true"> + + + + + + @@ -229,7 +251,38 @@ As of 2013-02, the very latest lambda 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -245,7 +298,7 @@ As of 2013-02, the very latest lambda 8 jdk="${jdk@{target}.home}" workDir="@{workdir}/JTwork" reportDir="@{workdir}/JTreport"> - + @@ -268,6 +321,9 @@ As of 2013-02, the very latest lambda 8 + + + @@ -286,13 +342,14 @@ As of 2013-02, the very latest lambda 8 classpath="" includeAntRuntime="false" includeJavaRuntime="false" - executable="${javac8}" + executable="${build.main.javac}" fork="true"> + @@ -322,15 +379,16 @@ As of 2013-02, the very latest lambda 8 + executable="${javadoc9}"> + @@ -379,6 +437,7 @@ As of 2013-02, the very latest lambda 8 + @@ -394,31 +453,72 @@ As of 2013-02, the very latest lambda 8 - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -468,6 +568,32 @@ As of 2013-02, the very latest lambda 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -521,6 +677,7 @@ As of 2013-02, the very latest lambda 8 + @@ -567,8 +724,7 @@ As of 2013-02, the very latest lambda 8 + classes="${4jdk7product.jar}"/> @@ -586,7 +742,7 @@ As of 2013-02, the very latest lambda 8 + @@ -613,11 +770,6 @@ As of 2013-02, the very latest lambda 8 - - - - @@ -654,6 +806,7 @@ As of 2013-02, the very latest lambda 8 + @@ -679,12 +832,13 @@ As of 2013-02, the very latest lambda 8 + @@ -704,12 +858,6 @@ As of 2013-02, the very latest lambda 8 - - - - - @@ -745,6 +893,7 @@ As of 2013-02, the very latest lambda 8 + @@ -770,12 +919,13 @@ As of 2013-02, the very latest lambda 8 + @@ -795,11 +945,6 @@ As of 2013-02, the very latest lambda 8 - - - - @@ -836,6 +981,7 @@ As of 2013-02, the very latest lambda 8 + @@ -861,12 +1007,13 @@ As of 2013-02, the very latest lambda 8 + @@ -886,11 +1033,6 @@ As of 2013-02, the very latest lambda 8 - - - - @@ -927,11 +1069,39 @@ As of 2013-02, the very latest lambda 8 + + + + + + + + + + + + + + + + + + @@ -964,8 +1135,7 @@ As of 2013-02, the very latest lambda 8 + depends="jsr166ejar"> @@ -1015,11 +1185,6 @@ As of 2013-02, the very latest lambda 8 - - - - @@ -1035,6 +1200,13 @@ As of 2013-02, the very latest lambda 8 + + + + + + +