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.216 by jsr166, Tue Aug 30 00:01:22 2016 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>
7		------------------------------------------------------------------------------
#	Line 17 | 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:
20	–	$HOME/jdk/jdk6
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
25	–	$HOME/jdk/src/jdk6
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 6 7 8 9 ...
38	>	for $N in 8 9 10 ...
39
40	<	As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37	<	target is currently broken.
40	>	As of 2016-03, the sources in src/main are for jdk9+ only.
41		------------------------------------------------------------------------------
42		</description>
43
#	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 63 | Line 65
65		<property name="build.classes.dir"           location="${build.dir}/classes"/>
66		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
67		<property name="build.loops.dir"             location="${build.dir}/loops"/>
66	–	<property name="build.reports.dir"           location="${build.dir}/reports"/>
68
69		<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
70		<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
#	Line 104 | 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 135
135		<defjdklocations v="7"/>
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 143 | Line 147
147		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
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 182 | 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 198 | 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 230 | 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"/>
255	>	<condition property="use-doclint">
256	>	<not> <equals arg1="@{target}" arg2="7"/> </not>
257		</condition>
258
259		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 245 | Line 268
268		classpath="${junit.jar}"
269		includeAntRuntime="false"
270		includeJavaRuntime="false"
271	+	encoding="ASCII"
272		executable="${javac@{compile-target}}"
273		fork="true">
274
275		<include name="*.java"/>
276		<compilerarg value="-XDignore.symbol.file=true"/>
277		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
278	+	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
279		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280	<	<compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
280	>	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
281		<compilerarg line="${build.args}"/>
282		<javac-elements/>
283
#	Line 263 | Line 288
288		jvm="${java@{target}}"
289		fork="true">
290		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
291	<	<jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
291	>	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
292	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
293	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
294	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
295	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
296	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
297		<jvmarg line="@{jvmflags}"/>
298		<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
299		<jvmarg line="${vmoptions}" if:set="vmoptions"/>
#	Line 285 | Line 315
315		</macrodef>
316
317		<!-- Define jtreg test sets for different jdk versions -->
318	<	<fileset dir="${jtreg9.src.dir}">
319	<	<patternset id="jdk9.jtreg.tests">
320	<	<include name="**/*.java"/>
321	<	</patternset>
322	<	</fileset>
323	<
324	<	<fileset dir="${jtreg8.src.dir}">
325	<	<patternset id="jdk8.jtreg.tests">
326	<	<include name="**/*.java"/>
327	<	<exclude name="**/SpliteratorCharacteristics.java"/>
328	<	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
329	<	<exclude name="**/GCDuringIteration.java"/>
330	<	</patternset>
301	<	</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=""/>
341
342		<macrodef name="run-jtreg-tests">
343		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
314	–	<attribute name="source" default="7"/>
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 324 | 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"/>
331	–	<delete dir="@{workdir}/JTreport" quiet="true"/>
362		<jtreg dir="${jtreg@{target}.src.dir}"
363		jdk="${jdk@{target}.home}"
364	<	workDir="@{workdir}/JTwork"
335	<	reportDir="@{workdir}/JTreport">
364	>	workDir="@{workdir}/JTwork">
365		<patternset refid="jdk@{target}.jtreg.tests"/>
366		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
367	<	<arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" 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="-verbose:${jtreg.verbose}"/>
370	>	<arg value="-noreport"/>
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 358 | 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, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
403	>	depends="dist, 4jdk8dist"
404		description="Builds all public jars and docs"/>
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
372	–	<local name="modules"/>
373	–	<condition property="modules">
374	–	<and>
375	–	<available file="${jdk9.home}/jmods" type="dir"/>
376	–	<equals arg1="9" arg2="${build.main.java.version}"/>
377	–	</and>
378	–	</condition>
379	–
411		<local name="destdir"/>
412	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
382	<	<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 391 | Line 421
421		classpath=""
422		includeAntRuntime="false"
423		includeJavaRuntime="false"
424	+	encoding="ASCII"
425		executable="${build.main.javac}"
426		fork="true">
427
428		<include name="**/*.java"/>
429	<	<compilerarg value="-Xmodule:java.base" 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"/>
403	–	<compilerarg value="-Xdoclint:all/protected"/>
436		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
437		<compilerarg line="${build.args}"/>
438
#	Line 432 | Line 464
464		<!-- the packagenames="none" hack below prevents scanning the -->
465		<!-- sourcepath for packages -->
466
467	<	<!--  TODO:       sourcepath="${src.dir}:${jdk9.src.dir}" -->
467	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
468	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
469	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
470	>	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
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	<	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="-Xmodule:java.base"/>
488	<	<arg value="-tag"/>
489	<	<arg value="${javadoc.jls.option}"/>
490	<	<arg value="-tag"/>
491	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
492	<	<arg value="-tag"/>
493	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
494	<	<arg value="-tag"/>
495	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
496	<	<!-- tags added in jdk9 -->
497	<	<arg value="-tag"/>
461	<	<arg value="revised:X"/>
462	<	<arg value="-tag"/>
463	<	<arg value="spec:X"/>
487	>	<arg value="-html5"/>
488	>	<arg value="--patch-module=java.base=${src.dir}"/>
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"/> <arg value="revised:X"/> -->
497	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
498		</javadoc>
499		</target>
500
#	Line 470 | Line 504
504		description="Puts all distributable products in single hierarchy"/>
505
506
473	–	<target name="release"
474	–	depends="dist"
475	–	description="Puts entire CVS tree, plus distribution productions, in a jar">
476	–
477	–	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
478	–
479	–	<jar basedir="${basedir}" destfile="${release.jar}">
480	–	<!-- <exclude name="build/**"/> -->
481	–	<exclude name="${release.jar}"/>
482	–	<exclude name="user.properties"/>
483	–	<exclude name="etc/notes/**"/>
484	–	<exclude name="src/emulation/**"/>
485	–	<exclude name="**/SyntaxTest.java"/>
486	–	<exclude name="**/SuperfluousAbstract.java"/>
487	–	<manifest>
488	–	<attribute name="Built-By" value="${user.name}"/>
489	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
490	–	</manifest>
491	–	</jar>
492	–	</target>
493	–
494	–
507		<target name="clean"
508		description="Removes all build products">
497	–
509		<delete dir="${build.dir}"/>
499	–
510		</target>
511
512
513		<target name="dist-clean"
514		description="Removes all build and distribution products">
505	–
515		<delete dir="${build.dir}"/>
516		<delete dir="${dist.dir}"/>
508	–
517		</target>
518
519
#	Line 526 | Line 534
534		<run-tck-tests
535		target="${build.main.java.version}"
536		workdir="${build.dir}"
537	<	classes="${product.jar}"/>
537	>	classes="${product.jar}">
538	>	<javac-elements>
539	>	<compilerarg value="-Werror"/>
540	>	</javac-elements>
541	>	</run-tck-tests>
542		</target>
543
544		<target name="tck-parallelism-1"
#	Line 561 | Line 573
573
574		<target name="test"
575		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
576	<	description="Runs tck and jtreg tests for src/main">
565	<	</target>
566	<
567	<	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
576	>	description="Runs tck and jtreg tests for src/main"/>
577
578	<	<!--     <antcall target="jtreg"> -->
579	<	<!--       <param name="build.main.java.version" value="8"/> -->
580	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
572	<	<!--     </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">
654		<fail message="ant version too old">
655	<	<condition>
598	<	<not> <antversion atleast="1.9.1"/> </not>
599	<	</condition>
655	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
656		</fail>
657
658		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 614 | Line 670
670		</target>
671
672
617	–
618	–	<!-- Various demos and test programs -->
619	–
620	–
621	–	<!-- description="Benchmark from Doug Lea's AQS paper" -->
622	–	<target name="loops" depends="configure-compiler">
623	–
624	–	<mkdir dir="${build.loops.dir}"/>
625	–
626	–	<javac srcdir="${loops.src.dir}"
627	–	destdir="${build.loops.dir}"
628	–	debug="${build.debug}"
629	–	debuglevel="${build.debuglevel}"
630	–	deprecation="${build.deprecation}"
631	–	source="${build.sourcelevel}"
632	–	target="${build.sourcelevel}"
633	–	fork="true">
634	–
635	–	<compilerarg line="${build.args}"/>
636	–	<classpath refid="loops.classpath"/>
637	–	<compilerarg value="-XDignore.symbol.file=true"/>
638	–
639	–	</javac>
640	–
641	–	<java classname="ALoops" fork="true">
642	–	<classpath refid="loops.classpath"/>
643	–	</java>
644	–
645	–	</target>
646	–
647	–
673		<target name="compile-test-loops" depends="jar"
674	<	description="compile all the perf tests in src/test/loops">
674	>	description="Compiles all the perf tests in src/test/loops">
675
676		<mkdir dir="${build.dir}/test/loops"/>
677
#	Line 657 | Line 682
682		deprecation="${build.deprecation}"
683		includeAntRuntime="false"
684		includeJavaRuntime="false"
685	<	executable="${javac9}"
685	>	encoding="ASCII"
686	>	executable="${build.main.javac}"
687		fork="true">
688
689		<include name="*.java"/>
#	Line 665 | Line 691
691		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
692		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
693		<compilerarg line="${build.args}"/>
668	–
694		</javac>
670	–
695		</target>
696
697
#	Line 690 | Line 714
714		bootclasspath="${bootclasspath8}"
715		includeAntRuntime="false"
716		includeJavaRuntime="false"
717	+	encoding="ASCII"
718		executable="${javac8}"
719		fork="true">
695	–
720		<include name="**/*.java"/>
721		<compilerarg value="-Xprefer:source"/>
722		<compilerarg value="-XDignore.symbol.file=true"/>
723		<compilerarg value="-Xlint:all"/>
724		<compilerarg value="-Werror"/>
725		<compilerarg line="${build.args}"/>
702	–
726		</javac>
727		</target>
728
#	Line 720 | Line 743
743		bootclasspath="${bootclasspath8}"
744		includeAntRuntime="false"
745		includeJavaRuntime="false"
746	+	encoding="ASCII"
747		executable="${javac8}"
748		fork="true">
725	–
749		<include name="**/*.java"/>
750		<compilerarg value="-Xprefer:source"/>
751		<compilerarg value="-XDignore.symbol.file=true"/>
752		<compilerarg value="-Xlint:all"/>
753	<	<compilerarg value="-Xdoclint:all/protected"/>
753	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
754		<compilerarg line="${build.args}"/>
732	–
755		</javac>
756		</target>
757
#	Line 745 | Line 767
767		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
768		</manifest>
769		</jar>
748	–
770		</target>
771
772
#	Line 761 | Line 782
782		<!-- JDK9+ test classes -->
783		<exclude name="*9Test.java"/>
784		<exclude name="*10Test.java"/>
785	+	<compilerarg value="-Werror"/>
786		</javac-elements>
787		</run-tck-tests>
788		</target>
#	Line 778 | Line 800
800
801		<target name="4jdk8-test"
802		depends="4jdk8-tck, 4jdk8-jtreg"
803	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
782	<	</target>
803	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
804
805
806		<target name="4jdk8docs"
#	Line 795 | Line 816
816		access="${build.javadoc.access}"
817		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
818		classpath=""
819	+	source="8"
820		executable="${javadoc8}"
821		failonerror = "true">
822		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 802 | 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	<	<arg value="-tag"/>
830	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
831	<	<arg value="-tag"/>
810	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
811	<	<arg value="-tag"/>
812	<	<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 821 | Line 840
840
841		<target name="4jdk8clean"
842		description="Removes all 4jdk8 build products">
824	–
843		<delete dir="${build.4jdk8.dir}"/>
826	–
844		</target>
845
846
#	Line 839 | Line 856
856		</target>
857
858
859	+	<!-- jsr166 4jdk7 (no longer maintained) -->
860
861	<	<!-- jsr166 4jdk7 -->
844	<
845	<	<target name="4jdk7compile"
846	<	depends="configure-compiler"
847	<	description="Compiles src/jdk7 sources, targeting jdk7">
848	<
861	>	<target name="4jdk7compile" depends="configure-compiler">
862		<mkdir dir="${build.4jdk7.classes.dir}"/>
863
864		<javac srcdir="${4jdk7src.dir}"
#	Line 859 | Line 872
872		bootclasspath="${bootclasspath6}"
873		includeAntRuntime="false"
874		includeJavaRuntime="false"
875	+	encoding="ASCII"
876		executable="${javac7}"
877		fork="true">
878
#	Line 868 | Line 882
882		<compilerarg value="-Xlint:all"/>
883		<compilerarg value="-Werror"/>
884		<compilerarg line="${build.args}"/>
871	–
885		</javac>
886		</target>
887
888	<	<target name="4jdk7doclint"
876	<	depends="configure-compiler"
877	<	description="Finds doclint warnings">
878	<
888	>	<target name="4jdk7doclint" depends="configure-compiler">
889		<mkdir dir="${build.4jdk7.classes.dir}"/>
890
891		<javac srcdir="${4jdk7src.dir}"
#	Line 889 | Line 899
899		bootclasspath="${bootclasspath6}"
900		includeAntRuntime="false"
901		includeJavaRuntime="false"
902	+	encoding="ASCII"
903		executable="${javac8}"
904		fork="true">
905
#	Line 898 | Line 909
909		<compilerarg value="-Xlint:all"/>
910		<compilerarg value="-Xdoclint:all/protected"/>
911		<compilerarg line="${build.args}"/>
901	–
912		</javac>
913		</target>
914
915	<
906	<	<target name="4jdk7jar"
907	<	depends="4jdk7compile"
908	<	description="Builds library jar from compiled sources">
909	<
915	>	<target name="4jdk7jar" depends="4jdk7compile">
916		<jar destfile="${4jdk7product.jar}">
917		<fileset dir="${build.4jdk7.classes.dir}"/>
918		<manifest>
#	Line 914 | Line 920
920		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
921		</manifest>
922		</jar>
917	–
923		</target>
924
925	<
921	<	<target name="4jdk7-tck"
922	<	depends="4jdk7jar"
923	<	description="Runs tck tests for jsr166-4jdk7 directly">
924	<
925	>	<target name="4jdk7-tck" depends="4jdk7jar">
926		<run-tck-tests
927		target="7"
928		workdir="${build.4jdk7.dir}"
#	Line 939 | Line 940
940		<exclude name="SplittableRandomTest.java"/>
941		<exclude name="StampedLockTest.java"/>
942		<exclude name="SubmissionPublisherTest.java"/>
943	+	<compilerarg value="-Werror"/>
944		</javac-elements>
945		</run-tck-tests>
946		</target>
947
946	–
948		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
949	<	<target name="4jdk7-tck-junit"
949	<	depends="4jdk7compile">
949	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
950
951		<junit printsummary="true"
952		showoutput="true"
#	Line 968 | Line 968
968
969		<test name="${jsr166.tckTestClass}" haltonfailure="no">
970		</test>
971	–
971		</junit>
972		</target>
973
974	<	<target name="4jdk7-jtreg"
976	<	depends="4jdk7jar"
977	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
974	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
975		<run-jtreg-tests
976		target="7"
977		workdir="${build.4jdk7.dir}"
978		classes="${4jdk7product.jar}"/>
979		</target>
980
981	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
982
983	<	<target name="4jdk7-test"
986	<	depends="4jdk7-tck, 4jdk7-jtreg"
987	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
988	<	</target>
989	<
990	<
991	<	<target name="4jdk7docs"
992	<	description="Builds javadocs for src/jdk7 to dist dir">
993	<
983	>	<target name="4jdk7docs">
984		<delete dir="${4jdk7docs.dir}"/>
985		<mkdir dir="${4jdk7docs.dir}"/>
986
#	Line 1011 | Line 1001
1001		</javadoc>
1002		</target>
1003
1004	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1005
1006	<	<target name="4jdk7dist"
1016	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1017	<	description="Puts all distributable products in single hierarchy"/>
1018	<
1019	<
1020	<	<target name="4jdk7clean"
1021	<	description="Removes all 4jdk7 build products">
1022	<
1006	>	<target name="4jdk7clean">
1007		<delete dir="${build.4jdk7.dir}"/>
1024	–
1008		</target>
1009
1010	<
1028	<	<target name="4jdk7dist-jar"
1029	<	depends="4jdk7clean, 4jdk7jar">
1010	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1011		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1012		</target>
1013
1014	<
1034	<	<target name="4jdk7dist-docs"
1035	<	depends="4jdk7clean, 4jdk7docs">
1014	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1015		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1016		</target>
1017
1018
1019	<	<!-- jsr166x -->
1041	<
1042	<	<target name="jsr166xcompile"
1043	<	depends="configure-compiler"
1044	<	description="Compiles jsr166x sources to build dir">
1019	>	<!-- jsr166x (no longer maintained) -->
1020
1021	+	<target name="jsr166xcompile" depends="configure-compiler">
1022		<mkdir dir="${build.jsr166x.classes.dir}"/>
1023
1024		<javac srcdir="${topsrc.dir}"
#	Line 1056 | Line 1032
1032		target="5"
1033		includeAntRuntime="false"
1034		includeJavaRuntime="false"
1035	+	encoding="ASCII"
1036		executable="${javac7}"
1037		fork="true">
1061	–
1038		<include name="jsr166x/**/*.java"/>
1039		<compilerarg value="-XDignore.symbol.file=true"/>
1040		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1041		<compilerarg value="-Werror"/>
1042		<compilerarg line="${build.args}"/>
1067	–
1043		</javac>
1044		</target>
1045
1046	<
1072	<	<target name="jsr166xjar"
1073	<	depends="jsr166xcompile"
1074	<	description="Builds library jar from compiled sources">
1075	<
1046	>	<target name="jsr166xjar" depends="jsr166xcompile">
1047		<jar destfile="${jsr166x.jar}">
1048		<fileset dir="${build.jsr166x.classes.dir}"/>
1049		<manifest>
#	Line 1080 | Line 1051
1051		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1052		</manifest>
1053		</jar>
1083	–
1054		</target>
1055
1056	<
1087	<	<target name="jsr166xdocs"
1088	<	description="Builds javadocs to dist dir">
1089	<
1056	>	<target name="jsr166xdocs">
1057		<delete dir="${jsr166xdocs.dir}"/>
1058		<mkdir dir="${jsr166xdocs.dir}"/>
1059
#	Line 1101 | Line 1068
1068		failonerror = "true">
1069		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1070		<arg value="-XDignore.symbol.file=true"/>
1104	–
1071		</javadoc>
1072		</target>
1073
1074	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1075
1076	<	<target name="jsr166xdist"
1110	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1111	<	description="Puts all distributable products in single hierarchy"/>
1112	<
1113	<
1114	<	<target name="jsr166xclean"
1115	<	description="Removes all jsr166x build products">
1116	<
1076	>	<target name="jsr166xclean">
1077		<delete dir="${build.jsr166x.dir}"/>
1118	–
1078		</target>
1079
1080	<
1122	<	<target name="jsr166xdist-jar"
1123	<	depends="jsr166xclean, jsr166xjar">
1080	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1081		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1082		</target>
1083
1084	<	<target name="jsr166xdist-docs"
1128	<	depends="jsr166xclean, jsr166xdocs">
1084	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1085		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1086		</target>
1087
1132	–	<!-- jsr166y -->
1088
1089	+	<!-- jsr166y (no longer maintained) -->
1090
1091	<	<target name="jsr166ycompile"
1136	<	depends="configure-compiler"
1137	<	description="Compiles jsr166y sources">
1138	<
1091	>	<target name="jsr166ycompile" depends="configure-compiler">
1092		<mkdir dir="${build.jsr166y.classes.dir}"/>
1093
1094		<javac srcdir="${topsrc.dir}"
#	Line 1149 | Line 1102
1102		bootclasspath="${bootclasspath6}"
1103		includeAntRuntime="false"
1104		includeJavaRuntime="false"
1105	+	encoding="ASCII"
1106		executable="${javac7}"
1107		fork="true">
1108
#	Line 1157 | Line 1111
1111		<compilerarg value="-Xlint:all"/>
1112		<compilerarg value="-Werror"/>
1113		<compilerarg line="${build.args}"/>
1160	–
1114		</javac>
1115		</target>
1116
1117	<
1165	<	<target name="jsr166yjar"
1166	<	depends="jsr166ycompile"
1167	<	description="Builds library jar from compiled sources">
1168	<
1117	>	<target name="jsr166yjar" depends="jsr166ycompile">
1118		<jar destfile="${jsr166y.jar}" index="true">
1119		<fileset dir="${build.jsr166y.classes.dir}"/>
1120		<manifest>
#	Line 1173 | Line 1122
1122		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1123		</manifest>
1124		</jar>
1176	–
1125		</target>
1126
1127	<
1180	<	<target name="jsr166ydocs"
1181	<	description="Builds javadocs to dist dir">
1182	<
1127	>	<target name="jsr166ydocs">
1128		<delete dir="${jsr166ydocs.dir}"/>
1129		<mkdir dir="${jsr166ydocs.dir}"/>
1130
#	Line 1194 | Line 1139
1139		failonerror = "true">
1140		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1141		<arg value="-XDignore.symbol.file=true"/>
1197	–
1142		</javadoc>
1143		</target>
1144
1145	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1146
1147	<	<target name="jsr166ydist"
1203	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1204	<	description="Puts all distributable products in single hierarchy"/>
1205	<
1206	<
1207	<	<target name="jsr166yclean"
1208	<	description="Removes all jsr166y build products">
1209	<
1147	>	<target name="jsr166yclean">
1148		<delete dir="${build.jsr166y.dir}"/>
1211	–
1149		</target>
1150
1151	<
1215	<	<target name="jsr166ydist-jar"
1216	<	depends="jsr166yclean, jsr166yjar">
1151	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1152		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1153		</target>
1154
1155	<	<target name="jsr166ydist-docs"
1221	<	depends="jsr166yclean, jsr166ydocs">
1155	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1156		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1157		</target>
1158
1159
1160	<	<!-- extra166y -->
1227	<
1228	<
1229	<	<target name="extra166ycompile"
1230	<	depends="configure-compiler, jsr166yjar"
1231	<	description="Compiles extra166y sources">
1160	>	<!-- extra166y (no longer maintained) -->
1161
1162	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1163		<mkdir dir="${build.extra166y.classes.dir}"/>
1164
1165		<javac srcdir="${topsrc.dir}"
#	Line 1243 | Line 1173
1173		target="6"
1174		includeAntRuntime="false"
1175		includeJavaRuntime="false"
1176	+	encoding="ASCII"
1177		executable="${javac7}"
1178		fork="true">
1179
#	Line 1251 | Line 1182
1182		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1183		<compilerarg value="-Werror"/>
1184		<compilerarg line="${build.args}"/>
1254	–
1185		</javac>
1186		</target>
1187
1188	<
1259	<	<target name="extra166yjar"
1260	<	depends="extra166ycompile"
1261	<	description="Builds library jar from compiled sources">
1262	<
1188	>	<target name="extra166yjar" depends="extra166ycompile">
1189		<jar destfile="${extra166y.jar}" index="true">
1190		<fileset dir="${build.extra166y.classes.dir}"/>
1191		<manifest>
#	Line 1267 | Line 1193
1193		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1194		</manifest>
1195		</jar>
1270	–
1196		</target>
1197
1198	<
1274	<	<target name="extra166ydocs"
1275	<	description="Builds javadocs to build dir">
1276	<
1198	>	<target name="extra166ydocs">
1199		<delete dir="${extra166ydocs.dir}"/>
1200		<mkdir dir="${extra166ydocs.dir}"/>
1201
#	Line 1287 | Line 1209
1209		executable="${javadoc7}">
1210		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1211		<arg value="-XDignore.symbol.file=true"/>
1290	–
1212		</javadoc>
1213		</target>
1214
1215	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1216
1217	<	<target name="extra166ydist"
1296	<	depends="extra166ydist-jar, extra166ydist-docs"
1297	<	description="Puts all distributable products in single hierarchy"/>
1298	<
1299	<
1300	<	<target name="extra166yclean"
1301	<	description="Removes all extra166y build products">
1302	<
1217	>	<target name="extra166yclean">
1218		<delete dir="${build.extra166y.dir}"/>
1304	–
1219		</target>
1220
1221	<
1308	<	<target name="extra166ydist-jar"
1309	<	depends="extra166yclean, extra166yjar">
1221	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1222		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1223		</target>
1224
1225	<	<target name="extra166ydist-docs"
1314	<	depends="extra166yclean, extra166ydocs">
1225	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1226		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1227		</target>
1228
1229	<	<!-- jsr166e -->
1229	>
1230	>	<!-- jsr166e (no longer maintained) -->
1231
1232		<property name="build.jsr166e.java.version" value="6"/>
1233		<property name="build.jsr166e.javac" value="${javac6}"/>
1234
1235	<	<target name="jsr166ecompile"
1324	<	depends="configure-compiler"
1325	<	description="Compiles jsr166e sources">
1326	<
1235	>	<target name="jsr166ecompile" depends="configure-compiler">
1236		<mkdir dir="${build.jsr166e.classes.dir}"/>
1237
1238		<javac srcdir="${topsrc.dir}"
#	Line 1344 | Line 1253
1253		<compilerarg value="-Xlint:all"/>
1254		<compilerarg value="-Werror"/>
1255		<compilerarg line="${build.args}"/>
1347	–
1256		</javac>
1257		</target>
1258
1351	–	<!-- jsr166e: find doclint errors -->
1259		<target name="jsr166edoclint">
1353	–
1260		<mkdir dir="${build.jsr166e.classes.dir}"/>
1261
1262		<javac srcdir="${topsrc.dir}"
#	Line 1372 | Line 1278
1278		<compilerarg value="-Xlint:all"/>
1279		<compilerarg value="-Werror"/>
1280		<compilerarg value="-Xdoclint:all/protected"/>
1375	–
1281		</javac>
1282		</target>
1283
1284	<
1380	<	<target name="jsr166ejar"
1381	<	depends="jsr166ecompile"
1382	<	description="Builds library jar from compiled sources">
1383	<
1284	>	<target name="jsr166ejar" depends="jsr166ecompile">
1285		<jar destfile="${jsr166e.jar}" index="true">
1286		<fileset dir="${build.jsr166e.classes.dir}"/>
1287		<manifest>
#	Line 1388 | Line 1289
1289		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1290		</manifest>
1291		</jar>
1391	–
1292		</target>
1293
1294	<
1395	<	<target name="jsr166edocs"
1396	<	description="Builds javadocs to build dir">
1397	<
1294	>	<target name="jsr166edocs">
1295		<delete dir="${jsr166edocs.dir}"/>
1296		<mkdir dir="${jsr166edocs.dir}"/>
1297
#	Line 1408 | Line 1305
1305		failonerror = "true">
1306		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1307		<arg value="-XDignore.symbol.file=true"/>
1411	–
1308		</javadoc>
1309		</target>
1310
1311	<
1416	<	<target name="jsr166e-tck-one-java-version"
1417	<	depends="jsr166ejar">
1418	<
1311	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1312		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1420	–
1313		<run-tck-tests
1314		tck.src.dir="${test.src.dir}/tck-jsr166e"
1315		target="${build.jsr166e.java.version}"
#	Line 1425 | Line 1317
1317		classes="${jsr166e.jar}"/>
1318		</target>
1319
1320	<	<target name="jsr166e-tck"
1429	<	description="Runs tck tests for jsr166e for multiple java versions">
1320	>	<target name="jsr166e-tck">
1321
1322		<!--     <antcall target="clean"/> -->
1323		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1447 | Line 1338
1338		</antcall>
1339		</target>
1340
1341	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1342
1343	<	<target name="jsr166e-test"
1452	<	depends="jsr166e-tck"
1453	<	description="Runs all tests for jsr166e">
1454	<	</target>
1455	<
1456	<	<target name="jsr166edist"
1457	<	depends="jsr166edist-jar, jsr166edist-docs"
1458	<	description="Puts all distributable products in single hierarchy"/>
1343	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1344
1345	<
1461	<	<target name="jsr166eclean"
1462	<	description="Removes all jsr166e build products">
1345	>	<target name="jsr166eclean">
1346		<delete dir="${build.jsr166e.dir}"/>
1347		</target>
1348
1466	–
1349		<target name="jsr166edist-jar"
1350		depends="jsr166eclean, jsr166ejar">
1351		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1352		</target>
1353
1354	<	<target name="jsr166edist-docs"
1473	<	depends="jsr166eclean, jsr166edocs">
1354	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1355		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1356		</target>
1357
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>
1372		</target>
1373
1374
1375	+	<!-- ==============================================================
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)">
1404	+
1405	+	<local name="destdir"/>
1406	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1407	+	<mkdir dir="${destdir}"/>
1408	+
1409	+	<javac srcdir="${src.dir}"
1410	+	destdir="${destdir}"
1411	+	debug="${build.debug}"
1412	+	debuglevel="${build.debuglevel}"
1413	+	deprecation="${build.deprecation}"
1414	+	classpath=""
1415	+	includeAntRuntime="false"
1416	+	includeJavaRuntime="false"
1417	+	encoding="ASCII"
1418	+	executable="${build.main.javac}"
1419	+	fork="true">
1420	+
1421	+	<include name="**/*.java"/>
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	+	${errorprone.jsr166.flags}"/>
1428	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1429	+	<compilerarg value="-Xprefer:source"/>
1430	+	<compilerarg value="-XDignore.symbol.file=true"/>
1431	+	<compilerarg value="-Xlint:all"/>
1432	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1433	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1434	+	<compilerarg line="${build.args}"/>
1435	+	</javac>
1436	+
1437	+	<jar destfile="${product.jar}">
1438	+	<fileset dir="${destdir}"/>
1439	+	</jar>
1440	+
1441	+	<run-tck-tests
1442	+	target="${build.main.java.version}"
1443	+	workdir="${build.dir}"
1444	+	classes="${product.jar}">
1445	+	<javac-elements>
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	+	${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
1485	+	=================================================================== -->
1486	+
1487	+	<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1488	+	<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1489	+	<!-- <property name="guava.version" value="21.0"/> -->
1490	+
1491	+	<!-- HOWTO debug print a path id -->
1492	+	<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1493	+	<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1494	+
1495	+	<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1496	+	<!--   organisation="com.google.guava" module="guava-tests"/> -->
1497	+	<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1498	+	<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1499	+	<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1500	+	<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1501	+
1502	+	<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1503	+	<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1504	+	<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1505	+	<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1506	+
1507	+	<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1508	+	<!--   type="*" inline="true" conf="*(private),*(public)" -->
1509	+	<!--   pattern="${guava.dir}/[artifact].[ext]" -->
1510	+	<!--   organisation="com.google.guava" module="guava-testlib"/> -->
1511	+
1512	+	<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1513	+	<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1514	+	<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1515	+
1516	+	<target name="init-ivy">
1517	+	<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1518	+	dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1519	+	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1520	+	classpath="${build.dir}/ivy.jar"/>
1521	+	</target>
1522	+
1523	+	<target name="guava-tests" depends="jar, init-ivy"
1524	+	description="Guava tests run against jsr166 collections">
1525	+	<property name="guava.dir" value="${build.dir}/guava-testlib"/>
1526	+	<mkdir dir="${guava.dir}"/>
1527	+	<ivy:retrieve pathid="guava.testlib.classpath"
1528	+	type="jar,bundle" inline="true" conf="default,master"
1529	+	pattern="${guava.dir}/[artifact].[ext]"
1530	+	organisation="com.google.guava" module="guava-testlib"/>
1531	+	<property name="guava.version" value="21.0"/>
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="${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"/>
1540	+	<path refid="guava.testlib.classpath"/>
1541	+	</classpath>
1542	+
1543	+	<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1544	+	<test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1545	+	</junit>
1546	+	</target>
1547	+
1548		</project>

Diff Legend

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