| 38 |
|
------------------------------------------------------------------------------ |
| 39 |
|
</description> |
| 40 |
|
|
| 41 |
< |
<!-- Display main targets by running 'ant -projecthelp' --> |
| 41 |
> |
<!-- Run 'ant -projecthelp' (default target) --> |
| 42 |
|
<target name="usage"> |
| 43 |
|
<java classname="org.apache.tools.ant.Main"> |
| 44 |
|
<arg value="-projecthelp" /> |
| 186 |
|
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
| 187 |
|
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
| 188 |
|
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
| 189 |
< |
<!-- The expected canonical location does not yet exist as of 2016-03 --> |
| 189 |
> |
<!-- The expected canonical location does not yet exist as of 2016-04 --> |
| 190 |
|
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
| 191 |
< |
<property name="java9.docroot.url" value="http://download.java.net/jdk9/docs"/> |
| 191 |
> |
<property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> |
| 192 |
|
<!-- Default jdk doc location (latest stable release seems best) --> |
| 193 |
|
<property name="java.docroot.url" value="${java8.docroot.url}"/> |
| 194 |
|
|
| 252 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 253 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/> |
| 254 |
|
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
| 255 |
< |
<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
| 255 |
> |
<compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/> |
| 256 |
|
<compilerarg line="${build.args}"/> |
| 257 |
|
<javac-elements/> |
| 258 |
|
|
| 263 |
|
jvm="${java@{target}}" |
| 264 |
|
fork="true"> |
| 265 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
| 266 |
< |
<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
| 266 |
> |
<jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/> |
| 267 |
|
<jvmarg line="@{jvmflags}"/> |
| 268 |
+ |
<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck --> |
| 269 |
+ |
<jvmarg line="${vmoptions}" if:set="vmoptions"/> |
| 270 |
|
|
| 271 |
< |
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
| 271 |
> |
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
| 272 |
|
<syspropertyset id="system-properties-used-by-tck"> |
| 273 |
|
<propertyref prefix="java.util.concurrent.ForkJoinPool"/> |
| 274 |
|
<propertyref prefix="jsr166."/> |
| 329 |
|
|
| 330 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
| 331 |
|
<delete dir="@{workdir}/JTreport" quiet="true"/> |
| 330 |
– |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
| 331 |
– |
<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 --> |
| 332 |
– |
<mkdir dir="@{workdir}/JTreport/html"/> |
| 333 |
– |
<mkdir dir="@{workdir}/JTreport/text"/> |
| 332 |
|
<jtreg dir="${jtreg@{target}.src.dir}" |
| 333 |
|
jdk="${jdk@{target}.home}" |
| 334 |
|
workDir="@{workdir}/JTwork" |
| 335 |
|
reportDir="@{workdir}/JTreport"> |
| 336 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
| 337 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
| 338 |
< |
<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
| 338 |
> |
<arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/> |
| 339 |
|
<arg value="-agentvm"/> |
| 340 |
|
<arg value="-verbose:${jtreg.verbose}"/> |
| 341 |
|
<arg value="-vmoptions:-esa -ea"/> |
| 411 |
|
<target name="jar" |
| 412 |
|
depends="compile" |
| 413 |
|
description="Builds library jar for src/main from compiled sources"> |
| 414 |
< |
|
| 414 |
> |
<local name="subdir"/> |
| 415 |
> |
<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/> |
| 416 |
|
<jar destfile="${product.jar}"> |
| 417 |
< |
<fileset dir="${build.classes.dir}"/> |
| 417 |
> |
<fileset dir="${build.classes.dir}${subdir}"/> |
| 418 |
|
<manifest> |
| 419 |
|
<attribute name="Built-By" value="${user.name}"/> |
| 420 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
| 432 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
| 433 |
|
<!-- sourcepath for packages --> |
| 434 |
|
|
| 435 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" --> |
| 436 |
|
<javadoc destdir="${docs.dir}" |
| 437 |
|
packagenames="none" |
| 438 |
|
link="${java9.api.url}" |
| 439 |
|
overview="${src.dir}/intro.html" |
| 440 |
|
access="${build.javadoc.access}" |
| 441 |
< |
sourcepath="${src.dir}:${jdk9.src.dir}" |
| 441 |
> |
sourcepath="${src.dir}" |
| 442 |
|
classpath="" |
| 443 |
|
executable="${javadoc9}"> |
| 444 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
| 447 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
| 448 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
| 449 |
|
<arg value="-XDignore.symbol.file=true"/> |
| 450 |
< |
<!-- TODO <arg value="-Xmodule:java.base"/> --> |
| 450 |
> |
<arg value="-Xmodule:java.base"/> |
| 451 |
|
<arg value="-tag"/> |
| 452 |
|
<arg value="${javadoc.jls.option}"/> |
| 453 |
|
<arg value="-tag"/> |
| 530 |
|
</target> |
| 531 |
|
|
| 532 |
|
<target name="tck-parallelism-1" |
| 533 |
< |
description="Runs tck with given common pool parallelism"> |
| 533 |
> |
description="Runs tck with common pool parallelism 1"> |
| 534 |
|
<antcall target="tck"> |
| 535 |
|
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/> |
| 536 |
|
</antcall> |
| 537 |
|
</target> |
| 538 |
|
|
| 539 |
|
<target name="tck-parallelism-0" |
| 540 |
< |
description="Runs tck with given common pool parallelism"> |
| 540 |
> |
description="Runs tck with common pool parallelism 0"> |
| 541 |
|
<antcall target="tck"> |
| 542 |
|
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/> |
| 543 |
|
</antcall> |
| 544 |
|
</target> |
| 545 |
|
|
| 546 |
+ |
<target name="tck-security-manager" |
| 547 |
+ |
description="Runs tck with a security manager"> |
| 548 |
+ |
<antcall target="tck"> |
| 549 |
+ |
<param name="jsr166.useSecurityManager" value="true"/> |
| 550 |
+ |
</antcall> |
| 551 |
+ |
</target> |
| 552 |
+ |
|
| 553 |
|
<target name="jtreg" |
| 554 |
|
depends="jar" |
| 555 |
|
description="Runs jtreg tests for src/main using the jtreg ant task"> |
| 560 |
|
</target> |
| 561 |
|
|
| 562 |
|
<target name="test" |
| 563 |
< |
depends="tck, tck-parallelism-1, jtreg" |
| 563 |
> |
depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg" |
| 564 |
|
description="Runs tck and jtreg tests for src/main"> |
| 565 |
|
</target> |
| 566 |
|
|
