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.202 by jsr166, Sat Mar 26 15:10:14 2016 UTC vs.
Revision 1.278 by jsr166, Mon Oct 1 00:10:52 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
44	<	<!-- Display main targets by running 'ant -projecthelp' -->
44	>	<!-- Run 'ant -projecthelp' (default target) -->
45		<target name="usage">
46		<java classname="org.apache.tools.ant.Main">
47		<arg value="-projecthelp" />
#	Line 63 | Line 66
66		<property name="build.classes.dir"           location="${build.dir}/classes"/>
67		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68		<property name="build.loops.dir"             location="${build.dir}/loops"/>
66	–	<property name="build.reports.dir"           location="${build.dir}/reports"/>
69
70		<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
71		<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
#	Line 104 | Line 106
106		<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107		unless:set="have.java.base"/>
108		<local name="modules"/>
109	<	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
109	>	<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110		<local name="boot.jar.dir"/>
111		<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112		<path id="bootclasspath@{v}" unless:set="modules">
#	Line 134 | Line 136
136		<defjdklocations v="7"/>
137		<defjdklocations v="8"/>
138		<defjdklocations v="9"/>
139	+	<defjdklocations v="10"/>
140	+	<defjdklocations v="11"/>
141	+	<defjdklocations v="12"/>
142
143		<!-- Source locations -->
144		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 143 | Line 148
148		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
149		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
150		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151	+	<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
152	+	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
153	+	<property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
154		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
155		<property name="lib.dir"              location="${basedir}/lib"/>
156		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 182 | Line 190
190		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
191
192		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
193	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
194	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
195	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
196	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
197	<	<!-- The expected canonical location does not yet exist as of 2016-03 -->
198	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
199	<	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
193	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
194	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
195	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
196	>	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
197	>	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
198	>	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
199	>	<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
200	>	<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
201	>	<!-- The location of jdk early access docs (RIP) -->
202	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
203	>	<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
204	>	<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
205	>	<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206		<!-- Default jdk doc location (latest stable release seems best) -->
207	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
207	>	<property name="java.docroot.url"   value="${java11.docroot.url}"/>
208
209		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
210		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 198 | Line 212
212		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
213		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
214		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
215	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
216	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
217	+	<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
218		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
219
220		<!-- Define the "jtreg" task -->
#	Line 230 | Line 247
247
248		<local name="modules"/>
249		<condition property="modules">
250	<	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
250	>	<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
251	>	</condition>
252	>
253	>	<local name="use-doclint"/>
254	>	<condition property="use-doclint">
255	>	<not> <equals arg1="@{target}" arg2="7"/> </not>
256		</condition>
257
258		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 245 | Line 267
267		classpath="${junit.jar}"
268		includeAntRuntime="false"
269		includeJavaRuntime="false"
270	+	encoding="ASCII"
271		executable="${javac@{compile-target}}"
272		fork="true">
273
274		<include name="*.java"/>
275		<compilerarg value="-XDignore.symbol.file=true"/>
276		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
277	+	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
278		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
279	<	<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
279	>	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
280		<compilerarg line="${build.args}"/>
281		<javac-elements/>
282
#	Line 263 | Line 287
287		jvm="${java@{target}}"
288		fork="true">
289		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
290	<	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
290	>	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
291	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
292	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
293	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
294	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
295	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
296		<jvmarg line="@{jvmflags}"/>
297	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
298	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
299
300	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
300	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
301		<syspropertyset id="system-properties-used-by-tck">
302		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
303		<propertyref prefix="jsr166."/>
#	Line 283 | Line 314
314		</macrodef>
315
316		<!-- Define jtreg test sets for different jdk versions -->
317	<	<fileset dir="${jtreg9.src.dir}">
318	<	<patternset id="jdk9.jtreg.tests">
319	<	<include name="**/*.java"/>
320	<	</patternset>
321	<	</fileset>
322	<
323	<	<fileset dir="${jtreg8.src.dir}">
324	<	<patternset id="jdk8.jtreg.tests">
325	<	<include name="**/*.java"/>
326	<	<exclude name="**/SpliteratorCharacteristics.java"/>
327	<	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
328	<	<exclude name="**/GCDuringIteration.java"/>
329	<	</patternset>
299	<	</fileset>
317	>	<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
318	>	<!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
319	>	<property name="jtreg.test.pattern" value="**/*.java"/>
320	>	<macrodef name="defjtregtests">
321	>	<attribute name="v"/>
322	>	<sequential>
323	>	<fileset dir="${jtreg@{v}.src.dir}">
324	>	<patternset id="jdk@{v}.jtreg.tests">
325	>	<include name="${jtreg.test.pattern}"/>
326	>	</patternset>
327	>	</fileset>
328	>	</sequential>
329	>	</macrodef>
330
331	<	<fileset dir="${jtreg7.src.dir}">
332	<	<patternset id="jdk7.jtreg.tests">
333	<	<include name="**/*.java"/>
334	<	</patternset>
335	<	</fileset>
331	>	<defjtregtests v="12"/>
332	>	<defjtregtests v="11"/>
333	>	<defjtregtests v="10"/>
334	>	<defjtregtests v="9"/>
335	>	<defjtregtests v="8"/>
336	>	<defjtregtests v="7"/>
337
338		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
339		<property name="jtreg.flags" value=""/>
340
341		<macrodef name="run-jtreg-tests">
342		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
312	–	<attribute name="source" default="7"/>
343		<attribute name="target"/>
344		<attribute name="workdir"/>
345		<attribute name="classes"/>
346	+	<attribute name="verbose" default="${jtreg.verbose}"/>
347		<attribute name="jtregflags" default=""/>
348	+	<element name="jtreg-elements" optional="true"/>
349
350		<sequential>
351
#	Line 322 | Line 354
354
355		<local name="modules"/>
356		<condition property="modules">
357	<	<available file="${jdk@{target}.home}/jmods" type="dir"/>
357	>	<available file="${jdk@{target}.home}/lib/modules" type="file"/>
358		</condition>
359
360		<delete dir="@{workdir}/JTwork"   quiet="true"/>
329	–	<delete dir="@{workdir}/JTreport" quiet="true"/>
330	–	<mkdir dir="@{workdir}/JTwork/scratch"/>
331	–	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
332	–	<mkdir dir="@{workdir}/JTreport/html"/>
333	–	<mkdir dir="@{workdir}/JTreport/text"/>
361		<jtreg dir="${jtreg@{target}.src.dir}"
362		jdk="${jdk@{target}.home}"
363	<	workDir="@{workdir}/JTwork"
337	<	reportDir="@{workdir}/JTreport">
363	>	workDir="@{workdir}/JTwork">
364		<patternset refid="jdk@{target}.jtreg.tests"/>
365		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
366	<	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
366	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368		<arg value="-agentvm"/>
369	<	<arg value="-verbose:${jtreg.verbose}"/>
369	>	<arg value="-noreport"/>
370	>	<arg value="-verbose:@{verbose}"/>
371		<arg value="-vmoptions:-esa -ea"/>
372		<arg value="-automatic"/>
373		<arg value="-k:!ignore"/>
374		<arg line="@{jtregflags}"/>
375		<arg line="${jtreg.flags}"/>
376	+	<jtreg-elements/>
377		</jtreg>
378		</sequential>
379		</macrodef>
#	Line 360 | Line 389
389
390		<!-- Main targets -->
391
392	<	<property name="build.main.java.version" value="9"/>
393	<	<property name="build.main.javac" value="${javac9}"/>
392	>	<property name="build.main.java.version" value="11"/>
393	>	<!-- Workaround "no nested properties in ant" -->
394	>	<macrodef name="define-build-main-properties">
395	>	<attribute name="v"/>
396	>	<sequential>
397	>	<property name="build.main.java"    value="${java@{v}}"/>
398	>	<property name="build.main.javac"   value="${javac@{v}}"/>
399	>	<!-- Force javadoc version to be at least 10,
400	>	so we can use override-methods=summary -->
401	>	<condition property="build.main.javadoc"
402	>	value="${javadoc11}"
403	>	else="${javadoc@{v}}">
404	>	<equals arg1="@{v}" arg2="9"/>
405	>	</condition>
406	>	</sequential>
407	>	</macrodef>
408	>	<define-build-main-properties v="${build.main.java.version}"/>
409
410		<target name="dists"
411	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
411	>	depends="dist, 4jdk8dist"
412		description="Builds all public jars and docs"/>
413	+	<!--
414	+	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
415	+	-->
416
417		<target name="compile"
418		depends="configure-compiler"
419		description="Compiles src/main sources to build dir">
420
374	–	<local name="modules"/>
375	–	<condition property="modules">
376	–	<and>
377	–	<available file="${jdk9.home}/jmods" type="dir"/>
378	–	<equals arg1="9" arg2="${build.main.java.version}"/>
379	–	</and>
380	–	</condition>
381	–
421		<local name="destdir"/>
422	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
384	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
422	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
423
424		<mkdir dir="${destdir}"/>
425
#	Line 393 | Line 431
431		classpath=""
432		includeAntRuntime="false"
433		includeJavaRuntime="false"
434	+	encoding="ASCII"
435		executable="${build.main.javac}"
436		fork="true">
437
438		<include name="**/*.java"/>
439	<	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
439	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
440		<compilerarg value="-Xprefer:source"/>
441		<compilerarg value="-XDignore.symbol.file=true"/>
442		<compilerarg value="-Xlint:all"/>
443	+	<compilerarg line="--doclint-format html5"/>
444	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
445		<compilerarg value="-Werror"/>
405	–	<compilerarg value="-Xdoclint:all/protected"/>
446		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
447		<compilerarg line="${build.args}"/>
448
449		</javac>
410	–
411	–	<!-- We need jdk9's Contended annotation, but at compile time only -->
412	–	<!--
413	–	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
414	–	-->
450		</target>
451
452
453		<target name="jar"
454		depends="compile"
455	<	description="Builds library jar from compiled sources">
456	<
455	>	description="Builds library jar for src/main from compiled sources">
456	>	<local name="subdir"/>
457	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
458		<jar destfile="${product.jar}">
459	<	<fileset dir="${build.classes.dir}"/>
459	>	<fileset dir="${build.classes.dir}${subdir}"/>
460		<manifest>
461		<attribute name="Built-By" value="${user.name}"/>
462		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
#	Line 438 | Line 474
474		<!-- the packagenames="none" hack below prevents scanning the -->
475		<!-- sourcepath for packages -->
476
477	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
478	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
479	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
480	+	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
481	+	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
482		<javadoc destdir="${docs.dir}"
483		packagenames="none"
484	<	link="${java9.api.url}"
484	>	link="${java10.api.url}"
485		overview="${src.dir}/intro.html"
486		access="${build.javadoc.access}"
487	<	sourcepath="${src.dir}:${jdk9.src.dir}"
487	>	sourcepath="${src.dir}"
488		classpath=""
489	<	executable="${javadoc9}">
489	>	source="11"
490	>	executable="${build.main.javadoc}">
491		<fileset dir="${src.dir}" defaultexcludes="yes">
492		<include name="**/*.java"/>
493		</fileset>
494	<	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
494	>	<arg line="-Xdocrootparent ${java10.docroot.url}"/>
495		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
496		<arg value="-XDignore.symbol.file=true"/>
497	<	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
498	<	<arg value="-tag"/>
499	<	<arg value="${javadoc.jls.option}"/>
500	<	<arg value="-tag"/>
501	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
502	<	<arg value="-tag"/>
503	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
504	<	<arg value="-tag"/>
505	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
506	<	<!-- tags added in jdk9 -->
465	<	<arg value="-tag"/>
466	<	<arg value="revised:X"/>
467	<	<arg value="-tag"/>
468	<	<arg value="spec:X"/>
497	>	<arg value="-html5"/>
498	>	<arg value="--patch-module=java.base=${src.dir}"/>
499	>	<arg value="--override-methods=summary"/>
500	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
501	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
502	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
503	>	<arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
504	>	<!-- tags added in jdk9: currently unused -->
505	>	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
506	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
507		</javadoc>
508		</target>
509
#	Line 499 | Line 537
537
538		<target name="clean"
539		description="Removes all build products">
502	–
540		<delete dir="${build.dir}"/>
504	–
541		</target>
542
543
544		<target name="dist-clean"
545		description="Removes all build and distribution products">
510	–
546		<delete dir="${build.dir}"/>
547		<delete dir="${dist.dir}"/>
513	–
548		</target>
549
550
#	Line 526 | Line 560
560
561		<target name="tck"
562		depends="jar"
563	<	description="Runs tck tests for main directly">
563	>	description="Runs tck tests for src/main directly">
564
565		<run-tck-tests
566		target="${build.main.java.version}"
567		workdir="${build.dir}"
568	<	classes="${product.jar}"/>
568	>	classes="${product.jar}">
569	>	<javac-elements>
570	>	<compilerarg value="-Werror"/>
571	>	</javac-elements>
572	>	</run-tck-tests>
573		</target>
574
575		<target name="tck-parallelism-1"
576	<	description="Runs tck with given common pool parallelism">
576	>	description="Runs tck with common pool parallelism 1">
577		<antcall target="tck">
578		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
579		</antcall>
580		</target>
581
582		<target name="tck-parallelism-0"
583	<	description="Runs tck with given common pool parallelism">
583	>	description="Runs tck with common pool parallelism 0">
584		<antcall target="tck">
585		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
586		</antcall>
587		</target>
588
589	+	<target name="tck-security-manager"
590	+	description="Runs tck with a security manager">
591	+	<antcall target="tck">
592	+	<param name="jsr166.useSecurityManager" value="true"/>
593	+	</antcall>
594	+	</target>
595	+
596		<target name="jtreg"
597		depends="jar"
598	<	description="Runs jtreg tests for main using the jtreg ant task">
598	>	description="Runs jtreg tests for src/main using the jtreg ant task">
599		<run-jtreg-tests
600		target="${build.main.java.version}"
601		workdir="${build.dir}"
#	Line 558 | Line 603
603		</target>
604
605		<target name="test"
606	<	depends="tck, tck-parallelism-1, jtreg"
607	<	description="Runs tck and jtreg tests for main">
563	<	</target>
606	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
607	>	description="Runs tck and jtreg tests for src/main"/>
608
609	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
609	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
610
611	<	<antcall target="jtreg">
612	<	<param name="build.main.java.version" value="8"/>
613	<	<param name="build.main.javac" value="${javac8}"/>
614	<	</antcall>
611	>	<!--     <antcall target="jtreg"> -->
612	>	<!--       <param name="build.main.java.version" value="8"/> -->
613	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
614	>	<!--     </antcall> -->
615
616	<	</target>
616	>	<!--   </target> -->
617
618	<	<target name="test89"
619	<	description="Runs tck and jtreg tests for main for multiple java versions">
618	>	<target name="test9101112"
619	>	description="Runs tck and jtreg tests for src/main for multiple java versions">
620
621		<antcall target="clean"/>
622		<antcall target="test">
623	<	<param name="build.main.java.version" value="8"/>
624	<	<param name="build.main.javac" value="${javac8}"/>
623	>	<param name="build.main.java.version" value="9"/>
624	>	<param name="build.main.java" value="${java9}"/>
625	>	<param name="build.main.javac" value="${javac9}"/>
626		</antcall>
627
628		<antcall target="clean"/>
629		<antcall target="test">
630	<	<param name="build.main.java.version" value="9"/>
631	<	<param name="build.main.javac" value="${javac9}"/>
630	>	<param name="build.main.java.version" value="10"/>
631	>	<param name="build.main.java" value="${java10}"/>
632	>	<param name="build.main.javac" value="${javac10}"/>
633	>	</antcall>
634	>
635	>	<antcall target="clean"/>
636	>	<antcall target="test">
637	>	<param name="build.main.java.version" value="11"/>
638	>	<param name="build.main.java" value="${java11}"/>
639	>	<param name="build.main.javac" value="${javac11}"/>
640		</antcall>
641
642	+	<antcall target="clean"/>
643	+	<antcall target="test">
644	+	<param name="build.main.java.version" value="12"/>
645	+	<param name="build.main.java" value="${java12}"/>
646	+	<param name="build.main.javac" value="${javac12}"/>
647	+	</antcall>
648	+	<antcall target="docs">
649	+	<param name="build.main.java.version" value="12"/>
650	+	<param name="build.main.java" value="${java12}"/>
651	+	<param name="build.main.javac" value="${javac12}"/>
652	+	<param name="build.main.javadoc" value="${javadoc12}"/>
653	+	</antcall>
654	+
655	+	<!-- Clean up to avoid obscure wrong class file version bugs -->
656	+	<antcall target="clean"/>
657	+
658		</target>
659
660
661
662		<target name="configure-compiler">
663		<fail message="ant version too old">
664	<	<condition>
596	<	<not> <antversion atleast="1.9.1"/> </not>
597	<	</condition>
664	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
665		</fail>
666
667		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 616 | Line 683
683		<!-- Various demos and test programs -->
684
685
686	<	<target name="loops" depends="configure-compiler"
687	<	description="Benchmark from Doug Lea's AQS paper">
686	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
687	>	<target name="loops" depends="configure-compiler">
688
689		<mkdir dir="${build.loops.dir}"/>
690
#	Line 628 | Line 695
695		deprecation="${build.deprecation}"
696		source="${build.sourcelevel}"
697		target="${build.sourcelevel}"
698	+	encoding="ASCII"
699		fork="true">
700
701		<compilerarg line="${build.args}"/>
#	Line 639 | Line 707
707		<java classname="ALoops" fork="true">
708		<classpath refid="loops.classpath"/>
709		</java>
642	–
710		</target>
711
712
713		<target name="compile-test-loops" depends="jar"
714	<	description="compile all the perf tests in src/test/loops">
714	>	description="Compiles all the perf tests in src/test/loops">
715
716		<mkdir dir="${build.dir}/test/loops"/>
717
#	Line 655 | Line 722
722		deprecation="${build.deprecation}"
723		includeAntRuntime="false"
724		includeJavaRuntime="false"
725	<	executable="${javac9}"
725	>	encoding="ASCII"
726	>	executable="${build.main.javac}"
727		fork="true">
728
729		<include name="*.java"/>
#	Line 663 | Line 731
731		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
732		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
733		<compilerarg line="${build.args}"/>
666	–
734		</javac>
668	–
735		</target>
736
737
#	Line 688 | Line 754
754		bootclasspath="${bootclasspath8}"
755		includeAntRuntime="false"
756		includeJavaRuntime="false"
757	+	encoding="ASCII"
758		executable="${javac8}"
759		fork="true">
693	–
760		<include name="**/*.java"/>
761		<compilerarg value="-Xprefer:source"/>
762		<compilerarg value="-XDignore.symbol.file=true"/>
763		<compilerarg value="-Xlint:all"/>
764		<compilerarg value="-Werror"/>
765		<compilerarg line="${build.args}"/>
700	–
766		</javac>
767		</target>
768
#	Line 718 | Line 783
783		bootclasspath="${bootclasspath8}"
784		includeAntRuntime="false"
785		includeJavaRuntime="false"
786	+	encoding="ASCII"
787		executable="${javac8}"
788		fork="true">
723	–
789		<include name="**/*.java"/>
790		<compilerarg value="-Xprefer:source"/>
791		<compilerarg value="-XDignore.symbol.file=true"/>
792		<compilerarg value="-Xlint:all"/>
793	<	<compilerarg value="-Xdoclint:all/protected"/>
793	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
794		<compilerarg line="${build.args}"/>
730	–
795		</javac>
796		</target>
797
#	Line 743 | Line 807
807		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
808		</manifest>
809		</jar>
746	–
810		</target>
811
812
#	Line 759 | Line 822
822		<!-- JDK9+ test classes -->
823		<exclude name="*9Test.java"/>
824		<exclude name="*10Test.java"/>
825	+	<compilerarg value="-Werror"/>
826		</javac-elements>
827		</run-tck-tests>
828		</target>
#	Line 776 | Line 840
840
841		<target name="4jdk8-test"
842		depends="4jdk8-tck, 4jdk8-jtreg"
843	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
780	<	</target>
843	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
844
845
846		<target name="4jdk8docs"
#	Line 793 | Line 856
856		access="${build.javadoc.access}"
857		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
858		classpath=""
859	<	executable="${javadoc8}">
859	>	source="8"
860	>	executable="${javadoc8}"
861	>	failonerror = "true">
862		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
863		<include name="**/*.java"/>
864		</fileset>
865		<arg line="-Xdocrootparent ${java8.docroot.url}"/>
866		<arg value="-XDignore.symbol.file=true"/>
867	<	<arg value="-tag"/>
868	<	<arg value="${javadoc.jls.option}"/>
869	<	<arg value="-tag"/>
870	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
871	<	<arg value="-tag"/>
807	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
808	<	<arg value="-tag"/>
809	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
867	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
868	>	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
869	>	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
870	>	<!-- @apiNote tag currently unused -->
871	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
872		</javadoc>
873		</target>
874
#	Line 818 | Line 880
880
881		<target name="4jdk8clean"
882		description="Removes all 4jdk8 build products">
821	–
883		<delete dir="${build.4jdk8.dir}"/>
823	–
884		</target>
885
886
#	Line 836 | Line 896
896		</target>
897
898
899	+	<!-- jsr166 4jdk7 (no longer maintained) -->
900
901	<	<!-- jsr166 4jdk7 -->
841	<
842	<	<target name="4jdk7compile"
843	<	depends="configure-compiler"
844	<	description="Compiles src/jdk7 sources, targeting jdk7">
845	<
901	>	<target name="4jdk7compile" depends="configure-compiler">
902		<mkdir dir="${build.4jdk7.classes.dir}"/>
903
904		<javac srcdir="${4jdk7src.dir}"
#	Line 856 | Line 912
912		bootclasspath="${bootclasspath6}"
913		includeAntRuntime="false"
914		includeJavaRuntime="false"
915	+	encoding="ASCII"
916		executable="${javac7}"
917		fork="true">
918
#	Line 865 | Line 922
922		<compilerarg value="-Xlint:all"/>
923		<compilerarg value="-Werror"/>
924		<compilerarg line="${build.args}"/>
868	–
925		</javac>
926		</target>
927
928	<	<target name="4jdk7doclint"
873	<	depends="configure-compiler"
874	<	description="Finds doclint warnings">
875	<
928	>	<target name="4jdk7doclint" depends="configure-compiler">
929		<mkdir dir="${build.4jdk7.classes.dir}"/>
930
931		<javac srcdir="${4jdk7src.dir}"
#	Line 886 | Line 939
939		bootclasspath="${bootclasspath6}"
940		includeAntRuntime="false"
941		includeJavaRuntime="false"
942	+	encoding="ASCII"
943		executable="${javac8}"
944		fork="true">
945
#	Line 895 | Line 949
949		<compilerarg value="-Xlint:all"/>
950		<compilerarg value="-Xdoclint:all/protected"/>
951		<compilerarg line="${build.args}"/>
898	–
952		</javac>
953		</target>
954
955	<
903	<	<target name="4jdk7jar"
904	<	depends="4jdk7compile"
905	<	description="Builds library jar from compiled sources">
906	<
955	>	<target name="4jdk7jar" depends="4jdk7compile">
956		<jar destfile="${4jdk7product.jar}">
957		<fileset dir="${build.4jdk7.classes.dir}"/>
958		<manifest>
#	Line 911 | Line 960
960		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
961		</manifest>
962		</jar>
914	–
963		</target>
964
965	<
918	<	<target name="4jdk7-tck"
919	<	depends="4jdk7jar"
920	<	description="Runs tck tests for jsr166-4jdk7 directly">
921	<
965	>	<target name="4jdk7-tck" depends="4jdk7jar">
966		<run-tck-tests
967		target="7"
968		workdir="${build.4jdk7.dir}"
#	Line 936 | Line 980
980		<exclude name="SplittableRandomTest.java"/>
981		<exclude name="StampedLockTest.java"/>
982		<exclude name="SubmissionPublisherTest.java"/>
983	+	<compilerarg value="-Werror"/>
984		</javac-elements>
985		</run-tck-tests>
986		</target>
987
988	<
989	<	<target name="4jdk7-tck-junit"
945	<	depends="4jdk7compile"
946	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
988	>	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
989	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
990
991		<junit printsummary="true"
992		showoutput="true"
#	Line 965 | Line 1008
1008
1009		<test name="${jsr166.tckTestClass}" haltonfailure="no">
1010		</test>
968	–
1011		</junit>
1012		</target>
1013
1014	<	<target name="4jdk7-jtreg"
973	<	depends="4jdk7jar"
974	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1014	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
1015		<run-jtreg-tests
1016		target="7"
1017		workdir="${build.4jdk7.dir}"
1018		classes="${4jdk7product.jar}"/>
1019		</target>
1020
1021	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1022
1023	<	<target name="4jdk7-test"
983	<	depends="4jdk7-tck, 4jdk7-jtreg"
984	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
985	<	</target>
986	<
987	<
988	<	<target name="4jdk7docs"
989	<	description="Builds javadocs for src/jdk7 to dist dir">
990	<
1023	>	<target name="4jdk7docs">
1024		<delete dir="${4jdk7docs.dir}"/>
1025		<mkdir dir="${4jdk7docs.dir}"/>
1026
#	Line 998 | Line 1031
1031		access="${build.javadoc.access}"
1032		sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1033		classpath=""
1034	<	executable="${javadoc7}">
1034	>	executable="${javadoc7}"
1035	>	failonerror = "true">
1036		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1037		<include name="**/*.java"/>
1038		</fileset>
#	Line 1007 | Line 1041
1041		</javadoc>
1042		</target>
1043
1044	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1045
1046	<	<target name="4jdk7dist"
1012	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1013	<	description="Puts all distributable products in single hierarchy"/>
1014	<
1015	<
1016	<	<target name="4jdk7clean"
1017	<	description="Removes all 4jdk7 build products">
1018	<
1046	>	<target name="4jdk7clean">
1047		<delete dir="${build.4jdk7.dir}"/>
1020	–
1048		</target>
1049
1050	<
1024	<	<target name="4jdk7dist-jar"
1025	<	depends="4jdk7clean, 4jdk7jar">
1050	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1051		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1052		</target>
1053
1054	<
1030	<	<target name="4jdk7dist-docs"
1031	<	depends="4jdk7clean, 4jdk7docs">
1054	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1055		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1056		</target>
1057
1058
1059	<	<!-- jsr166x -->
1037	<
1038	<	<target name="jsr166xcompile"
1039	<	depends="configure-compiler"
1040	<	description="Compiles jsr166x sources to build dir">
1059	>	<!-- jsr166x (no longer maintained) -->
1060
1061	+	<target name="jsr166xcompile" depends="configure-compiler">
1062		<mkdir dir="${build.jsr166x.classes.dir}"/>
1063
1064		<javac srcdir="${topsrc.dir}"
#	Line 1052 | Line 1072
1072		target="5"
1073		includeAntRuntime="false"
1074		includeJavaRuntime="false"
1075	+	encoding="ASCII"
1076		executable="${javac7}"
1077		fork="true">
1057	–
1078		<include name="jsr166x/**/*.java"/>
1079		<compilerarg value="-XDignore.symbol.file=true"/>
1080		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1081		<compilerarg value="-Werror"/>
1082		<compilerarg line="${build.args}"/>
1063	–
1083		</javac>
1084		</target>
1085
1086	<
1068	<	<target name="jsr166xjar"
1069	<	depends="jsr166xcompile"
1070	<	description="Builds library jar from compiled sources">
1071	<
1086	>	<target name="jsr166xjar" depends="jsr166xcompile">
1087		<jar destfile="${jsr166x.jar}">
1088		<fileset dir="${build.jsr166x.classes.dir}"/>
1089		<manifest>
#	Line 1076 | Line 1091
1091		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1092		</manifest>
1093		</jar>
1079	–
1094		</target>
1095
1096	<
1083	<	<target name="jsr166xdocs"
1084	<	description="Builds javadocs to dist dir">
1085	<
1096	>	<target name="jsr166xdocs">
1097		<delete dir="${jsr166xdocs.dir}"/>
1098		<mkdir dir="${jsr166xdocs.dir}"/>
1099
#	Line 1093 | Line 1104
1104		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1105		bootclasspath="${bootclasspath6}"
1106		source="5"
1107	<	executable="${javadoc7}">
1107	>	executable="${javadoc7}"
1108	>	failonerror = "true">
1109		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1110		<arg value="-XDignore.symbol.file=true"/>
1099	–
1111		</javadoc>
1112		</target>
1113
1114	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1115
1116	<	<target name="jsr166xdist"
1105	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1106	<	description="Puts all distributable products in single hierarchy"/>
1107	<
1108	<
1109	<	<target name="jsr166xclean"
1110	<	description="Removes all jsr166x build products">
1111	<
1116	>	<target name="jsr166xclean">
1117		<delete dir="${build.jsr166x.dir}"/>
1113	–
1118		</target>
1119
1120	<
1117	<	<target name="jsr166xdist-jar"
1118	<	depends="jsr166xclean, jsr166xjar">
1120	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1121		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1122		</target>
1123
1124	<	<target name="jsr166xdist-docs"
1123	<	depends="jsr166xclean, jsr166xdocs">
1124	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1125		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1126		</target>
1127
1127	–	<!-- jsr166y -->
1128
1129	+	<!-- jsr166y (no longer maintained) -->
1130
1131	<	<target name="jsr166ycompile"
1131	<	depends="configure-compiler"
1132	<	description="Compiles jsr166y sources">
1133	<
1131	>	<target name="jsr166ycompile" depends="configure-compiler">
1132		<mkdir dir="${build.jsr166y.classes.dir}"/>
1133
1134		<javac srcdir="${topsrc.dir}"
#	Line 1144 | Line 1142
1142		bootclasspath="${bootclasspath6}"
1143		includeAntRuntime="false"
1144		includeJavaRuntime="false"
1145	+	encoding="ASCII"
1146		executable="${javac7}"
1147		fork="true">
1148
#	Line 1152 | Line 1151
1151		<compilerarg value="-Xlint:all"/>
1152		<compilerarg value="-Werror"/>
1153		<compilerarg line="${build.args}"/>
1155	–
1154		</javac>
1155		</target>
1156
1157	<
1160	<	<target name="jsr166yjar"
1161	<	depends="jsr166ycompile"
1162	<	description="Builds library jar from compiled sources">
1163	<
1157	>	<target name="jsr166yjar" depends="jsr166ycompile">
1158		<jar destfile="${jsr166y.jar}" index="true">
1159		<fileset dir="${build.jsr166y.classes.dir}"/>
1160		<manifest>
#	Line 1168 | Line 1162
1162		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1163		</manifest>
1164		</jar>
1171	–
1165		</target>
1166
1167	<
1175	<	<target name="jsr166ydocs"
1176	<	description="Builds javadocs to dist dir">
1177	<
1167	>	<target name="jsr166ydocs">
1168		<delete dir="${jsr166ydocs.dir}"/>
1169		<mkdir dir="${jsr166ydocs.dir}"/>
1170
#	Line 1185 | Line 1175
1175		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1176		bootclasspath="${bootclasspath6}"
1177		source="6"
1178	<	executable="${javadoc7}">
1178	>	executable="${javadoc7}"
1179	>	failonerror = "true">
1180		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1181		<arg value="-XDignore.symbol.file=true"/>
1191	–
1182		</javadoc>
1183		</target>
1184
1185	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1186
1187	<	<target name="jsr166ydist"
1197	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1198	<	description="Puts all distributable products in single hierarchy"/>
1199	<
1200	<
1201	<	<target name="jsr166yclean"
1202	<	description="Removes all jsr166y build products">
1203	<
1187	>	<target name="jsr166yclean">
1188		<delete dir="${build.jsr166y.dir}"/>
1205	–
1189		</target>
1190
1191	<
1209	<	<target name="jsr166ydist-jar"
1210	<	depends="jsr166yclean, jsr166yjar">
1191	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1192		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1193		</target>
1194
1195	<	<target name="jsr166ydist-docs"
1215	<	depends="jsr166yclean, jsr166ydocs">
1195	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1196		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1197		</target>
1198
1199
1200	<	<!-- extra166y -->
1221	<
1222	<
1223	<	<target name="extra166ycompile"
1224	<	depends="configure-compiler, jsr166yjar"
1225	<	description="Compiles extra166y sources">
1200	>	<!-- extra166y (no longer maintained) -->
1201
1202	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1203		<mkdir dir="${build.extra166y.classes.dir}"/>
1204
1205		<javac srcdir="${topsrc.dir}"
#	Line 1237 | Line 1213
1213		target="6"
1214		includeAntRuntime="false"
1215		includeJavaRuntime="false"
1216	+	encoding="ASCII"
1217		executable="${javac7}"
1218		fork="true">
1219
#	Line 1245 | Line 1222
1222		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1223		<compilerarg value="-Werror"/>
1224		<compilerarg line="${build.args}"/>
1248	–
1225		</javac>
1226		</target>
1227
1228	<
1253	<	<target name="extra166yjar"
1254	<	depends="extra166ycompile"
1255	<	description="Builds library jar from compiled sources">
1256	<
1228	>	<target name="extra166yjar" depends="extra166ycompile">
1229		<jar destfile="${extra166y.jar}" index="true">
1230		<fileset dir="${build.extra166y.classes.dir}"/>
1231		<manifest>
#	Line 1261 | Line 1233
1233		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1234		</manifest>
1235		</jar>
1264	–
1236		</target>
1237
1238	<
1268	<	<target name="extra166ydocs"
1269	<	description="Builds javadocs to build dir">
1270	<
1238	>	<target name="extra166ydocs">
1239		<delete dir="${extra166ydocs.dir}"/>
1240		<mkdir dir="${extra166ydocs.dir}"/>
1241
#	Line 1281 | Line 1249
1249		executable="${javadoc7}">
1250		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1251		<arg value="-XDignore.symbol.file=true"/>
1284	–
1252		</javadoc>
1253		</target>
1254
1255	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1256
1257	<	<target name="extra166ydist"
1290	<	depends="extra166ydist-jar, extra166ydist-docs"
1291	<	description="Puts all distributable products in single hierarchy"/>
1292	<
1293	<
1294	<	<target name="extra166yclean"
1295	<	description="Removes all extra166y build products">
1296	<
1257	>	<target name="extra166yclean">
1258		<delete dir="${build.extra166y.dir}"/>
1298	–
1259		</target>
1260
1261	<
1302	<	<target name="extra166ydist-jar"
1303	<	depends="extra166yclean, extra166yjar">
1261	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1262		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1263		</target>
1264
1265	<	<target name="extra166ydist-docs"
1308	<	depends="extra166yclean, extra166ydocs">
1265	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1266		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1267		</target>
1268
1269	<	<!-- jsr166e -->
1269	>
1270	>	<!-- jsr166e (no longer maintained) -->
1271
1272		<property name="build.jsr166e.java.version" value="6"/>
1273		<property name="build.jsr166e.javac" value="${javac6}"/>
1274
1275	<	<target name="jsr166ecompile"
1318	<	depends="configure-compiler"
1319	<	description="Compiles jsr166e sources">
1320	<
1275	>	<target name="jsr166ecompile" depends="configure-compiler">
1276		<mkdir dir="${build.jsr166e.classes.dir}"/>
1277
1278		<javac srcdir="${topsrc.dir}"
#	Line 1338 | Line 1293
1293		<compilerarg value="-Xlint:all"/>
1294		<compilerarg value="-Werror"/>
1295		<compilerarg line="${build.args}"/>
1341	–
1296		</javac>
1297		</target>
1298
1345	–	<!-- jsr166e: find doclint errors -->
1299		<target name="jsr166edoclint">
1347	–
1300		<mkdir dir="${build.jsr166e.classes.dir}"/>
1301
1302		<javac srcdir="${topsrc.dir}"
#	Line 1366 | Line 1318
1318		<compilerarg value="-Xlint:all"/>
1319		<compilerarg value="-Werror"/>
1320		<compilerarg value="-Xdoclint:all/protected"/>
1369	–
1321		</javac>
1322		</target>
1323
1324	<
1374	<	<target name="jsr166ejar"
1375	<	depends="jsr166ecompile"
1376	<	description="Builds library jar from compiled sources">
1377	<
1324	>	<target name="jsr166ejar" depends="jsr166ecompile">
1325		<jar destfile="${jsr166e.jar}" index="true">
1326		<fileset dir="${build.jsr166e.classes.dir}"/>
1327		<manifest>
#	Line 1382 | Line 1329
1329		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1330		</manifest>
1331		</jar>
1385	–
1332		</target>
1333
1334	<
1389	<	<target name="jsr166edocs"
1390	<	description="Builds javadocs to build dir">
1391	<
1334	>	<target name="jsr166edocs">
1335		<delete dir="${jsr166edocs.dir}"/>
1336		<mkdir dir="${jsr166edocs.dir}"/>
1337
#	Line 1398 | Line 1341
1341		access="${build.javadoc.access}"
1342		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1343		source="${build.jsr166e.java.version}"
1344	<	executable="${javadoc7}">
1344	>	executable="${javadoc7}"
1345	>	failonerror = "true">
1346		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1347		<arg value="-XDignore.symbol.file=true"/>
1404	–
1348		</javadoc>
1349		</target>
1350
1351	<
1409	<	<target name="jsr166e-tck-one-java-version"
1410	<	depends="jsr166ejar">
1411	<
1351	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1352		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1413	–
1353		<run-tck-tests
1354		tck.src.dir="${test.src.dir}/tck-jsr166e"
1355		target="${build.jsr166e.java.version}"
#	Line 1418 | Line 1357
1357		classes="${jsr166e.jar}"/>
1358		</target>
1359
1360	<	<target name="jsr166e-tck"
1422	<	description="Runs tck tests for jsr166e for multiple java versions">
1360	>	<target name="jsr166e-tck">
1361
1362		<!--     <antcall target="clean"/> -->
1363		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1440 | Line 1378
1378		</antcall>
1379		</target>
1380
1381	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1382
1383	<	<target name="jsr166e-test"
1445	<	depends="jsr166e-tck"
1446	<	description="Runs all tests for jsr166e">
1447	<	</target>
1383	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1384
1385	<	<target name="jsr166edist"
1450	<	depends="jsr166edist-jar, jsr166edist-docs"
1451	<	description="Puts all distributable products in single hierarchy"/>
1452	<
1453	<
1454	<	<target name="jsr166eclean"
1455	<	description="Removes all jsr166e build products">
1385	>	<target name="jsr166eclean">
1386		<delete dir="${build.jsr166e.dir}"/>
1387		</target>
1388
1459	–
1389		<target name="jsr166edist-jar"
1390		depends="jsr166eclean, jsr166ejar">
1391		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1392		</target>
1393
1394	<	<target name="jsr166edist-docs"
1466	<	depends="jsr166eclean, jsr166edocs">
1394	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1395		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1396		</target>
1397
1398
1399		<!-- Find buglets that can be detected by static build tools -->
1400
1401	<	<target name="lint">
1402	<	<antcall target="dists">
1403	<	<param name="build.javadoc.access" value="public"/>
1404	<	</antcall>
1405	<	</target>
1401	>	<!--   <target name="lint"> -->
1402	>	<!--     <antcall target="dists"> -->
1403	>	<!--       <param name="build.javadoc.access" value="protected"/> -->
1404	>	<!--     </antcall> -->
1405	>	<!--   </target> -->
1406
1407		<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1408	<	<target name="lint-private">
1408	>	<target name="doclint-private">
1409		<antcall target="dist">
1410		<param name="build.javadoc.access" value="private"/>
1411		</antcall>
1412		</target>
1413
1414
1415	+	<!-- ==============================================================
1416	+	Experimental errorprone support - https://errorprone.info
1417	+	=================================================================== -->
1418	+	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1419	+	<property name="errorprone.jsr166.user.flags" value=""/>
1420	+	<property name="errorprone.jsr166.flags"
1421	+	value="-Xep:HashtableContains:OFF
1422	+	-Xep:JdkObsolete:OFF
1423	+	-Xep:MissingOverride:OFF
1424	+	-Xep:MissingFail:OFF
1425	+	-Xep:MixedArrayDimensions:ERROR
1426	+	-Xep:RemoveUnusedImports:ERROR
1427	+	-Xep:EmptyIf:ERROR
1428	+	-Xep:MultipleTopLevelClasses:ERROR
1429	+	-Xep:ClassName:ERROR
1430	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1431	+	-Xep:RedundantThrows:ERROR
1432	+	-Xep:IdentityBinaryExpression:WARN
1433	+	-Xep:MethodCanBeStatic:WARN
1434	+	${errorprone.jsr166.user.flags}"/>
1435	+	<!-- -Xep:WildcardImport:ERROR -->
1436	+	<property name="errorprone.jsr166.test.flags"
1437	+	value="-Xep:StringSplitter:OFF
1438	+	-Xep:BoxedPrimitiveConstructor:OFF
1439	+	-Xep:ModifyingCollectionWithItself:OFF"/>
1440	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1441	+	<target name="errorprone"
1442	+	depends="clean, configure-compiler"
1443	+	description="Run errorprone over jsr166 source code (experimental)">
1444	+
1445	+	<local name="destdir"/>
1446	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1447	+	<mkdir dir="${destdir}"/>
1448	+
1449	+	<javac srcdir="${src.dir}"
1450	+	destdir="${destdir}"
1451	+	debug="${build.debug}"
1452	+	debuglevel="${build.debuglevel}"
1453	+	deprecation="${build.deprecation}"
1454	+	classpath=""
1455	+	includeAntRuntime="false"
1456	+	includeJavaRuntime="false"
1457	+	encoding="ASCII"
1458	+	executable="${build.main.javac}"
1459	+	fork="true">
1460	+
1461	+	<include name="**/*.java"/>
1462	+	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1463	+	<compilerarg value="-J--illegal-access=permit"/>
1464	+	<compilerarg value="-XDcompilePolicy=simple"/>
1465	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1466	+	<compilerarg value="-Xplugin:ErrorProne
1467	+	${errorprone.jsr166.flags}"/>
1468	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1469	+	<compilerarg value="-Xprefer:source"/>
1470	+	<compilerarg value="-XDignore.symbol.file=true"/>
1471	+	<compilerarg value="-Xlint:all"/>
1472	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1473	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1474	+	<compilerarg line="${build.args}"/>
1475	+	</javac>
1476	+
1477	+	<jar destfile="${product.jar}">
1478	+	<fileset dir="${destdir}"/>
1479	+	</jar>
1480	+
1481	+	<run-tck-tests
1482	+	target="${build.main.java.version}"
1483	+	workdir="${build.dir}"
1484	+	classes="${product.jar}">
1485	+	<javac-elements>
1486	+	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1487	+	<compilerarg value="-J--illegal-access=permit"/>
1488	+	<compilerarg value="-XDcompilePolicy=simple"/>
1489	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1490	+	<compilerarg value="-Xplugin:ErrorProne
1491	+	${errorprone.jsr166.flags}
1492	+	${errorprone.jsr166.test.flags}"/>
1493	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1494	+	</javac-elements>
1495	+	</run-tck-tests>
1496	+	</target>
1497	+
1498	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1499	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1500	+	<target name="errorprone-jtreg"
1501	+	depends="jar"
1502	+	description="Run errorprone over jtreg tests (experimental)">
1503	+
1504	+	<run-jtreg-tests
1505	+	target="${build.main.java.version}"
1506	+	workdir="${build.dir}"
1507	+	classes="${product.jar}"
1508	+	verbose="all">
1509	+	<jtreg-elements>
1510	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1511	+	<arg value="-javacoption:-processorpath"/>
1512	+	<arg value="-javacoption:${errorprone.jar}"/>
1513	+	<arg value="-javacoption:-Xplugin:ErrorProne
1514	+	${errorprone.jsr166.flags}
1515	+	${errorprone.jsr166.test.flags}
1516	+	-Xep:MultipleTopLevelClasses:WARN
1517	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1518	+	</jtreg-elements>
1519	+	</run-jtreg-tests>
1520	+	</target>
1521	+
1522	+
1523	+	<!-- ==============================================================
1524	+	Running guava tests against jsr166 code
1525	+	=================================================================== -->
1526	+
1527	+	<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1528	+	<!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1529	+	<!-- <property name="guava.version" value="21.0"/> -->
1530	+
1531	+	<!-- HOWTO debug print a path id -->
1532	+	<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1533	+	<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1534	+
1535	+	<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1536	+	<!--   organisation="com.google.guava" module="guava-tests"/> -->
1537	+	<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1538	+	<!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1539	+	<!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1540	+	<!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1541	+
1542	+	<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1543	+	<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1544	+	<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1545	+	<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1546	+
1547	+	<!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1548	+	<!--   type="*" inline="true" conf="*(private),*(public)" -->
1549	+	<!--   pattern="${guava.dir}/[artifact].[ext]" -->
1550	+	<!--   organisation="com.google.guava" module="guava-testlib"/> -->
1551	+
1552	+	<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1553	+	<!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1554	+	<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1555	+
1556	+	<target name="init-ivy">
1557	+	<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1558	+	dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1559	+	<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1560	+	classpath="${build.dir}/ivy.jar"/>
1561	+	</target>
1562	+
1563	+	<target name="guava-tests" depends="jar, init-ivy"
1564	+	description="Guava tests run against jsr166 collections">
1565	+	<property name="guava.dir" value="${build.dir}/guava-testlib"/>
1566	+	<mkdir dir="${guava.dir}"/>
1567	+	<ivy:retrieve pathid="guava.testlib.classpath"
1568	+	type="jar,bundle" inline="true" conf="default,master"
1569	+	pattern="${guava.dir}/[artifact].[ext]"
1570	+	organisation="com.google.guava" module="guava-testlib"/>
1571	+	<property name="guava.version" value="21.0"/>
1572	+	<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1573	+	dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1574	+	<junit printsummary="true" showoutput="true" haltonfailure="true"
1575	+	jvm="${build.main.java}" fork="true">
1576	+	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1577	+	<formatter type="brief"/>
1578	+	<classpath>
1579	+	<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1580	+	<path refid="guava.testlib.classpath"/>
1581	+	</classpath>
1582	+
1583	+	<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1584	+	<test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1585	+	</junit>
1586	+	</target>
1587	+
1588		</project>

Diff Legend

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