--- jsr166/build.xml 2013/01/19 17:30:36 1.101 +++ jsr166/build.xml 2017/10/31 17:47:57 1.258 @@ -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,154 +18,351 @@ 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. + + Alternatively, define ant variables thus: + ant -Djdk$N.home=... -Djdk$N.src.home=... + for $N in 8 9 10 ... + + As of 2016-03, the sources in src/main are for jdk9+ only. ------------------------------------------------------------------------------ - - Run "ant -projecthelp" for full usage information. + + + + + + - + + - - - - - - - - - - - - + + + + + + + + + + - - - - - - - - - + + + + + + - - - - - - - + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - + + + - - - - - - - - + + + + + + + + + + + - + + + + + + - - - - - - - - + + + + + + + + + + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + @@ -168,102 +370,132 @@ - - - - + + + + + + + + + + + + + + + description="Compiles src/main sources to build dir"> - + + + + - + + - - - - - - - + description="Builds library jar for src/main from compiled sources"> + + - + + + + + - - - - - - + description="Builds javadocs for src/main to dist dir"> - - + + - + + + + + - - - + source="9" + executable="${build.main.javadoc}"> + + + + + + + + + + + + + + + + + + + - - @@ -281,186 +513,118 @@ + + + + - - - - - - - - + - - - - - - - - - - - - - Building JSR-166 version ${version} - java.home is ${java.home} - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - + - + - + + + + - - - + - + - + + + + - - - - - - - - - - - - - + + + + - + + - - - - - - - - - - - - - - - - - + + + @@ -477,35 +641,12 @@ - - - - - - - - - - - - - - - + + @@ -515,6 +656,8 @@ debuglevel="${build.debuglevel}" deprecation="${build.deprecation}" source="${build.sourcelevel}" + target="${build.sourcelevel}" + encoding="ASCII" fork="true"> @@ -526,596 +669,889 @@ - - + + + + + + + + + + + + + + + - + description="Compiles src/jdk8 sources, targeting jdk8"> - + - - - + - + + + - - - - - + - + - - - + - - + + + - - - - + + + + + + + + + - - + - - + + + + + + + + + - - - - - + + + - - - - + - + - - + + - - - + source="8" + executable="${javadoc8}" + failonerror = "true"> + + + + + + + + + + + + - - - - - - - + + - - - + + - - - - - - - - - - - - - - - - - + + - + - - - + + - + - + - + + + - + + + - - - + + + + + + + + - - + + + + + + + - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + - - + + + - + + + + - - + + + + - - - - + + + + + + - - - - - - - + + + + + + + - - - + + + - + + + + + + - - + - + + - - + + - - - - + + + - - - - - - - - - + + + + + + + - + + + + + + + + + + - - - - - - - + + + + + - + + + + - + + - - + + + + + + + - - - - + + + + + + + + - - - - - - - + + + + + + + + - - - + + + + + + - + + + - + - + + - + - - + - - - - + + + - - - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + - - - - - - + - - - - - - + + - - - - - - - + + - - - - - - + - + + - + + - - + + - + + + - - - + + + + + + + - - + + + + + + + - - - - - - - - - + + + + - - - + failonerror = "true"> + + + + + + + - + + + + + + + + + + + + + + + + + + - + + - + + + + + + - + + + + + - + + + + + + - - - + + + - + + + - + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +