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.236 by jsr166, Mon Mar 20 00:03:57 2017 UTC vs.
Revision 1.292 by jsr166, Thu Dec 13 01:12:01 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 18 | Line 19
19		itself.  Because the JDK version matters and because different
20		targets require different JDKs, we assume that users have created a
21		hierarchy containing:
21	–	$HOME/jdk/jdk7
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
26	–	$HOME/jdk/src/jdk7
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
36		Alternatively, define ant variables thus:
37		ant -Djdk$N.home=... -Djdk$N.src.home=...
38	<	for $N in 7 8 9 10 ...
38	>	for $N in 8 9 10 ...
39
40		As of 2016-03, the sources in src/main are for jdk9+ only.
41		------------------------------------------------------------------------------
#	Line 52 | Line 55
55
56
57		<!-- Compilation options -->
55	–	<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 103 | 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 134 | 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 144 | 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 183 | 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"/>
199	<	<!-- Default jdk doc location (latest stable release seems best) -->
200	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
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 LTS release seems best) -->
206	>	<property name="java.docroot.url"   value="${java11.docroot.url}"/>
207
208		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
209		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 199 | Line 211
211		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
212		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
213		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
214	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
215	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
216	+	<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
217		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
218
219		<!-- Define the "jtreg" task -->
#	Line 231 | Line 246
246
247		<local name="modules"/>
248		<condition property="modules">
249	<	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
249	>	<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
250	>	</condition>
251	>
252	>	<local name="use-doclint"/>
253	>	<condition property="use-doclint">
254	>	<not> <equals arg1="@{target}" arg2="7"/> </not>
255		</condition>
256
257		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 253 | Line 273
273		<include name="*.java"/>
274		<compilerarg value="-XDignore.symbol.file=true"/>
275		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
276	<	<compilerarg value="-Xdoclint:reference/private"/>
276	>	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
277		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
278		<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
279		<compilerarg line="${build.args}"/>
#	Line 293 | Line 313
313		</macrodef>
314
315		<!-- Define jtreg test sets for different jdk versions -->
316	<	<fileset dir="${jtreg9.src.dir}">
317	<	<patternset id="jdk9.jtreg.tests">
318	<	<include name="**/*.java"/>
319	<	</patternset>
320	<	</fileset>
321	<
322	<	<fileset dir="${jtreg8.src.dir}">
323	<	<patternset id="jdk8.jtreg.tests">
324	<	<include name="**/*.java"/>
325	<	</patternset>
326	<	</fileset>
316	>	<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
317	>	<!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
318	>	<property name="jtreg.test.pattern" value="**/*.java"/>
319	>	<macrodef name="defjtregtests">
320	>	<attribute name="v"/>
321	>	<sequential>
322	>	<fileset dir="${jtreg@{v}.src.dir}">
323	>	<patternset id="jdk@{v}.jtreg.tests">
324	>	<include name="${jtreg.test.pattern}"/>
325	>	</patternset>
326	>	</fileset>
327	>	</sequential>
328	>	</macrodef>
329
330	<	<fileset dir="${jtreg7.src.dir}">
331	<	<patternset id="jdk7.jtreg.tests">
332	<	<include name="**/*.java"/>
333	<	</patternset>
334	<	</fileset>
330	>	<defjtregtests v="12"/>
331	>	<defjtregtests v="11"/>
332	>	<defjtregtests v="10"/>
333	>	<defjtregtests v="9"/>
334	>	<defjtregtests v="8"/>
335	>	<defjtregtests v="7"/>
336
337		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
338		<property name="jtreg.flags" value=""/>
339
340		<macrodef name="run-jtreg-tests">
341	<	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
319	<	<attribute name="source" default="7"/>
341	>	<!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
342		<attribute name="target"/>
343		<attribute name="workdir"/>
344		<attribute name="classes"/>
345	+	<attribute name="verbose" default="${jtreg.verbose}"/>
346		<attribute name="jtregflags" default=""/>
347	+	<element name="jtreg-elements" optional="true"/>
348
349		<sequential>
350
#	Line 329 | Line 353
353
354		<local name="modules"/>
355		<condition property="modules">
356	<	<available file="${jdk@{target}.home}/jmods" type="dir"/>
356	>	<available file="${jdk@{target}.home}/lib/modules" type="file"/>
357		</condition>
358
359		<delete dir="@{workdir}/JTwork"   quiet="true"/>
#	Line 338 | Line 362
362		workDir="@{workdir}/JTwork">
363		<patternset refid="jdk@{target}.jtreg.tests"/>
364		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
365	<	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
366	<	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
365	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
366	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367		<arg value="-agentvm"/>
368		<arg value="-noreport"/>
369	<	<arg value="-verbose:${jtreg.verbose}"/>
369	>	<arg value="-verbose:@{verbose}"/>
370		<arg value="-vmoptions:-esa -ea"/>
371		<arg value="-automatic"/>
372		<arg value="-k:!ignore"/>
373		<arg line="@{jtregflags}"/>
374		<arg line="${jtreg.flags}"/>
375	+	<jtreg-elements/>
376		</jtreg>
377		</sequential>
378		</macrodef>
#	Line 363 | Line 388
388
389		<!-- Main targets -->
390
391	<	<property name="build.main.java.version" value="9"/>
391	>	<!-- Default values: may seem strange ... -->
392	>	<!-- At runtime, target latest LTS, i.e. jdk11 -->
393	>	<!-- But at build time, target jdk9, for maximal binary portability -->
394	>	<!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
395	>	o override-methods=summary
396	>	o {@systemProperty ...}
397	>	o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
398	>	o 8202628: javadoc generates bad links in TestModules.java
399	>	-->
400	>	<property name="java.runtime.target" value="11"/>
401	>	<property name="build.main.java" value="${java11}"/>
402		<property name="build.main.javac" value="${javac9}"/>
403	+	<property name="build.main.javadoc" value="${javadoc12}"/>
404	+	<property name="build.main.javadoc.source" value="${java.runtime.target}"/>
405
406		<target name="dists"
407	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
407	>	depends="dist, 4jdk8dist"
408		description="Builds all public jars and docs"/>
409	+	<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
410
411		<target name="compile"
412		depends="configure-compiler"
413		description="Compiles src/main sources to build dir">
414
377	–	<local name="modules"/>
378	–	<condition property="modules">
379	–	<and>
380	–	<available file="${jdk9.home}/jmods" type="dir"/>
381	–	<equals arg1="9" arg2="${build.main.java.version}"/>
382	–	</and>
383	–	</condition>
384	–
415		<local name="destdir"/>
416	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
387	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
416	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
417
418		<mkdir dir="${destdir}"/>
419
#	Line 401 | Line 430
430		fork="true">
431
432		<include name="**/*.java"/>
433	<	<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
433	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
434		<compilerarg value="-Xprefer:source"/>
435		<compilerarg value="-XDignore.symbol.file=true"/>
436	<	<compilerarg value="-Xlint:all"/>
437	<	<compilerarg value="-Werror"/>
436	>	<compilerarg value="-Xlint:all,-removal"/>
437	>	<compilerarg line="--doclint-format html5"/>
438		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
439	+	<compilerarg value="-Werror"/>
440		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
441		<compilerarg line="${build.args}"/>
442
#	Line 445 | Line 475
475		<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
476		<javadoc destdir="${docs.dir}"
477		packagenames="none"
478	<	link="${java9.api.url}"
478	>	link="${java.api.url}"
479		overview="${src.dir}/intro.html"
480		access="${build.javadoc.access}"
481		sourcepath="${src.dir}"
482		classpath=""
483	<	executable="${javadoc9}">
483	>	source="${build.main.javadoc.source}"
484	>	executable="${build.main.javadoc}">
485	>	<!-- TODO: JDK-8214571 failonerror = "true" -->
486		<fileset dir="${src.dir}" defaultexcludes="yes">
487		<include name="**/*.java"/>
488		</fileset>
489	<	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
489	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
490		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
491		<arg value="-XDignore.symbol.file=true"/>
492	+	<arg value="-html5"/>
493		<arg value="--patch-module=java.base=${src.dir}"/>
494	<	<arg value="-tag"/>
495	<	<arg value="${javadoc.jls.option}"/>
496	<	<!-- @apiNote currently unused -->
497	<	<!--       <arg value="-tag"/> -->
498	<	<!--       <arg value="apiNote:a:API Note:"/> -->
499	<	<arg value="-tag"/>
500	<	<arg value="implSpec:a:Implementation Requirements:"/>
468	<	<arg value="-tag"/>
469	<	<arg value="implNote:a:Implementation Note:"/>
494	>	<!-- old school frames via docs/index.html?overview-summary.html -->
495	>	<arg value="--frames"/>
496	>	<arg value="--override-methods=summary"/>
497	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
498	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
499	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
500	>	<arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
501		<!-- tags added in jdk9: currently unused -->
502	<	<!--       <arg value="-tag"/> -->
503	<	<!--       <arg value="revised:X"/> -->
473	<	<!--       <arg value="-tag"/> -->
474	<	<!--       <arg value="spec:X"/> -->
502	>	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
503	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
504		</javadoc>
505		</target>
506
#	Line 481 | Line 510
510		description="Puts all distributable products in single hierarchy"/>
511
512
484	–	<target name="release"
485	–	depends="dist"
486	–	description="Puts entire CVS tree, plus distribution productions, in a jar">
487	–
488	–	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
489	–
490	–	<jar basedir="${basedir}" destfile="${release.jar}">
491	–	<!-- <exclude name="build/**"/> -->
492	–	<exclude name="${release.jar}"/>
493	–	<exclude name="user.properties"/>
494	–	<exclude name="etc/notes/**"/>
495	–	<exclude name="src/emulation/**"/>
496	–	<exclude name="**/SyntaxTest.java"/>
497	–	<exclude name="**/SuperfluousAbstract.java"/>
498	–	<manifest>
499	–	<attribute name="Built-By" value="${user.name}"/>
500	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
501	–	</manifest>
502	–	</jar>
503	–	</target>
504	–
505	–
513		<target name="clean"
514		description="Removes all build products">
508	–
515		<delete dir="${build.dir}"/>
510	–
516		</target>
517
518
519		<target name="dist-clean"
520		description="Removes all build and distribution products">
516	–
521		<delete dir="${build.dir}"/>
522		<delete dir="${dist.dir}"/>
519	–
523		</target>
524
525
#	Line 535 | Line 538
538		description="Runs tck tests for src/main directly">
539
540		<run-tck-tests
541	<	target="${build.main.java.version}"
541	>	target="${java.runtime.target}"
542		workdir="${build.dir}"
543		classes="${product.jar}">
544		<javac-elements>
#	Line 569 | Line 572
572		depends="jar"
573		description="Runs jtreg tests for src/main using the jtreg ant task">
574		<run-jtreg-tests
575	<	target="${build.main.java.version}"
575	>	target="${java.runtime.target}"
576		workdir="${build.dir}"
577		classes="${product.jar}"/>
578		</target>
579
580		<target name="test"
581		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
582	<	description="Runs tck and jtreg tests for src/main">
580	<	</target>
581	<
582	<	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
582	>	description="Runs tck and jtreg tests for src/main"/>
583
584	<	<!--     <antcall target="jtreg"> -->
585	<	<!--       <param name="build.main.java.version" value="8"/> -->
586	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
587	<	<!--     </antcall> -->
584	>	<target name="test-version-permutations"
585	>	depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
586	>	</target>
587
588	<	<!--   </target> -->
588	>	<target name="test9">
589	>	<antcall target="clean"/>
590	>	<antcall>
591	>	<param name="java.runtime.target" value="9"/>
592	>	<param name="build.main.javac" value="${javac9}"/>
593	>	<param name="build.main.javadoc" value="${javadoc12}"/>
594	>	<param name="build.main.javadoc.source" value="9"/>
595	>	<target name="test"/>
596	>	<target name="docs"/>
597	>	</antcall>
598	>	</target>
599
600	<	<!--   <target name="test89" -->
601	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
600	>	<target name="test10">
601	>	<antcall target="clean"/>
602	>	<antcall>
603	>	<param name="java.runtime.target" value="10"/>
604	>	<param name="build.main.javac" value="${javac10}"/>
605	>	<param name="build.main.javadoc" value="${javadoc12}"/>
606	>	<param name="build.main.javadoc.source" value="10"/>
607	>	<target name="test"/>
608	>	<target name="docs"/>
609	>	</antcall>
610	>	</target>
611
612	<	<!--     <antcall target="clean"/> -->
613	<	<!--     <antcall target="test"> -->
614	<	<!--       <param name="build.main.java.version" value="8"/> -->
615	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
616	<	<!--     </antcall> -->
612	>	<target name="test11">
613	>	<antcall target="clean"/>
614	>	<antcall>
615	>	<param name="java.runtime.target" value="11"/>
616	>	<param name="build.main.javac" value="${javac11}"/>
617	>	<param name="build.main.javadoc" value="${javadoc12}"/>
618	>	<param name="build.main.javadoc.source" value="11"/>
619	>	<target name="test"/>
620	>	<target name="docs"/>
621	>	</antcall>
622	>	</target>
623
624	<	<!--     <antcall target="clean"/> -->
625	<	<!--     <antcall target="test"> -->
626	<	<!--       <param name="build.main.java.version" value="9"/> -->
627	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
628	<	<!--     </antcall> -->
624	>	<target name="test12">
625	>	<antcall target="clean"/>
626	>	<antcall>
627	>	<param name="java.runtime.target" value="12"/>
628	>	<param name="build.main.javac" value="${javac12}"/>
629	>	<param name="build.main.javadoc" value="${javadoc12}"/>
630	>	<param name="build.main.javadoc.source" value="12"/>
631	>	<target name="test"/>
632	>	<target name="docs"/>
633	>	</antcall>
634	>	</target>
635
636	<	<!--   </target> -->
636	>	<target name="test9-11">
637	>	<antcall target="clean"/>
638	>	<antcall>
639	>	<param name="java.runtime.target" value="11"/>
640	>	<param name="build.main.javac" value="${javac9}"/>
641	>	<param name="build.main.javadoc" value="${javadoc12}"/>
642	>	<param name="build.main.javadoc.source" value="9"/>
643	>	<target name="test"/>
644	>	<target name="docs"/>
645	>	</antcall>
646	>	</target>
647
648	+	<target name="test9-12">
649	+	<antcall target="clean"/>
650	+	<antcall>
651	+	<param name="java.runtime.target" value="12"/>
652	+	<param name="build.main.javac" value="${javac9}"/>
653	+	<param name="build.main.javadoc" value="${javadoc12}"/>
654	+	<param name="build.main.javadoc.source" value="9"/>
655	+	<target name="test"/>
656	+	<target name="docs"/>
657	+	</antcall>
658	+	</target>
659
660
661		<target name="configure-compiler">
662		<fail message="ant version too old">
663	<	<condition>
613	<	<not> <antversion atleast="1.9.1"/> </not>
614	<	</condition>
663	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
664		</fail>
665
666		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 629 | Line 678
678		</target>
679
680
632	–
633	–	<!-- Various demos and test programs -->
634	–
635	–
636	–	<!-- description="Benchmark from Doug Lea's AQS paper" -->
637	–	<target name="loops" depends="configure-compiler">
638	–
639	–	<mkdir dir="${build.loops.dir}"/>
640	–
641	–	<javac srcdir="${loops.src.dir}"
642	–	destdir="${build.loops.dir}"
643	–	debug="${build.debug}"
644	–	debuglevel="${build.debuglevel}"
645	–	deprecation="${build.deprecation}"
646	–	source="${build.sourcelevel}"
647	–	target="${build.sourcelevel}"
648	–	encoding="ASCII"
649	–	fork="true">
650	–
651	–	<compilerarg line="${build.args}"/>
652	–	<classpath refid="loops.classpath"/>
653	–	<compilerarg value="-XDignore.symbol.file=true"/>
654	–
655	–	</javac>
656	–
657	–	<java classname="ALoops" fork="true">
658	–	<classpath refid="loops.classpath"/>
659	–	</java>
660	–
661	–	</target>
662	–
663	–
681		<target name="compile-test-loops" depends="jar"
682	<	description="compile all the perf tests in src/test/loops">
682	>	description="Compiles all the perf tests in src/test/loops">
683
684		<mkdir dir="${build.dir}/test/loops"/>
685
#	Line 674 | Line 691
691		includeAntRuntime="false"
692		includeJavaRuntime="false"
693		encoding="ASCII"
694	<	executable="${javac9}"
694	>	executable="${build.main.javac}"
695		fork="true">
696
697		<include name="*.java"/>
#	Line 682 | Line 699
699		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
700		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
701		<compilerarg line="${build.args}"/>
685	–
702		</javac>
687	–
703		</target>
704
705
#	Line 710 | Line 725
725		encoding="ASCII"
726		executable="${javac8}"
727		fork="true">
713	–
728		<include name="**/*.java"/>
729		<compilerarg value="-Xprefer:source"/>
730		<compilerarg value="-XDignore.symbol.file=true"/>
731		<compilerarg value="-Xlint:all"/>
732		<compilerarg value="-Werror"/>
733		<compilerarg line="${build.args}"/>
720	–
734		</javac>
735		</target>
736
#	Line 741 | Line 754
754		encoding="ASCII"
755		executable="${javac8}"
756		fork="true">
744	–
757		<include name="**/*.java"/>
758		<compilerarg value="-Xprefer:source"/>
759		<compilerarg value="-XDignore.symbol.file=true"/>
760		<compilerarg value="-Xlint:all"/>
761		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
762		<compilerarg line="${build.args}"/>
751	–
763		</javac>
764		</target>
765
#	Line 764 | Line 775
775		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
776		</manifest>
777		</jar>
767	–
778		</target>
779
780
#	Line 798 | Line 808
808
809		<target name="4jdk8-test"
810		depends="4jdk8-tck, 4jdk8-jtreg"
811	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
802	<	</target>
811	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
812
813
814		<target name="4jdk8docs"
#	Line 815 | Line 824
824		access="${build.javadoc.access}"
825		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
826		classpath=""
827	+	source="8"
828		executable="${javadoc8}"
829		failonerror = "true">
830		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 822 | Line 832
832		</fileset>
833		<arg line="-Xdocrootparent ${java8.docroot.url}"/>
834		<arg value="-XDignore.symbol.file=true"/>
835	<	<arg value="-tag"/>
836	<	<arg value="${javadoc.jls.option}"/>
837	<	<!-- @apiNote currently unused -->
838	<	<!--       <arg value="-tag"/> -->
839	<	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
830	<	<arg value="-tag"/>
831	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
832	<	<arg value="-tag"/>
833	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
835	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
836	>	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
837	>	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
838	>	<!-- @apiNote tag currently unused -->
839	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
840		</javadoc>
841		</target>
842
#	Line 842 | Line 848
848
849		<target name="4jdk8clean"
850		description="Removes all 4jdk8 build products">
845	–
851		<delete dir="${build.4jdk8.dir}"/>
847	–
852		</target>
853
854
#	Line 860 | Line 864
864		</target>
865
866
867	+	<!-- jsr166 4jdk7 (no longer maintained) -->
868
869	<	<!-- jsr166 4jdk7 -->
865	<
866	<	<target name="4jdk7compile"
867	<	depends="configure-compiler"
868	<	description="Compiles src/jdk7 sources, targeting jdk7">
869	<
869	>	<target name="4jdk7compile" depends="configure-compiler">
870		<mkdir dir="${build.4jdk7.classes.dir}"/>
871
872		<javac srcdir="${4jdk7src.dir}"
#	Line 890 | Line 890
890		<compilerarg value="-Xlint:all"/>
891		<compilerarg value="-Werror"/>
892		<compilerarg line="${build.args}"/>
893	–
893		</javac>
894		</target>
895
896	<	<target name="4jdk7doclint"
898	<	depends="configure-compiler"
899	<	description="Finds doclint warnings">
900	<
896	>	<target name="4jdk7doclint" depends="configure-compiler">
897		<mkdir dir="${build.4jdk7.classes.dir}"/>
898
899		<javac srcdir="${4jdk7src.dir}"
#	Line 921 | Line 917
917		<compilerarg value="-Xlint:all"/>
918		<compilerarg value="-Xdoclint:all/protected"/>
919		<compilerarg line="${build.args}"/>
924	–
920		</javac>
921		</target>
922
923	<
929	<	<target name="4jdk7jar"
930	<	depends="4jdk7compile"
931	<	description="Builds library jar from compiled sources">
932	<
923	>	<target name="4jdk7jar" depends="4jdk7compile">
924		<jar destfile="${4jdk7product.jar}">
925		<fileset dir="${build.4jdk7.classes.dir}"/>
926		<manifest>
#	Line 937 | Line 928
928		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
929		</manifest>
930		</jar>
940	–
931		</target>
932
933	<
944	<	<target name="4jdk7-tck"
945	<	depends="4jdk7jar"
946	<	description="Runs tck tests for jsr166-4jdk7 directly">
947	<
933	>	<target name="4jdk7-tck" depends="4jdk7jar">
934		<run-tck-tests
935		target="7"
936		workdir="${build.4jdk7.dir}"
#	Line 967 | Line 953
953		</run-tck-tests>
954		</target>
955
970	–
956		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
957	<	<target name="4jdk7-tck-junit"
973	<	depends="4jdk7compile">
957	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
958
959		<junit printsummary="true"
960		showoutput="true"
#	Line 992 | Line 976
976
977		<test name="${jsr166.tckTestClass}" haltonfailure="no">
978		</test>
995	–
979		</junit>
980		</target>
981
982	<	<target name="4jdk7-jtreg"
1000	<	depends="4jdk7jar"
1001	<	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"
1010	<	depends="4jdk7-tck, 4jdk7-jtreg"
1011	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
1012	<	</target>
1013	<
1014	<
1015	<	<target name="4jdk7docs"
1016	<	description="Builds javadocs for src/jdk7 to dist dir">
1017	<
991	>	<target name="4jdk7docs">
992		<delete dir="${4jdk7docs.dir}"/>
993		<mkdir dir="${4jdk7docs.dir}"/>
994
#	Line 1035 | Line 1009
1009		</javadoc>
1010		</target>
1011
1012	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1013
1014	<	<target name="4jdk7dist"
1040	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1041	<	description="Puts all distributable products in single hierarchy"/>
1042	<
1043	<
1044	<	<target name="4jdk7clean"
1045	<	description="Removes all 4jdk7 build products">
1046	<
1014	>	<target name="4jdk7clean">
1015		<delete dir="${build.4jdk7.dir}"/>
1048	–
1016		</target>
1017
1018	<
1052	<	<target name="4jdk7dist-jar"
1053	<	depends="4jdk7clean, 4jdk7jar">
1018	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1019		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1020		</target>
1021
1022	<
1058	<	<target name="4jdk7dist-docs"
1059	<	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 -->
1065	<
1066	<	<target name="jsr166xcompile"
1067	<	depends="configure-compiler"
1068	<	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 1083 | Line 1043
1043		encoding="ASCII"
1044		executable="${javac7}"
1045		fork="true">
1086	–
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}"/>
1092	–
1051		</javac>
1052		</target>
1053
1054	<
1097	<	<target name="jsr166xjar"
1098	<	depends="jsr166xcompile"
1099	<	description="Builds library jar from compiled sources">
1100	<
1054	>	<target name="jsr166xjar" depends="jsr166xcompile">
1055		<jar destfile="${jsr166x.jar}">
1056		<fileset dir="${build.jsr166x.classes.dir}"/>
1057		<manifest>
#	Line 1105 | Line 1059
1059		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1060		</manifest>
1061		</jar>
1108	–
1062		</target>
1063
1064	<
1112	<	<target name="jsr166xdocs"
1113	<	description="Builds javadocs to dist dir">
1114	<
1064	>	<target name="jsr166xdocs">
1065		<delete dir="${jsr166xdocs.dir}"/>
1066		<mkdir dir="${jsr166xdocs.dir}"/>
1067
#	Line 1126 | Line 1076
1076		failonerror = "true">
1077		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1078		<arg value="-XDignore.symbol.file=true"/>
1129	–
1079		</javadoc>
1080		</target>
1081
1082	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1083
1084	<	<target name="jsr166xdist"
1135	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1136	<	description="Puts all distributable products in single hierarchy"/>
1137	<
1138	<
1139	<	<target name="jsr166xclean"
1140	<	description="Removes all jsr166x build products">
1141	<
1084	>	<target name="jsr166xclean">
1085		<delete dir="${build.jsr166x.dir}"/>
1143	–
1086		</target>
1087
1088	<
1147	<	<target name="jsr166xdist-jar"
1148	<	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"
1153	<	depends="jsr166xclean, jsr166xdocs">
1092	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1093		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1094		</target>
1095
1157	–	<!-- jsr166y -->
1158	–
1096
1097	<	<target name="jsr166ycompile"
1161	<	depends="configure-compiler"
1162	<	description="Compiles jsr166y sources">
1097	>	<!-- jsr166y (no longer maintained) -->
1098
1099	+	<target name="jsr166ycompile" depends="configure-compiler">
1100		<mkdir dir="${build.jsr166y.classes.dir}"/>
1101
1102		<javac srcdir="${topsrc.dir}"
#	Line 1183 | Line 1119
1119		<compilerarg value="-Xlint:all"/>
1120		<compilerarg value="-Werror"/>
1121		<compilerarg line="${build.args}"/>
1186	–
1122		</javac>
1123		</target>
1124
1125	<
1191	<	<target name="jsr166yjar"
1192	<	depends="jsr166ycompile"
1193	<	description="Builds library jar from compiled sources">
1194	<
1125	>	<target name="jsr166yjar" depends="jsr166ycompile">
1126		<jar destfile="${jsr166y.jar}" index="true">
1127		<fileset dir="${build.jsr166y.classes.dir}"/>
1128		<manifest>
#	Line 1199 | Line 1130
1130		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1131		</manifest>
1132		</jar>
1202	–
1133		</target>
1134
1135	<
1206	<	<target name="jsr166ydocs"
1207	<	description="Builds javadocs to dist dir">
1208	<
1135	>	<target name="jsr166ydocs">
1136		<delete dir="${jsr166ydocs.dir}"/>
1137		<mkdir dir="${jsr166ydocs.dir}"/>
1138
#	Line 1220 | Line 1147
1147		failonerror = "true">
1148		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1149		<arg value="-XDignore.symbol.file=true"/>
1223	–
1150		</javadoc>
1151		</target>
1152
1153	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1154
1155	<	<target name="jsr166ydist"
1229	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1230	<	description="Puts all distributable products in single hierarchy"/>
1231	<
1232	<
1233	<	<target name="jsr166yclean"
1234	<	description="Removes all jsr166y build products">
1235	<
1155	>	<target name="jsr166yclean">
1156		<delete dir="${build.jsr166y.dir}"/>
1237	–
1157		</target>
1158
1159	<
1241	<	<target name="jsr166ydist-jar"
1242	<	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"
1247	<	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 -->
1253	<
1254	<
1255	<	<target name="extra166ycompile"
1256	<	depends="configure-compiler, jsr166yjar"
1257	<	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 1278 | Line 1190
1190		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1191		<compilerarg value="-Werror"/>
1192		<compilerarg line="${build.args}"/>
1281	–
1193		</javac>
1194		</target>
1195
1196	<
1286	<	<target name="extra166yjar"
1287	<	depends="extra166ycompile"
1288	<	description="Builds library jar from compiled sources">
1289	<
1196	>	<target name="extra166yjar" depends="extra166ycompile">
1197		<jar destfile="${extra166y.jar}" index="true">
1198		<fileset dir="${build.extra166y.classes.dir}"/>
1199		<manifest>
#	Line 1294 | Line 1201
1201		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1202		</manifest>
1203		</jar>
1297	–
1204		</target>
1205
1206	<
1301	<	<target name="extra166ydocs"
1302	<	description="Builds javadocs to build dir">
1303	<
1206	>	<target name="extra166ydocs">
1207		<delete dir="${extra166ydocs.dir}"/>
1208		<mkdir dir="${extra166ydocs.dir}"/>
1209
#	Line 1314 | Line 1217
1217		executable="${javadoc7}">
1218		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1219		<arg value="-XDignore.symbol.file=true"/>
1317	–
1220		</javadoc>
1221		</target>
1222
1223	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1224
1225	<	<target name="extra166ydist"
1323	<	depends="extra166ydist-jar, extra166ydist-docs"
1324	<	description="Puts all distributable products in single hierarchy"/>
1325	<
1326	<
1327	<	<target name="extra166yclean"
1328	<	description="Removes all extra166y build products">
1329	<
1225	>	<target name="extra166yclean">
1226		<delete dir="${build.extra166y.dir}"/>
1331	–
1227		</target>
1228
1229	<
1335	<	<target name="extra166ydist-jar"
1336	<	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"
1341	<	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"
1351	<	depends="configure-compiler"
1352	<	description="Compiles jsr166e sources">
1353	<
1243	>	<target name="jsr166ecompile" depends="configure-compiler">
1244		<mkdir dir="${build.jsr166e.classes.dir}"/>
1245
1246		<javac srcdir="${topsrc.dir}"
#	Line 1371 | Line 1261
1261		<compilerarg value="-Xlint:all"/>
1262		<compilerarg value="-Werror"/>
1263		<compilerarg line="${build.args}"/>
1374	–
1264		</javac>
1265		</target>
1266
1378	–	<!-- jsr166e: find doclint errors -->
1267		<target name="jsr166edoclint">
1380	–
1268		<mkdir dir="${build.jsr166e.classes.dir}"/>
1269
1270		<javac srcdir="${topsrc.dir}"
#	Line 1399 | Line 1286
1286		<compilerarg value="-Xlint:all"/>
1287		<compilerarg value="-Werror"/>
1288		<compilerarg value="-Xdoclint:all/protected"/>
1402	–
1289		</javac>
1290		</target>
1291
1292	<
1407	<	<target name="jsr166ejar"
1408	<	depends="jsr166ecompile"
1409	<	description="Builds library jar from compiled sources">
1410	<
1292	>	<target name="jsr166ejar" depends="jsr166ecompile">
1293		<jar destfile="${jsr166e.jar}" index="true">
1294		<fileset dir="${build.jsr166e.classes.dir}"/>
1295		<manifest>
#	Line 1415 | Line 1297
1297		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1298		</manifest>
1299		</jar>
1418	–
1300		</target>
1301
1302	<
1422	<	<target name="jsr166edocs"
1423	<	description="Builds javadocs to build dir">
1424	<
1302	>	<target name="jsr166edocs">
1303		<delete dir="${jsr166edocs.dir}"/>
1304		<mkdir dir="${jsr166edocs.dir}"/>
1305
#	Line 1435 | Line 1313
1313		failonerror = "true">
1314		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1315		<arg value="-XDignore.symbol.file=true"/>
1438	–
1316		</javadoc>
1317		</target>
1318
1319	<
1443	<	<target name="jsr166e-tck-one-java-version"
1444	<	depends="jsr166ejar">
1445	<
1319	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1320		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1447	–
1321		<run-tck-tests
1322		tck.src.dir="${test.src.dir}/tck-jsr166e"
1323		target="${build.jsr166e.java.version}"
#	Line 1452 | Line 1325
1325		classes="${jsr166e.jar}"/>
1326		</target>
1327
1328	<	<target name="jsr166e-tck"
1456	<	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 1474 | Line 1346
1346		</antcall>
1347		</target>
1348
1349	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1350
1351	<	<target name="jsr166e-test"
1479	<	depends="jsr166e-tck"
1480	<	description="Runs all tests for jsr166e">
1481	<	</target>
1482	<
1483	<	<target name="jsr166edist"
1484	<	depends="jsr166edist-jar, jsr166edist-docs"
1485	<	description="Puts all distributable products in single hierarchy"/>
1486	<
1351	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1352
1353	<	<target name="jsr166eclean"
1489	<	description="Removes all jsr166e build products">
1353	>	<target name="jsr166eclean">
1354		<delete dir="${build.jsr166e.dir}"/>
1355		</target>
1356
1493	–
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"
1500	<	depends="jsr166eclean, jsr166edocs">
1362	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1363		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1364		</target>
1365
1366
1367		<!-- Find buglets that can be detected by static build tools -->
1368
1369	<	<target name="lint">
1370	<	<antcall target="dists">
1371	<	<param name="build.javadoc.access" value="public"/>
1372	<	</antcall>
1373	<	</target>
1369	>	<!--   <target name="lint"> -->
1370	>	<!--     <antcall target="dists"> -->
1371	>	<!--       <param name="build.javadoc.access" value="protected"/> -->
1372	>	<!--     </antcall> -->
1373	>	<!--   </target> -->
1374
1375		<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1376	<	<target name="lint-private">
1376	>	<target name="doclint-private">
1377		<antcall target="dist">
1378		<param name="build.javadoc.access" value="private"/>
1379		</antcall>
#	Line 1519 | Line 1381
1381
1382
1383		<!-- ==============================================================
1384	<	Experimental errorprone support - http://errorprone.info
1385	<	You may need to bring your own errorprone jar.
1384	>	Experimental errorprone support
1385	>	https://errorprone.info
1386	>	https://errorprone.info/docs/installation
1387	>	https://github.com/google/error-prone/issues/1143
1388		=================================================================== -->
1389	+	<path id="errorprone.processorpath.path">
1390	+	<pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1391	+	<pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1392	+	<pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1393	+	<pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1394	+	</path>
1395	+	<property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1396	+	<property name="errorprone.jsr166.user.flags" value=""/>
1397	+	<property name="errorprone.jsr166.flags"
1398	+	value="-Xep:HashtableContains:OFF
1399	+	-Xep:JdkObsolete:OFF
1400	+	-Xep:MissingOverride:OFF
1401	+	-Xep:MissingFail:OFF
1402	+	-Xep:ThreadPriorityCheck:OFF
1403	+	-Xep:MixedArrayDimensions:ERROR
1404	+	-Xep:RemoveUnusedImports:ERROR
1405	+	-Xep:EmptyIf:ERROR
1406	+	-Xep:MultipleTopLevelClasses:ERROR
1407	+	-Xep:ClassName:ERROR
1408	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1409	+	-Xep:RedundantThrows:ERROR
1410	+	-Xep:IdentityBinaryExpression:WARN
1411	+	-Xep:ConstructorInvokesOverridable:WARN
1412	+	-Xep:MethodCanBeStatic:WARN
1413	+	${errorprone.jsr166.user.flags}"/>
1414	+	<!-- -Xep:WildcardImport:ERROR -->
1415	+	<property name="errorprone.jsr166.test.flags"
1416	+	value="-Xep:StringSplitter:OFF
1417	+	-Xep:BoxedPrimitiveConstructor:OFF
1418	+	-Xep:ModifyingCollectionWithItself:OFF"/>
1419	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1420		<target name="errorprone"
1421		depends="clean, configure-compiler"
1422	<	description="Run errorprone over jsr166 source code">
1422	>	description="Run errorprone over jsr166 source code (experimental)">
1423
1424		<local name="destdir"/>
1425		<property name="destdir" value="${build.classes.dir}/java.base"/>
#	Line 1543 | Line 1438
1438		fork="true">
1439
1440		<include name="**/*.java"/>
1441	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1442	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1443	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1444	<	<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"/>
1551	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1552	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1553	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1554	<	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1555	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1441	>	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1442	>	<compilerarg value="-J--illegal-access=permit"/>
1443	>	<compilerarg value="-XDcompilePolicy=simple"/>
1444	>	<compilerarg value="-processorpath"/>
1445	>	<compilerarg pathref="errorprone.processorpath.path"/>
1446		<compilerarg value="-Xplugin:ErrorProne
1447	<	-Xep:IdentityBinaryExpression:WARN
1558	<	-Xep:MissingOverride:OFF
1559	<	-Xep:MixedArrayDimensions:WARN
1560	<	-Xep:RemoveUnusedImports:ERROR
1561	<	-Xep:MethodCanBeStatic:WARN"/>
1447	>	${errorprone.jsr166.flags}"/>
1448		<compilerarg value="--patch-module=java.base=${src.dir}"/>
1449		<compilerarg value="-Xprefer:source"/>
1450		<compilerarg value="-XDignore.symbol.file=true"/>
#	Line 1573 | Line 1459
1459		</jar>
1460
1461		<run-tck-tests
1462	<	target="${build.main.java.version}"
1462	>	target="${java.runtime.target}"
1463		workdir="${build.dir}"
1464		classes="${product.jar}">
1465		<javac-elements>
1466	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
1467	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
1468	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
1469	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1470	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1471	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1472	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1587	<	<compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1588	<	<compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1589	<	<compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1590	<	<compilerarg value="-Xplugin:ErrorProne
1591	<	-Xep:IdentityBinaryExpression:WARN
1592	<	-Xep:BoxedPrimitiveConstructor:OFF
1593	<	-Xep:HashtableContains:OFF
1594	<	-Xep:ModifyingCollectionWithItself:OFF
1595	<	-Xep:MissingOverride:OFF
1596	<	-Xep:MixedArrayDimensions:WARN
1597	<	-Xep:RemoveUnusedImports:ERROR
1598	<	-Xep:MethodCanBeStatic:WARN"/>
1466	>	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1467	>	<compilerarg value="-J--illegal-access=permit"/>
1468	>	<compilerarg value="-XDcompilePolicy=simple"/>
1469	>	<compilerarg line="-processorpath ${errorprone.processorpath}"/>
1470	>	<compilerarg value="-Xplugin:ErrorProne
1471	>	${errorprone.jsr166.flags}
1472	>	${errorprone.jsr166.test.flags}"/>
1473		<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1474		</javac-elements>
1475		</run-tck-tests>
1476		</target>
1477
1478	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1479	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1480	+	<target name="errorprone-jtreg"
1481	+	depends="jar"
1482	+	description="Run errorprone over jtreg tests (experimental)">
1483	+
1484	+	<run-jtreg-tests
1485	+	target="${java.runtime.target}"
1486	+	workdir="${build.dir}"
1487	+	classes="${product.jar}"
1488	+	verbose="all">
1489	+	<jtreg-elements>
1490	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1491	+	<arg value="-javacoption:-processorpath"/>
1492	+	<arg value="-javacoption:${errorprone.processorpath}"/>
1493	+	<arg value="-javacoption:-Xplugin:ErrorProne
1494	+	${errorprone.jsr166.flags}
1495	+	${errorprone.jsr166.test.flags}
1496	+	-Xep:MultipleTopLevelClasses:WARN
1497	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1498	+	</jtreg-elements>
1499	+	</run-jtreg-tests>
1500	+	</target>
1501	+
1502
1503		<!-- ==============================================================
1504		Running guava tests against jsr166 code
#	Line 1654 | Line 1552
1552		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1553		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1554		<junit printsummary="true" showoutput="true" haltonfailure="true"
1555	<	jvm="${java9}" fork="true">
1556	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1555	>	jvm="${build.main.java}" fork="true">
1556	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1557		<formatter type="brief"/>
1558		<classpath>
1559		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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