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.289 by jsr166, Sun Dec 2 22:40:03 2018 UTC vs.
Revision 1.324 by jsr166, Wed Sep 29 01:13:44 2021 UTC

#	Line 19 | 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:
22	–	$HOME/jdk/jdk8
23	–	$HOME/jdk/jdk9
24	–	$HOME/jdk/jdk10
22		$HOME/jdk/jdk11
23		$HOME/jdk/jdk12
24	+	$HOME/jdk/jdk13
25	+	$HOME/jdk/jdk14
26	+	$HOME/jdk/jdk15
27	+	$HOME/jdk/jdk16
28	+	$HOME/jdk/jdk17
29	+	$HOME/jdk/jdk18
30		where each of the above is a JDK or a symlink to same, and
28	–	$HOME/jdk/src/jdk8
29	–	$HOME/jdk/src/jdk9
30	–	$HOME/jdk/src/jdk10
31		$HOME/jdk/src/jdk11
32		$HOME/jdk/src/jdk12
33	<	where each of the above is a complete JDK source tree
34	<	(e.g. mercurial forest) or a symlink to same.
33	>	$HOME/jdk/src/jdk13
34	>	$HOME/jdk/src/jdk14
35	>	$HOME/jdk/src/jdk15
36	>	$HOME/jdk/src/jdk16
37	>	$HOME/jdk/src/jdk17
38	>	$HOME/jdk/src/jdk18
39	>	where each of the above is a JDK source tree or a symlink to same.
40
41		Alternatively, define ant variables thus:
42		ant -Djdk$N.home=... -Djdk$N.src.home=...
43	<	for $N in 8 9 10 ...
43	>	for $N in 11 .. 18 ...
44
45		As of 2016-03, the sources in src/main are for jdk9+ only.
46	+	As of 2019-08, the sources in src/main are for jdk11+ only.
47	+	As of 2019-10, compatibility support for jdk8 is dropped entirely.
48		------------------------------------------------------------------------------
49		</description>
50
#	Line 66 | Line 73
73		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
74		<property name="build.loops.dir"             location="${build.dir}/loops"/>
75
69	–	<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
70	–	<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
71	–	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
72	–	<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
73	–
74	–	<property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
75	–	<property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
76	–	<property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
77	–	<property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
78	–
79	–	<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
80	–	<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
81	–	<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
82	–	<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
83	–
84	–	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
85	–	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
86	–	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
87	–	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
88	–
76		<!-- JDK locations -->
77		<property name="jdks.home"  location="${user.home}/jdk"/>
78
#	Line 97 | Line 84
84		<property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
85		<property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
86		<property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
87	<	<local name="have.java.base"/>
101	<	<available property="have.java.base"
102	<	file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
103	<	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
104	<	if:set="have.java.base"/>
105	<	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
106	<	unless:set="have.java.base"/>
107	<	<local name="modules"/>
108	<	<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
109	<	<local name="boot.jar.dir"/>
110	<	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
111	<	<path id="bootclasspath@{v}" unless:set="modules">
112	<	<pathelement path="${boot.jar.dir}/resources.jar"/>
113	<	<pathelement path="${boot.jar.dir}/rt.jar"/>
114	<	<pathelement path="${boot.jar.dir}/jsse.jar"/>
115	<	<pathelement path="${boot.jar.dir}/jce.jar"/>
116	<	<pathelement path="${boot.jar.dir}/charsets.jar"/>
117	<	</path>
118	<	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
87	>	<property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
88		</sequential>
89		</macrodef>
90
#	Line 131 | Line 100
100		</sequential>
101		</macrodef>
102
134	–	<defjdklocations v="6"/>
135	–	<defjdklocations v="7"/>
136	–	<defjdklocations v="8"/>
137	–	<defjdklocations v="9"/>
138	–	<defjdklocations v="10"/>
103		<defjdklocations v="11"/>
104		<defjdklocations v="12"/>
105	+	<defjdklocations v="13"/>
106	+	<defjdklocations v="14"/>
107	+	<defjdklocations v="15"/>
108	+	<defjdklocations v="16"/>
109	+	<defjdklocations v="17"/>
110	+	<defjdklocations v="18"/>
111
112		<!-- Source locations -->
113		<property name="src.dir"              location="${basedir}/src/main"/>
114		<property name="test.src.dir"         location="${basedir}/src/test"/>
115		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
116		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
147	–	<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
148	–	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
149	–	<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
150	–	<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
117		<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
118		<property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
119	<	<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
119	>	<property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
120	>	<property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
121	>	<property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
122	>	<property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
123	>	<property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
124	>	<property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
125	>	<property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
126		<property name="lib.dir"              location="${basedir}/lib"/>
127		<property name="dist.dir"             location="${basedir}/dist"/>
128		<property name="topsrc.dir"           location="${basedir}/src"/>
157	–	<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
158	–	<property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
159	–	<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
160	–	<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
161	–	<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
162	–	<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
129
130		<!-- Javadoc locations -->
131		<property name="docs.dir"          location="${build.dir}/docs"/>
132	<	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
167	<	<property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
168	<	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
169	<	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
170	<	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
171	<	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
172	<
173	<	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
174	<	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
175	<	<property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
176	<	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
177	<	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
178	<	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
179	<	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
132	>	<property name="dist.docs.dir"     location="${dist.dir}/docs"/>
133
134		<!-- Jar locations -->
135		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
183	–	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
184	–	<property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
185	–	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
186	–	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
187	–	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
188	–	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
136		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
137
138		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
139		<!-- Switched to https: in 2017-10 - JDK-8190312 -->
140	<	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
141	<	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
142	<	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
143	<	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
197	<	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
198	<	<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
199	<	<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
140	>	<!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
141	>	<!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
142	>	<!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
143	>	<!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
144		<!-- The location of jdk early access docs (RIP) -->
201	–	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202	–	<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
145		<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
146	<	<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
147	<	<!-- Default jdk doc location (latest stable release seems best) -->
148	<	<!-- But pin to jdk 10 until fix for -->
149	<	<!-- 8211194: javadoc -link doesn't take module path into consideration -->
150	<	<property name="java.docroot.url"   value="${java10.docroot.url}"/>
146	>	<!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
147	>	<!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
148	>	<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
149	>	<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
150	>	<property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
151	>	<property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
152	>	<property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
153	>	<property name="java16.docroot.url" value="https://docs.oracle.com/en/java/javase/16/docs"/>
154	>	<property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
155	>	<property name="java18.docroot.url" value="https://download.java.net/java/early_access/jdk18/docs"/>
156	>	<!-- Default jdk doc location (latest stable LTS release seems best) -->
157	>	<property name="java.docroot.url"   value="${java17.docroot.url}"/>
158
159		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
211	–	<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
212	–	<property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
213	–	<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
214	–	<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
215	–	<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
216	–	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
160		<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
161		<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
162	+	<property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
163	+	<property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
164	+	<property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
165	+	<property name="java16.api.url"     value="${java16.docroot.url}/api/"/>
166	+	<property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
167	+	<property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
168		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
169
170		<!-- Define the "jtreg" task -->
#	Line 223 | Line 172
172		<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
173		classpath="${lib.dir}/jtreg.jar" />
174
175	<	<!-- Tck options; see JSR166TestCase.java
175	>	<!-- Tck configuration options; see JSR166TestCase.java
176		To profile a single tck test class:
177		ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
178		To stress test a single tck test class:
#	Line 246 | Line 195
195
196		<sequential>
197
249	–	<local name="modules"/>
250	–	<condition property="modules">
251	–	<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
252	–	</condition>
253	–
254	–	<local name="use-doclint"/>
255	–	<condition property="use-doclint">
256	–	<not> <equals arg1="@{target}" arg2="7"/> </not>
257	–	</condition>
258	–
198		<mkdir dir="@{workdir}/tck-classes"/>
199
200		<javac srcdir="@{tck.src.dir}"
#	Line 275 | Line 214
214		<include name="*.java"/>
215		<compilerarg value="-XDignore.symbol.file=true"/>
216		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
217	<	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
218	<	<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280	<	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
217	>	<compilerarg value="-Xdoclint:reference/private"/>
218	>	<compilerarg value="--patch-module=java.base=@{classes}"/>
219		<compilerarg line="${build.args}"/>
220		<javac-elements/>
221
#	Line 287 | Line 225
225		failonerror="true"
226		jvm="${java@{target}}"
227		fork="true">
228	<	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
229	<	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
230	<	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
231	<	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
232	<	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
233	<	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
234	<	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
235	<	<jvmarg line="@{jvmflags}"/>
236	<	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
237	<	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
238	<
239	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
240	<	<syspropertyset id="system-properties-used-by-tck">
241	<	<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
242	<	<propertyref prefix="jsr166."/>
243	<	<propertyref name="test.timeout.factor"/>
244	<	</syspropertyset>
245	<
246	<	<classpath>
247	<	<pathelement location="${junit.jar}"/>
248	<	<pathelement location="@{workdir}/tck-classes"/>
311	<	</classpath>
228	>	<jvmarg value="--patch-module=java.base=@{classes}"/>
229	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
230	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
231	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
232	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
233	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
234	>	<jvmarg line="@{jvmflags}"/>
235	>	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
236	>	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
237	>
238	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
239	>	<syspropertyset id="system-properties-used-by-tck">
240	>	<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
241	>	<propertyref prefix="jsr166."/>
242	>	<propertyref name="test.timeout.factor"/>
243	>	</syspropertyset>
244	>
245	>	<classpath>
246	>	<pathelement location="${junit.jar}"/>
247	>	<pathelement location="@{workdir}/tck-classes"/>
248	>	</classpath>
249		</java>
250
251		</sequential>
#	Line 329 | Line 266
266		</sequential>
267		</macrodef>
268
269	+	<defjtregtests v="18"/>
270	+	<defjtregtests v="17"/>
271	+	<defjtregtests v="16"/>
272	+	<defjtregtests v="15"/>
273	+	<defjtregtests v="14"/>
274	+	<defjtregtests v="13"/>
275		<defjtregtests v="12"/>
276		<defjtregtests v="11"/>
334	–	<defjtregtests v="10"/>
335	–	<defjtregtests v="9"/>
336	–	<defjtregtests v="8"/>
337	–	<defjtregtests v="7"/>
277
278		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
279		<property name="jtreg.flags" value=""/>
280
281		<macrodef name="run-jtreg-tests">
282	<	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
282	>	<!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
283		<attribute name="target"/>
284		<attribute name="workdir"/>
285		<attribute name="classes"/>
#	Line 353 | Line 292
292		<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
293		<property name="jtreg.verbose" value="nopass,fail,error"/>
294
295	<	<local name="modules"/>
296	<	<condition property="modules">
297	<	<available file="${jdk@{target}.home}/lib/modules" type="file"/>
298	<	</condition>
295	>	<!-- concurrency > 1 mitigates slowness of some jtreg tests -->
296	>	<!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
297	>	<!-- In 2020 concurrency:3 seems like a sweet spot -->
298	>	<!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
299	>	<property name="jtreg.concurrency" value="3"/>
300
301	<	<delete dir="@{workdir}/JTwork"   quiet="true"/>
301	>	<delete dir="@{workdir}/JTwork" quiet="true"/>
302		<jtreg dir="${jtreg@{target}.src.dir}"
303		jdk="${jdk@{target}.home}"
304		workDir="@{workdir}/JTwork">
305		<patternset refid="jdk@{target}.jtreg.tests"/>
306	<	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
307	<	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
308	<	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
306	>	<arg value="-javacoption:--patch-module=java.base=@{classes}"/>
307	>	<arg value="-vmoption:--patch-module=java.base=@{classes}"/>
308	>	<arg value="-vmoption:-Xmx256m"/>
309	>	<arg value="-concurrency:${jtreg.concurrency}"/>
310	>	<arg value="-vmoptions:-esa -ea"/>
311	>	<arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
312		<arg value="-agentvm"/>
313		<arg value="-noreport"/>
314		<arg value="-verbose:@{verbose}"/>
372	–	<arg value="-vmoptions:-esa -ea"/>
315		<arg value="-automatic"/>
316		<arg value="-k:!ignore"/>
317		<arg line="@{jtregflags}"/>
#	Line 385 | Line 327
327		</path>
328
329		<!-- Support @jls tag, used in jdk8+ javadoc -->
330	+	<!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
331		<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
332		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
333
#	Line 393 | Line 336
336		<!-- Default values: may seem strange ... -->
337		<!-- At runtime, target latest LTS, i.e. jdk11 -->
338		<!-- But at build time, target jdk9, for maximal binary portability -->
339	<	<!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
340	<	<property name="build.main.java.version" value="11"/>
339	>	<!-- ButButBut as of 2019-08, target jdk11 at build time -->
340	>	<!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
341	>	o override-methods=summary
342	>	o {@systemProperty ...}
343	>	o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
344	>	o 8202628: javadoc generates bad links in TestModules.java
345	>	-->
346	>	<property name="java.runtime.target" value="11"/>
347		<property name="build.main.java" value="${java11}"/>
348	<	<property name="build.main.javac" value="${javac9}"/>
348	>	<property name="build.main.javac" value="${javac11}"/>
349		<property name="build.main.javadoc" value="${javadoc12}"/>
350	+	<property name="build.main.javadoc.source" value="${java.runtime.target}"/>
351
352		<target name="dists"
353	<	depends="dist, 4jdk8dist"
353	>	depends="dist"
354		description="Builds all public jars and docs"/>
405	–	<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
355
356		<target name="compile"
357		depends="configure-compiler"
#	Line 429 | Line 378
378		<compilerarg value="--patch-module=java.base=${src.dir}"/>
379		<compilerarg value="-Xprefer:source"/>
380		<compilerarg value="-XDignore.symbol.file=true"/>
381	+	<!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
382		<compilerarg value="-Xlint:all,-removal"/>
383		<compilerarg line="--doclint-format html5"/>
384	<	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
384	>	<!--  Temporarily disable doclint for private elements, due to -->
385	>	<!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
386	>	<!--  which is expected to be fixed in openjdk 11.0.8 -->
387	>	<!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
388	>	<compilerarg value="-Xdoclint:all/protected"/>
389	>	<compilerarg value="-Xdoclint/package:java.util.*"/>
390		<compilerarg value="-Werror"/>
391		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
392		<compilerarg line="${build.args}"/>
#	Line 458 | Line 413
413		<target name="docs"
414		description="Builds javadocs for src/main to dist dir">
415
416	<	<delete dir="${docs.dir}"/>
416	>	<delete dir="${docs.dir}" quiet="true"/>
417		<mkdir dir="${docs.dir}"/>
418
419	+	<!-- old school frames via docs/index.html?overview-summary.html -->
420	+	<!-- dash-dash-frames no longer a supported option in jdk13+ -->
421	+	<local name="use-frames"/>
422	+	<condition property="use-frames">
423	+	<equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
424	+	</condition>
425	+
426		<!-- the packagenames="none" hack below prevents scanning the -->
427		<!-- sourcepath for packages -->
428
#	Line 471 | Line 433
433		<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
434		<javadoc destdir="${docs.dir}"
435		packagenames="none"
436	<	link="${java11.api.url}"
436	>	link="${java.api.url}"
437		overview="${src.dir}/intro.html"
438		access="${build.javadoc.access}"
439		sourcepath="${src.dir}"
440		classpath=""
441	<	source="11"
441	>	source="${build.main.javadoc.source}"
442		executable="${build.main.javadoc}">
443	+	<!-- TODO: JDK-8214571 failonerror = "true" -->
444		<fileset dir="${src.dir}" defaultexcludes="yes">
445	<	<include name="**/*.java"/>
445	>	<include name="java/**/*.java"/>
446		</fileset>
447	<	<arg line="-Xdocrootparent ${java10.docroot.url}"/>
447	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
448		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
449	+	<arg value="-quiet"/>
450		<arg value="-XDignore.symbol.file=true"/>
451		<arg value="-html5"/>
452	+	<arg value="-Xdoclint:all,-missing"/>
453		<arg value="--patch-module=java.base=${src.dir}"/>
454	<	<!-- old school frames via docs/index.html?overview-summary.html -->
490	<	<arg value="--frames"/>
454	>	<arg value="--frames" if:set="use-frames"/>
455		<arg value="--override-methods=summary"/>
456		<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
457		<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
#	Line 529 | Line 493
493		</target>
494
495		<target name="tck"
496	<	depends="jar"
496	>	depends="jar"
497		description="Runs tck tests for src/main directly">
498
499		<run-tck-tests
500	<	target="${build.main.java.version}"
500	>	target="${java.runtime.target}"
501		workdir="${build.dir}"
502		classes="${product.jar}">
503		<javac-elements>
#	Line 564 | Line 528
528		</target>
529
530		<target name="jtreg"
531	<	depends="jar"
531	>	depends="jar"
532		description="Runs jtreg tests for src/main using the jtreg ant task">
533		<run-jtreg-tests
534	<	target="${build.main.java.version}"
534	>	target="${java.runtime.target}"
535		workdir="${build.dir}"
536		classes="${product.jar}"/>
537		</target>
#	Line 577 | Line 541
541		description="Runs tck and jtreg tests for src/main"/>
542
543		<target name="test-version-permutations"
544	<	depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
544	>	depends="test11, test12, test13, test14, test15, test16,
545	>	test11-12, test11-13, test11-14, test11-15, test11-16,
546	>	clean, test, docs"
547	>	description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
548	>
549	>	<target name="test11">
550	>	<antcall>
551	>	<param name="java.runtime.target" value="11"/>
552	>	<param name="build.main.javac" value="${javac11}"/>
553	>	<param name="build.main.javadoc" value="${javadoc12}"/>
554	>	<param name="build.main.javadoc.source" value="11"/>
555	>	<target name="clean"/>
556	>	<target name="test"/>
557	>	<target name="docs"/>
558	>	</antcall>
559		</target>
560
561	<	<target name="test9">
584	<	<antcall target="clean"/>
561	>	<target name="test12">
562		<antcall>
563	<	<param name="build.main.java.version" value="9"/>
564	<	<param name="build.main.java" value="${java9}"/>
565	<	<param name="build.main.javac" value="${javac9}"/>
563	>	<param name="java.runtime.target" value="12"/>
564	>	<param name="build.main.javac" value="${javac12}"/>
565	>	<param name="build.main.javadoc" value="${javadoc12}"/>
566	>	<param name="build.main.javadoc.source" value="12"/>
567	>	<target name="clean"/>
568		<target name="test"/>
569	+	<target name="docs"/>
570		</antcall>
571		</target>
572
573	<	<target name="test10">
594	<	<antcall target="clean"/>
573	>	<target name="test13">
574		<antcall>
575	<	<param name="build.main.java.version" value="10"/>
576	<	<param name="build.main.java" value="${java10}"/>
577	<	<param name="build.main.javac" value="${javac10}"/>
578	<	<param name="build.main.javadoc" value="${javadoc10}"/>
575	>	<param name="java.runtime.target" value="13"/>
576	>	<param name="build.main.javac" value="${javac13}"/>
577	>	<param name="build.main.javadoc" value="${javadoc13}"/>
578	>	<param name="build.main.javadoc.source" value="13"/>
579	>	<target name="clean"/>
580		<target name="test"/>
581		<target name="docs"/>
582		</antcall>
583		</target>
584
585	<	<target name="test11">
606	<	<antcall target="clean"/>
585	>	<target name="test14">
586		<antcall>
587	<	<param name="build.main.java.version" value="11"/>
588	<	<param name="build.main.java" value="${java11}"/>
589	<	<param name="build.main.javac" value="${javac11}"/>
590	<	<param name="build.main.javadoc" value="${javadoc11}"/>
587	>	<param name="java.runtime.target" value="14"/>
588	>	<param name="build.main.javac" value="${javac14}"/>
589	>	<param name="build.main.javadoc" value="${javadoc14}"/>
590	>	<param name="build.main.javadoc.source" value="14"/>
591	>	<target name="clean"/>
592		<target name="test"/>
593		<target name="docs"/>
594		</antcall>
595		</target>
596
597	<	<target name="test12">
618	<	<antcall target="clean"/>
597	>	<target name="test15">
598		<antcall>
599	<	<param name="build.main.java.version" value="12"/>
600	<	<param name="build.main.java" value="${java12}"/>
601	<	<param name="build.main.javac" value="${javac12}"/>
602	<	<param name="build.main.javadoc" value="${javadoc12}"/>
599	>	<param name="java.runtime.target" value="15"/>
600	>	<param name="build.main.javac" value="${javac15}"/>
601	>	<param name="build.main.javadoc" value="${javadoc15}"/>
602	>	<param name="build.main.javadoc.source" value="15"/>
603	>	<target name="clean"/>
604		<target name="test"/>
605		<target name="docs"/>
606		</antcall>
607		</target>
608
609	<	<target name="test9-11">
630	<	<antcall target="clean"/>
609	>	<target name="test16">
610		<antcall>
611	<	<param name="build.main.java.version" value="11"/>
612	<	<param name="build.main.java" value="${java11}"/>
613	<	<param name="build.main.javac" value="${javac9}"/>
614	<	<param name="build.main.javadoc" value="${javadoc11}"/>
611	>	<param name="java.runtime.target" value="16"/>
612	>	<param name="build.main.javac" value="${javac16}"/>
613	>	<param name="build.main.javadoc" value="${javadoc16}"/>
614	>	<param name="build.main.javadoc.source" value="16"/>
615	>	<target name="clean"/>
616		<target name="test"/>
617		<target name="docs"/>
618		</antcall>
619		</target>
620
621	<	<target name="test9-12">
642	<	<antcall target="clean"/>
621	>	<target name="test11-12">
622		<antcall>
623	<	<param name="build.main.java.version" value="12"/>
624	<	<param name="build.main.java" value="${java12}"/>
646	<	<param name="build.main.javac" value="${javac9}"/>
623	>	<param name="java.runtime.target" value="12"/>
624	>	<param name="build.main.javac" value="${javac11}"/>
625		<param name="build.main.javadoc" value="${javadoc12}"/>
626	+	<param name="build.main.javadoc.source" value="11"/>
627	+	<target name="clean"/>
628	+	<target name="test"/>
629	+	<target name="docs"/>
630	+	</antcall>
631	+	</target>
632	+
633	+	<target name="test11-13">
634	+	<antcall>
635	+	<param name="java.runtime.target" value="13"/>
636	+	<param name="build.main.javac" value="${javac11}"/>
637	+	<param name="build.main.javadoc" value="${javadoc13}"/>
638	+	<param name="build.main.javadoc.source" value="11"/>
639	+	<target name="clean"/>
640	+	<target name="test"/>
641	+	<target name="docs"/>
642	+	</antcall>
643	+	</target>
644	+
645	+	<target name="test11-14">
646	+	<antcall>
647	+	<param name="java.runtime.target" value="14"/>
648	+	<param name="build.main.javac" value="${javac11}"/>
649	+	<param name="build.main.javadoc" value="${javadoc14}"/>
650	+	<param name="build.main.javadoc.source" value="11"/>
651	+	<target name="clean"/>
652	+	<target name="test"/>
653	+	<target name="docs"/>
654	+	</antcall>
655	+	</target>
656	+
657	+	<target name="test11-15">
658	+	<antcall>
659	+	<param name="java.runtime.target" value="15"/>
660	+	<param name="build.main.javac" value="${javac11}"/>
661	+	<param name="build.main.javadoc" value="${javadoc15}"/>
662	+	<param name="build.main.javadoc.source" value="11"/>
663	+	<target name="clean"/>
664		<target name="test"/>
665		<target name="docs"/>
666		</antcall>
667		</target>
668
669	+	<target name="test11-16">
670	+	<antcall>
671	+	<param name="java.runtime.target" value="16"/>
672	+	<param name="build.main.javac" value="${javac11}"/>
673	+	<param name="build.main.javadoc" value="${javadoc16}"/>
674	+	<param name="build.main.javadoc.source" value="11"/>
675	+	<target name="clean"/>
676	+	<target name="test"/>
677	+	<target name="docs"/>
678	+	</antcall>
679	+	</target>
680	+
681	+	<target name="docs16">
682	+	<antcall>
683	+	<param name="java.runtime.target" value="16"/>
684	+	<param name="build.main.javac" value="${javac16}"/>
685	+	<param name="build.main.javadoc" value="${javadoc16}"/>
686	+	<param name="build.main.javadoc.source" value="16"/>
687	+	<target name="clean"/>
688	+	<target name="docs"/>
689	+	</antcall>
690	+	</target>
691	+
692
693		<target name="configure-compiler">
694		<fail message="ant version too old">
#	Line 689 | Line 728
728
729		<include name="*.java"/>
730		<compilerarg value="-XDignore.symbol.file=true"/>
731	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
732	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
694	<	<compilerarg line="${build.args}"/>
695	<	</javac>
696	<	</target>
697	<
698	<
699	<	<!-- jsr166 4jdk8 -->
700	<
701	<	<target name="4jdk8compile"
702	<	depends="configure-compiler"
703	<	description="Compiles src/jdk8 sources, targeting jdk8">
704	<
705	<	<mkdir dir="${build.4jdk8.classes.dir}"/>
706	<
707	<	<javac srcdir="${4jdk8src.dir}"
708	<	destdir="${build.4jdk8.classes.dir}"
709	<	debug="${build.debug}"
710	<	debuglevel="${build.debuglevel}"
711	<	deprecation="${build.deprecation}"
712	<	source="8"
713	<	target="8"
714	<	classpath=""
715	<	bootclasspath="${bootclasspath8}"
716	<	includeAntRuntime="false"
717	<	includeJavaRuntime="false"
718	<	encoding="ASCII"
719	<	executable="${javac8}"
720	<	fork="true">
721	<	<include name="**/*.java"/>
722	<	<compilerarg value="-Xprefer:source"/>
723	<	<compilerarg value="-XDignore.symbol.file=true"/>
724	<	<compilerarg value="-Xlint:all"/>
725	<	<compilerarg value="-Werror"/>
726	<	<compilerarg line="${build.args}"/>
727	<	</javac>
728	<	</target>
729	<
730	<	<target name="4jdk8doclint"
731	<	depends="configure-compiler"
732	<	description="Finds doclint warnings">
733	<
734	<	<mkdir dir="${build.4jdk8.classes.dir}"/>
735	<
736	<	<javac srcdir="${4jdk8src.dir}"
737	<	destdir="${build.4jdk8.classes.dir}"
738	<	debug="${build.debug}"
739	<	debuglevel="${build.debuglevel}"
740	<	deprecation="${build.deprecation}"
741	<	source="8"
742	<	target="8"
743	<	classpath=""
744	<	bootclasspath="${bootclasspath8}"
745	<	includeAntRuntime="false"
746	<	includeJavaRuntime="false"
747	<	encoding="ASCII"
748	<	executable="${javac8}"
749	<	fork="true">
750	<	<include name="**/*.java"/>
751	<	<compilerarg value="-Xprefer:source"/>
752	<	<compilerarg value="-XDignore.symbol.file=true"/>
753	<	<compilerarg value="-Xlint:all"/>
754	<	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
731	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
732	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
733		<compilerarg line="${build.args}"/>
734		</javac>
735		</target>
736
737
738	<	<target name="4jdk8jar"
739	<	depends="4jdk8compile"
762	<	description="Builds library jar from compiled sources">
763	<
764	<	<jar destfile="${4jdk8product.jar}">
765	<	<fileset dir="${build.4jdk8.classes.dir}"/>
766	<	<manifest>
767	<	<attribute name="Built-By" value="${user.name}"/>
768	<	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
769	<	</manifest>
770	<	</jar>
771	<	</target>
772	<
773	<
774	<	<target name="4jdk8-tck"
775	<	depends="4jdk8jar"
776	<	description="Runs tck tests for jsr166-4jdk8 directly">
777	<
778	<	<run-tck-tests
779	<	target="8"
780	<	workdir="${build.4jdk8.dir}"
781	<	classes="${4jdk8product.jar}">
782	<	<javac-elements>
783	<	<!-- JDK9+ test classes -->
784	<	<exclude name="*9Test.java"/>
785	<	<exclude name="*10Test.java"/>
786	<	<compilerarg value="-Werror"/>
787	<	</javac-elements>
788	<	</run-tck-tests>
789	<	</target>
790	<
791	<
792	<	<target name="4jdk8-jtreg"
793	<	depends="4jdk8jar"
794	<	description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
795	<	<run-jtreg-tests
796	<	target="8"
797	<	workdir="${build.4jdk8.dir}"
798	<	classes="${4jdk8product.jar}"/>
799	<	</target>
800	<
801	<
802	<	<target name="4jdk8-test"
803	<	depends="4jdk8-tck, 4jdk8-jtreg"
804	<	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
805	<
806	<
807	<	<target name="4jdk8docs"
808	<	description="Builds javadocs for src/jdk8 to dist dir">
809	<
810	<	<delete dir="${4jdk8docs.dir}"/>
811	<	<mkdir dir="${4jdk8docs.dir}"/>
812	<
813	<	<javadoc destdir="${4jdk8docs.dir}"
814	<	packagenames="none"
815	<	link="${java8.api.url}"
816	<	overview="${4jdk8src.dir}/intro.html"
817	<	access="${build.javadoc.access}"
818	<	sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
819	<	classpath=""
820	<	source="8"
821	<	executable="${javadoc8}"
822	<	failonerror = "true">
823	<	<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
824	<	<include name="**/*.java"/>
825	<	</fileset>
826	<	<arg line="-Xdocrootparent ${java8.docroot.url}"/>
827	<	<arg value="-XDignore.symbol.file=true"/>
828	<	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
829	<	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
830	<	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
831	<	<!-- @apiNote tag currently unused -->
832	<	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
833	<	</javadoc>
834	<	</target>
835	<
836	<
837	<	<target name="4jdk8dist"
838	<	depends="4jdk8dist-jar, 4jdk8dist-docs"
839	<	description="Puts all distributable products in single hierarchy"/>
840	<
841	<
842	<	<target name="4jdk8clean"
843	<	description="Removes all 4jdk8 build products">
844	<	<delete dir="${build.4jdk8.dir}"/>
845	<	</target>
846	<
847	<
848	<	<target name="4jdk8dist-jar"
849	<	depends="4jdk8clean, 4jdk8jar">
850	<	<copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
851	<	</target>
852	<
853	<
854	<	<target name="4jdk8dist-docs"
855	<	depends="4jdk8clean, 4jdk8docs">
856	<	<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
857	<	</target>
858	<
859	<
738	>	<!-- old branches no longer maintained.  build support deleted -->
739	>	<!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
740		<!-- jsr166 4jdk7 (no longer maintained) -->
861	–
862	–	<target name="4jdk7compile" depends="configure-compiler">
863	–	<mkdir dir="${build.4jdk7.classes.dir}"/>
864	–
865	–	<javac srcdir="${4jdk7src.dir}"
866	–	destdir="${build.4jdk7.classes.dir}"
867	–	debug="${build.debug}"
868	–	debuglevel="${build.debuglevel}"
869	–	deprecation="${build.deprecation}"
870	–	source="6"
871	–	target="6"
872	–	classpath=""
873	–	bootclasspath="${bootclasspath6}"
874	–	includeAntRuntime="false"
875	–	includeJavaRuntime="false"
876	–	encoding="ASCII"
877	–	executable="${javac7}"
878	–	fork="true">
879	–
880	–	<include name="**/*.java"/>
881	–	<compilerarg value="-Xprefer:source"/>
882	–	<compilerarg value="-XDignore.symbol.file=true"/>
883	–	<compilerarg value="-Xlint:all"/>
884	–	<compilerarg value="-Werror"/>
885	–	<compilerarg line="${build.args}"/>
886	–	</javac>
887	–	</target>
888	–
889	–	<target name="4jdk7doclint" depends="configure-compiler">
890	–	<mkdir dir="${build.4jdk7.classes.dir}"/>
891	–
892	–	<javac srcdir="${4jdk7src.dir}"
893	–	destdir="${build.4jdk7.classes.dir}"
894	–	debug="${build.debug}"
895	–	debuglevel="${build.debuglevel}"
896	–	deprecation="${build.deprecation}"
897	–	source="6"
898	–	target="6"
899	–	classpath=""
900	–	bootclasspath="${bootclasspath6}"
901	–	includeAntRuntime="false"
902	–	includeJavaRuntime="false"
903	–	encoding="ASCII"
904	–	executable="${javac8}"
905	–	fork="true">
906	–
907	–	<include name="**/*.java"/>
908	–	<compilerarg value="-Xprefer:source"/>
909	–	<compilerarg value="-XDignore.symbol.file=true"/>
910	–	<compilerarg value="-Xlint:all"/>
911	–	<compilerarg value="-Xdoclint:all/protected"/>
912	–	<compilerarg line="${build.args}"/>
913	–	</javac>
914	–	</target>
915	–
916	–	<target name="4jdk7jar" depends="4jdk7compile">
917	–	<jar destfile="${4jdk7product.jar}">
918	–	<fileset dir="${build.4jdk7.classes.dir}"/>
919	–	<manifest>
920	–	<attribute name="Built-By" value="${user.name}"/>
921	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
922	–	</manifest>
923	–	</jar>
924	–	</target>
925	–
926	–	<target name="4jdk7-tck" depends="4jdk7jar">
927	–	<run-tck-tests
928	–	target="7"
929	–	workdir="${build.4jdk7.dir}"
930	–	classes="${4jdk7product.jar}">
931	–	<javac-elements>
932	–	<!-- JDK8+ test classes -->
933	–	<exclude name="*8Test.java"/>
934	–	<exclude name="*9Test.java"/>
935	–	<exclude name="*10Test.java"/>
936	–	<exclude name="DoubleAccumulatorTest.java"/>
937	–	<exclude name="DoubleAdderTest.java"/>
938	–	<exclude name="LongAccumulatorTest.java"/>
939	–	<exclude name="LongAdderTest.java"/>
940	–	<exclude name="CompletableFutureTest.java"/>
941	–	<exclude name="SplittableRandomTest.java"/>
942	–	<exclude name="StampedLockTest.java"/>
943	–	<exclude name="SubmissionPublisherTest.java"/>
944	–	<compilerarg value="-Werror"/>
945	–	</javac-elements>
946	–	</run-tck-tests>
947	–	</target>
948	–
949	–	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
950	–	<target name="4jdk7-tck-junit" depends="4jdk7compile">
951	–
952	–	<junit printsummary="true"
953	–	showoutput="true"
954	–	errorProperty="junit.failed"
955	–	failureProperty="junit.failed"
956	–	includeantruntime="true"
957	–	jvm="${java7}"
958	–	fork="true">
959	–
960	–	<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
961	–	<jvmarg value="-server"/>
962	–
963	–	<classpath>
964	–	<pathelement location="${junit.jar}"/>
965	–	<pathelement location="${build.4jdk7.tck.classes.dir}"/>
966	–	</classpath>
967	–
968	–	<formatter type="brief"/>
969	–
970	–	<test name="${jsr166.tckTestClass}" haltonfailure="no">
971	–	</test>
972	–	</junit>
973	–	</target>
974	–
975	–	<target name="4jdk7-jtreg" depends="4jdk7jar">
976	–	<run-jtreg-tests
977	–	target="7"
978	–	workdir="${build.4jdk7.dir}"
979	–	classes="${4jdk7product.jar}"/>
980	–	</target>
981	–
982	–	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
983	–
984	–	<target name="4jdk7docs">
985	–	<delete dir="${4jdk7docs.dir}"/>
986	–	<mkdir dir="${4jdk7docs.dir}"/>
987	–
988	–	<javadoc destdir="${4jdk7docs.dir}"
989	–	packagenames="none"
990	–	link="${java7.api.url}"
991	–	overview="${4jdk7src.dir}/intro.html"
992	–	access="${build.javadoc.access}"
993	–	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
994	–	classpath=""
995	–	executable="${javadoc7}"
996	–	failonerror = "true">
997	–	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
998	–	<include name="**/*.java"/>
999	–	</fileset>
1000	–	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
1001	–	<arg value="-XDignore.symbol.file=true"/>
1002	–	</javadoc>
1003	–	</target>
1004	–
1005	–	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1006	–
1007	–	<target name="4jdk7clean">
1008	–	<delete dir="${build.4jdk7.dir}"/>
1009	–	</target>
1010	–
1011	–	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1012	–	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1013	–	</target>
1014	–
1015	–	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1016	–	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1017	–	</target>
1018	–
1019	–
741		<!-- jsr166x (no longer maintained) -->
1021	–
1022	–	<target name="jsr166xcompile" depends="configure-compiler">
1023	–	<mkdir dir="${build.jsr166x.classes.dir}"/>
1024	–
1025	–	<javac srcdir="${topsrc.dir}"
1026	–	destdir="${build.jsr166x.classes.dir}"
1027	–	debug="${build.debug}"
1028	–	debuglevel="${build.debuglevel}"
1029	–	deprecation="${build.deprecation}"
1030	–	classpath=""
1031	–	bootclasspath="${bootclasspath6}"
1032	–	source="5"
1033	–	target="5"
1034	–	includeAntRuntime="false"
1035	–	includeJavaRuntime="false"
1036	–	encoding="ASCII"
1037	–	executable="${javac7}"
1038	–	fork="true">
1039	–	<include name="jsr166x/**/*.java"/>
1040	–	<compilerarg value="-XDignore.symbol.file=true"/>
1041	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1042	–	<compilerarg value="-Werror"/>
1043	–	<compilerarg line="${build.args}"/>
1044	–	</javac>
1045	–	</target>
1046	–
1047	–	<target name="jsr166xjar" depends="jsr166xcompile">
1048	–	<jar destfile="${jsr166x.jar}">
1049	–	<fileset dir="${build.jsr166x.classes.dir}"/>
1050	–	<manifest>
1051	–	<attribute name="Built-By" value="${user.name}"/>
1052	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1053	–	</manifest>
1054	–	</jar>
1055	–	</target>
1056	–
1057	–	<target name="jsr166xdocs">
1058	–	<delete dir="${jsr166xdocs.dir}"/>
1059	–	<mkdir dir="${jsr166xdocs.dir}"/>
1060	–
1061	–	<javadoc destdir="${jsr166xdocs.dir}"
1062	–	packagenames="jsr166x.*"
1063	–	link="${java.api.url}"
1064	–	access="${build.javadoc.access}"
1065	–	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1066	–	bootclasspath="${bootclasspath6}"
1067	–	source="5"
1068	–	executable="${javadoc7}"
1069	–	failonerror = "true">
1070	–	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1071	–	<arg value="-XDignore.symbol.file=true"/>
1072	–	</javadoc>
1073	–	</target>
1074	–
1075	–	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1076	–
1077	–	<target name="jsr166xclean">
1078	–	<delete dir="${build.jsr166x.dir}"/>
1079	–	</target>
1080	–
1081	–	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1082	–	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1083	–	</target>
1084	–
1085	–	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1086	–	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1087	–	</target>
1088	–
1089	–
742		<!-- jsr166y (no longer maintained) -->
1091	–
1092	–	<target name="jsr166ycompile" depends="configure-compiler">
1093	–	<mkdir dir="${build.jsr166y.classes.dir}"/>
1094	–
1095	–	<javac srcdir="${topsrc.dir}"
1096	–	destdir="${build.jsr166y.classes.dir}"
1097	–	debug="${build.debug}"
1098	–	debuglevel="${build.debuglevel}"
1099	–	deprecation="${build.deprecation}"
1100	–	source="6"
1101	–	target="6"
1102	–	classpath=""
1103	–	bootclasspath="${bootclasspath6}"
1104	–	includeAntRuntime="false"
1105	–	includeJavaRuntime="false"
1106	–	encoding="ASCII"
1107	–	executable="${javac7}"
1108	–	fork="true">
1109	–
1110	–	<include name="jsr166y/**/*.java"/>
1111	–	<compilerarg value="-XDignore.symbol.file=true"/>
1112	–	<compilerarg value="-Xlint:all"/>
1113	–	<compilerarg value="-Werror"/>
1114	–	<compilerarg line="${build.args}"/>
1115	–	</javac>
1116	–	</target>
1117	–
1118	–	<target name="jsr166yjar" depends="jsr166ycompile">
1119	–	<jar destfile="${jsr166y.jar}" index="true">
1120	–	<fileset dir="${build.jsr166y.classes.dir}"/>
1121	–	<manifest>
1122	–	<attribute name="Built-By" value="${user.name}"/>
1123	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1124	–	</manifest>
1125	–	</jar>
1126	–	</target>
1127	–
1128	–	<target name="jsr166ydocs">
1129	–	<delete dir="${jsr166ydocs.dir}"/>
1130	–	<mkdir dir="${jsr166ydocs.dir}"/>
1131	–
1132	–	<javadoc destdir="${jsr166ydocs.dir}"
1133	–	packagenames="jsr166y.*"
1134	–	link="${java.api.url}"
1135	–	access="${build.javadoc.access}"
1136	–	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1137	–	bootclasspath="${bootclasspath6}"
1138	–	source="6"
1139	–	executable="${javadoc7}"
1140	–	failonerror = "true">
1141	–	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1142	–	<arg value="-XDignore.symbol.file=true"/>
1143	–	</javadoc>
1144	–	</target>
1145	–
1146	–	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1147	–
1148	–	<target name="jsr166yclean">
1149	–	<delete dir="${build.jsr166y.dir}"/>
1150	–	</target>
1151	–
1152	–	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1153	–	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1154	–	</target>
1155	–
1156	–	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1157	–	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1158	–	</target>
1159	–
1160	–
743		<!-- extra166y (no longer maintained) -->
1162	–
1163	–	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1164	–	<mkdir dir="${build.extra166y.classes.dir}"/>
1165	–
1166	–	<javac srcdir="${topsrc.dir}"
1167	–	destdir="${build.extra166y.classes.dir}"
1168	–	debug="${build.debug}"
1169	–	debuglevel="${build.debuglevel}"
1170	–	deprecation="${build.deprecation}"
1171	–	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1172	–	classpath=""
1173	–	source="6"
1174	–	target="6"
1175	–	includeAntRuntime="false"
1176	–	includeJavaRuntime="false"
1177	–	encoding="ASCII"
1178	–	executable="${javac7}"
1179	–	fork="true">
1180	–
1181	–	<include name="extra166y/**/*.java"/>
1182	–	<compilerarg value="-XDignore.symbol.file=true"/>
1183	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1184	–	<compilerarg value="-Werror"/>
1185	–	<compilerarg line="${build.args}"/>
1186	–	</javac>
1187	–	</target>
1188	–
1189	–	<target name="extra166yjar" depends="extra166ycompile">
1190	–	<jar destfile="${extra166y.jar}" index="true">
1191	–	<fileset dir="${build.extra166y.classes.dir}"/>
1192	–	<manifest>
1193	–	<attribute name="Built-By" value="${user.name}"/>
1194	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1195	–	</manifest>
1196	–	</jar>
1197	–	</target>
1198	–
1199	–	<target name="extra166ydocs">
1200	–	<delete dir="${extra166ydocs.dir}"/>
1201	–	<mkdir dir="${extra166ydocs.dir}"/>
1202	–
1203	–	<javadoc destdir="${extra166ydocs.dir}"
1204	–	packagenames="extra166y.*"
1205	–	link="${java.api.url}"
1206	–	access="${build.javadoc.access}"
1207	–	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1208	–	bootclasspath="${bootclasspath6}"
1209	–	source="6"
1210	–	executable="${javadoc7}">
1211	–	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1212	–	<arg value="-XDignore.symbol.file=true"/>
1213	–	</javadoc>
1214	–	</target>
1215	–
1216	–	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1217	–
1218	–	<target name="extra166yclean">
1219	–	<delete dir="${build.extra166y.dir}"/>
1220	–	</target>
1221	–
1222	–	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1223	–	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1224	–	</target>
1225	–
1226	–	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1227	–	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1228	–	</target>
1229	–
1230	–
744		<!-- jsr166e (no longer maintained) -->
745
1233	–	<property name="build.jsr166e.java.version" value="6"/>
1234	–	<property name="build.jsr166e.javac" value="${javac6}"/>
1235	–
1236	–	<target name="jsr166ecompile" depends="configure-compiler">
1237	–	<mkdir dir="${build.jsr166e.classes.dir}"/>
1238	–
1239	–	<javac srcdir="${topsrc.dir}"
1240	–	destdir="${build.jsr166e.classes.dir}"
1241	–	debug="${build.debug}"
1242	–	debuglevel="${build.debuglevel}"
1243	–	deprecation="${build.deprecation}"
1244	–	source="${build.jsr166e.java.version}"
1245	–	target="${build.jsr166e.java.version}"
1246	–	classpath=""
1247	–	includeAntRuntime="false"
1248	–	includeJavaRuntime="false"
1249	–	executable="${build.jsr166e.javac}"
1250	–	fork="true">
1251	–
1252	–	<include name="jsr166e/**/*.java"/>
1253	–	<compilerarg value="-XDignore.symbol.file=true"/>
1254	–	<compilerarg value="-Xlint:all"/>
1255	–	<compilerarg value="-Werror"/>
1256	–	<compilerarg line="${build.args}"/>
1257	–	</javac>
1258	–	</target>
1259	–
1260	–	<target name="jsr166edoclint">
1261	–	<mkdir dir="${build.jsr166e.classes.dir}"/>
1262	–
1263	–	<javac srcdir="${topsrc.dir}"
1264	–	destdir="${build.jsr166e.classes.dir}"
1265	–	debug="${build.debug}"
1266	–	debuglevel="${build.debuglevel}"
1267	–	deprecation="${build.deprecation}"
1268	–	source="${build.jsr166e.java.version}"
1269	–	target="${build.jsr166e.java.version}"
1270	–	classpath=""
1271	–	bootclasspath="${bootclasspath6}"
1272	–	includeAntRuntime="false"
1273	–	includeJavaRuntime="false"
1274	–	executable="${javac8}"
1275	–	fork="true">
1276	–
1277	–	<include name="jsr166e/**/*.java"/>
1278	–	<compilerarg value="-XDignore.symbol.file=true"/>
1279	–	<compilerarg value="-Xlint:all"/>
1280	–	<compilerarg value="-Werror"/>
1281	–	<compilerarg value="-Xdoclint:all/protected"/>
1282	–	</javac>
1283	–	</target>
1284	–
1285	–	<target name="jsr166ejar" depends="jsr166ecompile">
1286	–	<jar destfile="${jsr166e.jar}" index="true">
1287	–	<fileset dir="${build.jsr166e.classes.dir}"/>
1288	–	<manifest>
1289	–	<attribute name="Built-By" value="${user.name}"/>
1290	–	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1291	–	</manifest>
1292	–	</jar>
1293	–	</target>
1294	–
1295	–	<target name="jsr166edocs">
1296	–	<delete dir="${jsr166edocs.dir}"/>
1297	–	<mkdir dir="${jsr166edocs.dir}"/>
1298	–
1299	–	<javadoc destdir="${jsr166edocs.dir}"
1300	–	packagenames="jsr166e.*"
1301	–	link="${java.api.url}"
1302	–	access="${build.javadoc.access}"
1303	–	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1304	–	source="${build.jsr166e.java.version}"
1305	–	executable="${javadoc7}"
1306	–	failonerror = "true">
1307	–	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1308	–	<arg value="-XDignore.symbol.file=true"/>
1309	–	</javadoc>
1310	–	</target>
1311	–
1312	–	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1313	–	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1314	–	<run-tck-tests
1315	–	tck.src.dir="${test.src.dir}/tck-jsr166e"
1316	–	target="${build.jsr166e.java.version}"
1317	–	workdir="${build.jsr166e.dir}"
1318	–	classes="${jsr166e.jar}"/>
1319	–	</target>
1320	–
1321	–	<target name="jsr166e-tck">
1322	–
1323	–	<!--     <antcall target="clean"/> -->
1324	–	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1325	–	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1326	–	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1327	–	<!--     </antcall> -->
1328	–
1329	–	<antcall target="clean"/>
1330	–	<antcall target="jsr166e-tck-one-java-version">
1331	–	<param name="build.jsr166e.java.version" value="7"/>
1332	–	<param name="build.jsr166e.javac" value="${javac7}"/>
1333	–	</antcall>
1334	–
1335	–	<antcall target="clean"/>
1336	–	<antcall target="jsr166e-tck-one-java-version">
1337	–	<param name="build.jsr166e.java.version" value="6"/>
1338	–	<param name="build.jsr166e.javac" value="${javac6}"/>
1339	–	</antcall>
1340	–	</target>
1341	–
1342	–	<target name="jsr166e-test" depends="jsr166e-tck"/>
1343	–
1344	–	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1345	–
1346	–	<target name="jsr166eclean">
1347	–	<delete dir="${build.jsr166e.dir}"/>
1348	–	</target>
1349	–
1350	–	<target name="jsr166edist-jar"
1351	–	depends="jsr166eclean, jsr166ejar">
1352	–	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1353	–	</target>
1354	–
1355	–	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1356	–	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1357	–	</target>
1358	–
1359	–
746		<!-- Find buglets that can be detected by static build tools -->
747
748		<!--   <target name="lint"> -->
#	Line 1380 | Line 766
766		https://github.com/google/error-prone/issues/1143
767		=================================================================== -->
768		<path id="errorprone.processorpath.path">
769	<	<pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
769	>	<pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
770		<pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
771		<pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
772		<pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
773	+	<pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
774		</path>
775		<property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
776		<property name="errorprone.jsr166.user.flags" value=""/>
777		<property name="errorprone.jsr166.flags"
778		value="-Xep:HashtableContains:OFF
779	+	-Xep:PreferJavaTimeOverload:OFF
780		-Xep:JdkObsolete:OFF
781		-Xep:MissingOverride:OFF
782		-Xep:MissingFail:OFF
#	Line 1408 | Line 796
796		<property name="errorprone.jsr166.test.flags"
797		value="-Xep:StringSplitter:OFF
798		-Xep:BoxedPrimitiveConstructor:OFF
799	+	-Xep:UnnecessaryParentheses:OFF
800		-Xep:ModifyingCollectionWithItself:OFF"/>
801		<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
802		<target name="errorprone"
#	Line 1452 | Line 841
841		</jar>
842
843		<run-tck-tests
844	<	target="${build.main.java.version}"
844	>	target="${java.runtime.target}"
845		workdir="${build.dir}"
846		classes="${product.jar}">
847		<javac-elements>
#	Line 1475 | Line 864
864		description="Run errorprone over jtreg tests (experimental)">
865
866		<run-jtreg-tests
867	<	target="${build.main.java.version}"
867	>	target="${java.runtime.target}"
868		workdir="${build.dir}"
869		classes="${product.jar}"
870		verbose="all">

Diff Legend

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