ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.238 by jsr166, Fri Mar 24 16:33:02 2017 UTC vs.
Revision 1.250 by jsr166, Thu Sep 14 14:23:02 2017 UTC

#	Line 18 | Line 18
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
#	Line 32 | Line 30
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		------------------------------------------------------------------------------
#	Line 298 | Line 296
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"/>
#	Line 321 | Line 325
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"/>
#	Line 343 | Line 346
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}"/>
#	Line 369 | Line 372
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, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
387	>	depends="dist, 4jdk8dist"
388		description="Builds all public jars and docs"/>
389	+	<!--
390	+	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
391	+	-->
392
393		<target name="compile"
394		depends="configure-compiler"
395		description="Compiles src/main sources to build dir">
396
382	–	<local name="modules"/>
383	–	<condition property="modules">
384	–	<and>
385	–	<available file="${jdk9.home}/jmods" type="dir"/>
386	–	<equals arg1="9" arg2="${build.main.java.version}"/>
387	–	</and>
388	–	</condition>
389	–
397		<local name="destdir"/>
398	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
392	<	<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
#	Line 406 | Line 412
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
#	Line 455 | Line 462
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}"/>
#	Line 510 | Line 519
519
520		<target name="clean"
521		description="Removes all build products">
513	–
522		<delete dir="${build.dir}"/>
515	–
523		</target>
524
525
526		<target name="dist-clean"
527		description="Removes all build and distribution products">
521	–
528		<delete dir="${build.dir}"/>
529		<delete dir="${dist.dir}"/>
524	–
530		</target>
531
532
#	Line 581 | Line 586
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">
585	<	</target>
589	>	description="Runs tck and jtreg tests for src/main"/>
590
591		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
592
#	Line 593 | Line 597
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}"/> -->
603	<	<!--     </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}"/> -->
609	<	<!--     </antcall> -->
608	>	<antcall target="clean"/>
609	>	<antcall target="test">
610	>	<param name="build.main.java.version" value="10"/>
611	>	</antcall>
612
613	<	<!--   </target> -->
613	>	</target>
614
615
616
#	Line 660 | Line 662
662		<java classname="ALoops" fork="true">
663		<classpath refid="loops.classpath"/>
664		</java>
663	–
665		</target>
666
667
668		<target name="compile-test-loops" depends="jar"
669	<	description="compile all the perf tests in src/test/loops">
669	>	description="Compiles all the perf tests in src/test/loops">
670
671		<mkdir dir="${build.dir}/test/loops"/>
672
#	Line 677 | Line 678
678		includeAntRuntime="false"
679		includeJavaRuntime="false"
680		encoding="ASCII"
681	<	executable="${javac9}"
681	>	executable="${build.main.javac}"
682		fork="true">
683
684		<include name="*.java"/>
#	Line 685 | Line 686
686		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
687		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
688		<compilerarg line="${build.args}"/>
688	–
689		</javac>
690	–
690		</target>
691
692
#	Line 713 | Line 712
712		encoding="ASCII"
713		executable="${javac8}"
714		fork="true">
716	–
715		<include name="**/*.java"/>
716		<compilerarg value="-Xprefer:source"/>
717		<compilerarg value="-XDignore.symbol.file=true"/>
718		<compilerarg value="-Xlint:all"/>
719		<compilerarg value="-Werror"/>
720		<compilerarg line="${build.args}"/>
723	–
721		</javac>
722		</target>
723
#	Line 744 | Line 741
741		encoding="ASCII"
742		executable="${javac8}"
743		fork="true">
747	–
744		<include name="**/*.java"/>
745		<compilerarg value="-Xprefer:source"/>
746		<compilerarg value="-XDignore.symbol.file=true"/>
747		<compilerarg value="-Xlint:all"/>
748		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
749		<compilerarg line="${build.args}"/>
754	–
750		</javac>
751		</target>
752
#	Line 767 | Line 762
762		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
763		</manifest>
764		</jar>
770	–
765		</target>
766
767
#	Line 801 | Line 795
795
796		<target name="4jdk8-test"
797		depends="4jdk8-tck, 4jdk8-jtreg"
798	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
805	<	</target>
798	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
799
800
801		<target name="4jdk8docs"
#	Line 818 | Line 811
811		access="${build.javadoc.access}"
812		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
813		classpath=""
814	+	source="8"
815		executable="${javadoc8}"
816		failonerror = "true">
817		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 845 | Line 839
839
840		<target name="4jdk8clean"
841		description="Removes all 4jdk8 build products">
848	–
842		<delete dir="${build.4jdk8.dir}"/>
850	–
843		</target>
844
845
#	Line 863 | Line 855
855		</target>
856
857
858	+	<!-- jsr166 4jdk7 (no longer maintained) -->
859
860	<	<!-- jsr166 4jdk7 -->
868	<
869	<	<target name="4jdk7compile"
870	<	depends="configure-compiler"
871	<	description="Compiles src/jdk7 sources, targeting jdk7">
872	<
860	>	<target name="4jdk7compile" depends="configure-compiler">
861		<mkdir dir="${build.4jdk7.classes.dir}"/>
862
863		<javac srcdir="${4jdk7src.dir}"
#	Line 893 | Line 881
881		<compilerarg value="-Xlint:all"/>
882		<compilerarg value="-Werror"/>
883		<compilerarg line="${build.args}"/>
896	–
884		</javac>
885		</target>
886
887	<	<target name="4jdk7doclint"
901	<	depends="configure-compiler"
902	<	description="Finds doclint warnings">
903	<
887	>	<target name="4jdk7doclint" depends="configure-compiler">
888		<mkdir dir="${build.4jdk7.classes.dir}"/>
889
890		<javac srcdir="${4jdk7src.dir}"
#	Line 924 | Line 908
908		<compilerarg value="-Xlint:all"/>
909		<compilerarg value="-Xdoclint:all/protected"/>
910		<compilerarg line="${build.args}"/>
927	–
911		</javac>
912		</target>
913
914	<
932	<	<target name="4jdk7jar"
933	<	depends="4jdk7compile"
934	<	description="Builds library jar from compiled sources">
935	<
914	>	<target name="4jdk7jar" depends="4jdk7compile">
915		<jar destfile="${4jdk7product.jar}">
916		<fileset dir="${build.4jdk7.classes.dir}"/>
917		<manifest>
#	Line 940 | Line 919
919		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
920		</manifest>
921		</jar>
943	–
922		</target>
923
924	<
947	<	<target name="4jdk7-tck"
948	<	depends="4jdk7jar"
949	<	description="Runs tck tests for jsr166-4jdk7 directly">
950	<
924	>	<target name="4jdk7-tck" depends="4jdk7jar">
925		<run-tck-tests
926		target="7"
927		workdir="${build.4jdk7.dir}"
#	Line 970 | Line 944
944		</run-tck-tests>
945		</target>
946
973	–
947		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
948	<	<target name="4jdk7-tck-junit"
976	<	depends="4jdk7compile">
948	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
949
950		<junit printsummary="true"
951		showoutput="true"
#	Line 995 | Line 967
967
968		<test name="${jsr166.tckTestClass}" haltonfailure="no">
969		</test>
998	–
970		</junit>
971		</target>
972
973	<	<target name="4jdk7-jtreg"
1003	<	depends="4jdk7jar"
1004	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
973	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
974		<run-jtreg-tests
975		target="7"
976		workdir="${build.4jdk7.dir}"
977		classes="${4jdk7product.jar}"/>
978		</target>
979
980	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
981
982	<	<target name="4jdk7-test"
1013	<	depends="4jdk7-tck, 4jdk7-jtreg"
1014	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
1015	<	</target>
1016	<
1017	<
1018	<	<target name="4jdk7docs"
1019	<	description="Builds javadocs for src/jdk7 to dist dir">
1020	<
982	>	<target name="4jdk7docs">
983		<delete dir="${4jdk7docs.dir}"/>
984		<mkdir dir="${4jdk7docs.dir}"/>
985
#	Line 1038 | Line 1000
1000		</javadoc>
1001		</target>
1002
1003	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1004
1005	<	<target name="4jdk7dist"
1043	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1044	<	description="Puts all distributable products in single hierarchy"/>
1045	<
1046	<
1047	<	<target name="4jdk7clean"
1048	<	description="Removes all 4jdk7 build products">
1049	<
1005	>	<target name="4jdk7clean">
1006		<delete dir="${build.4jdk7.dir}"/>
1051	–
1007		</target>
1008
1009	<
1055	<	<target name="4jdk7dist-jar"
1056	<	depends="4jdk7clean, 4jdk7jar">
1009	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1010		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1011		</target>
1012
1013	<
1061	<	<target name="4jdk7dist-docs"
1062	<	depends="4jdk7clean, 4jdk7docs">
1013	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1014		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1015		</target>
1016
1017
1018	<	<!-- jsr166x -->
1068	<
1069	<	<target name="jsr166xcompile"
1070	<	depends="configure-compiler"
1071	<	description="Compiles jsr166x sources to build dir">
1018	>	<!-- jsr166x (no longer maintained) -->
1019
1020	+	<target name="jsr166xcompile" depends="configure-compiler">
1021		<mkdir dir="${build.jsr166x.classes.dir}"/>
1022
1023		<javac srcdir="${topsrc.dir}"
#	Line 1086 | Line 1034
1034		encoding="ASCII"
1035		executable="${javac7}"
1036		fork="true">
1089	–
1037		<include name="jsr166x/**/*.java"/>
1038		<compilerarg value="-XDignore.symbol.file=true"/>
1039		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1040		<compilerarg value="-Werror"/>
1041		<compilerarg line="${build.args}"/>
1095	–
1042		</javac>
1043		</target>
1044
1045	<
1100	<	<target name="jsr166xjar"
1101	<	depends="jsr166xcompile"
1102	<	description="Builds library jar from compiled sources">
1103	<
1045	>	<target name="jsr166xjar" depends="jsr166xcompile">
1046		<jar destfile="${jsr166x.jar}">
1047		<fileset dir="${build.jsr166x.classes.dir}"/>
1048		<manifest>
#	Line 1108 | Line 1050
1050		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1051		</manifest>
1052		</jar>
1111	–
1053		</target>
1054
1055	<
1115	<	<target name="jsr166xdocs"
1116	<	description="Builds javadocs to dist dir">
1117	<
1055	>	<target name="jsr166xdocs">
1056		<delete dir="${jsr166xdocs.dir}"/>
1057		<mkdir dir="${jsr166xdocs.dir}"/>
1058
#	Line 1129 | Line 1067
1067		failonerror = "true">
1068		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1069		<arg value="-XDignore.symbol.file=true"/>
1132	–
1070		</javadoc>
1071		</target>
1072
1073	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1074
1075	<	<target name="jsr166xdist"
1138	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1139	<	description="Puts all distributable products in single hierarchy"/>
1140	<
1141	<
1142	<	<target name="jsr166xclean"
1143	<	description="Removes all jsr166x build products">
1144	<
1075	>	<target name="jsr166xclean">
1076		<delete dir="${build.jsr166x.dir}"/>
1146	–
1077		</target>
1078
1079	<
1150	<	<target name="jsr166xdist-jar"
1151	<	depends="jsr166xclean, jsr166xjar">
1079	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1080		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1081		</target>
1082
1083	<	<target name="jsr166xdist-docs"
1156	<	depends="jsr166xclean, jsr166xdocs">
1083	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1084		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1085		</target>
1086
1160	–	<!-- jsr166y -->
1087
1088	+	<!-- jsr166y (no longer maintained) -->
1089
1090	<	<target name="jsr166ycompile"
1164	<	depends="configure-compiler"
1165	<	description="Compiles jsr166y sources">
1166	<
1090	>	<target name="jsr166ycompile" depends="configure-compiler">
1091		<mkdir dir="${build.jsr166y.classes.dir}"/>
1092
1093		<javac srcdir="${topsrc.dir}"
#	Line 1186 | Line 1110
1110		<compilerarg value="-Xlint:all"/>
1111		<compilerarg value="-Werror"/>
1112		<compilerarg line="${build.args}"/>
1189	–
1113		</javac>
1114		</target>
1115
1116	<
1194	<	<target name="jsr166yjar"
1195	<	depends="jsr166ycompile"
1196	<	description="Builds library jar from compiled sources">
1197	<
1116	>	<target name="jsr166yjar" depends="jsr166ycompile">
1117		<jar destfile="${jsr166y.jar}" index="true">
1118		<fileset dir="${build.jsr166y.classes.dir}"/>
1119		<manifest>
#	Line 1202 | Line 1121
1121		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1122		</manifest>
1123		</jar>
1205	–
1124		</target>
1125
1126	<
1209	<	<target name="jsr166ydocs"
1210	<	description="Builds javadocs to dist dir">
1211	<
1126	>	<target name="jsr166ydocs">
1127		<delete dir="${jsr166ydocs.dir}"/>
1128		<mkdir dir="${jsr166ydocs.dir}"/>
1129
#	Line 1223 | Line 1138
1138		failonerror = "true">
1139		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1140		<arg value="-XDignore.symbol.file=true"/>
1226	–
1141		</javadoc>
1142		</target>
1143
1144	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1145
1146	<	<target name="jsr166ydist"
1232	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1233	<	description="Puts all distributable products in single hierarchy"/>
1234	<
1235	<
1236	<	<target name="jsr166yclean"
1237	<	description="Removes all jsr166y build products">
1238	<
1146	>	<target name="jsr166yclean">
1147		<delete dir="${build.jsr166y.dir}"/>
1240	–
1148		</target>
1149
1150	<
1244	<	<target name="jsr166ydist-jar"
1245	<	depends="jsr166yclean, jsr166yjar">
1150	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1151		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1152		</target>
1153
1154	<	<target name="jsr166ydist-docs"
1250	<	depends="jsr166yclean, jsr166ydocs">
1154	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1155		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1156		</target>
1157
1158
1159	<	<!-- extra166y -->
1256	<
1257	<
1258	<	<target name="extra166ycompile"
1259	<	depends="configure-compiler, jsr166yjar"
1260	<	description="Compiles extra166y sources">
1159	>	<!-- extra166y (no longer maintained) -->
1160
1161	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1162		<mkdir dir="${build.extra166y.classes.dir}"/>
1163
1164		<javac srcdir="${topsrc.dir}"
#	Line 1281 | Line 1181
1181		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1182		<compilerarg value="-Werror"/>
1183		<compilerarg line="${build.args}"/>
1284	–
1184		</javac>
1185		</target>
1186
1187	<
1289	<	<target name="extra166yjar"
1290	<	depends="extra166ycompile"
1291	<	description="Builds library jar from compiled sources">
1292	<
1187	>	<target name="extra166yjar" depends="extra166ycompile">
1188		<jar destfile="${extra166y.jar}" index="true">
1189		<fileset dir="${build.extra166y.classes.dir}"/>
1190		<manifest>
#	Line 1297 | Line 1192
1192		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1193		</manifest>
1194		</jar>
1300	–
1195		</target>
1196
1197	<
1304	<	<target name="extra166ydocs"
1305	<	description="Builds javadocs to build dir">
1306	<
1197	>	<target name="extra166ydocs">
1198		<delete dir="${extra166ydocs.dir}"/>
1199		<mkdir dir="${extra166ydocs.dir}"/>
1200
#	Line 1317 | Line 1208
1208		executable="${javadoc7}">
1209		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1210		<arg value="-XDignore.symbol.file=true"/>
1320	–
1211		</javadoc>
1212		</target>
1213
1214	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1215
1216	<	<target name="extra166ydist"
1326	<	depends="extra166ydist-jar, extra166ydist-docs"
1327	<	description="Puts all distributable products in single hierarchy"/>
1328	<
1329	<
1330	<	<target name="extra166yclean"
1331	<	description="Removes all extra166y build products">
1332	<
1216	>	<target name="extra166yclean">
1217		<delete dir="${build.extra166y.dir}"/>
1334	–
1218		</target>
1219
1220	<
1338	<	<target name="extra166ydist-jar"
1339	<	depends="extra166yclean, extra166yjar">
1220	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1221		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1222		</target>
1223
1224	<	<target name="extra166ydist-docs"
1344	<	depends="extra166yclean, extra166ydocs">
1224	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1225		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1226		</target>
1227
1228	<	<!-- jsr166e -->
1228	>
1229	>	<!-- jsr166e (no longer maintained) -->
1230
1231		<property name="build.jsr166e.java.version" value="6"/>
1232		<property name="build.jsr166e.javac" value="${javac6}"/>
1233
1234	<	<target name="jsr166ecompile"
1354	<	depends="configure-compiler"
1355	<	description="Compiles jsr166e sources">
1356	<
1234	>	<target name="jsr166ecompile" depends="configure-compiler">
1235		<mkdir dir="${build.jsr166e.classes.dir}"/>
1236
1237		<javac srcdir="${topsrc.dir}"
#	Line 1374 | Line 1252
1252		<compilerarg value="-Xlint:all"/>
1253		<compilerarg value="-Werror"/>
1254		<compilerarg line="${build.args}"/>
1377	–
1255		</javac>
1256		</target>
1257
1381	–	<!-- jsr166e: find doclint errors -->
1258		<target name="jsr166edoclint">
1383	–
1259		<mkdir dir="${build.jsr166e.classes.dir}"/>
1260
1261		<javac srcdir="${topsrc.dir}"
#	Line 1402 | Line 1277
1277		<compilerarg value="-Xlint:all"/>
1278		<compilerarg value="-Werror"/>
1279		<compilerarg value="-Xdoclint:all/protected"/>
1405	–
1280		</javac>
1281		</target>
1282
1283	<
1410	<	<target name="jsr166ejar"
1411	<	depends="jsr166ecompile"
1412	<	description="Builds library jar from compiled sources">
1413	<
1283	>	<target name="jsr166ejar" depends="jsr166ecompile">
1284		<jar destfile="${jsr166e.jar}" index="true">
1285		<fileset dir="${build.jsr166e.classes.dir}"/>
1286		<manifest>
#	Line 1418 | Line 1288
1288		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1289		</manifest>
1290		</jar>
1421	–
1291		</target>
1292
1293	<
1425	<	<target name="jsr166edocs"
1426	<	description="Builds javadocs to build dir">
1427	<
1293	>	<target name="jsr166edocs">
1294		<delete dir="${jsr166edocs.dir}"/>
1295		<mkdir dir="${jsr166edocs.dir}"/>
1296
#	Line 1438 | Line 1304
1304		failonerror = "true">
1305		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1306		<arg value="-XDignore.symbol.file=true"/>
1441	–
1307		</javadoc>
1308		</target>
1309
1310	<
1446	<	<target name="jsr166e-tck-one-java-version"
1447	<	depends="jsr166ejar">
1448	<
1310	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1311		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1450	–
1312		<run-tck-tests
1313		tck.src.dir="${test.src.dir}/tck-jsr166e"
1314		target="${build.jsr166e.java.version}"
#	Line 1455 | Line 1316
1316		classes="${jsr166e.jar}"/>
1317		</target>
1318
1319	<	<target name="jsr166e-tck"
1459	<	description="Runs tck tests for jsr166e for multiple java versions">
1319	>	<target name="jsr166e-tck">
1320
1321		<!--     <antcall target="clean"/> -->
1322		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1477 | Line 1337
1337		</antcall>
1338		</target>
1339
1340	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1341
1342	<	<target name="jsr166e-test"
1482	<	depends="jsr166e-tck"
1483	<	description="Runs all tests for jsr166e">
1484	<	</target>
1485	<
1486	<	<target name="jsr166edist"
1487	<	depends="jsr166edist-jar, jsr166edist-docs"
1488	<	description="Puts all distributable products in single hierarchy"/>
1489	<
1342	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1343
1344	<	<target name="jsr166eclean"
1492	<	description="Removes all jsr166e build products">
1344	>	<target name="jsr166eclean">
1345		<delete dir="${build.jsr166e.dir}"/>
1346		</target>
1347
1496	–
1348		<target name="jsr166edist-jar"
1349		depends="jsr166eclean, jsr166ejar">
1350		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1351		</target>
1352
1353	<	<target name="jsr166edist-docs"
1503	<	depends="jsr166eclean, jsr166edocs">
1353	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1354		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1355		</target>
1356
#	Line 1523 | Line 1373
1373
1374		<!-- ==============================================================
1375		Experimental errorprone support - http://errorprone.info
1526	–	You may need to bring your own errorprone jar.
1376		=================================================================== -->
1377		<target name="errorprone"
1378		depends="clean, configure-compiler"
1379	<	description="Run errorprone over jsr166 source code">
1379	>	description="Run errorprone over jsr166 source code (experimental)">
1380
1381		<local name="destdir"/>
1382		<property name="destdir" value="${build.classes.dir}/java.base"/>
#	Line 1546 | Line 1395
1395		fork="true">
1396
1397		<include name="**/*.java"/>
1398	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1550	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1551	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1552	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1553	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1554	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1555	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1556	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1557	<	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1558	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1398	>	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
1399		<compilerarg value="-Xplugin:ErrorProne
1400	<	-Xep:IdentityBinaryExpression:WARN
1400	>	-Xep:IdentityBinaryExpression:WARN
1401		-Xep:MissingOverride:OFF
1402	<	-Xep:MixedArrayDimensions:WARN
1403	<	-Xep:RemoveUnusedImports:ERROR
1402	>	-Xep:MixedArrayDimensions:WARN
1403	>	-Xep:RemoveUnusedImports:ERROR
1404	>	-Xep:ClassName:ERROR
1405	>	-Xep:MultipleTopLevelClasses:ERROR
1406	>	-Xep:EmptyIf:ERROR
1407	>	-Xep:LongLiteralLowerCaseSuffix:ERROR
1408	>	-Xep:RedundantThrows:ERROR
1409		-Xep:MethodCanBeStatic:WARN"/>
1410		<compilerarg value="--patch-module=java.base=${src.dir}"/>
1411		<compilerarg value="-Xprefer:source"/>
#	Line 1580 | Line 1425
1425		workdir="${build.dir}"
1426		classes="${product.jar}">
1427		<javac-elements>
1428	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1429	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1430	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1431	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1432	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1433	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1434	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1435	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1436	<	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1437	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1438	<	<compilerarg value="-Xplugin:ErrorProne
1439	<	-Xep:IdentityBinaryExpression:WARN
1440	<	-Xep:BoxedPrimitiveConstructor:OFF
1441	<	-Xep:HashtableContains:OFF
1597	<	-Xep:ModifyingCollectionWithItself:OFF
1598	<	-Xep:MissingOverride:OFF
1599	<	-Xep:MixedArrayDimensions:WARN
1600	<	-Xep:RemoveUnusedImports:ERROR
1428	>	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
1429	>	<compilerarg value="-Xplugin:ErrorProne
1430	>	-Xep:IdentityBinaryExpression:WARN
1431	>	-Xep:BoxedPrimitiveConstructor:OFF
1432	>	-Xep:HashtableContains:OFF
1433	>	-Xep:ModifyingCollectionWithItself:OFF
1434	>	-Xep:MissingOverride:OFF
1435	>	-Xep:MixedArrayDimensions:WARN
1436	>	-Xep:RemoveUnusedImports:ERROR
1437	>	-Xep:ClassName:ERROR
1438	>	-Xep:MultipleTopLevelClasses:ERROR
1439	>	-Xep:EmptyIf:ERROR
1440	>	-Xep:LongLiteralLowerCaseSuffix:ERROR
1441	>	-Xep:RedundantThrows:ERROR
1442		-Xep:MethodCanBeStatic:WARN"/>
1443		<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1444		</javac-elements>
#	Line 1657 | Line 1498
1498		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1499		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1500		<junit printsummary="true" showoutput="true" haltonfailure="true"
1501	<	jvm="${java9}" fork="true">
1501	>	jvm="${build.main.java}" fork="true">
1502		<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1503		<formatter type="brief"/>
1504		<classpath>

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines