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.254 by jsr166, Mon Sep 25 22:54:09 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 183 | Line 181
181		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
182
183		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
184	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
185	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188	<	<!-- The expected canonical location does not yet exist as of 2016-04 -->
189	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190	<	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
184	>	<property name="java5.docroot.url"  value="http://docs.oracle.com/javase/1.5.0/docs"/>
185	>	<property name="java6.docroot.url"  value="http://docs.oracle.com/javase/6/docs"/>
186	>	<property name="java7.docroot.url"  value="http://docs.oracle.com/javase/7/docs"/>
187	>	<property name="java8.docroot.url"  value="http://docs.oracle.com/javase/8/docs"/>
188	>	<property name="java9.docroot.url"  value="http://docs.oracle.com/javase/9/docs"/>
189	>	<!-- The location of jdk9 early access docs -->
190	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
191		<!-- Default jdk doc location (latest stable release seems best) -->
192	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
192	>	<property name="java.docroot.url"   value="${java9.docroot.url}"/>
193
194		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
195		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	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	>	<!-- Clean up to avoid obscure wrong class file version bugs -->
614	>	<antcall target="clean"/>
615	>
616	>	</target>
617
618
619
#	Line 660 | Line 665
665		<java classname="ALoops" fork="true">
666		<classpath refid="loops.classpath"/>
667		</java>
663	–
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
#	Line 677 | Line 681
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"/>
#	Line 685 | Line 689
689		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
690		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
691		<compilerarg line="${build.args}"/>
688	–
692		</javac>
690	–
693		</target>
694
695
#	Line 713 | Line 715
715		encoding="ASCII"
716		executable="${javac8}"
717		fork="true">
716	–
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}"/>
723	–
724		</javac>
725		</target>
726
#	Line 744 | Line 744
744		encoding="ASCII"
745		executable="${javac8}"
746		fork="true">
747	–
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}"/>
754	–
753		</javac>
754		</target>
755
#	Line 767 | Line 765
765		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
766		</manifest>
767		</jar>
770	–
768		</target>
769
770
#	Line 801 | Line 798
798
799		<target name="4jdk8-test"
800		depends="4jdk8-tck, 4jdk8-jtreg"
801	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
805	<	</target>
801	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
802
803
804		<target name="4jdk8docs"
#	Line 818 | Line 814
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">
#	Line 845 | Line 842
842
843		<target name="4jdk8clean"
844		description="Removes all 4jdk8 build products">
848	–
845		<delete dir="${build.4jdk8.dir}"/>
850	–
846		</target>
847
848
#	Line 863 | Line 858
858		</target>
859
860
861	+	<!-- jsr166 4jdk7 (no longer maintained) -->
862
863	<	<!-- jsr166 4jdk7 -->
868	<
869	<	<target name="4jdk7compile"
870	<	depends="configure-compiler"
871	<	description="Compiles src/jdk7 sources, targeting jdk7">
872	<
863	>	<target name="4jdk7compile" depends="configure-compiler">
864		<mkdir dir="${build.4jdk7.classes.dir}"/>
865
866		<javac srcdir="${4jdk7src.dir}"
#	Line 893 | Line 884
884		<compilerarg value="-Xlint:all"/>
885		<compilerarg value="-Werror"/>
886		<compilerarg line="${build.args}"/>
896	–
887		</javac>
888		</target>
889
890	<	<target name="4jdk7doclint"
901	<	depends="configure-compiler"
902	<	description="Finds doclint warnings">
903	<
890	>	<target name="4jdk7doclint" depends="configure-compiler">
891		<mkdir dir="${build.4jdk7.classes.dir}"/>
892
893		<javac srcdir="${4jdk7src.dir}"
#	Line 924 | Line 911
911		<compilerarg value="-Xlint:all"/>
912		<compilerarg value="-Xdoclint:all/protected"/>
913		<compilerarg line="${build.args}"/>
927	–
914		</javac>
915		</target>
916
917	<
932	<	<target name="4jdk7jar"
933	<	depends="4jdk7compile"
934	<	description="Builds library jar from compiled sources">
935	<
917	>	<target name="4jdk7jar" depends="4jdk7compile">
918		<jar destfile="${4jdk7product.jar}">
919		<fileset dir="${build.4jdk7.classes.dir}"/>
920		<manifest>
#	Line 940 | Line 922
922		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
923		</manifest>
924		</jar>
943	–
925		</target>
926
927	<
947	<	<target name="4jdk7-tck"
948	<	depends="4jdk7jar"
949	<	description="Runs tck tests for jsr166-4jdk7 directly">
950	<
927	>	<target name="4jdk7-tck" depends="4jdk7jar">
928		<run-tck-tests
929		target="7"
930		workdir="${build.4jdk7.dir}"
#	Line 970 | Line 947
947		</run-tck-tests>
948		</target>
949
973	–
950		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
951	<	<target name="4jdk7-tck-junit"
976	<	depends="4jdk7compile">
951	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
952
953		<junit printsummary="true"
954		showoutput="true"
#	Line 995 | Line 970
970
971		<test name="${jsr166.tckTestClass}" haltonfailure="no">
972		</test>
998	–
973		</junit>
974		</target>
975
976	<	<target name="4jdk7-jtreg"
1003	<	depends="4jdk7jar"
1004	<	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"
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	<
985	>	<target name="4jdk7docs">
986		<delete dir="${4jdk7docs.dir}"/>
987		<mkdir dir="${4jdk7docs.dir}"/>
988
#	Line 1038 | Line 1003
1003		</javadoc>
1004		</target>
1005
1006	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1007
1008	<	<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	<
1008	>	<target name="4jdk7clean">
1009		<delete dir="${build.4jdk7.dir}"/>
1051	–
1010		</target>
1011
1012	<
1055	<	<target name="4jdk7dist-jar"
1056	<	depends="4jdk7clean, 4jdk7jar">
1012	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1013		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1014		</target>
1015
1016	<
1061	<	<target name="4jdk7dist-docs"
1062	<	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 -->
1068	<
1069	<	<target name="jsr166xcompile"
1070	<	depends="configure-compiler"
1071	<	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}"
#	Line 1086 | Line 1037
1037		encoding="ASCII"
1038		executable="${javac7}"
1039		fork="true">
1089	–
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}"/>
1095	–
1045		</javac>
1046		</target>
1047
1048	<
1100	<	<target name="jsr166xjar"
1101	<	depends="jsr166xcompile"
1102	<	description="Builds library jar from compiled sources">
1103	<
1048	>	<target name="jsr166xjar" depends="jsr166xcompile">
1049		<jar destfile="${jsr166x.jar}">
1050		<fileset dir="${build.jsr166x.classes.dir}"/>
1051		<manifest>
#	Line 1108 | Line 1053
1053		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1054		</manifest>
1055		</jar>
1111	–
1056		</target>
1057
1058	<
1115	<	<target name="jsr166xdocs"
1116	<	description="Builds javadocs to dist dir">
1117	<
1058	>	<target name="jsr166xdocs">
1059		<delete dir="${jsr166xdocs.dir}"/>
1060		<mkdir dir="${jsr166xdocs.dir}"/>
1061
#	Line 1129 | Line 1070
1070		failonerror = "true">
1071		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1072		<arg value="-XDignore.symbol.file=true"/>
1132	–
1073		</javadoc>
1074		</target>
1075
1076	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1077
1078	<	<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	<
1078	>	<target name="jsr166xclean">
1079		<delete dir="${build.jsr166x.dir}"/>
1146	–
1080		</target>
1081
1082	<
1150	<	<target name="jsr166xdist-jar"
1151	<	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"
1156	<	depends="jsr166xclean, jsr166xdocs">
1086	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1087		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1088		</target>
1089
1160	–	<!-- jsr166y -->
1161	–
1090
1091	<	<target name="jsr166ycompile"
1164	<	depends="configure-compiler"
1165	<	description="Compiles jsr166y sources">
1091	>	<!-- jsr166y (no longer maintained) -->
1092
1093	+	<target name="jsr166ycompile" depends="configure-compiler">
1094		<mkdir dir="${build.jsr166y.classes.dir}"/>
1095
1096		<javac srcdir="${topsrc.dir}"
#	Line 1186 | Line 1113
1113		<compilerarg value="-Xlint:all"/>
1114		<compilerarg value="-Werror"/>
1115		<compilerarg line="${build.args}"/>
1189	–
1116		</javac>
1117		</target>
1118
1119	<
1194	<	<target name="jsr166yjar"
1195	<	depends="jsr166ycompile"
1196	<	description="Builds library jar from compiled sources">
1197	<
1119	>	<target name="jsr166yjar" depends="jsr166ycompile">
1120		<jar destfile="${jsr166y.jar}" index="true">
1121		<fileset dir="${build.jsr166y.classes.dir}"/>
1122		<manifest>
#	Line 1202 | Line 1124
1124		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1125		</manifest>
1126		</jar>
1205	–
1127		</target>
1128
1129	<
1209	<	<target name="jsr166ydocs"
1210	<	description="Builds javadocs to dist dir">
1211	<
1129	>	<target name="jsr166ydocs">
1130		<delete dir="${jsr166ydocs.dir}"/>
1131		<mkdir dir="${jsr166ydocs.dir}"/>
1132
#	Line 1223 | Line 1141
1141		failonerror = "true">
1142		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1143		<arg value="-XDignore.symbol.file=true"/>
1226	–
1144		</javadoc>
1145		</target>
1146
1147	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1148
1149	<	<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	<
1149	>	<target name="jsr166yclean">
1150		<delete dir="${build.jsr166y.dir}"/>
1240	–
1151		</target>
1152
1153	<
1244	<	<target name="jsr166ydist-jar"
1245	<	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"
1250	<	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 -->
1256	<
1257	<
1258	<	<target name="extra166ycompile"
1259	<	depends="configure-compiler, jsr166yjar"
1260	<	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}"
#	Line 1281 | Line 1184
1184		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1185		<compilerarg value="-Werror"/>
1186		<compilerarg line="${build.args}"/>
1284	–
1187		</javac>
1188		</target>
1189
1190	<
1289	<	<target name="extra166yjar"
1290	<	depends="extra166ycompile"
1291	<	description="Builds library jar from compiled sources">
1292	<
1190	>	<target name="extra166yjar" depends="extra166ycompile">
1191		<jar destfile="${extra166y.jar}" index="true">
1192		<fileset dir="${build.extra166y.classes.dir}"/>
1193		<manifest>
#	Line 1297 | Line 1195
1195		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1196		</manifest>
1197		</jar>
1300	–
1198		</target>
1199
1200	<
1304	<	<target name="extra166ydocs"
1305	<	description="Builds javadocs to build dir">
1306	<
1200	>	<target name="extra166ydocs">
1201		<delete dir="${extra166ydocs.dir}"/>
1202		<mkdir dir="${extra166ydocs.dir}"/>
1203
#	Line 1317 | Line 1211
1211		executable="${javadoc7}">
1212		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1213		<arg value="-XDignore.symbol.file=true"/>
1320	–
1214		</javadoc>
1215		</target>
1216
1217	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1218
1219	<	<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	<
1219	>	<target name="extra166yclean">
1220		<delete dir="${build.extra166y.dir}"/>
1334	–
1221		</target>
1222
1223	<
1338	<	<target name="extra166ydist-jar"
1339	<	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"
1344	<	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"
1354	<	depends="configure-compiler"
1355	<	description="Compiles jsr166e sources">
1356	<
1237	>	<target name="jsr166ecompile" depends="configure-compiler">
1238		<mkdir dir="${build.jsr166e.classes.dir}"/>
1239
1240		<javac srcdir="${topsrc.dir}"
#	Line 1374 | Line 1255
1255		<compilerarg value="-Xlint:all"/>
1256		<compilerarg value="-Werror"/>
1257		<compilerarg line="${build.args}"/>
1377	–
1258		</javac>
1259		</target>
1260
1381	–	<!-- jsr166e: find doclint errors -->
1261		<target name="jsr166edoclint">
1383	–
1262		<mkdir dir="${build.jsr166e.classes.dir}"/>
1263
1264		<javac srcdir="${topsrc.dir}"
#	Line 1402 | Line 1280
1280		<compilerarg value="-Xlint:all"/>
1281		<compilerarg value="-Werror"/>
1282		<compilerarg value="-Xdoclint:all/protected"/>
1405	–
1283		</javac>
1284		</target>
1285
1286	<
1410	<	<target name="jsr166ejar"
1411	<	depends="jsr166ecompile"
1412	<	description="Builds library jar from compiled sources">
1413	<
1286	>	<target name="jsr166ejar" depends="jsr166ecompile">
1287		<jar destfile="${jsr166e.jar}" index="true">
1288		<fileset dir="${build.jsr166e.classes.dir}"/>
1289		<manifest>
#	Line 1418 | Line 1291
1291		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1292		</manifest>
1293		</jar>
1421	–
1294		</target>
1295
1296	<
1425	<	<target name="jsr166edocs"
1426	<	description="Builds javadocs to build dir">
1427	<
1296	>	<target name="jsr166edocs">
1297		<delete dir="${jsr166edocs.dir}"/>
1298		<mkdir dir="${jsr166edocs.dir}"/>
1299
#	Line 1438 | Line 1307
1307		failonerror = "true">
1308		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1309		<arg value="-XDignore.symbol.file=true"/>
1441	–
1310		</javadoc>
1311		</target>
1312
1313	<
1446	<	<target name="jsr166e-tck-one-java-version"
1447	<	depends="jsr166ejar">
1448	<
1313	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1314		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1450	–
1315		<run-tck-tests
1316		tck.src.dir="${test.src.dir}/tck-jsr166e"
1317		target="${build.jsr166e.java.version}"
#	Line 1455 | Line 1319
1319		classes="${jsr166e.jar}"/>
1320		</target>
1321
1322	<	<target name="jsr166e-tck"
1459	<	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"> -->
#	Line 1477 | Line 1340
1340		</antcall>
1341		</target>
1342
1343	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1344
1345	<	<target name="jsr166e-test"
1482	<	depends="jsr166e-tck"
1483	<	description="Runs all tests for jsr166e">
1484	<	</target>
1345	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1346
1347	<	<target name="jsr166edist"
1487	<	depends="jsr166edist-jar, jsr166edist-docs"
1488	<	description="Puts all distributable products in single hierarchy"/>
1489	<
1490	<
1491	<	<target name="jsr166eclean"
1492	<	description="Removes all jsr166e build products">
1347	>	<target name="jsr166eclean">
1348		<delete dir="${build.jsr166e.dir}"/>
1349		</target>
1350
1496	–
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"
1503	<	depends="jsr166eclean, jsr166edocs">
1356	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1357		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1358		</target>
1359
#	Line 1523 | Line 1376
1376
1377		<!-- ==============================================================
1378		Experimental errorprone support - http://errorprone.info
1526	–	You may need to bring your own errorprone jar.
1379		=================================================================== -->
1380	+	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/>
1381		<target name="errorprone"
1382		depends="clean, configure-compiler"
1383	<	description="Run errorprone over jsr166 source code">
1383	>	description="Run errorprone over jsr166 source code (experimental)">
1384
1385		<local name="destdir"/>
1386		<property name="destdir" value="${build.classes.dir}/java.base"/>
#	Line 1546 | Line 1399
1399		fork="true">
1400
1401		<include name="**/*.java"/>
1402	<	<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"/>
1402	>	<compilerarg line="-processorpath ${errorprone.jar}"/>
1403		<compilerarg value="-Xplugin:ErrorProne
1404	<	-Xep:IdentityBinaryExpression:WARN
1404	>	-Xep:IdentityBinaryExpression:WARN
1405		-Xep:MissingOverride:OFF
1406	<	-Xep:MixedArrayDimensions:WARN
1407	<	-Xep:RemoveUnusedImports:ERROR
1406	>	-Xep:MixedArrayDimensions:WARN
1407	>	-Xep:RemoveUnusedImports:ERROR
1408	>	-Xep:ClassName:ERROR
1409	>	-Xep:MultipleTopLevelClasses:ERROR
1410	>	-Xep:EmptyIf:ERROR
1411	>	-Xep:LongLiteralLowerCaseSuffix:ERROR
1412	>	-Xep:RedundantThrows:ERROR
1413		-Xep:MethodCanBeStatic:WARN"/>
1414		<compilerarg value="--patch-module=java.base=${src.dir}"/>
1415		<compilerarg value="-Xprefer:source"/>
#	Line 1580 | Line 1429
1429		workdir="${build.dir}"
1430		classes="${product.jar}">
1431		<javac-elements>
1432	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1433	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1434	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1435	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1436	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1437	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1438	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1439	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1440	<	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1441	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1442	<	<compilerarg value="-Xplugin:ErrorProne
1443	<	-Xep:IdentityBinaryExpression:WARN
1444	<	-Xep:BoxedPrimitiveConstructor:OFF
1445	<	-Xep:HashtableContains:OFF
1597	<	-Xep:ModifyingCollectionWithItself:OFF
1598	<	-Xep:MissingOverride:OFF
1599	<	-Xep:MixedArrayDimensions:WARN
1600	<	-Xep:RemoveUnusedImports:ERROR
1432	>	<compilerarg line="-processorpath ${errorprone.jar}"/>
1433	>	<compilerarg value="-Xplugin:ErrorProne
1434	>	-Xep:IdentityBinaryExpression:WARN
1435	>	-Xep:BoxedPrimitiveConstructor:OFF
1436	>	-Xep:HashtableContains:OFF
1437	>	-Xep:ModifyingCollectionWithItself:OFF
1438	>	-Xep:MissingOverride:OFF
1439	>	-Xep:MixedArrayDimensions:WARN
1440	>	-Xep:RemoveUnusedImports:ERROR
1441	>	-Xep:ClassName:ERROR
1442	>	-Xep:MultipleTopLevelClasses:ERROR
1443	>	-Xep:EmptyIf:ERROR
1444	>	-Xep:LongLiteralLowerCaseSuffix:ERROR
1445	>	-Xep:RedundantThrows:ERROR
1446		-Xep:MethodCanBeStatic:WARN"/>
1447		<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1448		</javac-elements>
#	Line 1657 | Line 1502
1502		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1503		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1504		<junit printsummary="true" showoutput="true" haltonfailure="true"
1505	<	jvm="${java9}" fork="true">
1506	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1505	>	jvm="${build.main.java}" fork="true">
1506	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1507		<formatter type="brief"/>
1508		<classpath>
1509		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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