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/jdk7 |
21 |
|
$HOME/jdk/jdk8 |
22 |
|
$HOME/jdk/jdk9 |
23 |
|
$HOME/jdk/jdk10 |
24 |
|
where each of the above is a JDK or a symlink to same, and |
26 |
– |
$HOME/jdk/src/jdk7 |
25 |
|
$HOME/jdk/src/jdk8 |
26 |
|
$HOME/jdk/src/jdk9 |
27 |
|
$HOME/jdk/src/jdk10 |
30 |
|
|
31 |
|
Alternatively, define ant variables thus: |
32 |
|
ant -Djdk$N.home=... -Djdk$N.src.home=... |
33 |
< |
for $N in 7 8 9 10 ... |
33 |
> |
for $N in 8 9 10 ... |
34 |
|
|
35 |
|
As of 2016-03, the sources in src/main are for jdk9+ only. |
36 |
|
------------------------------------------------------------------------------ |
296 |
|
</macrodef> |
297 |
|
|
298 |
|
<!-- Define jtreg test sets for different jdk versions --> |
299 |
+ |
<fileset dir="${jtreg10.src.dir}"> |
300 |
+ |
<patternset id="jdk10.jtreg.tests"> |
301 |
+ |
<include name="**/*.java"/> |
302 |
+ |
</patternset> |
303 |
+ |
</fileset> |
304 |
+ |
|
305 |
|
<fileset dir="${jtreg9.src.dir}"> |
306 |
|
<patternset id="jdk9.jtreg.tests"> |
307 |
|
<include name="**/*.java"/> |
325 |
|
|
326 |
|
<macrodef name="run-jtreg-tests"> |
327 |
|
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
324 |
– |
<attribute name="source" default="7"/> |
328 |
|
<attribute name="target"/> |
329 |
|
<attribute name="workdir"/> |
330 |
|
<attribute name="classes"/> |
346 |
|
workDir="@{workdir}/JTwork"> |
347 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
348 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
349 |
< |
<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
350 |
< |
<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/> |
349 |
> |
<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
350 |
> |
<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
351 |
|
<arg value="-agentvm"/> |
352 |
|
<arg value="-noreport"/> |
353 |
|
<arg value="-verbose:${jtreg.verbose}"/> |
372 |
|
<!-- Main targets --> |
373 |
|
|
374 |
|
<property name="build.main.java.version" value="9"/> |
375 |
< |
<property name="build.main.javac" value="${javac9}"/> |
375 |
> |
<!-- Workaround "no nested properties in ant" --> |
376 |
> |
<macrodef name="define-build-main-properties"> |
377 |
> |
<attribute name="v"/> |
378 |
> |
<sequential> |
379 |
> |
<property name="build.main.java" value="${java@{v}}"/> |
380 |
> |
<property name="build.main.javac" value="${javac@{v}}"/> |
381 |
> |
<property name="build.main.javadoc" value="${javadoc@{v}}"/> |
382 |
> |
</sequential> |
383 |
> |
</macrodef> |
384 |
> |
<define-build-main-properties v="${build.main.java.version}"/> |
385 |
|
|
386 |
|
<target name="dists" |
387 |
+ |
depends="dist, 4jdk8dist" |
388 |
+ |
description="Builds all public jars and docs"/> |
389 |
|
<!-- |
390 |
|
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
391 |
|
--> |
378 |
– |
depends="dist, 4jdk8dist" |
379 |
– |
description="Builds all public jars and docs"/> |
392 |
|
|
393 |
|
<target name="compile" |
394 |
|
depends="configure-compiler" |
395 |
|
description="Compiles src/main sources to build dir"> |
396 |
|
|
385 |
– |
<local name="modules"/> |
386 |
– |
<condition property="modules"> |
387 |
– |
<and> |
388 |
– |
<available file="${jdk9.home}/jmods" type="dir"/> |
389 |
– |
<equals arg1="9" arg2="${build.main.java.version}"/> |
390 |
– |
</and> |
391 |
– |
</condition> |
392 |
– |
|
397 |
|
<local name="destdir"/> |
398 |
< |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
395 |
< |
<property name="destdir" value="${build.classes.dir}" unless:set="modules"/> |
398 |
> |
<property name="destdir" value="${build.classes.dir}/java.base"/> |
399 |
|
|
400 |
|
<mkdir dir="${destdir}"/> |
401 |
|
|
412 |
|
fork="true"> |
413 |
|
|
414 |
|
<include name="**/*.java"/> |
415 |
< |
<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/> |
415 |
> |
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
416 |
|
<compilerarg value="-Xprefer:source"/> |
417 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
418 |
|
<compilerarg value="-Xlint:all"/> |
419 |
< |
<compilerarg value="-Werror"/> |
419 |
> |
<compilerarg line="--doclint-format html5"/> |
420 |
|
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
421 |
+ |
<compilerarg value="-Werror"/> |
422 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
423 |
|
<compilerarg line="${build.args}"/> |
424 |
|
|
462 |
|
access="${build.javadoc.access}" |
463 |
|
sourcepath="${src.dir}" |
464 |
|
classpath="" |
465 |
< |
executable="${javadoc9}"> |
465 |
> |
source="9" |
466 |
> |
executable="${build.main.javadoc}"> |
467 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
468 |
|
<include name="**/*.java"/> |
469 |
|
</fileset> |
470 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
471 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
472 |
|
<arg value="-XDignore.symbol.file=true"/> |
473 |
+ |
<arg value="-html5"/> |
474 |
|
<arg value="--patch-module=java.base=${src.dir}"/> |
475 |
|
<arg value="-tag"/> |
476 |
|
<arg value="${javadoc.jls.option}"/> |
519 |
|
|
520 |
|
<target name="clean" |
521 |
|
description="Removes all build products"> |
516 |
– |
|
522 |
|
<delete dir="${build.dir}"/> |
518 |
– |
|
523 |
|
</target> |
524 |
|
|
525 |
|
|
526 |
|
<target name="dist-clean" |
527 |
|
description="Removes all build and distribution products"> |
524 |
– |
|
528 |
|
<delete dir="${build.dir}"/> |
529 |
|
<delete dir="${dist.dir}"/> |
527 |
– |
|
530 |
|
</target> |
531 |
|
|
532 |
|
|
586 |
|
|
587 |
|
<target name="test" |
588 |
|
depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg" |
589 |
< |
description="Runs tck and jtreg tests for src/main"> |
588 |
< |
</target> |
589 |
> |
description="Runs tck and jtreg tests for src/main"/> |
590 |
|
|
591 |
|
<!-- <target name="jtreg8" description="Runs jtreg tests with jdk8"> --> |
592 |
|
|
597 |
|
|
598 |
|
<!-- </target> --> |
599 |
|
|
600 |
< |
<!-- <target name="test89" --> |
601 |
< |
<!-- description="Runs tck and jtreg tests for src/main for multiple java versions"> --> |
600 |
> |
<target name="test910" |
601 |
> |
description="Runs tck and jtreg tests for src/main for multiple java versions"> |
602 |
|
|
603 |
< |
<!-- <antcall target="clean"/> --> |
604 |
< |
<!-- <antcall target="test"> --> |
605 |
< |
<!-- <param name="build.main.java.version" value="8"/> --> |
606 |
< |
<!-- <param name="build.main.javac" value="${javac8}"/> --> |
606 |
< |
<!-- </antcall> --> |
603 |
> |
<antcall target="clean"/> |
604 |
> |
<antcall target="test"> |
605 |
> |
<param name="build.main.java.version" value="9"/> |
606 |
> |
</antcall> |
607 |
|
|
608 |
< |
<!-- <antcall target="clean"/> --> |
609 |
< |
<!-- <antcall target="test"> --> |
610 |
< |
<!-- <param name="build.main.java.version" value="9"/> --> |
611 |
< |
<!-- <param name="build.main.javac" value="${javac9}"/> --> |
612 |
< |
<!-- </antcall> --> |
608 |
> |
<antcall target="clean"/> |
609 |
> |
<antcall target="test"> |
610 |
> |
<param name="build.main.java.version" value="10"/> |
611 |
> |
</antcall> |
612 |
|
|
613 |
< |
<!-- </target> --> |
613 |
> |
<!-- Clean up to avoid obscure wrong class file version bugs --> |
614 |
> |
<antcall target="clean"/> |
615 |
> |
|
616 |
> |
</target> |
617 |
|
|
618 |
|
|
619 |
|
|
665 |
|
<java classname="ALoops" fork="true"> |
666 |
|
<classpath refid="loops.classpath"/> |
667 |
|
</java> |
666 |
– |
|
668 |
|
</target> |
669 |
|
|
670 |
|
|
671 |
|
<target name="compile-test-loops" depends="jar" |
672 |
< |
description="compile all the perf tests in src/test/loops"> |
672 |
> |
description="Compiles all the perf tests in src/test/loops"> |
673 |
|
|
674 |
|
<mkdir dir="${build.dir}/test/loops"/> |
675 |
|
|
681 |
|
includeAntRuntime="false" |
682 |
|
includeJavaRuntime="false" |
683 |
|
encoding="ASCII" |
684 |
< |
executable="${javac9}" |
684 |
> |
executable="${build.main.javac}" |
685 |
|
fork="true"> |
686 |
|
|
687 |
|
<include name="*.java"/> |
689 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
690 |
|
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
691 |
|
<compilerarg line="${build.args}"/> |
691 |
– |
|
692 |
|
</javac> |
693 |
– |
|
693 |
|
</target> |
694 |
|
|
695 |
|
|
715 |
|
encoding="ASCII" |
716 |
|
executable="${javac8}" |
717 |
|
fork="true"> |
719 |
– |
|
718 |
|
<include name="**/*.java"/> |
719 |
|
<compilerarg value="-Xprefer:source"/> |
720 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
721 |
|
<compilerarg value="-Xlint:all"/> |
722 |
|
<compilerarg value="-Werror"/> |
723 |
|
<compilerarg line="${build.args}"/> |
726 |
– |
|
724 |
|
</javac> |
725 |
|
</target> |
726 |
|
|
744 |
|
encoding="ASCII" |
745 |
|
executable="${javac8}" |
746 |
|
fork="true"> |
750 |
– |
|
747 |
|
<include name="**/*.java"/> |
748 |
|
<compilerarg value="-Xprefer:source"/> |
749 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
750 |
|
<compilerarg value="-Xlint:all"/> |
751 |
|
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
752 |
|
<compilerarg line="${build.args}"/> |
757 |
– |
|
753 |
|
</javac> |
754 |
|
</target> |
755 |
|
|
765 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
766 |
|
</manifest> |
767 |
|
</jar> |
773 |
– |
|
768 |
|
</target> |
769 |
|
|
770 |
|
|
798 |
|
|
799 |
|
<target name="4jdk8-test" |
800 |
|
depends="4jdk8-tck, 4jdk8-jtreg" |
801 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk8"> |
808 |
< |
</target> |
801 |
> |
description="Runs tck and jtreg tests for jsr166-4jdk8"/> |
802 |
|
|
803 |
|
|
804 |
|
<target name="4jdk8docs" |
814 |
|
access="${build.javadoc.access}" |
815 |
|
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
816 |
|
classpath="" |
817 |
+ |
source="8" |
818 |
|
executable="${javadoc8}" |
819 |
|
failonerror = "true"> |
820 |
|
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
842 |
|
|
843 |
|
<target name="4jdk8clean" |
844 |
|
description="Removes all 4jdk8 build products"> |
851 |
– |
|
845 |
|
<delete dir="${build.4jdk8.dir}"/> |
853 |
– |
|
846 |
|
</target> |
847 |
|
|
848 |
|
|
858 |
|
</target> |
859 |
|
|
860 |
|
|
861 |
+ |
<!-- jsr166 4jdk7 (no longer maintained) --> |
862 |
|
|
863 |
< |
<!-- jsr166 4jdk7 --> |
871 |
< |
|
872 |
< |
<target name="4jdk7compile" |
873 |
< |
depends="configure-compiler" |
874 |
< |
description="Compiles src/jdk7 sources, targeting jdk7"> |
875 |
< |
|
863 |
> |
<target name="4jdk7compile" depends="configure-compiler"> |
864 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
865 |
|
|
866 |
|
<javac srcdir="${4jdk7src.dir}" |
884 |
|
<compilerarg value="-Xlint:all"/> |
885 |
|
<compilerarg value="-Werror"/> |
886 |
|
<compilerarg line="${build.args}"/> |
899 |
– |
|
887 |
|
</javac> |
888 |
|
</target> |
889 |
|
|
890 |
< |
<target name="4jdk7doclint" |
904 |
< |
depends="configure-compiler" |
905 |
< |
description="Finds doclint warnings"> |
906 |
< |
|
890 |
> |
<target name="4jdk7doclint" depends="configure-compiler"> |
891 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
892 |
|
|
893 |
|
<javac srcdir="${4jdk7src.dir}" |
911 |
|
<compilerarg value="-Xlint:all"/> |
912 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
913 |
|
<compilerarg line="${build.args}"/> |
930 |
– |
|
914 |
|
</javac> |
915 |
|
</target> |
916 |
|
|
917 |
< |
|
935 |
< |
<target name="4jdk7jar" |
936 |
< |
depends="4jdk7compile" |
937 |
< |
description="Builds library jar from compiled sources"> |
938 |
< |
|
917 |
> |
<target name="4jdk7jar" depends="4jdk7compile"> |
918 |
|
<jar destfile="${4jdk7product.jar}"> |
919 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
920 |
|
<manifest> |
922 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
923 |
|
</manifest> |
924 |
|
</jar> |
946 |
– |
|
925 |
|
</target> |
926 |
|
|
927 |
< |
|
950 |
< |
<target name="4jdk7-tck" |
951 |
< |
depends="4jdk7jar" |
952 |
< |
description="Runs tck tests for jsr166-4jdk7 directly"> |
953 |
< |
|
927 |
> |
<target name="4jdk7-tck" depends="4jdk7jar"> |
928 |
|
<run-tck-tests |
929 |
|
target="7" |
930 |
|
workdir="${build.4jdk7.dir}" |
947 |
|
</run-tck-tests> |
948 |
|
</target> |
949 |
|
|
976 |
– |
|
950 |
|
<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) --> |
951 |
< |
<target name="4jdk7-tck-junit" |
979 |
< |
depends="4jdk7compile"> |
951 |
> |
<target name="4jdk7-tck-junit" depends="4jdk7compile"> |
952 |
|
|
953 |
|
<junit printsummary="true" |
954 |
|
showoutput="true" |
970 |
|
|
971 |
|
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
972 |
|
</test> |
1001 |
– |
|
973 |
|
</junit> |
974 |
|
</target> |
975 |
|
|
976 |
< |
<target name="4jdk7-jtreg" |
1006 |
< |
depends="4jdk7jar" |
1007 |
< |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
976 |
> |
<target name="4jdk7-jtreg" depends="4jdk7jar"> |
977 |
|
<run-jtreg-tests |
978 |
|
target="7" |
979 |
|
workdir="${build.4jdk7.dir}" |
980 |
|
classes="${4jdk7product.jar}"/> |
981 |
|
</target> |
982 |
|
|
983 |
+ |
<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/> |
984 |
|
|
985 |
< |
<target name="4jdk7-test" |
1016 |
< |
depends="4jdk7-tck, 4jdk7-jtreg" |
1017 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
1018 |
< |
</target> |
1019 |
< |
|
1020 |
< |
|
1021 |
< |
<target name="4jdk7docs" |
1022 |
< |
description="Builds javadocs for src/jdk7 to dist dir"> |
1023 |
< |
|
985 |
> |
<target name="4jdk7docs"> |
986 |
|
<delete dir="${4jdk7docs.dir}"/> |
987 |
|
<mkdir dir="${4jdk7docs.dir}"/> |
988 |
|
|
1003 |
|
</javadoc> |
1004 |
|
</target> |
1005 |
|
|
1006 |
+ |
<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/> |
1007 |
|
|
1008 |
< |
<target name="4jdk7dist" |
1046 |
< |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
1047 |
< |
description="Puts all distributable products in single hierarchy"/> |
1048 |
< |
|
1049 |
< |
|
1050 |
< |
<target name="4jdk7clean" |
1051 |
< |
description="Removes all 4jdk7 build products"> |
1052 |
< |
|
1008 |
> |
<target name="4jdk7clean"> |
1009 |
|
<delete dir="${build.4jdk7.dir}"/> |
1054 |
– |
|
1010 |
|
</target> |
1011 |
|
|
1012 |
< |
|
1058 |
< |
<target name="4jdk7dist-jar" |
1059 |
< |
depends="4jdk7clean, 4jdk7jar"> |
1012 |
> |
<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar"> |
1013 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
1014 |
|
</target> |
1015 |
|
|
1016 |
< |
|
1064 |
< |
<target name="4jdk7dist-docs" |
1065 |
< |
depends="4jdk7clean, 4jdk7docs"> |
1016 |
> |
<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs"> |
1017 |
|
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
1018 |
|
</target> |
1019 |
|
|
1020 |
|
|
1021 |
< |
<!-- jsr166x --> |
1071 |
< |
|
1072 |
< |
<target name="jsr166xcompile" |
1073 |
< |
depends="configure-compiler" |
1074 |
< |
description="Compiles jsr166x sources to build dir"> |
1021 |
> |
<!-- jsr166x (no longer maintained) --> |
1022 |
|
|
1023 |
+ |
<target name="jsr166xcompile" depends="configure-compiler"> |
1024 |
|
<mkdir dir="${build.jsr166x.classes.dir}"/> |
1025 |
|
|
1026 |
|
<javac srcdir="${topsrc.dir}" |
1037 |
|
encoding="ASCII" |
1038 |
|
executable="${javac7}" |
1039 |
|
fork="true"> |
1092 |
– |
|
1040 |
|
<include name="jsr166x/**/*.java"/> |
1041 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1042 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
1043 |
|
<compilerarg value="-Werror"/> |
1044 |
|
<compilerarg line="${build.args}"/> |
1098 |
– |
|
1045 |
|
</javac> |
1046 |
|
</target> |
1047 |
|
|
1048 |
< |
|
1103 |
< |
<target name="jsr166xjar" |
1104 |
< |
depends="jsr166xcompile" |
1105 |
< |
description="Builds library jar from compiled sources"> |
1106 |
< |
|
1048 |
> |
<target name="jsr166xjar" depends="jsr166xcompile"> |
1049 |
|
<jar destfile="${jsr166x.jar}"> |
1050 |
|
<fileset dir="${build.jsr166x.classes.dir}"/> |
1051 |
|
<manifest> |
1053 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1054 |
|
</manifest> |
1055 |
|
</jar> |
1114 |
– |
|
1056 |
|
</target> |
1057 |
|
|
1058 |
< |
|
1118 |
< |
<target name="jsr166xdocs" |
1119 |
< |
description="Builds javadocs to dist dir"> |
1120 |
< |
|
1058 |
> |
<target name="jsr166xdocs"> |
1059 |
|
<delete dir="${jsr166xdocs.dir}"/> |
1060 |
|
<mkdir dir="${jsr166xdocs.dir}"/> |
1061 |
|
|
1070 |
|
failonerror = "true"> |
1071 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1072 |
|
<arg value="-XDignore.symbol.file=true"/> |
1135 |
– |
|
1073 |
|
</javadoc> |
1074 |
|
</target> |
1075 |
|
|
1076 |
+ |
<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/> |
1077 |
|
|
1078 |
< |
<target name="jsr166xdist" |
1141 |
< |
depends="jsr166xdist-jar, jsr166xdist-docs" |
1142 |
< |
description="Puts all distributable products in single hierarchy"/> |
1143 |
< |
|
1144 |
< |
|
1145 |
< |
<target name="jsr166xclean" |
1146 |
< |
description="Removes all jsr166x build products"> |
1147 |
< |
|
1078 |
> |
<target name="jsr166xclean"> |
1079 |
|
<delete dir="${build.jsr166x.dir}"/> |
1149 |
– |
|
1080 |
|
</target> |
1081 |
|
|
1082 |
< |
|
1153 |
< |
<target name="jsr166xdist-jar" |
1154 |
< |
depends="jsr166xclean, jsr166xjar"> |
1082 |
> |
<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar"> |
1083 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
1084 |
|
</target> |
1085 |
|
|
1086 |
< |
<target name="jsr166xdist-docs" |
1159 |
< |
depends="jsr166xclean, jsr166xdocs"> |
1086 |
> |
<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs"> |
1087 |
|
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
1088 |
|
</target> |
1089 |
|
|
1163 |
– |
<!-- jsr166y --> |
1090 |
|
|
1091 |
+ |
<!-- jsr166y (no longer maintained) --> |
1092 |
|
|
1093 |
< |
<target name="jsr166ycompile" |
1167 |
< |
depends="configure-compiler" |
1168 |
< |
description="Compiles jsr166y sources"> |
1169 |
< |
|
1093 |
> |
<target name="jsr166ycompile" depends="configure-compiler"> |
1094 |
|
<mkdir dir="${build.jsr166y.classes.dir}"/> |
1095 |
|
|
1096 |
|
<javac srcdir="${topsrc.dir}" |
1113 |
|
<compilerarg value="-Xlint:all"/> |
1114 |
|
<compilerarg value="-Werror"/> |
1115 |
|
<compilerarg line="${build.args}"/> |
1192 |
– |
|
1116 |
|
</javac> |
1117 |
|
</target> |
1118 |
|
|
1119 |
< |
|
1197 |
< |
<target name="jsr166yjar" |
1198 |
< |
depends="jsr166ycompile" |
1199 |
< |
description="Builds library jar from compiled sources"> |
1200 |
< |
|
1119 |
> |
<target name="jsr166yjar" depends="jsr166ycompile"> |
1120 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
1121 |
|
<fileset dir="${build.jsr166y.classes.dir}"/> |
1122 |
|
<manifest> |
1124 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1125 |
|
</manifest> |
1126 |
|
</jar> |
1208 |
– |
|
1127 |
|
</target> |
1128 |
|
|
1129 |
< |
|
1212 |
< |
<target name="jsr166ydocs" |
1213 |
< |
description="Builds javadocs to dist dir"> |
1214 |
< |
|
1129 |
> |
<target name="jsr166ydocs"> |
1130 |
|
<delete dir="${jsr166ydocs.dir}"/> |
1131 |
|
<mkdir dir="${jsr166ydocs.dir}"/> |
1132 |
|
|
1141 |
|
failonerror = "true"> |
1142 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1143 |
|
<arg value="-XDignore.symbol.file=true"/> |
1229 |
– |
|
1144 |
|
</javadoc> |
1145 |
|
</target> |
1146 |
|
|
1147 |
+ |
<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/> |
1148 |
|
|
1149 |
< |
<target name="jsr166ydist" |
1235 |
< |
depends="jsr166ydist-jar, jsr166ydist-docs" |
1236 |
< |
description="Puts all distributable products in single hierarchy"/> |
1237 |
< |
|
1238 |
< |
|
1239 |
< |
<target name="jsr166yclean" |
1240 |
< |
description="Removes all jsr166y build products"> |
1241 |
< |
|
1149 |
> |
<target name="jsr166yclean"> |
1150 |
|
<delete dir="${build.jsr166y.dir}"/> |
1243 |
– |
|
1151 |
|
</target> |
1152 |
|
|
1153 |
< |
|
1247 |
< |
<target name="jsr166ydist-jar" |
1248 |
< |
depends="jsr166yclean, jsr166yjar"> |
1153 |
> |
<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar"> |
1154 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
1155 |
|
</target> |
1156 |
|
|
1157 |
< |
<target name="jsr166ydist-docs" |
1253 |
< |
depends="jsr166yclean, jsr166ydocs"> |
1157 |
> |
<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs"> |
1158 |
|
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
1159 |
|
</target> |
1160 |
|
|
1161 |
|
|
1162 |
< |
<!-- extra166y --> |
1259 |
< |
|
1260 |
< |
|
1261 |
< |
<target name="extra166ycompile" |
1262 |
< |
depends="configure-compiler, jsr166yjar" |
1263 |
< |
description="Compiles extra166y sources"> |
1162 |
> |
<!-- extra166y (no longer maintained) --> |
1163 |
|
|
1164 |
+ |
<target name="extra166ycompile" depends="configure-compiler, jsr166yjar"> |
1165 |
|
<mkdir dir="${build.extra166y.classes.dir}"/> |
1166 |
|
|
1167 |
|
<javac srcdir="${topsrc.dir}" |
1184 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
1185 |
|
<compilerarg value="-Werror"/> |
1186 |
|
<compilerarg line="${build.args}"/> |
1287 |
– |
|
1187 |
|
</javac> |
1188 |
|
</target> |
1189 |
|
|
1190 |
< |
|
1292 |
< |
<target name="extra166yjar" |
1293 |
< |
depends="extra166ycompile" |
1294 |
< |
description="Builds library jar from compiled sources"> |
1295 |
< |
|
1190 |
> |
<target name="extra166yjar" depends="extra166ycompile"> |
1191 |
|
<jar destfile="${extra166y.jar}" index="true"> |
1192 |
|
<fileset dir="${build.extra166y.classes.dir}"/> |
1193 |
|
<manifest> |
1195 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1196 |
|
</manifest> |
1197 |
|
</jar> |
1303 |
– |
|
1198 |
|
</target> |
1199 |
|
|
1200 |
< |
|
1307 |
< |
<target name="extra166ydocs" |
1308 |
< |
description="Builds javadocs to build dir"> |
1309 |
< |
|
1200 |
> |
<target name="extra166ydocs"> |
1201 |
|
<delete dir="${extra166ydocs.dir}"/> |
1202 |
|
<mkdir dir="${extra166ydocs.dir}"/> |
1203 |
|
|
1211 |
|
executable="${javadoc7}"> |
1212 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1213 |
|
<arg value="-XDignore.symbol.file=true"/> |
1323 |
– |
|
1214 |
|
</javadoc> |
1215 |
|
</target> |
1216 |
|
|
1217 |
+ |
<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/> |
1218 |
|
|
1219 |
< |
<target name="extra166ydist" |
1329 |
< |
depends="extra166ydist-jar, extra166ydist-docs" |
1330 |
< |
description="Puts all distributable products in single hierarchy"/> |
1331 |
< |
|
1332 |
< |
|
1333 |
< |
<target name="extra166yclean" |
1334 |
< |
description="Removes all extra166y build products"> |
1335 |
< |
|
1219 |
> |
<target name="extra166yclean"> |
1220 |
|
<delete dir="${build.extra166y.dir}"/> |
1337 |
– |
|
1221 |
|
</target> |
1222 |
|
|
1223 |
< |
|
1341 |
< |
<target name="extra166ydist-jar" |
1342 |
< |
depends="extra166yclean, extra166yjar"> |
1223 |
> |
<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar"> |
1224 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
1225 |
|
</target> |
1226 |
|
|
1227 |
< |
<target name="extra166ydist-docs" |
1347 |
< |
depends="extra166yclean, extra166ydocs"> |
1227 |
> |
<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs"> |
1228 |
|
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
1229 |
|
</target> |
1230 |
|
|
1231 |
< |
<!-- jsr166e --> |
1231 |
> |
|
1232 |
> |
<!-- jsr166e (no longer maintained) --> |
1233 |
|
|
1234 |
|
<property name="build.jsr166e.java.version" value="6"/> |
1235 |
|
<property name="build.jsr166e.javac" value="${javac6}"/> |
1236 |
|
|
1237 |
< |
<target name="jsr166ecompile" |
1357 |
< |
depends="configure-compiler" |
1358 |
< |
description="Compiles jsr166e sources"> |
1359 |
< |
|
1237 |
> |
<target name="jsr166ecompile" depends="configure-compiler"> |
1238 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1239 |
|
|
1240 |
|
<javac srcdir="${topsrc.dir}" |
1255 |
|
<compilerarg value="-Xlint:all"/> |
1256 |
|
<compilerarg value="-Werror"/> |
1257 |
|
<compilerarg line="${build.args}"/> |
1380 |
– |
|
1258 |
|
</javac> |
1259 |
|
</target> |
1260 |
|
|
1384 |
– |
<!-- jsr166e: find doclint errors --> |
1261 |
|
<target name="jsr166edoclint"> |
1386 |
– |
|
1262 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1263 |
|
|
1264 |
|
<javac srcdir="${topsrc.dir}" |
1280 |
|
<compilerarg value="-Xlint:all"/> |
1281 |
|
<compilerarg value="-Werror"/> |
1282 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1408 |
– |
|
1283 |
|
</javac> |
1284 |
|
</target> |
1285 |
|
|
1286 |
< |
|
1413 |
< |
<target name="jsr166ejar" |
1414 |
< |
depends="jsr166ecompile" |
1415 |
< |
description="Builds library jar from compiled sources"> |
1416 |
< |
|
1286 |
> |
<target name="jsr166ejar" depends="jsr166ecompile"> |
1287 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1288 |
|
<fileset dir="${build.jsr166e.classes.dir}"/> |
1289 |
|
<manifest> |
1291 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1292 |
|
</manifest> |
1293 |
|
</jar> |
1424 |
– |
|
1294 |
|
</target> |
1295 |
|
|
1296 |
< |
|
1428 |
< |
<target name="jsr166edocs" |
1429 |
< |
description="Builds javadocs to build dir"> |
1430 |
< |
|
1296 |
> |
<target name="jsr166edocs"> |
1297 |
|
<delete dir="${jsr166edocs.dir}"/> |
1298 |
|
<mkdir dir="${jsr166edocs.dir}"/> |
1299 |
|
|
1307 |
|
failonerror = "true"> |
1308 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1309 |
|
<arg value="-XDignore.symbol.file=true"/> |
1444 |
– |
|
1310 |
|
</javadoc> |
1311 |
|
</target> |
1312 |
|
|
1313 |
< |
|
1449 |
< |
<target name="jsr166e-tck-one-java-version" |
1450 |
< |
depends="jsr166ejar"> |
1451 |
< |
|
1313 |
> |
<target name="jsr166e-tck-one-java-version" depends="jsr166ejar"> |
1314 |
|
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1453 |
– |
|
1315 |
|
<run-tck-tests |
1316 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1317 |
|
target="${build.jsr166e.java.version}" |
1319 |
|
classes="${jsr166e.jar}"/> |
1320 |
|
</target> |
1321 |
|
|
1322 |
< |
<target name="jsr166e-tck" |
1462 |
< |
description="Runs tck tests for jsr166e for multiple java versions"> |
1322 |
> |
<target name="jsr166e-tck"> |
1323 |
|
|
1324 |
|
<!-- <antcall target="clean"/> --> |
1325 |
|
<!-- <antcall target="jsr166e-tck-one-java-version"> --> |
1340 |
|
</antcall> |
1341 |
|
</target> |
1342 |
|
|
1343 |
+ |
<target name="jsr166e-test" depends="jsr166e-tck"/> |
1344 |
|
|
1345 |
< |
<target name="jsr166e-test" |
1485 |
< |
depends="jsr166e-tck" |
1486 |
< |
description="Runs all tests for jsr166e"> |
1487 |
< |
</target> |
1345 |
> |
<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/> |
1346 |
|
|
1347 |
< |
<target name="jsr166edist" |
1490 |
< |
depends="jsr166edist-jar, jsr166edist-docs" |
1491 |
< |
description="Puts all distributable products in single hierarchy"/> |
1492 |
< |
|
1493 |
< |
|
1494 |
< |
<target name="jsr166eclean" |
1495 |
< |
description="Removes all jsr166e build products"> |
1347 |
> |
<target name="jsr166eclean"> |
1348 |
|
<delete dir="${build.jsr166e.dir}"/> |
1349 |
|
</target> |
1350 |
|
|
1499 |
– |
|
1351 |
|
<target name="jsr166edist-jar" |
1352 |
|
depends="jsr166eclean, jsr166ejar"> |
1353 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1354 |
|
</target> |
1355 |
|
|
1356 |
< |
<target name="jsr166edist-docs" |
1506 |
< |
depends="jsr166eclean, jsr166edocs"> |
1356 |
> |
<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs"> |
1357 |
|
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1358 |
|
</target> |
1359 |
|
|
1376 |
|
|
1377 |
|
<!-- ============================================================== |
1378 |
|
Experimental errorprone support - http://errorprone.info |
1529 |
– |
You may need to bring your own errorprone jar. |
1379 |
|
=================================================================== --> |
1380 |
|
<target name="errorprone" |
1381 |
|
depends="clean, configure-compiler" |
1382 |
< |
description="Run errorprone over jsr166 source code"> |
1382 |
> |
description="Run errorprone over jsr166 source code (experimental)"> |
1383 |
|
|
1384 |
|
<local name="destdir"/> |
1385 |
|
<property name="destdir" value="${build.classes.dir}/java.base"/> |
1398 |
|
fork="true"> |
1399 |
|
|
1400 |
|
<include name="**/*.java"/> |
1401 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1553 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1554 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1555 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1556 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1557 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1558 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1559 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1560 |
< |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1561 |
< |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1401 |
> |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/> |
1402 |
|
<compilerarg value="-Xplugin:ErrorProne |
1403 |
< |
-Xep:IdentityBinaryExpression:WARN |
1403 |
> |
-Xep:IdentityBinaryExpression:WARN |
1404 |
|
-Xep:MissingOverride:OFF |
1405 |
< |
-Xep:MixedArrayDimensions:WARN |
1406 |
< |
-Xep:RemoveUnusedImports:ERROR |
1405 |
> |
-Xep:MixedArrayDimensions:WARN |
1406 |
> |
-Xep:RemoveUnusedImports:ERROR |
1407 |
> |
-Xep:ClassName:ERROR |
1408 |
> |
-Xep:MultipleTopLevelClasses:ERROR |
1409 |
> |
-Xep:EmptyIf:ERROR |
1410 |
> |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1411 |
> |
-Xep:RedundantThrows:ERROR |
1412 |
|
-Xep:MethodCanBeStatic:WARN"/> |
1413 |
|
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1414 |
|
<compilerarg value="-Xprefer:source"/> |
1428 |
|
workdir="${build.dir}" |
1429 |
|
classes="${product.jar}"> |
1430 |
|
<javac-elements> |
1431 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/> |
1432 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/> |
1433 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/> |
1434 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/> |
1435 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/> |
1436 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/> |
1437 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/> |
1438 |
< |
<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1439 |
< |
<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/> |
1440 |
< |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/> |
1441 |
< |
<compilerarg value="-Xplugin:ErrorProne |
1442 |
< |
-Xep:IdentityBinaryExpression:WARN |
1443 |
< |
-Xep:BoxedPrimitiveConstructor:OFF |
1444 |
< |
-Xep:HashtableContains:OFF |
1600 |
< |
-Xep:ModifyingCollectionWithItself:OFF |
1601 |
< |
-Xep:MissingOverride:OFF |
1602 |
< |
-Xep:MixedArrayDimensions:WARN |
1603 |
< |
-Xep:RemoveUnusedImports:ERROR |
1431 |
> |
<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/> |
1432 |
> |
<compilerarg value="-Xplugin:ErrorProne |
1433 |
> |
-Xep:IdentityBinaryExpression:WARN |
1434 |
> |
-Xep:BoxedPrimitiveConstructor:OFF |
1435 |
> |
-Xep:HashtableContains:OFF |
1436 |
> |
-Xep:ModifyingCollectionWithItself:OFF |
1437 |
> |
-Xep:MissingOverride:OFF |
1438 |
> |
-Xep:MixedArrayDimensions:WARN |
1439 |
> |
-Xep:RemoveUnusedImports:ERROR |
1440 |
> |
-Xep:ClassName:ERROR |
1441 |
> |
-Xep:MultipleTopLevelClasses:ERROR |
1442 |
> |
-Xep:EmptyIf:ERROR |
1443 |
> |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1444 |
> |
-Xep:RedundantThrows:ERROR |
1445 |
|
-Xep:MethodCanBeStatic:WARN"/> |
1446 |
|
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1447 |
|
</javac-elements> |
1501 |
|
<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar" |
1502 |
|
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1503 |
|
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1504 |
< |
jvm="${java9}" fork="true"> |
1504 |
> |
jvm="${build.main.java}" fork="true"> |
1505 |
|
<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/> |
1506 |
|
<formatter type="brief"/> |
1507 |
|
<classpath> |