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.240 by jsr166, Sun Mar 26 22:25:20 2017 UTC vs.
Revision 1.259 by jsr166, Mon Dec 18 21:07:18 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	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
185	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
186	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
187	>	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
188	>	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
189	>	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
190	>	<!-- The location of jdk9 early access docs (RIP) -->
191	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
192		<!-- Default jdk doc location (latest stable release seems best) -->
193	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
193	>	<property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
194	>	<property name="java.docroot.url"   value="${java9.docroot.url}"/>
195
196		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
197		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 199 | Line 199
199		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
200		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
201		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
202	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
203		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
204
205		<!-- Define the "jtreg" task -->
#	Line 298 | Line 299
299		</macrodef>
300
301		<!-- Define jtreg test sets for different jdk versions -->
302	+	<fileset dir="${jtreg10.src.dir}">
303	+	<patternset id="jdk10.jtreg.tests">
304	+	<include name="**/*.java"/>
305	+	</patternset>
306	+	</fileset>
307	+
308		<fileset dir="${jtreg9.src.dir}">
309		<patternset id="jdk9.jtreg.tests">
310		<include name="**/*.java"/>
#	Line 321 | Line 328
328
329		<macrodef name="run-jtreg-tests">
330		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
324	–	<attribute name="source" default="7"/>
331		<attribute name="target"/>
332		<attribute name="workdir"/>
333		<attribute name="classes"/>
334	+	<attribute name="verbose" default="${jtreg.verbose}"/>
335		<attribute name="jtregflags" default=""/>
336	+	<element name="jtreg-elements" optional="true"/>
337
338		<sequential>
339
#	Line 343 | Line 351
351		workDir="@{workdir}/JTwork">
352		<patternset refid="jdk@{target}.jtreg.tests"/>
353		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
354	<	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
355	<	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
354	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
355	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
356		<arg value="-agentvm"/>
357		<arg value="-noreport"/>
358	<	<arg value="-verbose:${jtreg.verbose}"/>
358	>	<arg value="-verbose:@{verbose}"/>
359		<arg value="-vmoptions:-esa -ea"/>
360		<arg value="-automatic"/>
361		<arg value="-k:!ignore"/>
362		<arg line="@{jtregflags}"/>
363		<arg line="${jtreg.flags}"/>
364	+	<jtreg-elements/>
365		</jtreg>
366		</sequential>
367		</macrodef>
#	Line 369 | Line 378
378		<!-- Main targets -->
379
380		<property name="build.main.java.version" value="9"/>
381	<	<property name="build.main.javac" value="${javac9}"/>
381	>	<!-- Workaround "no nested properties in ant" -->
382	>	<macrodef name="define-build-main-properties">
383	>	<attribute name="v"/>
384	>	<sequential>
385	>	<property name="build.main.java"    value="${java@{v}}"/>
386	>	<property name="build.main.javac"   value="${javac@{v}}"/>
387	>	<property name="build.main.javadoc" value="${javadoc@{v}}"/>
388	>	</sequential>
389	>	</macrodef>
390	>	<define-build-main-properties v="${build.main.java.version}"/>
391
392		<target name="dists"
393		depends="dist, 4jdk8dist"
#	Line 382 | Line 400
400		depends="configure-compiler"
401		description="Compiles src/main sources to build dir">
402
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	–
403		<local name="destdir"/>
404	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
395	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
404	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
405
406		<mkdir dir="${destdir}"/>
407
#	Line 409 | Line 418
418		fork="true">
419
420		<include name="**/*.java"/>
421	<	<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
421	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
422		<compilerarg value="-Xprefer:source"/>
423		<compilerarg value="-XDignore.symbol.file=true"/>
424		<compilerarg value="-Xlint:all"/>
425	<	<compilerarg value="-Werror"/>
425	>	<compilerarg line="--doclint-format html5"/>
426		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
427	+	<compilerarg value="-Werror"/>
428		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
429		<compilerarg line="${build.args}"/>
430
#	Line 458 | Line 468
468		access="${build.javadoc.access}"
469		sourcepath="${src.dir}"
470		classpath=""
471	<	executable="${javadoc9}">
471	>	source="9"
472	>	executable="${build.main.javadoc}">
473		<fileset dir="${src.dir}" defaultexcludes="yes">
474		<include name="**/*.java"/>
475		</fileset>
476		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
477		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
478		<arg value="-XDignore.symbol.file=true"/>
479	+	<arg value="-html5"/>
480		<arg value="--patch-module=java.base=${src.dir}"/>
481		<arg value="-tag"/>
482		<arg value="${javadoc.jls.option}"/>
#	Line 513 | Line 525
525
526		<target name="clean"
527		description="Removes all build products">
516	–
528		<delete dir="${build.dir}"/>
518	–
529		</target>
530
531
532		<target name="dist-clean"
533		description="Removes all build and distribution products">
524	–
534		<delete dir="${build.dir}"/>
535		<delete dir="${dist.dir}"/>
527	–
536		</target>
537
538
#	Line 584 | Line 592
592
593		<target name="test"
594		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
595	<	description="Runs tck and jtreg tests for src/main">
588	<	</target>
595	>	description="Runs tck and jtreg tests for src/main"/>
596
597		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
598
#	Line 596 | Line 603
603
604		<!--   </target> -->
605
606	<	<!--   <target name="test89" -->
607	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
606	>	<target name="test910"
607	>	description="Runs tck and jtreg tests for src/main for multiple java versions">
608
609	<	<!--     <antcall target="clean"/> -->
610	<	<!--     <antcall target="test"> -->
611	<	<!--       <param name="build.main.java.version" value="8"/> -->
612	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
606	<	<!--     </antcall> -->
609	>	<antcall target="clean"/>
610	>	<antcall target="test">
611	>	<param name="build.main.java.version" value="9"/>
612	>	</antcall>
613
614	<	<!--     <antcall target="clean"/> -->
615	<	<!--     <antcall target="test"> -->
616	<	<!--       <param name="build.main.java.version" value="9"/> -->
617	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
612	<	<!--     </antcall> -->
614	>	<antcall target="clean"/>
615	>	<antcall target="test">
616	>	<param name="build.main.java.version" value="10"/>
617	>	</antcall>
618
619	<	<!--   </target> -->
619	>	<!-- Clean up to avoid obscure wrong class file version bugs -->
620	>	<antcall target="clean"/>
621	>
622	>	</target>
623
624
625
#	Line 663 | Line 671
671		<java classname="ALoops" fork="true">
672		<classpath refid="loops.classpath"/>
673		</java>
666	–
674		</target>
675
676
677		<target name="compile-test-loops" depends="jar"
678	<	description="compile all the perf tests in src/test/loops">
678	>	description="Compiles all the perf tests in src/test/loops">
679
680		<mkdir dir="${build.dir}/test/loops"/>
681
#	Line 680 | Line 687
687		includeAntRuntime="false"
688		includeJavaRuntime="false"
689		encoding="ASCII"
690	<	executable="${javac9}"
690	>	executable="${build.main.javac}"
691		fork="true">
692
693		<include name="*.java"/>
#	Line 688 | Line 695
695		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
696		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
697		<compilerarg line="${build.args}"/>
691	–
698		</javac>
693	–
699		</target>
700
701
#	Line 716 | Line 721
721		encoding="ASCII"
722		executable="${javac8}"
723		fork="true">
719	–
724		<include name="**/*.java"/>
725		<compilerarg value="-Xprefer:source"/>
726		<compilerarg value="-XDignore.symbol.file=true"/>
727		<compilerarg value="-Xlint:all"/>
728		<compilerarg value="-Werror"/>
729		<compilerarg line="${build.args}"/>
726	–
730		</javac>
731		</target>
732
#	Line 747 | Line 750
750		encoding="ASCII"
751		executable="${javac8}"
752		fork="true">
750	–
753		<include name="**/*.java"/>
754		<compilerarg value="-Xprefer:source"/>
755		<compilerarg value="-XDignore.symbol.file=true"/>
756		<compilerarg value="-Xlint:all"/>
757		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
758		<compilerarg line="${build.args}"/>
757	–
759		</javac>
760		</target>
761
#	Line 770 | Line 771
771		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
772		</manifest>
773		</jar>
773	–
774		</target>
775
776
#	Line 804 | Line 804
804
805		<target name="4jdk8-test"
806		depends="4jdk8-tck, 4jdk8-jtreg"
807	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
808	<	</target>
807	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
808
809
810		<target name="4jdk8docs"
#	Line 821 | Line 820
820		access="${build.javadoc.access}"
821		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
822		classpath=""
823	+	source="8"
824		executable="${javadoc8}"
825		failonerror = "true">
826		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 848 | Line 848
848
849		<target name="4jdk8clean"
850		description="Removes all 4jdk8 build products">
851	–
851		<delete dir="${build.4jdk8.dir}"/>
853	–
852		</target>
853
854
#	Line 866 | Line 864
864		</target>
865
866
867	+	<!-- jsr166 4jdk7 (no longer maintained) -->
868
869	<	<!-- jsr166 4jdk7 -->
871	<
872	<	<target name="4jdk7compile"
873	<	depends="configure-compiler"
874	<	description="Compiles src/jdk7 sources, targeting jdk7">
875	<
869	>	<target name="4jdk7compile" depends="configure-compiler">
870		<mkdir dir="${build.4jdk7.classes.dir}"/>
871
872		<javac srcdir="${4jdk7src.dir}"
#	Line 896 | Line 890
890		<compilerarg value="-Xlint:all"/>
891		<compilerarg value="-Werror"/>
892		<compilerarg line="${build.args}"/>
899	–
893		</javac>
894		</target>
895
896	<	<target name="4jdk7doclint"
904	<	depends="configure-compiler"
905	<	description="Finds doclint warnings">
906	<
896	>	<target name="4jdk7doclint" depends="configure-compiler">
897		<mkdir dir="${build.4jdk7.classes.dir}"/>
898
899		<javac srcdir="${4jdk7src.dir}"
#	Line 927 | Line 917
917		<compilerarg value="-Xlint:all"/>
918		<compilerarg value="-Xdoclint:all/protected"/>
919		<compilerarg line="${build.args}"/>
930	–
920		</javac>
921		</target>
922
923	<
935	<	<target name="4jdk7jar"
936	<	depends="4jdk7compile"
937	<	description="Builds library jar from compiled sources">
938	<
923	>	<target name="4jdk7jar" depends="4jdk7compile">
924		<jar destfile="${4jdk7product.jar}">
925		<fileset dir="${build.4jdk7.classes.dir}"/>
926		<manifest>
#	Line 943 | Line 928
928		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
929		</manifest>
930		</jar>
946	–
931		</target>
932
933	<
950	<	<target name="4jdk7-tck"
951	<	depends="4jdk7jar"
952	<	description="Runs tck tests for jsr166-4jdk7 directly">
953	<
933	>	<target name="4jdk7-tck" depends="4jdk7jar">
934		<run-tck-tests
935		target="7"
936		workdir="${build.4jdk7.dir}"
#	Line 973 | Line 953
953		</run-tck-tests>
954		</target>
955
976	–
956		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
957	<	<target name="4jdk7-tck-junit"
979	<	depends="4jdk7compile">
957	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
958
959		<junit printsummary="true"
960		showoutput="true"
#	Line 998 | Line 976
976
977		<test name="${jsr166.tckTestClass}" haltonfailure="no">
978		</test>
1001	–
979		</junit>
980		</target>
981
982	<	<target name="4jdk7-jtreg"
1006	<	depends="4jdk7jar"
1007	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
982	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
983		<run-jtreg-tests
984		target="7"
985		workdir="${build.4jdk7.dir}"
986		classes="${4jdk7product.jar}"/>
987		</target>
988
989	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
990
991	<	<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	<
991	>	<target name="4jdk7docs">
992		<delete dir="${4jdk7docs.dir}"/>
993		<mkdir dir="${4jdk7docs.dir}"/>
994
#	Line 1041 | Line 1009
1009		</javadoc>
1010		</target>
1011
1012	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1013
1014	<	<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	<
1014	>	<target name="4jdk7clean">
1015		<delete dir="${build.4jdk7.dir}"/>
1054	–
1016		</target>
1017
1018	<
1058	<	<target name="4jdk7dist-jar"
1059	<	depends="4jdk7clean, 4jdk7jar">
1018	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1019		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1020		</target>
1021
1022	<
1064	<	<target name="4jdk7dist-docs"
1065	<	depends="4jdk7clean, 4jdk7docs">
1022	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1023		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1024		</target>
1025
1026
1027	<	<!-- jsr166x -->
1071	<
1072	<	<target name="jsr166xcompile"
1073	<	depends="configure-compiler"
1074	<	description="Compiles jsr166x sources to build dir">
1027	>	<!-- jsr166x (no longer maintained) -->
1028
1029	+	<target name="jsr166xcompile" depends="configure-compiler">
1030		<mkdir dir="${build.jsr166x.classes.dir}"/>
1031
1032		<javac srcdir="${topsrc.dir}"
#	Line 1089 | Line 1043
1043		encoding="ASCII"
1044		executable="${javac7}"
1045		fork="true">
1092	–
1046		<include name="jsr166x/**/*.java"/>
1047		<compilerarg value="-XDignore.symbol.file=true"/>
1048		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1049		<compilerarg value="-Werror"/>
1050		<compilerarg line="${build.args}"/>
1098	–
1051		</javac>
1052		</target>
1053
1054	<
1103	<	<target name="jsr166xjar"
1104	<	depends="jsr166xcompile"
1105	<	description="Builds library jar from compiled sources">
1106	<
1054	>	<target name="jsr166xjar" depends="jsr166xcompile">
1055		<jar destfile="${jsr166x.jar}">
1056		<fileset dir="${build.jsr166x.classes.dir}"/>
1057		<manifest>
#	Line 1111 | Line 1059
1059		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1060		</manifest>
1061		</jar>
1114	–
1062		</target>
1063
1064	<
1118	<	<target name="jsr166xdocs"
1119	<	description="Builds javadocs to dist dir">
1120	<
1064	>	<target name="jsr166xdocs">
1065		<delete dir="${jsr166xdocs.dir}"/>
1066		<mkdir dir="${jsr166xdocs.dir}"/>
1067
#	Line 1132 | Line 1076
1076		failonerror = "true">
1077		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1078		<arg value="-XDignore.symbol.file=true"/>
1135	–
1079		</javadoc>
1080		</target>
1081
1082	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1083
1084	<	<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	<
1084	>	<target name="jsr166xclean">
1085		<delete dir="${build.jsr166x.dir}"/>
1149	–
1086		</target>
1087
1088	<
1153	<	<target name="jsr166xdist-jar"
1154	<	depends="jsr166xclean, jsr166xjar">
1088	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1089		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1090		</target>
1091
1092	<	<target name="jsr166xdist-docs"
1159	<	depends="jsr166xclean, jsr166xdocs">
1092	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1093		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1094		</target>
1095
1163	–	<!-- jsr166y -->
1096
1097	+	<!-- jsr166y (no longer maintained) -->
1098
1099	<	<target name="jsr166ycompile"
1167	<	depends="configure-compiler"
1168	<	description="Compiles jsr166y sources">
1169	<
1099	>	<target name="jsr166ycompile" depends="configure-compiler">
1100		<mkdir dir="${build.jsr166y.classes.dir}"/>
1101
1102		<javac srcdir="${topsrc.dir}"
#	Line 1189 | Line 1119
1119		<compilerarg value="-Xlint:all"/>
1120		<compilerarg value="-Werror"/>
1121		<compilerarg line="${build.args}"/>
1192	–
1122		</javac>
1123		</target>
1124
1125	<
1197	<	<target name="jsr166yjar"
1198	<	depends="jsr166ycompile"
1199	<	description="Builds library jar from compiled sources">
1200	<
1125	>	<target name="jsr166yjar" depends="jsr166ycompile">
1126		<jar destfile="${jsr166y.jar}" index="true">
1127		<fileset dir="${build.jsr166y.classes.dir}"/>
1128		<manifest>
#	Line 1205 | Line 1130
1130		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1131		</manifest>
1132		</jar>
1208	–
1133		</target>
1134
1135	<
1212	<	<target name="jsr166ydocs"
1213	<	description="Builds javadocs to dist dir">
1214	<
1135	>	<target name="jsr166ydocs">
1136		<delete dir="${jsr166ydocs.dir}"/>
1137		<mkdir dir="${jsr166ydocs.dir}"/>
1138
#	Line 1226 | Line 1147
1147		failonerror = "true">
1148		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1149		<arg value="-XDignore.symbol.file=true"/>
1229	–
1150		</javadoc>
1151		</target>
1152
1153	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1154
1155	<	<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	<
1155	>	<target name="jsr166yclean">
1156		<delete dir="${build.jsr166y.dir}"/>
1243	–
1157		</target>
1158
1159	<
1247	<	<target name="jsr166ydist-jar"
1248	<	depends="jsr166yclean, jsr166yjar">
1159	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1160		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1161		</target>
1162
1163	<	<target name="jsr166ydist-docs"
1253	<	depends="jsr166yclean, jsr166ydocs">
1163	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1164		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1165		</target>
1166
1167
1168	<	<!-- extra166y -->
1259	<
1260	<
1261	<	<target name="extra166ycompile"
1262	<	depends="configure-compiler, jsr166yjar"
1263	<	description="Compiles extra166y sources">
1168	>	<!-- extra166y (no longer maintained) -->
1169
1170	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1171		<mkdir dir="${build.extra166y.classes.dir}"/>
1172
1173		<javac srcdir="${topsrc.dir}"
#	Line 1284 | Line 1190
1190		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1191		<compilerarg value="-Werror"/>
1192		<compilerarg line="${build.args}"/>
1287	–
1193		</javac>
1194		</target>
1195
1196	<
1292	<	<target name="extra166yjar"
1293	<	depends="extra166ycompile"
1294	<	description="Builds library jar from compiled sources">
1295	<
1196	>	<target name="extra166yjar" depends="extra166ycompile">
1197		<jar destfile="${extra166y.jar}" index="true">
1198		<fileset dir="${build.extra166y.classes.dir}"/>
1199		<manifest>
#	Line 1300 | Line 1201
1201		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1202		</manifest>
1203		</jar>
1303	–
1204		</target>
1205
1206	<
1307	<	<target name="extra166ydocs"
1308	<	description="Builds javadocs to build dir">
1309	<
1206	>	<target name="extra166ydocs">
1207		<delete dir="${extra166ydocs.dir}"/>
1208		<mkdir dir="${extra166ydocs.dir}"/>
1209
#	Line 1320 | Line 1217
1217		executable="${javadoc7}">
1218		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1219		<arg value="-XDignore.symbol.file=true"/>
1323	–
1220		</javadoc>
1221		</target>
1222
1223	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1224
1225	<	<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	<
1225	>	<target name="extra166yclean">
1226		<delete dir="${build.extra166y.dir}"/>
1337	–
1227		</target>
1228
1229	<
1341	<	<target name="extra166ydist-jar"
1342	<	depends="extra166yclean, extra166yjar">
1229	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1230		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1231		</target>
1232
1233	<	<target name="extra166ydist-docs"
1347	<	depends="extra166yclean, extra166ydocs">
1233	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1234		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1235		</target>
1236
1237	<	<!-- jsr166e -->
1237	>
1238	>	<!-- jsr166e (no longer maintained) -->
1239
1240		<property name="build.jsr166e.java.version" value="6"/>
1241		<property name="build.jsr166e.javac" value="${javac6}"/>
1242
1243	<	<target name="jsr166ecompile"
1357	<	depends="configure-compiler"
1358	<	description="Compiles jsr166e sources">
1359	<
1243	>	<target name="jsr166ecompile" depends="configure-compiler">
1244		<mkdir dir="${build.jsr166e.classes.dir}"/>
1245
1246		<javac srcdir="${topsrc.dir}"
#	Line 1377 | Line 1261
1261		<compilerarg value="-Xlint:all"/>
1262		<compilerarg value="-Werror"/>
1263		<compilerarg line="${build.args}"/>
1380	–
1264		</javac>
1265		</target>
1266
1384	–	<!-- jsr166e: find doclint errors -->
1267		<target name="jsr166edoclint">
1386	–
1268		<mkdir dir="${build.jsr166e.classes.dir}"/>
1269
1270		<javac srcdir="${topsrc.dir}"
#	Line 1405 | Line 1286
1286		<compilerarg value="-Xlint:all"/>
1287		<compilerarg value="-Werror"/>
1288		<compilerarg value="-Xdoclint:all/protected"/>
1408	–
1289		</javac>
1290		</target>
1291
1292	<
1413	<	<target name="jsr166ejar"
1414	<	depends="jsr166ecompile"
1415	<	description="Builds library jar from compiled sources">
1416	<
1292	>	<target name="jsr166ejar" depends="jsr166ecompile">
1293		<jar destfile="${jsr166e.jar}" index="true">
1294		<fileset dir="${build.jsr166e.classes.dir}"/>
1295		<manifest>
#	Line 1421 | Line 1297
1297		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1298		</manifest>
1299		</jar>
1424	–
1300		</target>
1301
1302	<
1428	<	<target name="jsr166edocs"
1429	<	description="Builds javadocs to build dir">
1430	<
1302	>	<target name="jsr166edocs">
1303		<delete dir="${jsr166edocs.dir}"/>
1304		<mkdir dir="${jsr166edocs.dir}"/>
1305
#	Line 1441 | Line 1313
1313		failonerror = "true">
1314		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1315		<arg value="-XDignore.symbol.file=true"/>
1444	–
1316		</javadoc>
1317		</target>
1318
1319	<
1449	<	<target name="jsr166e-tck-one-java-version"
1450	<	depends="jsr166ejar">
1451	<
1319	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1320		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1453	–
1321		<run-tck-tests
1322		tck.src.dir="${test.src.dir}/tck-jsr166e"
1323		target="${build.jsr166e.java.version}"
#	Line 1458 | Line 1325
1325		classes="${jsr166e.jar}"/>
1326		</target>
1327
1328	<	<target name="jsr166e-tck"
1462	<	description="Runs tck tests for jsr166e for multiple java versions">
1328	>	<target name="jsr166e-tck">
1329
1330		<!--     <antcall target="clean"/> -->
1331		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1480 | Line 1346
1346		</antcall>
1347		</target>
1348
1349	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1350
1351	<	<target name="jsr166e-test"
1485	<	depends="jsr166e-tck"
1486	<	description="Runs all tests for jsr166e">
1487	<	</target>
1488	<
1489	<	<target name="jsr166edist"
1490	<	depends="jsr166edist-jar, jsr166edist-docs"
1491	<	description="Puts all distributable products in single hierarchy"/>
1492	<
1351	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1352
1353	<	<target name="jsr166eclean"
1495	<	description="Removes all jsr166e build products">
1353	>	<target name="jsr166eclean">
1354		<delete dir="${build.jsr166e.dir}"/>
1355		</target>
1356
1499	–
1357		<target name="jsr166edist-jar"
1358		depends="jsr166eclean, jsr166ejar">
1359		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1360		</target>
1361
1362	<	<target name="jsr166edist-docs"
1506	<	depends="jsr166eclean, jsr166edocs">
1362	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1363		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1364		</target>
1365
#	Line 1526 | Line 1382
1382
1383		<!-- ==============================================================
1384		Experimental errorprone support - http://errorprone.info
1529	–	You may need to bring your own errorprone jar.
1385		=================================================================== -->
1386	+	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/>
1387		<target name="errorprone"
1388		depends="clean, configure-compiler"
1389	<	description="Run errorprone over jsr166 source code">
1389	>	description="Run errorprone over jsr166 source code (experimental)">
1390
1391		<local name="destdir"/>
1392		<property name="destdir" value="${build.classes.dir}/java.base"/>
#	Line 1549 | Line 1405
1405		fork="true">
1406
1407		<include name="**/*.java"/>
1408	<	<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"/>
1408	>	<compilerarg line="-processorpath ${errorprone.jar}"/>
1409		<compilerarg value="-Xplugin:ErrorProne
1410	<	-Xep:IdentityBinaryExpression:WARN
1410	>	-Xep:IdentityBinaryExpression:WARN
1411		-Xep:MissingOverride:OFF
1412	<	-Xep:MixedArrayDimensions:WARN
1413	<	-Xep:RemoveUnusedImports:ERROR
1412	>	-Xep:MixedArrayDimensions:ERROR
1413	>	-Xep:RemoveUnusedImports:ERROR
1414	>	-Xep:ClassName:ERROR
1415	>	-Xep:MultipleTopLevelClasses:ERROR
1416	>	-Xep:EmptyIf:ERROR
1417	>	-Xep:LongLiteralLowerCaseSuffix:ERROR
1418	>	-Xep:RedundantThrows:ERROR
1419		-Xep:MethodCanBeStatic:WARN"/>
1420		<compilerarg value="--patch-module=java.base=${src.dir}"/>
1421		<compilerarg value="-Xprefer:source"/>
#	Line 1583 | Line 1435
1435		workdir="${build.dir}"
1436		classes="${product.jar}">
1437		<javac-elements>
1438	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1439	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1440	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1441	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1442	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1443	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1444	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1445	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1446	<	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1447	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1448	<	<compilerarg value="-Xplugin:ErrorProne
1449	<	-Xep:IdentityBinaryExpression:WARN
1450	<	-Xep:BoxedPrimitiveConstructor:OFF
1451	<	-Xep:HashtableContains:OFF
1452	<	-Xep:ModifyingCollectionWithItself:OFF
1453	<	-Xep:MissingOverride:OFF
1602	<	-Xep:MixedArrayDimensions:WARN
1603	<	-Xep:RemoveUnusedImports:ERROR
1438	>	<compilerarg line="-processorpath ${errorprone.jar}"/>
1439	>	<compilerarg value="-Xplugin:ErrorProne
1440	>	-Xep:IdentityBinaryExpression:WARN
1441	>	-Xep:BoxedPrimitiveConstructor:OFF
1442	>	-Xep:HashtableContains:OFF
1443	>	-Xep:ModifyingCollectionWithItself:OFF
1444	>	-Xep:MissingOverride:OFF
1445	>	-Xep:MissingFail:OFF
1446	>	-Xep:JdkObsolete:OFF
1447	>	-Xep:MixedArrayDimensions:ERROR
1448	>	-Xep:RemoveUnusedImports:ERROR
1449	>	-Xep:ClassName:ERROR
1450	>	-Xep:MultipleTopLevelClasses:ERROR
1451	>	-Xep:EmptyIf:ERROR
1452	>	-Xep:LongLiteralLowerCaseSuffix:ERROR
1453	>	-Xep:RedundantThrows:ERROR
1454		-Xep:MethodCanBeStatic:WARN"/>
1455		<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1456		</javac-elements>
1457		</run-tck-tests>
1458		</target>
1459
1460	+	<!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1461	+	<target name="errorprone-jtreg"
1462	+	depends="jar"
1463	+	description="Run errorprone over jtreg tests (experimental)">
1464	+
1465	+	<run-jtreg-tests
1466	+	target="${build.main.java.version}"
1467	+	workdir="${build.dir}"
1468	+	classes="${product.jar}"
1469	+	verbose="all">
1470	+	<jtreg-elements>
1471	+	<arg value="-javacoption:-processorpath"/>
1472	+	<arg value="-javacoption:${errorprone.jar}"/>
1473	+	<arg value="-javacoption:-Xplugin:ErrorProne
1474	+	-Xep:IdentityBinaryExpression:WARN
1475	+	-Xep:BoxedPrimitiveConstructor:OFF
1476	+	-Xep:HashtableContains:OFF
1477	+	-Xep:ModifyingCollectionWithItself:OFF
1478	+	-Xep:MissingOverride:OFF
1479	+	-Xep:JdkObsolete:OFF
1480	+	-Xep:NonAtomicVolatileUpdate:OFF
1481	+	-Xep:MixedArrayDimensions:ERROR
1482	+	-Xep:RemoveUnusedImports:ERROR
1483	+	-Xep:ClassName:ERROR
1484	+	-Xep:MultipleTopLevelClasses:ERROR
1485	+	-Xep:EmptyIf:ERROR
1486	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1487	+	-Xep:RedundantThrows:ERROR
1488	+	-Xep:MethodCanBeStatic:WARN"/>
1489	+	</jtreg-elements>
1490	+	</run-jtreg-tests>
1491	+	</target>
1492	+
1493
1494		<!-- ==============================================================
1495		Running guava tests against jsr166 code
#	Line 1660 | Line 1543
1543		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1544		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1545		<junit printsummary="true" showoutput="true" haltonfailure="true"
1546	<	jvm="${java9}" fork="true">
1547	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1546	>	jvm="${build.main.java}" fork="true">
1547	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1548		<formatter type="brief"/>
1549		<classpath>
1550		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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