| 18 |
|
itself. Because the JDK version matters and because different |
| 19 |
|
targets require different JDKs, we assume that users have created a |
| 20 |
|
hierarchy containing: |
| 21 |
– |
$HOME/jdk/jdk6 |
| 21 |
|
$HOME/jdk/jdk7 |
| 22 |
|
$HOME/jdk/jdk8 |
| 23 |
|
$HOME/jdk/jdk9 |
| 24 |
+ |
$HOME/jdk/jdk10 |
| 25 |
|
where each of the above is a JDK or a symlink to same, and |
| 26 |
– |
$HOME/jdk/src/jdk6 |
| 26 |
|
$HOME/jdk/src/jdk7 |
| 27 |
|
$HOME/jdk/src/jdk8 |
| 28 |
|
$HOME/jdk/src/jdk9 |
| 29 |
+ |
$HOME/jdk/src/jdk10 |
| 30 |
|
where each of the above is a complete JDK source tree |
| 31 |
|
(e.g. mercurial forest) or a symlink to same. |
| 32 |
|
|
| 33 |
|
Alternatively, define ant variables thus: |
| 34 |
|
ant -Djdk$N.home=... -Djdk$N.src.home=... |
| 35 |
< |
for $N in 6 7 8 9 ... |
| 35 |
> |
for $N in 7 8 9 10 ... |
| 36 |
|
|
| 37 |
< |
As of 2016-03, the sources in src/main are for jdk9+ only. The "docs" |
| 38 |
< |
target is currently broken. |
| 37 |
> |
As of 2016-03, the sources in src/main are for jdk9+ only. |
| 38 |
|
------------------------------------------------------------------------------ |
| 39 |
|
</description> |
| 40 |
|
|
| 133 |
|
<defjdklocations v="7"/> |
| 134 |
|
<defjdklocations v="8"/> |
| 135 |
|
<defjdklocations v="9"/> |
| 136 |
+ |
<defjdklocations v="10"/> |
| 137 |
|
|
| 138 |
|
<!-- Source locations --> |
| 139 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
| 143 |
|
<property name="jtreg7.src.dir" location="${test.src.dir}/jtreg-jdk7"/> |
| 144 |
|
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg-jdk8"/> |
| 145 |
|
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
| 146 |
+ |
<property name="jtreg10.src.dir" location="${test.src.dir}/jtreg"/> |
| 147 |
|
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
| 148 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
| 149 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
| 254 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 255 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/> |
| 256 |
|
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
| 257 |
< |
<compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/> |
| 257 |
> |
<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/> |
| 258 |
|
<compilerarg line="${build.args}"/> |
| 259 |
|
<javac-elements/> |
| 260 |
|
|
| 265 |
|
jvm="${java@{target}}" |
| 266 |
|
fork="true"> |
| 267 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
| 268 |
< |
<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/> |
| 269 |
< |
<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/> |
| 270 |
< |
<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/> |
| 271 |
< |
<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/> |
| 272 |
< |
<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/> |
| 268 |
> |
<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/> |
| 269 |
> |
<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/> |
| 270 |
> |
<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/> |
| 271 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/> |
| 272 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/> |
| 273 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/> |
| 274 |
|
<jvmarg line="@{jvmflags}"/> |
| 275 |
|
<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck --> |
| 276 |
|
<jvmarg line="${vmoptions}" if:set="vmoptions"/> |
| 400 |
|
fork="true"> |
| 401 |
|
|
| 402 |
|
<include name="**/*.java"/> |
| 403 |
< |
<compilerarg value="-Xmodule:java.base" if:set="modules"/> |
| 403 |
> |
<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/> |
| 404 |
|
<compilerarg value="-Xprefer:source"/> |
| 405 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 406 |
|
<compilerarg value="-Xlint:all"/> |
| 456 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
| 457 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
| 458 |
|
<arg value="-XDignore.symbol.file=true"/> |
| 459 |
< |
<arg value="-Xmodule:java.base"/> |
| 459 |
> |
<arg value="--patch-module=java.base=${src.dir}"/> |
| 460 |
|
<arg value="-tag"/> |
| 461 |
|
<arg value="${javadoc.jls.option}"/> |
| 462 |
|
<!-- @apiNote currently unused --> |
| 1515 |
|
=================================================================== --> |
| 1516 |
|
|
| 1517 |
|
<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" --> |
| 1518 |
< |
<!-- organisation="com.google.guava" module="guava-testlib" revision="21.0-rc1"/> --> |
| 1519 |
< |
<!-- <property name="guava.version" value="20.0"/> --> |
| 1518 |
> |
<!-- organisation="com.google.guava" module="guava-testlib" revision="21.0"/> --> |
| 1519 |
> |
<!-- <property name="guava.version" value="21.0"/> --> |
| 1520 |
|
|
| 1521 |
|
<!-- HOWTO debug print a path id --> |
| 1522 |
|
<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> --> |
| 1558 |
|
type="jar,bundle" inline="true" conf="default,master" |
| 1559 |
|
pattern="${guava.dir}/[artifact].[ext]" |
| 1560 |
|
organisation="com.google.guava" module="guava-testlib"/> |
| 1561 |
< |
<property name="guava.version" value="21.0-rc1"/> |
| 1561 |
> |
<property name="guava.version" value="21.0"/> |
| 1562 |
|
<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar" |
| 1563 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
| 1564 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
