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-04 --> |
190 |
|
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
191 |
< |
<property name="java9.docroot.url" value="http://http://download.java.net/java/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 |
|
|
245 |
|
classpath="${junit.jar}" |
246 |
|
includeAntRuntime="false" |
247 |
|
includeJavaRuntime="false" |
248 |
+ |
encoding="ASCII" |
249 |
|
executable="${javac@{compile-target}}" |
250 |
|
fork="true"> |
251 |
|
|
253 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
254 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/> |
255 |
|
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
256 |
< |
<compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/> |
256 |
> |
<compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/> |
257 |
|
<compilerarg line="${build.args}"/> |
258 |
|
<javac-elements/> |
259 |
|
|
264 |
|
jvm="${java@{target}}" |
265 |
|
fork="true"> |
266 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
267 |
< |
<jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/> |
267 |
> |
<jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/> |
268 |
|
<jvmarg line="@{jvmflags}"/> |
269 |
+ |
<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck --> |
270 |
+ |
<jvmarg line="${vmoptions}" if:set="vmoptions"/> |
271 |
|
|
272 |
< |
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
272 |
> |
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
273 |
|
<syspropertyset id="system-properties-used-by-tck"> |
274 |
|
<propertyref prefix="java.util.concurrent.ForkJoinPool"/> |
275 |
|
<propertyref prefix="jsr166."/> |
329 |
|
</condition> |
330 |
|
|
331 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
329 |
– |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
332 |
|
<jtreg dir="${jtreg@{target}.src.dir}" |
333 |
|
jdk="${jdk@{target}.home}" |
334 |
< |
workDir="@{workdir}/JTwork" |
333 |
< |
reportDir="@{workdir}/JTreport"> |
334 |
> |
workDir="@{workdir}/JTwork"> |
335 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
336 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
337 |
< |
<arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/> |
337 |
> |
<arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/> |
338 |
> |
<arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/> |
339 |
|
<arg value="-agentvm"/> |
340 |
+ |
<arg value="-noreport"/> |
341 |
|
<arg value="-verbose:${jtreg.verbose}"/> |
342 |
|
<arg value="-vmoptions:-esa -ea"/> |
343 |
|
<arg value="-automatic"/> |
392 |
|
classpath="" |
393 |
|
includeAntRuntime="false" |
394 |
|
includeJavaRuntime="false" |
395 |
+ |
encoding="ASCII" |
396 |
|
executable="${build.main.javac}" |
397 |
|
fork="true"> |
398 |
|
|
413 |
|
<target name="jar" |
414 |
|
depends="compile" |
415 |
|
description="Builds library jar for src/main from compiled sources"> |
416 |
< |
|
416 |
> |
<local name="subdir"/> |
417 |
> |
<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/> |
418 |
|
<jar destfile="${product.jar}"> |
419 |
< |
<fileset dir="${build.classes.dir}"/> |
419 |
> |
<fileset dir="${build.classes.dir}${subdir}"/> |
420 |
|
<manifest> |
421 |
|
<attribute name="Built-By" value="${user.name}"/> |
422 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
434 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
435 |
|
<!-- sourcepath for packages --> |
436 |
|
|
437 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" --> |
438 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" --> |
439 |
|
<javadoc destdir="${docs.dir}" |
440 |
|
packagenames="none" |
441 |
|
link="${java9.api.url}" |
442 |
|
overview="${src.dir}/intro.html" |
443 |
|
access="${build.javadoc.access}" |
444 |
< |
sourcepath="${src.dir}:${jdk9.src.dir}" |
444 |
> |
sourcepath="${src.dir}" |
445 |
|
classpath="" |
446 |
|
executable="${javadoc9}"> |
447 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
450 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
451 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
452 |
|
<arg value="-XDignore.symbol.file=true"/> |
453 |
< |
<!-- TODO <arg value="-Xmodule:java.base"/> --> |
453 |
> |
<arg value="-Xmodule:java.base"/> |
454 |
|
<arg value="-tag"/> |
455 |
|
<arg value="${javadoc.jls.option}"/> |
456 |
+ |
<!-- @apiNote currently unused --> |
457 |
+ |
<!-- <arg value="-tag"/> --> |
458 |
+ |
<!-- <arg value="apiNote:a:API Note:"/> --> |
459 |
|
<arg value="-tag"/> |
460 |
< |
<arg value="apiNote:a:<em>API Note:</em>"/> |
451 |
< |
<arg value="-tag"/> |
452 |
< |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
453 |
< |
<arg value="-tag"/> |
454 |
< |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
455 |
< |
<!-- tags added in jdk9 --> |
456 |
< |
<arg value="-tag"/> |
457 |
< |
<arg value="revised:X"/> |
460 |
> |
<arg value="implSpec:a:Implementation Requirements:"/> |
461 |
|
<arg value="-tag"/> |
462 |
< |
<arg value="spec:X"/> |
462 |
> |
<arg value="implNote:a:Implementation Note:"/> |
463 |
> |
<!-- tags added in jdk9: currently unused --> |
464 |
> |
<!-- <arg value="-tag"/> --> |
465 |
> |
<!-- <arg value="revised:X"/> --> |
466 |
> |
<!-- <arg value="-tag"/> --> |
467 |
> |
<!-- <arg value="spec:X"/> --> |
468 |
|
</javadoc> |
469 |
|
</target> |
470 |
|
|
547 |
|
</antcall> |
548 |
|
</target> |
549 |
|
|
550 |
+ |
<target name="tck-security-manager" |
551 |
+ |
description="Runs tck with a security manager"> |
552 |
+ |
<antcall target="tck"> |
553 |
+ |
<param name="jsr166.useSecurityManager" value="true"/> |
554 |
+ |
</antcall> |
555 |
+ |
</target> |
556 |
+ |
|
557 |
|
<target name="jtreg" |
558 |
|
depends="jar" |
559 |
|
description="Runs jtreg tests for src/main using the jtreg ant task"> |
634 |
|
deprecation="${build.deprecation}" |
635 |
|
source="${build.sourcelevel}" |
636 |
|
target="${build.sourcelevel}" |
637 |
+ |
encoding="ASCII" |
638 |
|
fork="true"> |
639 |
|
|
640 |
|
<compilerarg line="${build.args}"/> |
662 |
|
deprecation="${build.deprecation}" |
663 |
|
includeAntRuntime="false" |
664 |
|
includeJavaRuntime="false" |
665 |
+ |
encoding="ASCII" |
666 |
|
executable="${javac9}" |
667 |
|
fork="true"> |
668 |
|
|
696 |
|
bootclasspath="${bootclasspath8}" |
697 |
|
includeAntRuntime="false" |
698 |
|
includeJavaRuntime="false" |
699 |
+ |
encoding="ASCII" |
700 |
|
executable="${javac8}" |
701 |
|
fork="true"> |
702 |
|
|
727 |
|
bootclasspath="${bootclasspath8}" |
728 |
|
includeAntRuntime="false" |
729 |
|
includeJavaRuntime="false" |
730 |
+ |
encoding="ASCII" |
731 |
|
executable="${javac8}" |
732 |
|
fork="true"> |
733 |
|
|
812 |
|
<arg value="-XDignore.symbol.file=true"/> |
813 |
|
<arg value="-tag"/> |
814 |
|
<arg value="${javadoc.jls.option}"/> |
815 |
< |
<arg value="-tag"/> |
816 |
< |
<arg value="apiNote:a:<em>API Note:</em>"/> |
815 |
> |
<!-- @apiNote currently unused --> |
816 |
> |
<!-- <arg value="-tag"/> --> |
817 |
> |
<!-- <arg value="apiNote:a:<em>API Note:</em>"/> --> |
818 |
|
<arg value="-tag"/> |
819 |
|
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
820 |
|
<arg value="-tag"/> |
868 |
|
bootclasspath="${bootclasspath6}" |
869 |
|
includeAntRuntime="false" |
870 |
|
includeJavaRuntime="false" |
871 |
+ |
encoding="ASCII" |
872 |
|
executable="${javac7}" |
873 |
|
fork="true"> |
874 |
|
|
899 |
|
bootclasspath="${bootclasspath6}" |
900 |
|
includeAntRuntime="false" |
901 |
|
includeJavaRuntime="false" |
902 |
+ |
encoding="ASCII" |
903 |
|
executable="${javac8}" |
904 |
|
fork="true"> |
905 |
|
|
1067 |
|
target="5" |
1068 |
|
includeAntRuntime="false" |
1069 |
|
includeJavaRuntime="false" |
1070 |
+ |
encoding="ASCII" |
1071 |
|
executable="${javac7}" |
1072 |
|
fork="true"> |
1073 |
|
|
1161 |
|
bootclasspath="${bootclasspath6}" |
1162 |
|
includeAntRuntime="false" |
1163 |
|
includeJavaRuntime="false" |
1164 |
+ |
encoding="ASCII" |
1165 |
|
executable="${javac7}" |
1166 |
|
fork="true"> |
1167 |
|
|
1256 |
|
target="6" |
1257 |
|
includeAntRuntime="false" |
1258 |
|
includeJavaRuntime="false" |
1259 |
+ |
encoding="ASCII" |
1260 |
|
executable="${javac7}" |
1261 |
|
fork="true"> |
1262 |
|
|