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.246 by jsr166, Fri Jun 16 20:56:47 2017 UTC vs.
Revision 1.284 by jsr166, Sat Oct 27 01:16:23 2018 UTC

#	Line 1 | Line 1
1		<project name="jsr166" default="usage"
2	<	xmlns:if="ant:if" xmlns:unless="ant:unless"
2	>	xmlns:if="ant:if"
3	>	xmlns:unless="ant:unless"
4		xmlns:ivy="antlib:org.apache.ivy.ant">
5
6		<description>
#	Line 21 | Line 22
22		$HOME/jdk/jdk8
23		$HOME/jdk/jdk9
24		$HOME/jdk/jdk10
25	+	$HOME/jdk/jdk11
26	+	$HOME/jdk/jdk12
27		where each of the above is a JDK or a symlink to same, and
28		$HOME/jdk/src/jdk8
29		$HOME/jdk/src/jdk9
30		$HOME/jdk/src/jdk10
31	+	$HOME/jdk/src/jdk11
32	+	$HOME/jdk/src/jdk12
33		where each of the above is a complete JDK source tree
34		(e.g. mercurial forest) or a symlink to same.
35
#	Line 50 | Line 55
55
56
57		<!-- Compilation options -->
53	–	<property name="build.sourcelevel"    value="6"/>
58		<property name="build.debug"          value="true"/>
59		<property name="build.debuglevel"     value="source,lines,vars"/>
60		<property name="build.deprecation"    value="false"/>
#	Line 101 | Line 105
105		<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
106		unless:set="have.java.base"/>
107		<local name="modules"/>
108	<	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108	>	<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
109		<local name="boot.jar.dir"/>
110		<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
111		<path id="bootclasspath@{v}" unless:set="modules">
#	Line 132 | Line 136
136		<defjdklocations v="8"/>
137		<defjdklocations v="9"/>
138		<defjdklocations v="10"/>
139	+	<defjdklocations v="11"/>
140	+	<defjdklocations v="12"/>
141
142		<!-- Source locations -->
143		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 142 | Line 148
148		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
149		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
150		<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
151	+	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
152	+	<property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
153		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
154		<property name="lib.dir"              location="${basedir}/lib"/>
155		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 181 | Line 189
189		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
190
191		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
192	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
193	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
194	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
195	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
196	<	<!-- The expected canonical location does not yet exist as of 2016-04 -->
197	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
198	<	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
192	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
193	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
194	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
195	>	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
196	>	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
197	>	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
198	>	<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
199	>	<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
200	>	<!-- The location of jdk early access docs (RIP) -->
201	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202	>	<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203	>	<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
204	>	<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
205		<!-- Default jdk doc location (latest stable release seems best) -->
206	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
206	>	<!-- But pin to jdk 10 until fix for -->
207	>	<!-- 8211194: javadoc -link doesn't take module path into consideration -->
208	>	<property name="java.docroot.url"   value="${java10.docroot.url}"/>
209
210		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
211		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 197 | Line 213
213		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
214		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
215		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
216	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
217	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
218	+	<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
219		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
220
221		<!-- Define the "jtreg" task -->
#	Line 229 | Line 248
248
249		<local name="modules"/>
250		<condition property="modules">
251	<	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
251	>	<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
252		</condition>
253
254		<local name="use-doclint"/>
#	Line 296 | Line 315
315		</macrodef>
316
317		<!-- Define jtreg test sets for different jdk versions -->
318	<	<fileset dir="${jtreg10.src.dir}">
319	<	<patternset id="jdk10.jtreg.tests">
320	<	<include name="**/*.java"/>
321	<	</patternset>
322	<	</fileset>
323	<
324	<	<fileset dir="${jtreg9.src.dir}">
325	<	<patternset id="jdk9.jtreg.tests">
326	<	<include name="**/*.java"/>
327	<	</patternset>
328	<	</fileset>
329	<
330	<	<fileset dir="${jtreg8.src.dir}">
312	<	<patternset id="jdk8.jtreg.tests">
313	<	<include name="**/*.java"/>
314	<	</patternset>
315	<	</fileset>
318	>	<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
319	>	<!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
320	>	<property name="jtreg.test.pattern" value="**/*.java"/>
321	>	<macrodef name="defjtregtests">
322	>	<attribute name="v"/>
323	>	<sequential>
324	>	<fileset dir="${jtreg@{v}.src.dir}">
325	>	<patternset id="jdk@{v}.jtreg.tests">
326	>	<include name="${jtreg.test.pattern}"/>
327	>	</patternset>
328	>	</fileset>
329	>	</sequential>
330	>	</macrodef>
331
332	<	<fileset dir="${jtreg7.src.dir}">
333	<	<patternset id="jdk7.jtreg.tests">
334	<	<include name="**/*.java"/>
335	<	</patternset>
336	<	</fileset>
332	>	<defjtregtests v="12"/>
333	>	<defjtregtests v="11"/>
334	>	<defjtregtests v="10"/>
335	>	<defjtregtests v="9"/>
336	>	<defjtregtests v="8"/>
337	>	<defjtregtests v="7"/>
338
339		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
340		<property name="jtreg.flags" value=""/>
#	Line 328 | Line 344
344		<attribute name="target"/>
345		<attribute name="workdir"/>
346		<attribute name="classes"/>
347	+	<attribute name="verbose" default="${jtreg.verbose}"/>
348		<attribute name="jtregflags" default=""/>
349	+	<element name="jtreg-elements" optional="true"/>
350
351		<sequential>
352
#	Line 337 | Line 355
355
356		<local name="modules"/>
357		<condition property="modules">
358	<	<available file="${jdk@{target}.home}/jmods" type="dir"/>
358	>	<available file="${jdk@{target}.home}/lib/modules" type="file"/>
359		</condition>
360
361		<delete dir="@{workdir}/JTwork"   quiet="true"/>
#	Line 346 | Line 364
364		workDir="@{workdir}/JTwork">
365		<patternset refid="jdk@{target}.jtreg.tests"/>
366		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
367	<	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
368	<	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
367	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
369		<arg value="-agentvm"/>
370		<arg value="-noreport"/>
371	<	<arg value="-verbose:${jtreg.verbose}"/>
371	>	<arg value="-verbose:@{verbose}"/>
372		<arg value="-vmoptions:-esa -ea"/>
373		<arg value="-automatic"/>
374		<arg value="-k:!ignore"/>
375		<arg line="@{jtregflags}"/>
376		<arg line="${jtreg.flags}"/>
377	+	<jtreg-elements/>
378		</jtreg>
379		</sequential>
380		</macrodef>
#	Line 371 | Line 390
390
391		<!-- Main targets -->
392
393	<	<property name="build.main.java.version" value="9"/>
393	>	<!-- Default values: may seem strange ... -->
394	>	<!-- At runtime, target latest LTS, i.e. jdk11 -->
395	>	<!-- But at build time, target jdk9, for maximal binary portability -->
396	>	<!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
397	>	<property name="build.main.java.version" value="11"/>
398	>	<property name="build.main.java" value="${java11}"/>
399		<property name="build.main.javac" value="${javac9}"/>
400	+	<property name="build.main.javadoc" value="${javadoc12}"/>
401
402		<target name="dists"
403		depends="dist, 4jdk8dist"
404		description="Builds all public jars and docs"/>
405	<	<!--
381	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
382	<	-->
405	>	<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
406
407		<target name="compile"
408		depends="configure-compiler"
409		description="Compiles src/main sources to build dir">
410
388	–	<local name="modules"/>
389	–	<condition property="modules">
390	–	<and>
391	–	<available file="${jdk9.home}/jmods" type="dir"/>
392	–	<equals arg1="9" arg2="${build.main.java.version}"/>
393	–	</and>
394	–	</condition>
395	–
411		<local name="destdir"/>
412	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
398	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
412	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
413
414		<mkdir dir="${destdir}"/>
415
#	Line 412 | Line 426
426		fork="true">
427
428		<include name="**/*.java"/>
429	<	<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
429	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
430		<compilerarg value="-Xprefer:source"/>
431		<compilerarg value="-XDignore.symbol.file=true"/>
432	<	<compilerarg value="-Xlint:all"/>
432	>	<compilerarg value="-Xlint:all,-removal"/>
433		<compilerarg line="--doclint-format html5"/>
434		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
435		<compilerarg value="-Werror"/>
#	Line 457 | Line 471
471		<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
472		<javadoc destdir="${docs.dir}"
473		packagenames="none"
474	<	link="${java9.api.url}"
474	>	link="${java11.api.url}"
475		overview="${src.dir}/intro.html"
476		access="${build.javadoc.access}"
477		sourcepath="${src.dir}"
478		classpath=""
479	<	source="9"
480	<	executable="${javadoc9}">
479	>	source="11"
480	>	executable="${build.main.javadoc}">
481		<fileset dir="${src.dir}" defaultexcludes="yes">
482		<include name="**/*.java"/>
483		</fileset>
484	<	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
484	>	<arg line="-Xdocrootparent ${java10.docroot.url}"/>
485		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
486		<arg value="-XDignore.symbol.file=true"/>
487		<arg value="-html5"/>
488		<arg value="--patch-module=java.base=${src.dir}"/>
489	<	<arg value="-tag"/>
490	<	<arg value="${javadoc.jls.option}"/>
491	<	<!-- @apiNote currently unused -->
492	<	<!--       <arg value="-tag"/> -->
493	<	<!--       <arg value="apiNote:a:API Note:"/> -->
494	<	<arg value="-tag"/>
481	<	<arg value="implSpec:a:Implementation Requirements:"/>
482	<	<arg value="-tag"/>
483	<	<arg value="implNote:a:Implementation Note:"/>
489	>	<arg value="--frames"/>
490	>	<arg value="--override-methods=summary"/>
491	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
492	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
493	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
494	>	<arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
495		<!-- tags added in jdk9: currently unused -->
496	<	<!--       <arg value="-tag"/> -->
497	<	<!--       <arg value="revised:X"/> -->
487	<	<!--       <arg value="-tag"/> -->
488	<	<!--       <arg value="spec:X"/> -->
496	>	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
497	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
498		</javadoc>
499		</target>
500
#	Line 495 | Line 504
504		description="Puts all distributable products in single hierarchy"/>
505
506
498	–	<target name="release"
499	–	depends="dist"
500	–	description="Puts entire CVS tree, plus distribution productions, in a jar">
501	–
502	–	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
503	–
504	–	<jar basedir="${basedir}" destfile="${release.jar}">
505	–	<!-- <exclude name="build/**"/> -->
506	–	<exclude name="${release.jar}"/>
507	–	<exclude name="user.properties"/>
508	–	<exclude name="etc/notes/**"/>
509	–	<exclude name="src/emulation/**"/>
510	–	<exclude name="**/SyntaxTest.java"/>
511	–	<exclude name="**/SuperfluousAbstract.java"/>
512	–	<manifest>
513	–	<attribute name="Built-By" value="${user.name}"/>
514	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
515	–	</manifest>
516	–	</jar>
517	–	</target>
518	–
519	–
507		<target name="clean"
508		description="Removes all build products">
509		<delete dir="${build.dir}"/>
#	Line 588 | Line 575
575		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
576		description="Runs tck and jtreg tests for src/main"/>
577
578	<	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
579	<
580	<	<!--     <antcall target="jtreg"> -->
594	<	<!--       <param name="build.main.java.version" value="8"/> -->
595	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
596	<	<!--     </antcall> -->
578	>	<target name="test-version-permutations"
579	>	depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
580	>	</target>
581
582	<	<!--   </target> -->
582	>	<target name="test9">
583	>	<antcall target="clean"/>
584	>	<antcall>
585	>	<param name="build.main.java.version" value="9"/>
586	>	<param name="build.main.java" value="${java9}"/>
587	>	<param name="build.main.javac" value="${javac9}"/>
588	>	<target name="test"/>
589	>	</antcall>
590	>	</target>
591
592	<	<!--   <target name="test89" -->
593	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
592	>	<target name="test10">
593	>	<antcall target="clean"/>
594	>	<antcall>
595	>	<param name="build.main.java.version" value="10"/>
596	>	<param name="build.main.java" value="${java10}"/>
597	>	<param name="build.main.javac" value="${javac10}"/>
598	>	<param name="build.main.javadoc" value="${javadoc10}"/>
599	>	<target name="test"/>
600	>	<target name="docs"/>
601	>	</antcall>
602	>	</target>
603
604	<	<!--     <antcall target="clean"/> -->
605	<	<!--     <antcall target="test"> -->
606	<	<!--       <param name="build.main.java.version" value="8"/> -->
607	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
608	<	<!--     </antcall> -->
604	>	<target name="test11">
605	>	<antcall target="clean"/>
606	>	<antcall>
607	>	<param name="build.main.java.version" value="11"/>
608	>	<param name="build.main.java" value="${java11}"/>
609	>	<param name="build.main.javac" value="${javac11}"/>
610	>	<param name="build.main.javadoc" value="${javadoc11}"/>
611	>	<target name="test"/>
612	>	<target name="docs"/>
613	>	</antcall>
614	>	</target>
615
616	<	<!--     <antcall target="clean"/> -->
617	<	<!--     <antcall target="test"> -->
618	<	<!--       <param name="build.main.java.version" value="9"/> -->
619	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
620	<	<!--     </antcall> -->
616	>	<target name="test12">
617	>	<antcall target="clean"/>
618	>	<antcall>
619	>	<param name="build.main.java.version" value="12"/>
620	>	<param name="build.main.java" value="${java12}"/>
621	>	<param name="build.main.javac" value="${javac12}"/>
622	>	<param name="build.main.javadoc" value="${javadoc12}"/>
623	>	<target name="test"/>
624	>	<target name="docs"/>
625	>	</antcall>
626	>	</target>
627
628	<	<!--   </target> -->
628	>	<target name="test9-11">
629	>	<antcall target="clean"/>
630	>	<antcall>
631	>	<param name="build.main.java.version" value="11"/>
632	>	<param name="build.main.java" value="${java11}"/>
633	>	<param name="build.main.javac" value="${javac9}"/>
634	>	<param name="build.main.javadoc" value="${javadoc11}"/>
635	>	<target name="test"/>
636	>	<target name="docs"/>
637	>	</antcall>
638	>	</target>
639
640	+	<target name="test9-12">
641	+	<antcall target="clean"/>
642	+	<antcall>
643	+	<param name="build.main.java.version" value="12"/>
644	+	<param name="build.main.java" value="${java12}"/>
645	+	<param name="build.main.javac" value="${javac9}"/>
646	+	<param name="build.main.javadoc" value="${javadoc12}"/>
647	+	<target name="test"/>
648	+	<target name="docs"/>
649	+	</antcall>
650	+	</target>
651
652
653		<target name="configure-compiler">
#	Line 636 | Line 670
670		</target>
671
672
639	–
640	–	<!-- Various demos and test programs -->
641	–
642	–
643	–	<!-- description="Benchmark from Doug Lea's AQS paper" -->
644	–	<target name="loops" depends="configure-compiler">
645	–
646	–	<mkdir dir="${build.loops.dir}"/>
647	–
648	–	<javac srcdir="${loops.src.dir}"
649	–	destdir="${build.loops.dir}"
650	–	debug="${build.debug}"
651	–	debuglevel="${build.debuglevel}"
652	–	deprecation="${build.deprecation}"
653	–	source="${build.sourcelevel}"
654	–	target="${build.sourcelevel}"
655	–	encoding="ASCII"
656	–	fork="true">
657	–
658	–	<compilerarg line="${build.args}"/>
659	–	<classpath refid="loops.classpath"/>
660	–	<compilerarg value="-XDignore.symbol.file=true"/>
661	–
662	–	</javac>
663	–
664	–	<java classname="ALoops" fork="true">
665	–	<classpath refid="loops.classpath"/>
666	–	</java>
667	–	</target>
668	–
669	–
673		<target name="compile-test-loops" depends="jar"
674		description="Compiles all the perf tests in src/test/loops">
675
#	Line 680 | Line 683
683		includeAntRuntime="false"
684		includeJavaRuntime="false"
685		encoding="ASCII"
686	<	executable="${javac9}"
686	>	executable="${build.main.javac}"
687		fork="true">
688
689		<include name="*.java"/>
#	Line 821 | Line 824
824		</fileset>
825		<arg line="-Xdocrootparent ${java8.docroot.url}"/>
826		<arg value="-XDignore.symbol.file=true"/>
827	<	<arg value="-tag"/>
828	<	<arg value="${javadoc.jls.option}"/>
829	<	<!-- @apiNote currently unused -->
830	<	<!--       <arg value="-tag"/> -->
831	<	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
829	<	<arg value="-tag"/>
830	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
831	<	<arg value="-tag"/>
832	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
827	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
828	>	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
829	>	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
830	>	<!-- @apiNote tag currently unused -->
831	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
832		</javadoc>
833		</target>
834
#	Line 1359 | Line 1358
1358
1359		<!-- Find buglets that can be detected by static build tools -->
1360
1361	<	<target name="lint">
1362	<	<antcall target="dists">
1363	<	<param name="build.javadoc.access" value="public"/>
1364	<	</antcall>
1365	<	</target>
1361	>	<!--   <target name="lint"> -->
1362	>	<!--     <antcall target="dists"> -->
1363	>	<!--       <param name="build.javadoc.access" value="protected"/> -->
1364	>	<!--     </antcall> -->
1365	>	<!--   </target> -->
1366
1367		<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1368	<	<target name="lint-private">
1368	>	<target name="doclint-private">
1369		<antcall target="dist">
1370		<param name="build.javadoc.access" value="private"/>
1371		</antcall>
#	Line 1374 | Line 1373
1373
1374
1375		<!-- ==============================================================
1376	<	Experimental errorprone support - http://errorprone.info
1378	<	You may need to bring your own errorprone jar.
1376	>	Experimental errorprone support - https://errorprone.info
1377		=================================================================== -->
1378	+	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1379	+	<property name="errorprone.jsr166.user.flags" value=""/>
1380	+	<property name="errorprone.jsr166.flags"
1381	+	value="-Xep:HashtableContains:OFF
1382	+	-Xep:JdkObsolete:OFF
1383	+	-Xep:MissingOverride:OFF
1384	+	-Xep:MissingFail:OFF
1385	+	-Xep:MixedArrayDimensions:ERROR
1386	+	-Xep:RemoveUnusedImports:ERROR
1387	+	-Xep:EmptyIf:ERROR
1388	+	-Xep:MultipleTopLevelClasses:ERROR
1389	+	-Xep:ClassName:ERROR
1390	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1391	+	-Xep:RedundantThrows:ERROR
1392	+	-Xep:IdentityBinaryExpression:WARN
1393	+	-Xep:MethodCanBeStatic:WARN
1394	+	${errorprone.jsr166.user.flags}"/>
1395	+	<!-- -Xep:WildcardImport:ERROR -->
1396	+	<property name="errorprone.jsr166.test.flags"
1397	+	value="-Xep:StringSplitter:OFF
1398	+	-Xep:BoxedPrimitiveConstructor:OFF
1399	+	-Xep:ModifyingCollectionWithItself:OFF"/>
1400	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1401		<target name="errorprone"
1402		depends="clean, configure-compiler"
1403		description="Run errorprone over jsr166 source code (experimental)">
#	Line 1398 | Line 1419
1419		fork="true">
1420
1421		<include name="**/*.java"/>
1422	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1423	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1424	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1425	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1405	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1406	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1407	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1408	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1409	<	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1410	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1422	>	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1423	>	<compilerarg value="-J--illegal-access=permit"/>
1424	>	<compilerarg value="-XDcompilePolicy=simple"/>
1425	>	<compilerarg line="-processorpath ${errorprone.jar}"/>
1426		<compilerarg value="-Xplugin:ErrorProne
1427	<	-Xep:IdentityBinaryExpression:WARN
1413	<	-Xep:MissingOverride:OFF
1414	<	-Xep:MixedArrayDimensions:WARN
1415	<	-Xep:RemoveUnusedImports:ERROR
1416	<	-Xep:ClassName:ERROR
1417	<	-Xep:MultipleTopLevelClasses:ERROR
1418	<	-Xep:EmptyIf:ERROR
1419	<	-Xep:LongLiteralLowerCaseSuffix:ERROR
1420	<	-Xep:ArgumentParameterSwap:ERROR
1421	<	-Xep:RedundantThrows:ERROR
1422	<	-Xep:MethodCanBeStatic:WARN"/>
1427	>	${errorprone.jsr166.flags}"/>
1428		<compilerarg value="--patch-module=java.base=${src.dir}"/>
1429		<compilerarg value="-Xprefer:source"/>
1430		<compilerarg value="-XDignore.symbol.file=true"/>
#	Line 1438 | Line 1443
1443		workdir="${build.dir}"
1444		classes="${product.jar}">
1445		<javac-elements>
1446	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1447	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1448	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1449	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1445	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1446	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1447	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1448	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1449	<	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1450	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1446	>	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1447	>	<compilerarg value="-J--illegal-access=permit"/>
1448	>	<compilerarg value="-XDcompilePolicy=simple"/>
1449	>	<compilerarg line="-processorpath ${errorprone.jar}"/>
1450		<compilerarg value="-Xplugin:ErrorProne
1451	<	-Xep:IdentityBinaryExpression:WARN
1452	<	-Xep:BoxedPrimitiveConstructor:OFF
1454	<	-Xep:HashtableContains:OFF
1455	<	-Xep:ModifyingCollectionWithItself:OFF
1456	<	-Xep:MissingOverride:OFF
1457	<	-Xep:MixedArrayDimensions:WARN
1458	<	-Xep:RemoveUnusedImports:ERROR
1459	<	-Xep:ClassName:ERROR
1460	<	-Xep:MultipleTopLevelClasses:ERROR
1461	<	-Xep:EmptyIf:ERROR
1462	<	-Xep:LongLiteralLowerCaseSuffix:ERROR
1463	<	-Xep:ArgumentParameterSwap:ERROR
1464	<	-Xep:RedundantThrows:ERROR
1465	<	-Xep:MethodCanBeStatic:WARN"/>
1451	>	${errorprone.jsr166.flags}
1452	>	${errorprone.jsr166.test.flags}"/>
1453		<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1454		</javac-elements>
1455		</run-tck-tests>
1456		</target>
1457
1458	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1459	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1460	+	<target name="errorprone-jtreg"
1461	+	depends="jar"
1462	+	description="Run errorprone over jtreg tests (experimental)">
1463	+
1464	+	<run-jtreg-tests
1465	+	target="${build.main.java.version}"
1466	+	workdir="${build.dir}"
1467	+	classes="${product.jar}"
1468	+	verbose="all">
1469	+	<jtreg-elements>
1470	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1471	+	<arg value="-javacoption:-processorpath"/>
1472	+	<arg value="-javacoption:${errorprone.jar}"/>
1473	+	<arg value="-javacoption:-Xplugin:ErrorProne
1474	+	${errorprone.jsr166.flags}
1475	+	${errorprone.jsr166.test.flags}
1476	+	-Xep:MultipleTopLevelClasses:WARN
1477	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1478	+	</jtreg-elements>
1479	+	</run-jtreg-tests>
1480	+	</target>
1481	+
1482
1483		<!-- ==============================================================
1484		Running guava tests against jsr166 code
#	Line 1521 | Line 1532
1532		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1533		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1534		<junit printsummary="true" showoutput="true" haltonfailure="true"
1535	<	jvm="${java9}" fork="true">
1536	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1535	>	jvm="${build.main.java}" fork="true">
1536	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1537		<formatter type="brief"/>
1538		<classpath>
1539		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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