--- jsr166/build.xml 2013/03/22 18:04:56 1.138 +++ jsr166/build.xml 2017/03/20 00:03:57 1.236 @@ -1,4 +1,6 @@ - + ------------------------------------------------------------------------------ @@ -6,6 +8,9 @@ Usage: ant [target] + See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for + more details. + User-specific settings are read from user.properties. See user.properties.sample for an explanation of some useful settings. @@ -13,25 +18,34 @@ 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 + $HOME/jdk/jdk9 + $HOME/jdk/jdk10 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 + $HOME/jdk/src/jdk10 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=... -Djdk$N.src.home=... + for $N in 7 8 9 10 ... + + As of 2016-03, the sources in src/main are for jdk9+ only. ------------------------------------------------------------------------------ - + + + @@ -49,13 +63,17 @@ As of 2013-02, the very latest lambda 8 - + + + + + @@ -72,21 +90,30 @@ As of 2013-02, the very latest lambda 8 - - - - - + + + + + + + + + + + - - + + - + @@ -105,17 +132,24 @@ As of 2013-02, the very latest lambda 8 + + - + + + + + + @@ -124,6 +158,7 @@ As of 2013-02, the very latest lambda 8 + @@ -131,6 +166,7 @@ As of 2013-02, the very latest lambda 8 + @@ -139,45 +175,65 @@ As of 2013-02, the very latest lambda 8 + - - - - - - - - + + + + + + + + + + - - + + + + + + + - - - - - - + + - + + + + + + + + - + + + + - - + + + + + + + + + + + + + + + + + @@ -217,30 +292,62 @@ As of 2013-02, the very latest lambda 8 + + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + - - - - - - + workDir="@{workdir}/JTwork"> + + + + - + + + @@ -256,31 +363,51 @@ As of 2013-02, the very latest lambda 8 + + + - + + + + + + + + + + + + + + + + + @@ -289,19 +416,19 @@ As of 2013-02, the very latest lambda 8 - + description="Builds library jar for src/main from compiled sources"> + + - + + + + + - - - @@ -311,20 +438,40 @@ As of 2013-02, the very latest lambda 8 + + + + + + executable="${javadoc9}"> + + + + + + + + + + + + + + + @@ -348,6 +495,10 @@ As of 2013-02, the very latest lambda 8 + + + + @@ -363,14 +514,12 @@ As of 2013-02, the very latest lambda 8 + - - - @@ -381,242 +530,373 @@ As of 2013-02, the very latest lambda 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - + - - + - + + - + + + + + + + + + - + + - + + + - - - - - + - - - + + + + + + + - - - - - - + - - - - - - - + + + + + + + + + - - - - - - - - - - - - - - + + + - + - + - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + - - - - - - - + - + - - + - - - - - - - - - - - + + - + - + - + - + - - + + + + + - - - - - - - - - + description="Finds doclint warnings"> @@ -626,17 +906,20 @@ As of 2013-02, the very latest lambda 8 debuglevel="${build.debuglevel}" deprecation="${build.deprecation}" source="6" + target="6" classpath="" bootclasspath="${bootclasspath6}" includeAntRuntime="false" includeJavaRuntime="false" - executable="${javac7}" + encoding="ASCII" + executable="${javac8}" fork="true"> + @@ -649,12 +932,16 @@ As of 2013-02, the very latest lambda 8 + + + + - @@ -665,20 +952,25 @@ As of 2013-02, the very latest lambda 8 + + + + + - + + - + - @@ -728,15 +1020,17 @@ As of 2013-02, the very latest lambda 8 + executable="${javadoc7}" + failonerror = "true"> + @@ -755,11 +1049,6 @@ As of 2013-02, the very latest lambda 8 - - - - @@ -788,14 +1077,17 @@ As of 2013-02, the very latest lambda 8 classpath="" bootclasspath="${bootclasspath6}" source="5" + target="5" includeAntRuntime="false" includeJavaRuntime="false" + encoding="ASCII" executable="${javac7}" fork="true"> + @@ -808,6 +1100,10 @@ As of 2013-02, the very latest lambda 8 + + + + @@ -821,12 +1117,14 @@ As of 2013-02, the very latest lambda 8 + executable="${javadoc7}" + failonerror = "true"> + @@ -846,12 +1144,6 @@ As of 2013-02, the very latest lambda 8 - - - - - @@ -877,16 +1169,19 @@ As of 2013-02, the very latest lambda 8 debuglevel="${build.debuglevel}" deprecation="${build.deprecation}" source="6" + target="6" classpath="" bootclasspath="${bootclasspath6}" includeAntRuntime="false" includeJavaRuntime="false" + encoding="ASCII" executable="${javac7}" fork="true"> + @@ -899,6 +1194,10 @@ As of 2013-02, the very latest lambda 8 + + + + @@ -912,12 +1211,14 @@ As of 2013-02, the very latest lambda 8 + executable="${javadoc7}" + failonerror = "true"> + @@ -937,11 +1238,6 @@ As of 2013-02, the very latest lambda 8 - - - - @@ -970,14 +1266,17 @@ As of 2013-02, the very latest lambda 8 bootclasspath="@{jsr166y.jar}:${bootclasspath6}" classpath="" source="6" + target="6" includeAntRuntime="false" includeJavaRuntime="false" + encoding="ASCII" executable="${javac7}" fork="true"> + @@ -990,6 +1289,10 @@ As of 2013-02, the very latest lambda 8 + + + + @@ -1003,12 +1306,13 @@ As of 2013-02, the very latest lambda 8 + @@ -1028,11 +1332,6 @@ As of 2013-02, the very latest lambda 8 - - - - @@ -1045,6 +1344,9 @@ As of 2013-02, the very latest lambda 8 + + + @@ -1056,21 +1358,51 @@ As of 2013-02, the very latest lambda 8 debug="${build.debug}" debuglevel="${build.debuglevel}" deprecation="${build.deprecation}" - source="7" + source="${build.jsr166e.java.version}" + target="${build.jsr166e.java.version}" classpath="" includeAntRuntime="false" includeJavaRuntime="false" - executable="${javac7}" + executable="${build.jsr166e.javac}" fork="true"> + + + + + + + + + + + + + + + + + + + + + @@ -1091,28 +1427,58 @@ As of 2013-02, the very latest lambda 8 + sourcepath="${topsrc.dir}:${jdk6.src.dir}" + source="${build.jsr166e.java.version}" + executable="${javadoc7}" + failonerror = "true"> + - + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - @@ -1145,9 +1506,165 @@ As of 2013-02, the very latest lambda 8 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +