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 |
|
|
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:${build.classes.dir}" 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:${build.classes.dir}" 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."/> |
330 |
|
|
331 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
332 |
|
<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"/> |
333 |
|
<jtreg dir="${jtreg@{target}.src.dir}" |
334 |
|
jdk="${jdk@{target}.home}" |
335 |
|
workDir="@{workdir}/JTwork" |
336 |
|
reportDir="@{workdir}/JTreport"> |
337 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
338 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
339 |
< |
<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
339 |
> |
<arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/> |
340 |
> |
<arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/> |
341 |
|
<arg value="-agentvm"/> |
342 |
|
<arg value="-verbose:${jtreg.verbose}"/> |
343 |
|
<arg value="-vmoptions:-esa -ea"/> |
393 |
|
classpath="" |
394 |
|
includeAntRuntime="false" |
395 |
|
includeJavaRuntime="false" |
396 |
+ |
encoding="ASCII" |
397 |
|
executable="${build.main.javac}" |
398 |
|
fork="true"> |
399 |
|
|
408 |
|
<compilerarg line="${build.args}"/> |
409 |
|
|
410 |
|
</javac> |
410 |
– |
|
411 |
– |
<!-- We need jdk9's Contended annotation, but at compile time only --> |
412 |
– |
<!-- |
413 |
– |
<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/> |
414 |
– |
--> |
411 |
|
</target> |
412 |
|
|
413 |
|
|
414 |
|
<target name="jar" |
415 |
|
depends="compile" |
416 |
< |
description="Builds library jar from compiled sources"> |
417 |
< |
|
416 |
> |
description="Builds library jar for src/main from compiled sources"> |
417 |
> |
<local name="subdir"/> |
418 |
> |
<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/> |
419 |
|
<jar destfile="${product.jar}"> |
420 |
< |
<fileset dir="${build.classes.dir}"/> |
420 |
> |
<fileset dir="${build.classes.dir}${subdir}"/> |
421 |
|
<manifest> |
422 |
|
<attribute name="Built-By" value="${user.name}"/> |
423 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
435 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
436 |
|
<!-- sourcepath for packages --> |
437 |
|
|
438 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" --> |
439 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" --> |
440 |
|
<javadoc destdir="${docs.dir}" |
441 |
|
packagenames="none" |
442 |
|
link="${java9.api.url}" |
443 |
|
overview="${src.dir}/intro.html" |
444 |
|
access="${build.javadoc.access}" |
445 |
< |
sourcepath="${src.dir}:${jdk9.src.dir}" |
445 |
> |
sourcepath="${src.dir}" |
446 |
|
classpath="" |
447 |
|
executable="${javadoc9}"> |
448 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
451 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
452 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
453 |
|
<arg value="-XDignore.symbol.file=true"/> |
454 |
< |
<!-- TODO <arg value="-Xmodule:java.base"/> --> |
454 |
> |
<arg value="-Xmodule:java.base"/> |
455 |
|
<arg value="-tag"/> |
456 |
|
<arg value="${javadoc.jls.option}"/> |
457 |
+ |
<!-- @apiNote currently unused --> |
458 |
+ |
<!-- <arg value="-tag"/> --> |
459 |
+ |
<!-- <arg value="apiNote:a:API Note:"/> --> |
460 |
|
<arg value="-tag"/> |
461 |
< |
<arg value="apiNote:a:<em>API Note:</em>"/> |
460 |
< |
<arg value="-tag"/> |
461 |
< |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
462 |
< |
<arg value="-tag"/> |
463 |
< |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
464 |
< |
<!-- tags added in jdk9 --> |
461 |
> |
<arg value="implSpec:a:Implementation Requirements:"/> |
462 |
|
<arg value="-tag"/> |
463 |
< |
<arg value="revised:X"/> |
464 |
< |
<arg value="-tag"/> |
465 |
< |
<arg value="spec:X"/> |
463 |
> |
<arg value="implNote:a:Implementation Note:"/> |
464 |
> |
<!-- tags added in jdk9: currently unused --> |
465 |
> |
<!-- <arg value="-tag"/> --> |
466 |
> |
<!-- <arg value="revised:X"/> --> |
467 |
> |
<!-- <arg value="-tag"/> --> |
468 |
> |
<!-- <arg value="spec:X"/> --> |
469 |
|
</javadoc> |
470 |
|
</target> |
471 |
|
|
526 |
|
|
527 |
|
<target name="tck" |
528 |
|
depends="jar" |
529 |
< |
description="Runs tck tests for main directly"> |
529 |
> |
description="Runs tck tests for src/main directly"> |
530 |
|
|
531 |
|
<run-tck-tests |
532 |
|
target="${build.main.java.version}" |
535 |
|
</target> |
536 |
|
|
537 |
|
<target name="tck-parallelism-1" |
538 |
< |
description="Runs tck with given common pool parallelism"> |
538 |
> |
description="Runs tck with common pool parallelism 1"> |
539 |
|
<antcall target="tck"> |
540 |
|
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/> |
541 |
|
</antcall> |
542 |
|
</target> |
543 |
|
|
544 |
|
<target name="tck-parallelism-0" |
545 |
< |
description="Runs tck with given common pool parallelism"> |
545 |
> |
description="Runs tck with common pool parallelism 0"> |
546 |
|
<antcall target="tck"> |
547 |
|
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/> |
548 |
|
</antcall> |
549 |
|
</target> |
550 |
|
|
551 |
+ |
<target name="tck-security-manager" |
552 |
+ |
description="Runs tck with a security manager"> |
553 |
+ |
<antcall target="tck"> |
554 |
+ |
<param name="jsr166.useSecurityManager" value="true"/> |
555 |
+ |
</antcall> |
556 |
+ |
</target> |
557 |
+ |
|
558 |
|
<target name="jtreg" |
559 |
|
depends="jar" |
560 |
< |
description="Runs jtreg tests for main using the jtreg ant task"> |
560 |
> |
description="Runs jtreg tests for src/main using the jtreg ant task"> |
561 |
|
<run-jtreg-tests |
562 |
|
target="${build.main.java.version}" |
563 |
|
workdir="${build.dir}" |
565 |
|
</target> |
566 |
|
|
567 |
|
<target name="test" |
568 |
< |
depends="tck, tck-parallelism-1, jtreg" |
569 |
< |
description="Runs tck and jtreg tests for main"> |
568 |
> |
depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg" |
569 |
> |
description="Runs tck and jtreg tests for src/main"> |
570 |
|
</target> |
571 |
|
|
572 |
< |
<target name="jtreg8" description="Runs jtreg tests with jdk8"> |
572 |
> |
<!-- <target name="jtreg8" description="Runs jtreg tests with jdk8"> --> |
573 |
|
|
574 |
< |
<antcall target="jtreg"> |
575 |
< |
<param name="build.main.java.version" value="8"/> |
576 |
< |
<param name="build.main.javac" value="${javac8}"/> |
577 |
< |
</antcall> |
574 |
> |
<!-- <antcall target="jtreg"> --> |
575 |
> |
<!-- <param name="build.main.java.version" value="8"/> --> |
576 |
> |
<!-- <param name="build.main.javac" value="${javac8}"/> --> |
577 |
> |
<!-- </antcall> --> |
578 |
|
|
579 |
< |
</target> |
579 |
> |
<!-- </target> --> |
580 |
|
|
581 |
< |
<target name="test89" |
582 |
< |
description="Runs tck and jtreg tests for main for multiple java versions"> |
581 |
> |
<!-- <target name="test89" --> |
582 |
> |
<!-- description="Runs tck and jtreg tests for src/main for multiple java versions"> --> |
583 |
|
|
584 |
< |
<antcall target="clean"/> |
585 |
< |
<antcall target="test"> |
586 |
< |
<param name="build.main.java.version" value="8"/> |
587 |
< |
<param name="build.main.javac" value="${javac8}"/> |
588 |
< |
</antcall> |
584 |
> |
<!-- <antcall target="clean"/> --> |
585 |
> |
<!-- <antcall target="test"> --> |
586 |
> |
<!-- <param name="build.main.java.version" value="8"/> --> |
587 |
> |
<!-- <param name="build.main.javac" value="${javac8}"/> --> |
588 |
> |
<!-- </antcall> --> |
589 |
|
|
590 |
< |
<antcall target="clean"/> |
591 |
< |
<antcall target="test"> |
592 |
< |
<param name="build.main.java.version" value="9"/> |
593 |
< |
<param name="build.main.javac" value="${javac9}"/> |
594 |
< |
</antcall> |
590 |
> |
<!-- <antcall target="clean"/> --> |
591 |
> |
<!-- <antcall target="test"> --> |
592 |
> |
<!-- <param name="build.main.java.version" value="9"/> --> |
593 |
> |
<!-- <param name="build.main.javac" value="${javac9}"/> --> |
594 |
> |
<!-- </antcall> --> |
595 |
|
|
596 |
< |
</target> |
596 |
> |
<!-- </target> --> |
597 |
|
|
598 |
|
|
599 |
|
|
635 |
|
deprecation="${build.deprecation}" |
636 |
|
source="${build.sourcelevel}" |
637 |
|
target="${build.sourcelevel}" |
638 |
+ |
encoding="ASCII" |
639 |
|
fork="true"> |
640 |
|
|
641 |
|
<compilerarg line="${build.args}"/> |
663 |
|
deprecation="${build.deprecation}" |
664 |
|
includeAntRuntime="false" |
665 |
|
includeJavaRuntime="false" |
666 |
+ |
encoding="ASCII" |
667 |
|
executable="${javac9}" |
668 |
|
fork="true"> |
669 |
|
|
697 |
|
bootclasspath="${bootclasspath8}" |
698 |
|
includeAntRuntime="false" |
699 |
|
includeJavaRuntime="false" |
700 |
+ |
encoding="ASCII" |
701 |
|
executable="${javac8}" |
702 |
|
fork="true"> |
703 |
|
|
728 |
|
bootclasspath="${bootclasspath8}" |
729 |
|
includeAntRuntime="false" |
730 |
|
includeJavaRuntime="false" |
731 |
+ |
encoding="ASCII" |
732 |
|
executable="${javac8}" |
733 |
|
fork="true"> |
734 |
|
|
804 |
|
access="${build.javadoc.access}" |
805 |
|
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
806 |
|
classpath="" |
807 |
< |
executable="${javadoc8}"> |
807 |
> |
executable="${javadoc8}" |
808 |
> |
failonerror = "true"> |
809 |
|
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
810 |
|
<include name="**/*.java"/> |
811 |
|
</fileset> |
813 |
|
<arg value="-XDignore.symbol.file=true"/> |
814 |
|
<arg value="-tag"/> |
815 |
|
<arg value="${javadoc.jls.option}"/> |
816 |
< |
<arg value="-tag"/> |
817 |
< |
<arg value="apiNote:a:<em>API Note:</em>"/> |
816 |
> |
<!-- @apiNote currently unused --> |
817 |
> |
<!-- <arg value="-tag"/> --> |
818 |
> |
<!-- <arg value="apiNote:a:<em>API Note:</em>"/> --> |
819 |
|
<arg value="-tag"/> |
820 |
|
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
821 |
|
<arg value="-tag"/> |
869 |
|
bootclasspath="${bootclasspath6}" |
870 |
|
includeAntRuntime="false" |
871 |
|
includeJavaRuntime="false" |
872 |
+ |
encoding="ASCII" |
873 |
|
executable="${javac7}" |
874 |
|
fork="true"> |
875 |
|
|
900 |
|
bootclasspath="${bootclasspath6}" |
901 |
|
includeAntRuntime="false" |
902 |
|
includeJavaRuntime="false" |
903 |
+ |
encoding="ASCII" |
904 |
|
executable="${javac8}" |
905 |
|
fork="true"> |
906 |
|
|
1013 |
|
access="${build.javadoc.access}" |
1014 |
|
sourcepath="${4jdk7src.dir}:${jdk7.src.dir}" |
1015 |
|
classpath="" |
1016 |
< |
executable="${javadoc7}"> |
1016 |
> |
executable="${javadoc7}" |
1017 |
> |
failonerror = "true"> |
1018 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
1019 |
|
<include name="**/*.java"/> |
1020 |
|
</fileset> |
1068 |
|
target="5" |
1069 |
|
includeAntRuntime="false" |
1070 |
|
includeJavaRuntime="false" |
1071 |
+ |
encoding="ASCII" |
1072 |
|
executable="${javac7}" |
1073 |
|
fork="true"> |
1074 |
|
|
1110 |
|
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
1111 |
|
bootclasspath="${bootclasspath6}" |
1112 |
|
source="5" |
1113 |
< |
executable="${javadoc7}"> |
1113 |
> |
executable="${javadoc7}" |
1114 |
> |
failonerror = "true"> |
1115 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1116 |
|
<arg value="-XDignore.symbol.file=true"/> |
1117 |
|
|
1162 |
|
bootclasspath="${bootclasspath6}" |
1163 |
|
includeAntRuntime="false" |
1164 |
|
includeJavaRuntime="false" |
1165 |
+ |
encoding="ASCII" |
1166 |
|
executable="${javac7}" |
1167 |
|
fork="true"> |
1168 |
|
|
1204 |
|
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
1205 |
|
bootclasspath="${bootclasspath6}" |
1206 |
|
source="6" |
1207 |
< |
executable="${javadoc7}"> |
1207 |
> |
executable="${javadoc7}" |
1208 |
> |
failonerror = "true"> |
1209 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1210 |
|
<arg value="-XDignore.symbol.file=true"/> |
1211 |
|
|
1257 |
|
target="6" |
1258 |
|
includeAntRuntime="false" |
1259 |
|
includeJavaRuntime="false" |
1260 |
+ |
encoding="ASCII" |
1261 |
|
executable="${javac7}" |
1262 |
|
fork="true"> |
1263 |
|
|
1419 |
|
access="${build.javadoc.access}" |
1420 |
|
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
1421 |
|
source="${build.jsr166e.java.version}" |
1422 |
< |
executable="${javadoc7}"> |
1422 |
> |
executable="${javadoc7}" |
1423 |
> |
failonerror = "true"> |
1424 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1425 |
|
<arg value="-XDignore.symbol.file=true"/> |
1426 |
|
|