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.224 by jsr166, Thu Nov 24 01:58:04 2016 UTC vs.
Revision 1.299 by jsr166, Fri Jun 14 20:10:53 2019 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	+	$HOME/jdk/jdk13
28	+	$HOME/jdk/jdk14
29		where each of the above is a JDK or a symlink to same, and
25	–	$HOME/jdk/src/jdk6
26	–	$HOME/jdk/src/jdk7
30		$HOME/jdk/src/jdk8
31		$HOME/jdk/src/jdk9
32	+	$HOME/jdk/src/jdk10
33	+	$HOME/jdk/src/jdk11
34	+	$HOME/jdk/src/jdk12
35	+	$HOME/jdk/src/jdk13
36	+	$HOME/jdk/src/jdk14
37		where each of the above is a complete JDK source tree
38		(e.g. mercurial forest) or a symlink to same.
39
40		Alternatively, define ant variables thus:
41		ant -Djdk$N.home=... -Djdk$N.src.home=...
42	<	for $N in 6 7 8 9 ...
42	>	for $N in 8 .. 14 ...
43
44	<	As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37	<	target is currently broken.
44	>	As of 2016-03, the sources in src/main are for jdk9+ only.
45		------------------------------------------------------------------------------
46		</description>
47
#	Line 52 | Line 59
59
60
61		<!-- Compilation options -->
55	–	<property name="build.sourcelevel"    value="6"/>
62		<property name="build.debug"          value="true"/>
63		<property name="build.debuglevel"     value="source,lines,vars"/>
64		<property name="build.deprecation"    value="false"/>
#	Line 103 | Line 109
109		<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
110		unless:set="have.java.base"/>
111		<local name="modules"/>
112	<	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
112	>	<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
113		<local name="boot.jar.dir"/>
114		<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
115		<path id="bootclasspath@{v}" unless:set="modules">
#	Line 133 | Line 139
139		<defjdklocations v="7"/>
140		<defjdklocations v="8"/>
141		<defjdklocations v="9"/>
142	+	<defjdklocations v="10"/>
143	+	<defjdklocations v="11"/>
144	+	<defjdklocations v="12"/>
145	+	<defjdklocations v="13"/>
146	+	<defjdklocations v="14"/>
147
148		<!-- Source locations -->
149		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 142 | Line 153
153		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
154		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
155		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
156	+	<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
157	+	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
158	+	<property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
159	+	<property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
160	+	<property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
161		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
162		<property name="lib.dir"              location="${basedir}/lib"/>
163		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 181 | Line 197
197		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
198
199		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
200	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
201	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
202	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
203	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
204	<	<!-- The expected canonical location does not yet exist as of 2016-04 -->
205	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
206	<	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
207	<	<!-- Default jdk doc location (latest stable release seems best) -->
208	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
200	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
201	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
202	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
203	>	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
204	>	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
205	>	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
206	>	<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
207	>	<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
208	>	<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
209	>	<!-- The location of jdk early access docs (RIP) -->
210	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
211	>	<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
212	>	<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
213	>	<!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
214	>	<property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
215	>	<property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
216	>	<!-- Default jdk doc location (latest stable LTS release seems best) -->
217	>	<property name="java.docroot.url"   value="${java11.docroot.url}"/>
218
219		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
220		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 197 | Line 222
222		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
223		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
224		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
225	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
226	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
227	+	<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
228	+	<property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
229	+	<property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
230		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
231
232		<!-- Define the "jtreg" task -->
#	Line 229 | Line 259
259
260		<local name="modules"/>
261		<condition property="modules">
262	<	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
262	>	<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
263	>	</condition>
264	>
265	>	<local name="use-doclint"/>
266	>	<condition property="use-doclint">
267	>	<not> <equals arg1="@{target}" arg2="7"/> </not>
268		</condition>
269
270		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 251 | Line 286
286		<include name="*.java"/>
287		<compilerarg value="-XDignore.symbol.file=true"/>
288		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
289	+	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
290		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
291	<	<compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
291	>	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
292		<compilerarg line="${build.args}"/>
293		<javac-elements/>
294
#	Line 263 | Line 299
299		jvm="${java@{target}}"
300		fork="true">
301		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
302	<	<jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
302	>	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
303	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
304	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
305	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
306	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
307	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
308		<jvmarg line="@{jvmflags}"/>
309		<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
310		<jvmarg line="${vmoptions}" if:set="vmoptions"/>
#	Line 285 | Line 326
326		</macrodef>
327
328		<!-- Define jtreg test sets for different jdk versions -->
329	<	<fileset dir="${jtreg9.src.dir}">
330	<	<patternset id="jdk9.jtreg.tests">
331	<	<include name="**/*.java"/>
332	<	</patternset>
333	<	</fileset>
334	<
335	<	<fileset dir="${jtreg8.src.dir}">
336	<	<patternset id="jdk8.jtreg.tests">
337	<	<include name="**/*.java"/>
338	<	<exclude name="**/SpliteratorCharacteristics.java"/>
339	<	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
340	<	<exclude name="**/GCDuringIteration.java"/>
341	<	</patternset>
301	<	</fileset>
329	>	<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
330	>	<!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
331	>	<property name="jtreg.test.pattern" value="**/*.java"/>
332	>	<macrodef name="defjtregtests">
333	>	<attribute name="v"/>
334	>	<sequential>
335	>	<fileset dir="${jtreg@{v}.src.dir}">
336	>	<patternset id="jdk@{v}.jtreg.tests">
337	>	<include name="${jtreg.test.pattern}"/>
338	>	</patternset>
339	>	</fileset>
340	>	</sequential>
341	>	</macrodef>
342
343	<	<fileset dir="${jtreg7.src.dir}">
344	<	<patternset id="jdk7.jtreg.tests">
345	<	<include name="**/*.java"/>
346	<	</patternset>
347	<	</fileset>
343	>	<defjtregtests v="14"/>
344	>	<defjtregtests v="13"/>
345	>	<defjtregtests v="12"/>
346	>	<defjtregtests v="11"/>
347	>	<defjtregtests v="10"/>
348	>	<defjtregtests v="9"/>
349	>	<defjtregtests v="8"/>
350	>	<defjtregtests v="7"/>
351
352		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
353		<property name="jtreg.flags" value=""/>
354
355		<macrodef name="run-jtreg-tests">
356	<	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
314	<	<attribute name="source" default="7"/>
356	>	<!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
357		<attribute name="target"/>
358		<attribute name="workdir"/>
359		<attribute name="classes"/>
360	+	<attribute name="verbose" default="${jtreg.verbose}"/>
361		<attribute name="jtregflags" default=""/>
362	+	<element name="jtreg-elements" optional="true"/>
363
364		<sequential>
365
#	Line 324 | Line 368
368
369		<local name="modules"/>
370		<condition property="modules">
371	<	<available file="${jdk@{target}.home}/jmods" type="dir"/>
371	>	<available file="${jdk@{target}.home}/lib/modules" type="file"/>
372		</condition>
373
374		<delete dir="@{workdir}/JTwork"   quiet="true"/>
#	Line 333 | Line 377
377		workDir="@{workdir}/JTwork">
378		<patternset refid="jdk@{target}.jtreg.tests"/>
379		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
380	<	<arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
381	<	<arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
380	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
381	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
382		<arg value="-agentvm"/>
383		<arg value="-noreport"/>
384	<	<arg value="-verbose:${jtreg.verbose}"/>
384	>	<arg value="-verbose:@{verbose}"/>
385		<arg value="-vmoptions:-esa -ea"/>
386		<arg value="-automatic"/>
387		<arg value="-k:!ignore"/>
388		<arg line="@{jtregflags}"/>
389		<arg line="${jtreg.flags}"/>
390	+	<jtreg-elements/>
391		</jtreg>
392		</sequential>
393		</macrodef>
#	Line 358 | Line 403
403
404		<!-- Main targets -->
405
406	<	<property name="build.main.java.version" value="9"/>
406	>	<!-- Default values: may seem strange ... -->
407	>	<!-- At runtime, target latest LTS, i.e. jdk11 -->
408	>	<!-- But at build time, target jdk9, for maximal binary portability -->
409	>	<!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
410	>	o override-methods=summary
411	>	o {@systemProperty ...}
412	>	o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
413	>	o 8202628: javadoc generates bad links in TestModules.java
414	>	-->
415	>	<property name="java.runtime.target" value="11"/>
416	>	<property name="build.main.java" value="${java11}"/>
417		<property name="build.main.javac" value="${javac9}"/>
418	+	<property name="build.main.javadoc" value="${javadoc12}"/>
419	+	<property name="build.main.javadoc.source" value="${java.runtime.target}"/>
420
421		<target name="dists"
422	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
422	>	depends="dist, 4jdk8dist"
423		description="Builds all public jars and docs"/>
424	+	<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
425
426		<target name="compile"
427		depends="configure-compiler"
428		description="Compiles src/main sources to build dir">
429
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	–
430		<local name="destdir"/>
431	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
382	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
431	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
432
433		<mkdir dir="${destdir}"/>
434
#	Line 396 | Line 445
445		fork="true">
446
447		<include name="**/*.java"/>
448	<	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
448	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
449		<compilerarg value="-Xprefer:source"/>
450		<compilerarg value="-XDignore.symbol.file=true"/>
451	<	<compilerarg value="-Xlint:all"/>
451	>	<compilerarg value="-Xlint:all,-removal"/>
452	>	<compilerarg line="--doclint-format html5"/>
453	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
454	>	<compilerarg value="-Xdoclint/package:java.util.*"/>
455		<compilerarg value="-Werror"/>
404	–	<compilerarg value="-Xdoclint:all/protected"/>
456		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
457		<compilerarg line="${build.args}"/>
458
#	Line 433 | Line 484
484		<!-- the packagenames="none" hack below prevents scanning the -->
485		<!-- sourcepath for packages -->
486
487	<	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
488	<	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
487	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
488	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
489	>	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
490	>	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
491	>	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
492		<javadoc destdir="${docs.dir}"
493		packagenames="none"
494	<	link="${java9.api.url}"
494	>	link="${java.api.url}"
495		overview="${src.dir}/intro.html"
496		access="${build.javadoc.access}"
497		sourcepath="${src.dir}"
498		classpath=""
499	<	executable="${javadoc9}">
499	>	source="${build.main.javadoc.source}"
500	>	executable="${build.main.javadoc}">
501	>	<!-- TODO: JDK-8214571 failonerror = "true" -->
502		<fileset dir="${src.dir}" defaultexcludes="yes">
503		<include name="**/*.java"/>
504		</fileset>
505	<	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
505	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
506		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
507		<arg value="-XDignore.symbol.file=true"/>
508	<	<arg value="-Xmodule:java.base"/>
509	<	<arg value="-tag"/>
510	<	<arg value="${javadoc.jls.option}"/>
511	<	<!-- @apiNote currently unused -->
512	<	<!--       <arg value="-tag"/> -->
513	<	<!--       <arg value="apiNote:a:API Note:"/> -->
514	<	<arg value="-tag"/>
515	<	<arg value="implSpec:a:Implementation Requirements:"/>
516	<	<arg value="-tag"/>
517	<	<arg value="implNote:a:Implementation Note:"/>
508	>	<arg value="-html5"/>
509	>	<arg value="--patch-module=java.base=${src.dir}"/>
510	>	<!-- old school frames via docs/index.html?overview-summary.html -->
511	>	<!-- TODO: - -frames no longer a supported option in jdk13+ -->
512	>	<arg value="--frames"/>
513	>	<arg value="--override-methods=summary"/>
514	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
515	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
516	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
517	>	<arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
518		<!-- tags added in jdk9: currently unused -->
519	<	<!--       <arg value="-tag"/> -->
520	<	<!--       <arg value="revised:X"/> -->
465	<	<!--       <arg value="-tag"/> -->
466	<	<!--       <arg value="spec:X"/> -->
519	>	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
520	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
521		</javadoc>
522		</target>
523
#	Line 473 | Line 527
527		description="Puts all distributable products in single hierarchy"/>
528
529
476	–	<target name="release"
477	–	depends="dist"
478	–	description="Puts entire CVS tree, plus distribution productions, in a jar">
479	–
480	–	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
481	–
482	–	<jar basedir="${basedir}" destfile="${release.jar}">
483	–	<!-- <exclude name="build/**"/> -->
484	–	<exclude name="${release.jar}"/>
485	–	<exclude name="user.properties"/>
486	–	<exclude name="etc/notes/**"/>
487	–	<exclude name="src/emulation/**"/>
488	–	<exclude name="**/SyntaxTest.java"/>
489	–	<exclude name="**/SuperfluousAbstract.java"/>
490	–	<manifest>
491	–	<attribute name="Built-By" value="${user.name}"/>
492	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
493	–	</manifest>
494	–	</jar>
495	–	</target>
496	–
497	–
530		<target name="clean"
531		description="Removes all build products">
500	–
532		<delete dir="${build.dir}"/>
502	–
533		</target>
534
535
536		<target name="dist-clean"
537		description="Removes all build and distribution products">
508	–
538		<delete dir="${build.dir}"/>
539		<delete dir="${dist.dir}"/>
511	–
540		</target>
541
542
#	Line 527 | Line 555
555		description="Runs tck tests for src/main directly">
556
557		<run-tck-tests
558	<	target="${build.main.java.version}"
558	>	target="${java.runtime.target}"
559		workdir="${build.dir}"
560	<	classes="${product.jar}"/>
560	>	classes="${product.jar}">
561	>	<javac-elements>
562	>	<compilerarg value="-Werror"/>
563	>	</javac-elements>
564	>	</run-tck-tests>
565		</target>
566
567		<target name="tck-parallelism-1"
#	Line 557 | Line 589
589		depends="jar"
590		description="Runs jtreg tests for src/main using the jtreg ant task">
591		<run-jtreg-tests
592	<	target="${build.main.java.version}"
592	>	target="${java.runtime.target}"
593		workdir="${build.dir}"
594		classes="${product.jar}"/>
595		</target>
596
597		<target name="test"
598		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
599	<	description="Runs tck and jtreg tests for src/main">
599	>	description="Runs tck and jtreg tests for src/main"/>
600	>
601	>	<target name="test-version-permutations"
602	>	depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">
603		</target>
604
605	<	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
605	>	<target name="test9">
606	>	<antcall target="clean"/>
607	>	<antcall>
608	>	<param name="java.runtime.target" value="9"/>
609	>	<param name="build.main.javac" value="${javac9}"/>
610	>	<param name="build.main.javadoc" value="${javadoc12}"/>
611	>	<param name="build.main.javadoc.source" value="9"/>
612	>	<target name="test"/>
613	>	<target name="docs"/>
614	>	</antcall>
615	>	</target>
616
617	<	<!--     <antcall target="jtreg"> -->
618	<	<!--       <param name="build.main.java.version" value="8"/> -->
619	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
620	<	<!--     </antcall> -->
617	>	<target name="test10">
618	>	<antcall target="clean"/>
619	>	<antcall>
620	>	<param name="java.runtime.target" value="10"/>
621	>	<param name="build.main.javac" value="${javac10}"/>
622	>	<param name="build.main.javadoc" value="${javadoc12}"/>
623	>	<param name="build.main.javadoc.source" value="10"/>
624	>	<target name="test"/>
625	>	<target name="docs"/>
626	>	</antcall>
627	>	</target>
628
629	<	<!--   </target> -->
629	>	<target name="test11">
630	>	<antcall target="clean"/>
631	>	<antcall>
632	>	<param name="java.runtime.target" value="11"/>
633	>	<param name="build.main.javac" value="${javac11}"/>
634	>	<param name="build.main.javadoc" value="${javadoc12}"/>
635	>	<param name="build.main.javadoc.source" value="11"/>
636	>	<target name="test"/>
637	>	<target name="docs"/>
638	>	</antcall>
639	>	</target>
640
641	<	<!--   <target name="test89" -->
642	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
641	>	<target name="test12">
642	>	<antcall target="clean"/>
643	>	<antcall>
644	>	<param name="java.runtime.target" value="12"/>
645	>	<param name="build.main.javac" value="${javac12}"/>
646	>	<param name="build.main.javadoc" value="${javadoc12}"/>
647	>	<param name="build.main.javadoc.source" value="12"/>
648	>	<target name="test"/>
649	>	<target name="docs"/>
650	>	</antcall>
651	>	</target>
652
653	<	<!--     <antcall target="clean"/> -->
654	<	<!--     <antcall target="test"> -->
655	<	<!--       <param name="build.main.java.version" value="8"/> -->
656	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
657	<	<!--     </antcall> -->
653	>	<target name="test13">
654	>	<antcall target="clean"/>
655	>	<antcall>
656	>	<param name="java.runtime.target" value="13"/>
657	>	<param name="build.main.javac" value="${javac13}"/>
658	>	<param name="build.main.javadoc" value="${javadoc13}"/>
659	>	<param name="build.main.javadoc.source" value="13"/>
660	>	<target name="test"/>
661	>	<target name="docs"/>
662	>	</antcall>
663	>	</target>
664
665	<	<!--     <antcall target="clean"/> -->
666	<	<!--     <antcall target="test"> -->
667	<	<!--       <param name="build.main.java.version" value="9"/> -->
668	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
669	<	<!--     </antcall> -->
665	>	<target name="test14">
666	>	<antcall target="clean"/>
667	>	<antcall>
668	>	<param name="java.runtime.target" value="14"/>
669	>	<param name="build.main.javac" value="${javac14}"/>
670	>	<param name="build.main.javadoc" value="${javadoc14}"/>
671	>	<param name="build.main.javadoc.source" value="14"/>
672	>	<target name="test"/>
673	>	<target name="docs"/>
674	>	</antcall>
675	>	</target>
676
677	<	<!--   </target> -->
677	>	<target name="test9-11">
678	>	<antcall target="clean"/>
679	>	<antcall>
680	>	<param name="java.runtime.target" value="11"/>
681	>	<param name="build.main.javac" value="${javac9}"/>
682	>	<param name="build.main.javadoc" value="${javadoc12}"/>
683	>	<param name="build.main.javadoc.source" value="9"/>
684	>	<target name="test"/>
685	>	<target name="docs"/>
686	>	</antcall>
687	>	</target>
688	>
689	>	<target name="test9-12">
690	>	<antcall target="clean"/>
691	>	<antcall>
692	>	<param name="java.runtime.target" value="12"/>
693	>	<param name="build.main.javac" value="${javac9}"/>
694	>	<param name="build.main.javadoc" value="${javadoc12}"/>
695	>	<param name="build.main.javadoc.source" value="9"/>
696	>	<target name="test"/>
697	>	<target name="docs"/>
698	>	</antcall>
699	>	</target>
700	>
701	>	<target name="test9-13">
702	>	<antcall target="clean"/>
703	>	<antcall>
704	>	<param name="java.runtime.target" value="13"/>
705	>	<param name="build.main.javac" value="${javac9}"/>
706	>	<param name="build.main.javadoc" value="${javadoc13}"/>
707	>	<param name="build.main.javadoc.source" value="9"/>
708	>	<target name="test"/>
709	>	<target name="docs"/>
710	>	</antcall>
711	>	</target>
712
713	+	<target name="test9-14">
714	+	<antcall target="clean"/>
715	+	<antcall>
716	+	<param name="java.runtime.target" value="14"/>
717	+	<param name="build.main.javac" value="${javac9}"/>
718	+	<param name="build.main.javadoc" value="${javadoc14}"/>
719	+	<param name="build.main.javadoc.source" value="9"/>
720	+	<target name="test"/>
721	+	<target name="docs"/>
722	+	</antcall>
723	+	</target>
724
725
726		<target name="configure-compiler">
727		<fail message="ant version too old">
728	<	<condition>
601	<	<not> <antversion atleast="1.9.1"/> </not>
602	<	</condition>
728	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
729		</fail>
730
731		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 617 | Line 743
743		</target>
744
745
620	–
621	–	<!-- Various demos and test programs -->
622	–
623	–
624	–	<!-- description="Benchmark from Doug Lea's AQS paper" -->
625	–	<target name="loops" depends="configure-compiler">
626	–
627	–	<mkdir dir="${build.loops.dir}"/>
628	–
629	–	<javac srcdir="${loops.src.dir}"
630	–	destdir="${build.loops.dir}"
631	–	debug="${build.debug}"
632	–	debuglevel="${build.debuglevel}"
633	–	deprecation="${build.deprecation}"
634	–	source="${build.sourcelevel}"
635	–	target="${build.sourcelevel}"
636	–	encoding="ASCII"
637	–	fork="true">
638	–
639	–	<compilerarg line="${build.args}"/>
640	–	<classpath refid="loops.classpath"/>
641	–	<compilerarg value="-XDignore.symbol.file=true"/>
642	–
643	–	</javac>
644	–
645	–	<java classname="ALoops" fork="true">
646	–	<classpath refid="loops.classpath"/>
647	–	</java>
648	–
649	–	</target>
650	–
651	–
746		<target name="compile-test-loops" depends="jar"
747	<	description="compile all the perf tests in src/test/loops">
747	>	description="Compiles all the perf tests in src/test/loops">
748
749		<mkdir dir="${build.dir}/test/loops"/>
750
#	Line 662 | Line 756
756		includeAntRuntime="false"
757		includeJavaRuntime="false"
758		encoding="ASCII"
759	<	executable="${javac9}"
759	>	executable="${build.main.javac}"
760		fork="true">
761
762		<include name="*.java"/>
#	Line 670 | Line 764
764		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
765		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
766		<compilerarg line="${build.args}"/>
673	–
767		</javac>
675	–
768		</target>
769
770
#	Line 698 | Line 790
790		encoding="ASCII"
791		executable="${javac8}"
792		fork="true">
701	–
793		<include name="**/*.java"/>
794		<compilerarg value="-Xprefer:source"/>
795		<compilerarg value="-XDignore.symbol.file=true"/>
796		<compilerarg value="-Xlint:all"/>
797		<compilerarg value="-Werror"/>
798		<compilerarg line="${build.args}"/>
708	–
799		</javac>
800		</target>
801
#	Line 729 | Line 819
819		encoding="ASCII"
820		executable="${javac8}"
821		fork="true">
732	–
822		<include name="**/*.java"/>
823		<compilerarg value="-Xprefer:source"/>
824		<compilerarg value="-XDignore.symbol.file=true"/>
825		<compilerarg value="-Xlint:all"/>
826	<	<compilerarg value="-Xdoclint:all/protected"/>
826	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
827		<compilerarg line="${build.args}"/>
739	–
828		</javac>
829		</target>
830
#	Line 752 | Line 840
840		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
841		</manifest>
842		</jar>
755	–
843		</target>
844
845
#	Line 768 | Line 855
855		<!-- JDK9+ test classes -->
856		<exclude name="*9Test.java"/>
857		<exclude name="*10Test.java"/>
858	+	<compilerarg value="-Werror"/>
859		</javac-elements>
860		</run-tck-tests>
861		</target>
#	Line 785 | Line 873
873
874		<target name="4jdk8-test"
875		depends="4jdk8-tck, 4jdk8-jtreg"
876	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
789	<	</target>
876	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
877
878
879		<target name="4jdk8docs"
#	Line 802 | Line 889
889		access="${build.javadoc.access}"
890		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
891		classpath=""
892	+	source="8"
893		executable="${javadoc8}"
894		failonerror = "true">
895		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 809 | Line 897
897		</fileset>
898		<arg line="-Xdocrootparent ${java8.docroot.url}"/>
899		<arg value="-XDignore.symbol.file=true"/>
900	<	<arg value="-tag"/>
901	<	<arg value="${javadoc.jls.option}"/>
902	<	<!-- @apiNote currently unused -->
903	<	<!--       <arg value="-tag"/> -->
904	<	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
817	<	<arg value="-tag"/>
818	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
819	<	<arg value="-tag"/>
820	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
900	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
901	>	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
902	>	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
903	>	<!-- @apiNote tag currently unused -->
904	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
905		</javadoc>
906		</target>
907
#	Line 829 | Line 913
913
914		<target name="4jdk8clean"
915		description="Removes all 4jdk8 build products">
832	–
916		<delete dir="${build.4jdk8.dir}"/>
834	–
917		</target>
918
919
#	Line 847 | Line 929
929		</target>
930
931
932	+	<!-- jsr166 4jdk7 (no longer maintained) -->
933
934	<	<!-- jsr166 4jdk7 -->
852	<
853	<	<target name="4jdk7compile"
854	<	depends="configure-compiler"
855	<	description="Compiles src/jdk7 sources, targeting jdk7">
856	<
934	>	<target name="4jdk7compile" depends="configure-compiler">
935		<mkdir dir="${build.4jdk7.classes.dir}"/>
936
937		<javac srcdir="${4jdk7src.dir}"
#	Line 877 | Line 955
955		<compilerarg value="-Xlint:all"/>
956		<compilerarg value="-Werror"/>
957		<compilerarg line="${build.args}"/>
880	–
958		</javac>
959		</target>
960
961	<	<target name="4jdk7doclint"
885	<	depends="configure-compiler"
886	<	description="Finds doclint warnings">
887	<
961	>	<target name="4jdk7doclint" depends="configure-compiler">
962		<mkdir dir="${build.4jdk7.classes.dir}"/>
963
964		<javac srcdir="${4jdk7src.dir}"
#	Line 908 | Line 982
982		<compilerarg value="-Xlint:all"/>
983		<compilerarg value="-Xdoclint:all/protected"/>
984		<compilerarg line="${build.args}"/>
911	–
985		</javac>
986		</target>
987
988	<
916	<	<target name="4jdk7jar"
917	<	depends="4jdk7compile"
918	<	description="Builds library jar from compiled sources">
919	<
988	>	<target name="4jdk7jar" depends="4jdk7compile">
989		<jar destfile="${4jdk7product.jar}">
990		<fileset dir="${build.4jdk7.classes.dir}"/>
991		<manifest>
#	Line 924 | Line 993
993		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
994		</manifest>
995		</jar>
927	–
996		</target>
997
998	<
931	<	<target name="4jdk7-tck"
932	<	depends="4jdk7jar"
933	<	description="Runs tck tests for jsr166-4jdk7 directly">
934	<
998	>	<target name="4jdk7-tck" depends="4jdk7jar">
999		<run-tck-tests
1000		target="7"
1001		workdir="${build.4jdk7.dir}"
#	Line 949 | Line 1013
1013		<exclude name="SplittableRandomTest.java"/>
1014		<exclude name="StampedLockTest.java"/>
1015		<exclude name="SubmissionPublisherTest.java"/>
1016	+	<compilerarg value="-Werror"/>
1017		</javac-elements>
1018		</run-tck-tests>
1019		</target>
1020
956	–
1021		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
1022	<	<target name="4jdk7-tck-junit"
959	<	depends="4jdk7compile">
1022	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
1023
1024		<junit printsummary="true"
1025		showoutput="true"
#	Line 978 | Line 1041
1041
1042		<test name="${jsr166.tckTestClass}" haltonfailure="no">
1043		</test>
981	–
1044		</junit>
1045		</target>
1046
1047	<	<target name="4jdk7-jtreg"
986	<	depends="4jdk7jar"
987	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1047	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
1048		<run-jtreg-tests
1049		target="7"
1050		workdir="${build.4jdk7.dir}"
1051		classes="${4jdk7product.jar}"/>
1052		</target>
1053
1054	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1055
1056	<	<target name="4jdk7-test"
996	<	depends="4jdk7-tck, 4jdk7-jtreg"
997	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
998	<	</target>
999	<
1000	<
1001	<	<target name="4jdk7docs"
1002	<	description="Builds javadocs for src/jdk7 to dist dir">
1003	<
1056	>	<target name="4jdk7docs">
1057		<delete dir="${4jdk7docs.dir}"/>
1058		<mkdir dir="${4jdk7docs.dir}"/>
1059
#	Line 1021 | Line 1074
1074		</javadoc>
1075		</target>
1076
1077	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1078
1079	<	<target name="4jdk7dist"
1026	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1027	<	description="Puts all distributable products in single hierarchy"/>
1028	<
1029	<
1030	<	<target name="4jdk7clean"
1031	<	description="Removes all 4jdk7 build products">
1032	<
1079	>	<target name="4jdk7clean">
1080		<delete dir="${build.4jdk7.dir}"/>
1034	–
1081		</target>
1082
1083	<
1038	<	<target name="4jdk7dist-jar"
1039	<	depends="4jdk7clean, 4jdk7jar">
1083	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1084		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1085		</target>
1086
1087	<
1044	<	<target name="4jdk7dist-docs"
1045	<	depends="4jdk7clean, 4jdk7docs">
1087	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1088		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1089		</target>
1090
1091
1092	<	<!-- jsr166x -->
1051	<
1052	<	<target name="jsr166xcompile"
1053	<	depends="configure-compiler"
1054	<	description="Compiles jsr166x sources to build dir">
1092	>	<!-- jsr166x (no longer maintained) -->
1093
1094	+	<target name="jsr166xcompile" depends="configure-compiler">
1095		<mkdir dir="${build.jsr166x.classes.dir}"/>
1096
1097		<javac srcdir="${topsrc.dir}"
#	Line 1069 | Line 1108
1108		encoding="ASCII"
1109		executable="${javac7}"
1110		fork="true">
1072	–
1111		<include name="jsr166x/**/*.java"/>
1112		<compilerarg value="-XDignore.symbol.file=true"/>
1113		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1114		<compilerarg value="-Werror"/>
1115		<compilerarg line="${build.args}"/>
1078	–
1116		</javac>
1117		</target>
1118
1119	<
1083	<	<target name="jsr166xjar"
1084	<	depends="jsr166xcompile"
1085	<	description="Builds library jar from compiled sources">
1086	<
1119	>	<target name="jsr166xjar" depends="jsr166xcompile">
1120		<jar destfile="${jsr166x.jar}">
1121		<fileset dir="${build.jsr166x.classes.dir}"/>
1122		<manifest>
#	Line 1091 | Line 1124
1124		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1125		</manifest>
1126		</jar>
1094	–
1127		</target>
1128
1129	<
1098	<	<target name="jsr166xdocs"
1099	<	description="Builds javadocs to dist dir">
1100	<
1129	>	<target name="jsr166xdocs">
1130		<delete dir="${jsr166xdocs.dir}"/>
1131		<mkdir dir="${jsr166xdocs.dir}"/>
1132
#	Line 1112 | Line 1141
1141		failonerror = "true">
1142		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1143		<arg value="-XDignore.symbol.file=true"/>
1115	–
1144		</javadoc>
1145		</target>
1146
1147	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1148
1149	<	<target name="jsr166xdist"
1121	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1122	<	description="Puts all distributable products in single hierarchy"/>
1123	<
1124	<
1125	<	<target name="jsr166xclean"
1126	<	description="Removes all jsr166x build products">
1127	<
1149	>	<target name="jsr166xclean">
1150		<delete dir="${build.jsr166x.dir}"/>
1129	–
1151		</target>
1152
1153	<
1133	<	<target name="jsr166xdist-jar"
1134	<	depends="jsr166xclean, jsr166xjar">
1153	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1154		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1155		</target>
1156
1157	<	<target name="jsr166xdist-docs"
1139	<	depends="jsr166xclean, jsr166xdocs">
1157	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1158		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1159		</target>
1160
1143	–	<!-- jsr166y -->
1161
1162	+	<!-- jsr166y (no longer maintained) -->
1163
1164	<	<target name="jsr166ycompile"
1147	<	depends="configure-compiler"
1148	<	description="Compiles jsr166y sources">
1149	<
1164	>	<target name="jsr166ycompile" depends="configure-compiler">
1165		<mkdir dir="${build.jsr166y.classes.dir}"/>
1166
1167		<javac srcdir="${topsrc.dir}"
#	Line 1169 | Line 1184
1184		<compilerarg value="-Xlint:all"/>
1185		<compilerarg value="-Werror"/>
1186		<compilerarg line="${build.args}"/>
1172	–
1187		</javac>
1188		</target>
1189
1190	<
1177	<	<target name="jsr166yjar"
1178	<	depends="jsr166ycompile"
1179	<	description="Builds library jar from compiled sources">
1180	<
1190	>	<target name="jsr166yjar" depends="jsr166ycompile">
1191		<jar destfile="${jsr166y.jar}" index="true">
1192		<fileset dir="${build.jsr166y.classes.dir}"/>
1193		<manifest>
#	Line 1185 | Line 1195
1195		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1196		</manifest>
1197		</jar>
1188	–
1198		</target>
1199
1200	<
1192	<	<target name="jsr166ydocs"
1193	<	description="Builds javadocs to dist dir">
1194	<
1200	>	<target name="jsr166ydocs">
1201		<delete dir="${jsr166ydocs.dir}"/>
1202		<mkdir dir="${jsr166ydocs.dir}"/>
1203
#	Line 1206 | Line 1212
1212		failonerror = "true">
1213		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1214		<arg value="-XDignore.symbol.file=true"/>
1209	–
1215		</javadoc>
1216		</target>
1217
1218	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1219
1220	<	<target name="jsr166ydist"
1215	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1216	<	description="Puts all distributable products in single hierarchy"/>
1217	<
1218	<
1219	<	<target name="jsr166yclean"
1220	<	description="Removes all jsr166y build products">
1221	<
1220	>	<target name="jsr166yclean">
1221		<delete dir="${build.jsr166y.dir}"/>
1223	–
1222		</target>
1223
1224	<
1227	<	<target name="jsr166ydist-jar"
1228	<	depends="jsr166yclean, jsr166yjar">
1224	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1225		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1226		</target>
1227
1228	<	<target name="jsr166ydist-docs"
1233	<	depends="jsr166yclean, jsr166ydocs">
1228	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1229		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1230		</target>
1231
1232
1233	<	<!-- extra166y -->
1239	<
1240	<
1241	<	<target name="extra166ycompile"
1242	<	depends="configure-compiler, jsr166yjar"
1243	<	description="Compiles extra166y sources">
1233	>	<!-- extra166y (no longer maintained) -->
1234
1235	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1236		<mkdir dir="${build.extra166y.classes.dir}"/>
1237
1238		<javac srcdir="${topsrc.dir}"
#	Line 1264 | Line 1255
1255		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1256		<compilerarg value="-Werror"/>
1257		<compilerarg line="${build.args}"/>
1267	–
1258		</javac>
1259		</target>
1260
1261	<
1272	<	<target name="extra166yjar"
1273	<	depends="extra166ycompile"
1274	<	description="Builds library jar from compiled sources">
1275	<
1261	>	<target name="extra166yjar" depends="extra166ycompile">
1262		<jar destfile="${extra166y.jar}" index="true">
1263		<fileset dir="${build.extra166y.classes.dir}"/>
1264		<manifest>
#	Line 1280 | Line 1266
1266		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1267		</manifest>
1268		</jar>
1283	–
1269		</target>
1270
1271	<
1287	<	<target name="extra166ydocs"
1288	<	description="Builds javadocs to build dir">
1289	<
1271	>	<target name="extra166ydocs">
1272		<delete dir="${extra166ydocs.dir}"/>
1273		<mkdir dir="${extra166ydocs.dir}"/>
1274
#	Line 1300 | Line 1282
1282		executable="${javadoc7}">
1283		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1284		<arg value="-XDignore.symbol.file=true"/>
1303	–
1285		</javadoc>
1286		</target>
1287
1288	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1289
1290	<	<target name="extra166ydist"
1309	<	depends="extra166ydist-jar, extra166ydist-docs"
1310	<	description="Puts all distributable products in single hierarchy"/>
1311	<
1312	<
1313	<	<target name="extra166yclean"
1314	<	description="Removes all extra166y build products">
1315	<
1290	>	<target name="extra166yclean">
1291		<delete dir="${build.extra166y.dir}"/>
1317	–
1292		</target>
1293
1294	<
1321	<	<target name="extra166ydist-jar"
1322	<	depends="extra166yclean, extra166yjar">
1294	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1295		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1296		</target>
1297
1298	<	<target name="extra166ydist-docs"
1327	<	depends="extra166yclean, extra166ydocs">
1298	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1299		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1300		</target>
1301
1302	<	<!-- jsr166e -->
1302	>
1303	>	<!-- jsr166e (no longer maintained) -->
1304
1305		<property name="build.jsr166e.java.version" value="6"/>
1306		<property name="build.jsr166e.javac" value="${javac6}"/>
1307
1308	<	<target name="jsr166ecompile"
1337	<	depends="configure-compiler"
1338	<	description="Compiles jsr166e sources">
1339	<
1308	>	<target name="jsr166ecompile" depends="configure-compiler">
1309		<mkdir dir="${build.jsr166e.classes.dir}"/>
1310
1311		<javac srcdir="${topsrc.dir}"
#	Line 1357 | Line 1326
1326		<compilerarg value="-Xlint:all"/>
1327		<compilerarg value="-Werror"/>
1328		<compilerarg line="${build.args}"/>
1360	–
1329		</javac>
1330		</target>
1331
1364	–	<!-- jsr166e: find doclint errors -->
1332		<target name="jsr166edoclint">
1366	–
1333		<mkdir dir="${build.jsr166e.classes.dir}"/>
1334
1335		<javac srcdir="${topsrc.dir}"
#	Line 1385 | Line 1351
1351		<compilerarg value="-Xlint:all"/>
1352		<compilerarg value="-Werror"/>
1353		<compilerarg value="-Xdoclint:all/protected"/>
1388	–
1354		</javac>
1355		</target>
1356
1357	<
1393	<	<target name="jsr166ejar"
1394	<	depends="jsr166ecompile"
1395	<	description="Builds library jar from compiled sources">
1396	<
1357	>	<target name="jsr166ejar" depends="jsr166ecompile">
1358		<jar destfile="${jsr166e.jar}" index="true">
1359		<fileset dir="${build.jsr166e.classes.dir}"/>
1360		<manifest>
#	Line 1401 | Line 1362
1362		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1363		</manifest>
1364		</jar>
1404	–
1365		</target>
1366
1367	<
1408	<	<target name="jsr166edocs"
1409	<	description="Builds javadocs to build dir">
1410	<
1367	>	<target name="jsr166edocs">
1368		<delete dir="${jsr166edocs.dir}"/>
1369		<mkdir dir="${jsr166edocs.dir}"/>
1370
#	Line 1421 | Line 1378
1378		failonerror = "true">
1379		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1380		<arg value="-XDignore.symbol.file=true"/>
1424	–
1381		</javadoc>
1382		</target>
1383
1384	<
1429	<	<target name="jsr166e-tck-one-java-version"
1430	<	depends="jsr166ejar">
1431	<
1384	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1385		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1433	–
1386		<run-tck-tests
1387		tck.src.dir="${test.src.dir}/tck-jsr166e"
1388		target="${build.jsr166e.java.version}"
#	Line 1438 | Line 1390
1390		classes="${jsr166e.jar}"/>
1391		</target>
1392
1393	<	<target name="jsr166e-tck"
1442	<	description="Runs tck tests for jsr166e for multiple java versions">
1393	>	<target name="jsr166e-tck">
1394
1395		<!--     <antcall target="clean"/> -->
1396		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1460 | Line 1411
1411		</antcall>
1412		</target>
1413
1414	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1415
1416	<	<target name="jsr166e-test"
1465	<	depends="jsr166e-tck"
1466	<	description="Runs all tests for jsr166e">
1467	<	</target>
1468	<
1469	<	<target name="jsr166edist"
1470	<	depends="jsr166edist-jar, jsr166edist-docs"
1471	<	description="Puts all distributable products in single hierarchy"/>
1472	<
1416	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1417
1418	<	<target name="jsr166eclean"
1475	<	description="Removes all jsr166e build products">
1418	>	<target name="jsr166eclean">
1419		<delete dir="${build.jsr166e.dir}"/>
1420		</target>
1421
1479	–
1422		<target name="jsr166edist-jar"
1423		depends="jsr166eclean, jsr166ejar">
1424		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1425		</target>
1426
1427	<	<target name="jsr166edist-docs"
1486	<	depends="jsr166eclean, jsr166edocs">
1427	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1428		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1429		</target>
1430
1431
1432		<!-- Find buglets that can be detected by static build tools -->
1433
1434	<	<target name="lint">
1435	<	<antcall target="dists">
1436	<	<param name="build.javadoc.access" value="public"/>
1437	<	</antcall>
1438	<	</target>
1434	>	<!--   <target name="lint"> -->
1435	>	<!--     <antcall target="dists"> -->
1436	>	<!--       <param name="build.javadoc.access" value="protected"/> -->
1437	>	<!--     </antcall> -->
1438	>	<!--   </target> -->
1439
1440		<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1441	<	<target name="lint-private">
1441	>	<target name="doclint-private">
1442		<antcall target="dist">
1443		<param name="build.javadoc.access" value="private"/>
1444		</antcall>
1445		</target>
1446
1447
1448	+	<!-- ==============================================================
1449	+	Experimental errorprone support
1450	+	https://errorprone.info
1451	+	https://errorprone.info/docs/installation
1452	+	https://github.com/google/error-prone/issues/1143
1453	+	=================================================================== -->
1454	+	<path id="errorprone.processorpath.path">
1455	+	<pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1456	+	<pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1457	+	<pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1458	+	<pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1459	+	</path>
1460	+	<property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1461	+	<property name="errorprone.jsr166.user.flags" value=""/>
1462	+	<property name="errorprone.jsr166.flags"
1463	+	value="-Xep:HashtableContains:OFF
1464	+	-Xep:JdkObsolete:OFF
1465	+	-Xep:MissingOverride:OFF
1466	+	-Xep:MissingFail:OFF
1467	+	-Xep:ThreadPriorityCheck:OFF
1468	+	-Xep:MixedArrayDimensions:ERROR
1469	+	-Xep:RemoveUnusedImports:ERROR
1470	+	-Xep:EmptyIf:ERROR
1471	+	-Xep:MultipleTopLevelClasses:ERROR
1472	+	-Xep:ClassName:ERROR
1473	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1474	+	-Xep:RedundantThrows:ERROR
1475	+	-Xep:IdentityBinaryExpression:WARN
1476	+	-Xep:ConstructorInvokesOverridable:WARN
1477	+	-Xep:MethodCanBeStatic:WARN
1478	+	${errorprone.jsr166.user.flags}"/>
1479	+	<!-- -Xep:WildcardImport:ERROR -->
1480	+	<property name="errorprone.jsr166.test.flags"
1481	+	value="-Xep:StringSplitter:OFF
1482	+	-Xep:BoxedPrimitiveConstructor:OFF
1483	+	-Xep:ModifyingCollectionWithItself:OFF"/>
1484	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1485	+	<target name="errorprone"
1486	+	depends="clean, configure-compiler"
1487	+	description="Run errorprone over jsr166 source code (experimental)">
1488	+
1489	+	<local name="destdir"/>
1490	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1491	+	<mkdir dir="${destdir}"/>
1492	+
1493	+	<javac srcdir="${src.dir}"
1494	+	destdir="${destdir}"
1495	+	debug="${build.debug}"
1496	+	debuglevel="${build.debuglevel}"
1497	+	deprecation="${build.deprecation}"
1498	+	classpath=""
1499	+	includeAntRuntime="false"
1500	+	includeJavaRuntime="false"
1501	+	encoding="ASCII"
1502	+	executable="${build.main.javac}"
1503	+	fork="true">
1504	+
1505	+	<include name="**/*.java"/>
1506	+	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1507	+	<compilerarg value="-J--illegal-access=permit"/>
1508	+	<compilerarg value="-XDcompilePolicy=simple"/>
1509	+	<compilerarg value="-processorpath"/>
1510	+	<compilerarg pathref="errorprone.processorpath.path"/>
1511	+	<compilerarg value="-Xplugin:ErrorProne
1512	+	${errorprone.jsr166.flags}"/>
1513	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1514	+	<compilerarg value="-Xprefer:source"/>
1515	+	<compilerarg value="-XDignore.symbol.file=true"/>
1516	+	<compilerarg value="-Xlint:all"/>
1517	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1518	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1519	+	<compilerarg line="${build.args}"/>
1520	+	</javac>
1521	+
1522	+	<jar destfile="${product.jar}">
1523	+	<fileset dir="${destdir}"/>
1524	+	</jar>
1525	+
1526	+	<run-tck-tests
1527	+	target="${java.runtime.target}"
1528	+	workdir="${build.dir}"
1529	+	classes="${product.jar}">
1530	+	<javac-elements>
1531	+	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1532	+	<compilerarg value="-J--illegal-access=permit"/>
1533	+	<compilerarg value="-XDcompilePolicy=simple"/>
1534	+	<compilerarg line="-processorpath ${errorprone.processorpath}"/>
1535	+	<compilerarg value="-Xplugin:ErrorProne
1536	+	${errorprone.jsr166.flags}
1537	+	${errorprone.jsr166.test.flags}"/>
1538	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1539	+	</javac-elements>
1540	+	</run-tck-tests>
1541	+	</target>
1542	+
1543	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1544	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1545	+	<target name="errorprone-jtreg"
1546	+	depends="jar"
1547	+	description="Run errorprone over jtreg tests (experimental)">
1548	+
1549	+	<run-jtreg-tests
1550	+	target="${java.runtime.target}"
1551	+	workdir="${build.dir}"
1552	+	classes="${product.jar}"
1553	+	verbose="all">
1554	+	<jtreg-elements>
1555	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1556	+	<arg value="-javacoption:-processorpath"/>
1557	+	<arg value="-javacoption:${errorprone.processorpath}"/>
1558	+	<arg value="-javacoption:-Xplugin:ErrorProne
1559	+	${errorprone.jsr166.flags}
1560	+	${errorprone.jsr166.test.flags}
1561	+	-Xep:MultipleTopLevelClasses:WARN
1562	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1563	+	</jtreg-elements>
1564	+	</run-jtreg-tests>
1565	+	</target>
1566	+
1567	+
1568	+	<!-- ==============================================================
1569	+	Running guava tests against jsr166 code
1570	+	=================================================================== -->
1571	+
1572	+	<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1573	+	<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1574	+	<!-- <property name="guava.version" value="21.0"/> -->
1575	+
1576	+	<!-- HOWTO debug print a path id -->
1577	+	<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1578	+	<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1579	+
1580	+	<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1581	+	<!--   organisation="com.google.guava" module="guava-tests"/> -->
1582	+	<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1583	+	<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1584	+	<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1585	+	<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1586	+
1587	+	<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1588	+	<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1589	+	<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1590	+	<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1591	+
1592	+	<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1593	+	<!--   type="*" inline="true" conf="*(private),*(public)" -->
1594	+	<!--   pattern="${guava.dir}/[artifact].[ext]" -->
1595	+	<!--   organisation="com.google.guava" module="guava-testlib"/> -->
1596	+
1597	+	<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1598	+	<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1599	+	<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1600	+
1601	+	<target name="init-ivy">
1602	+	<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1603	+	dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1604	+	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1605	+	classpath="${build.dir}/ivy.jar"/>
1606	+	</target>
1607	+
1608	+	<target name="guava-tests" depends="jar, init-ivy"
1609	+	description="Guava tests run against jsr166 collections">
1610	+	<property name="guava.dir" value="${build.dir}/guava-testlib"/>
1611	+	<mkdir dir="${guava.dir}"/>
1612	+	<ivy:retrieve pathid="guava.testlib.classpath"
1613	+	type="jar,bundle" inline="true" conf="default,master"
1614	+	pattern="${guava.dir}/[artifact].[ext]"
1615	+	organisation="com.google.guava" module="guava-testlib"/>
1616	+	<property name="guava.version" value="21.0"/>
1617	+	<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1618	+	dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1619	+	<junit printsummary="true" showoutput="true" haltonfailure="true"
1620	+	jvm="${build.main.java}" fork="true">
1621	+	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1622	+	<formatter type="brief"/>
1623	+	<classpath>
1624	+	<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1625	+	<path refid="guava.testlib.classpath"/>
1626	+	</classpath>
1627	+
1628	+	<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1629	+	<test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1630	+	</junit>
1631	+	</target>
1632	+
1633		</project>

Diff Legend

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