ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.243 by jsr166, Sat May 13 20:16:55 2017 UTC vs.
Revision 1.327 by jsr166, Fri Nov 25 20:33:50 2022 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
# Line 18 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22 <  $HOME/jdk/jdk8
23 <  $HOME/jdk/jdk9
23 <  $HOME/jdk/jdk10
22 >  $HOME/jdk/jdk17
23 >  $HOME/jdk/jdk19
24    where each of the above is a JDK or a symlink to same, and
25 <  $HOME/jdk/src/jdk8
26 <  $HOME/jdk/src/jdk9
27 <  $HOME/jdk/src/jdk10
28 <  where each of the above is a complete JDK source tree
29 <  (e.g. mercurial forest) or a symlink to same.
25 >  $HOME/jdk/src/jdk17
26 >  where each of the above is a JDK source tree or a symlink to same.
27  
28    Alternatively, define ant variables thus:
29    ant -Djdk$N.home=... -Djdk$N.src.home=...
30 <  for $N in 8 9 10 ...
30 >  for $N in 17 .. 19 ...
31  
32    As of 2016-03, the sources in src/main are for jdk9+ only.
33 +  As of 2019-08, the sources in src/main are for jdk11+ only.
34 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
35 +  As of 2022-02, the sources in src/main are for jdk17+ only.
36   ------------------------------------------------------------------------------
37    </description>
38  
# Line 50 | Line 50
50  
51  
52    <!-- Compilation options -->
53  <property name="build.sourcelevel"    value="6"/>
53    <property name="build.debug"          value="true"/>
54    <property name="build.debuglevel"     value="source,lines,vars"/>
55    <property name="build.deprecation"    value="false"/>
# Line 62 | Line 61
61    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62    <property name="build.loops.dir"             location="${build.dir}/loops"/>
63  
65  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
66  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
67  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
68  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
69
70  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
71  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
72  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
73  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
74
75  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
76  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
77  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
78  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
79
80  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
81  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
82  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
83  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
84
64    <!-- JDK locations -->
65    <property name="jdks.home"  location="${user.home}/jdk"/>
66  
# Line 93 | Line 72
72      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
73      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
74      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
75 <    <local name="have.java.base"/>
97 <    <available property="have.java.base"
98 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
99 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
100 <      if:set="have.java.base"/>
101 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
102 <      unless:set="have.java.base"/>
103 <    <local name="modules"/>
104 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
105 <    <local name="boot.jar.dir"/>
106 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
107 <    <path id="bootclasspath@{v}" unless:set="modules">
108 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
109 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
110 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
111 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
112 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
113 <    </path>
114 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
75 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
76      </sequential>
77    </macrodef>
78  
# Line 127 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="6"/>
92 <  <defjdklocations v="7"/>
93 <  <defjdklocations v="8"/>
94 <  <defjdklocations v="9"/>
134 <  <defjdklocations v="10"/>
91 >  <defjdklocations v="17"/>
92 >  <defjdklocations v="18"/>
93 >  <defjdklocations v="19"/>
94 >  <defjdklocations v="20"/>
95  
96    <!-- Source locations -->
97    <property name="src.dir"              location="${basedir}/src/main"/>
98    <property name="test.src.dir"         location="${basedir}/src/test"/>
99    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
100    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
101 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
102 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
103 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
104 <  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
105 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
101 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
102 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
103 >  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
104 >  <property name="jtreg20.src.dir"      location="${test.src.dir}/jtreg"/>
105 >  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
106    <property name="lib.dir"              location="${basedir}/lib"/>
107    <property name="dist.dir"             location="${basedir}/dist"/>
108    <property name="topsrc.dir"           location="${basedir}/src"/>
149  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
154  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
109  
110    <!-- Javadoc locations -->
111    <property name="docs.dir"          location="${build.dir}/docs"/>
112 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
163 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
164 <
165 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
171 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
112 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
113  
114    <!-- Jar locations -->
115    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
180  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
116    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
117  
118    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
119 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
120 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
121 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
122 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
123 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
124 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
125 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191 <  <!-- Default jdk doc location (latest stable release seems best) -->
192 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
119 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
120 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
121 >  <property name="java18.docroot.url" value="https://docs.oracle.com/en/java/javase/18/docs"/>
122 >  <property name="java19.docroot.url" value="https://docs.oracle.com/en/java/javase/19/docs"/>
123 >  <property name="java20.docroot.url" value="https://download.java.net/java/early_access/jdk20/docs"/>
124 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
125 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
126  
127    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
128 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
129 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
130 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
131 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
199 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
128 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
129 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
130 >  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
131 >  <property name="java20.api.url"     value="${java20.docroot.url}/api/"/>
132    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
133  
134    <!-- Define the "jtreg" task -->
# Line 204 | Line 136
136    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
137             classpath="${lib.dir}/jtreg.jar" />
138  
139 <  <!-- Tck options; see JSR166TestCase.java
139 >  <!-- Tck configuration options; see JSR166TestCase.java
140     To profile a single tck test class:
141     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
142     To stress test a single tck test class:
# Line 227 | Line 159
159  
160      <sequential>
161  
230    <local name="modules"/>
231    <condition property="modules">
232      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233    </condition>
234
235    <local name="use-doclint"/>
236    <condition property="use-doclint">
237      <not> <equals arg1="@{target}" arg2="7"/> </not>
238    </condition>
239
162      <mkdir dir="@{workdir}/tck-classes"/>
163  
164      <javac srcdir="@{tck.src.dir}"
# Line 256 | Line 178
178        <include name="*.java"/>
179        <compilerarg value="-XDignore.symbol.file=true"/>
180        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
181 <      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
182 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
181 >      <compilerarg value="-Xdoclint:reference/private"/>
182 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
183        <compilerarg line="${build.args}"/>
184        <javac-elements/>
185  
# Line 268 | Line 189
189            failonerror="true"
190            jvm="${java@{target}}"
191            fork="true">
192 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
193 <        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
194 <        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
195 <        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
196 <        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
197 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
198 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
199 <        <jvmarg line="@{jvmflags}"/>
200 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
201 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
202 <
203 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
204 <        <syspropertyset id="system-properties-used-by-tck">
205 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
206 <          <propertyref prefix="jsr166."/>
207 <          <propertyref name="test.timeout.factor"/>
208 <        </syspropertyset>
209 <
210 <        <classpath>
211 <          <pathelement location="${junit.jar}"/>
212 <          <pathelement location="@{workdir}/tck-classes"/>
292 <        </classpath>
192 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
193 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
194 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
195 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
196 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
197 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
198 >        <jvmarg line="@{jvmflags}"/>
199 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
200 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
201 >
202 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
203 >        <syspropertyset id="system-properties-used-by-tck">
204 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
205 >          <propertyref prefix="jsr166."/>
206 >          <propertyref name="test.timeout.factor"/>
207 >        </syspropertyset>
208 >
209 >        <classpath>
210 >          <pathelement location="${junit.jar}"/>
211 >          <pathelement location="@{workdir}/tck-classes"/>
212 >        </classpath>
213      </java>
214  
215      </sequential>
216    </macrodef>
217  
218    <!-- Define jtreg test sets for different jdk versions -->
219 <  <fileset dir="${jtreg9.src.dir}">
220 <    <patternset id="jdk9.jtreg.tests">
221 <      <include name="**/*.java"/>
222 <    </patternset>
223 <  </fileset>
224 <
225 <  <fileset dir="${jtreg8.src.dir}">
226 <    <patternset id="jdk8.jtreg.tests">
227 <      <include name="**/*.java"/>
228 <    </patternset>
229 <  </fileset>
219 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
220 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
221 >  <property name="jtreg.test.pattern" value="**/*.java"/>
222 >  <macrodef name="defjtregtests">
223 >    <attribute name="v"/>
224 >    <sequential>
225 >      <fileset dir="${jtreg@{v}.src.dir}">
226 >        <patternset id="jdk@{v}.jtreg.tests">
227 >          <include name="${jtreg.test.pattern}"/>
228 >        </patternset>
229 >      </fileset>
230 >    </sequential>
231 >  </macrodef>
232  
233 <  <fileset dir="${jtreg7.src.dir}">
234 <    <patternset id="jdk7.jtreg.tests">
235 <      <include name="**/*.java"/>
236 <    </patternset>
315 <  </fileset>
233 >  <defjtregtests v="17"/>
234 >  <defjtregtests v="18"/>
235 >  <defjtregtests v="19"/>
236 >  <defjtregtests v="20"/>
237  
238    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
239    <property name="jtreg.flags" value=""/>
240  
241    <macrodef name="run-jtreg-tests">
321    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
322    <attribute name="source" default="7"/>
242      <attribute name="target"/>
243      <attribute name="workdir"/>
244      <attribute name="classes"/>
245 +    <attribute name="verbose" default="${jtreg.verbose}"/>
246      <attribute name="jtregflags" default=""/>
247 +    <element name="jtreg-elements" optional="true"/>
248  
249      <sequential>
250  
251      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
252      <property name="jtreg.verbose" value="nopass,fail,error"/>
253  
254 <    <local name="modules"/>
255 <    <condition property="modules">
256 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
257 <    </condition>
254 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
255 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
256 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
257 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
258 >    <property name="jtreg.concurrency" value="3"/>
259  
260 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
260 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
261      <jtreg dir="${jtreg@{target}.src.dir}"
262             jdk="${jdk@{target}.home}"
263             workDir="@{workdir}/JTwork">
264        <patternset refid="jdk@{target}.jtreg.tests"/>
265 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
267 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
265 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
266 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
267 >      <arg value="-vmoption:-Xmx256m"/>
268 >      <arg value="-concurrency:${jtreg.concurrency}"/>
269 >      <arg value="-vmoptions:-esa -ea"/>
270 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
271        <arg value="-agentvm"/>
272        <arg value="-noreport"/>
273 <      <arg value="-verbose:${jtreg.verbose}"/>
349 <      <arg value="-vmoptions:-esa -ea"/>
273 >      <arg value="-verbose:@{verbose}"/>
274        <arg value="-automatic"/>
275        <arg value="-k:!ignore"/>
276        <arg line="@{jtregflags}"/>
277        <arg line="${jtreg.flags}"/>
278 +      <jtreg-elements/>
279      </jtreg>
280      </sequential>
281    </macrodef>
# Line 361 | Line 286
286    </path>
287  
288    <!-- Support @jls tag, used in jdk8+ javadoc -->
289 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
290    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
291    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
292  
293    <!-- Main targets -->
294  
295 <  <property name="build.main.java.version" value="9"/>
296 <  <property name="build.main.javac" value="${javac9}"/>
295 >  <!-- Default values: may seem strange ... -->
296 >  <!-- At runtime, target latest, but build for current LTS -->
297 >  <property name="java.runtime.target" value="19"/>
298 >  <property name="build.main.java" value="${java17}"/>
299 >  <property name="build.main.javac" value="${javac17}"/>
300 >  <property name="build.main.javadoc" value="${javadoc19}"/>
301 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
302  
303    <target name="dists"
304 <          depends="dist, 4jdk8dist"
304 >          depends="dist"
305            description="Builds all public jars and docs"/>
375          <!--
376              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
377          -->
306  
307    <target name="compile"
308            depends="configure-compiler"
309            description="Compiles src/main sources to build dir">
310  
383    <local name="modules"/>
384    <condition property="modules">
385      <and>
386        <available file="${jdk9.home}/jmods" type="dir"/>
387        <equals arg1="9" arg2="${build.main.java.version}"/>
388      </and>
389    </condition>
390
311      <local name="destdir"/>
312 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
393 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
312 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
313  
314      <mkdir dir="${destdir}"/>
315  
# Line 407 | Line 326
326             fork="true">
327  
328        <include name="**/*.java"/>
329 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
329 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
330        <compilerarg value="-Xprefer:source"/>
331        <compilerarg value="-XDignore.symbol.file=true"/>
332        <compilerarg value="-Xlint:all"/>
333 <      <compilerarg line="--doclint-format html5"/>
334 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
333 >      <compilerarg value="-Xdoclint:all/protected"/>
334 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
335        <compilerarg value="-Werror"/>
336        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
337        <compilerarg line="${build.args}"/>
419
338      </javac>
339    </target>
340  
423
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 438 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
358 <
442 <    <delete dir="${docs.dir}"/>
358 >    <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
444
445    <!-- the packagenames="none" hack below prevents scanning the -->
446    <!-- sourcepath for packages -->
447
448 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
449 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
450 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
451 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
452 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
360      <javadoc destdir="${docs.dir}"
361               packagenames="none"
362 <             link="${java9.api.url}"
362 >             link="${java.api.url}"
363               overview="${src.dir}/intro.html"
364               access="${build.javadoc.access}"
365               sourcepath="${src.dir}"
366               classpath=""
367 <             executable="${javadoc9}">
367 >             source="${build.main.javadoc.source}"
368 >             executable="${build.main.javadoc}">
369        <fileset dir="${src.dir}" defaultexcludes="yes">
370 <        <include name="**/*.java"/>
370 >        <include name="java/**/*.java"/>
371        </fileset>
372 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
372 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
373        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
374 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
375 +      <arg value="-quiet"/>
376        <arg value="-XDignore.symbol.file=true"/>
377        <arg value="-html5"/>
378 +      <arg value="-Xdoclint:all,-missing"/>
379        <arg value="--patch-module=java.base=${src.dir}"/>
380 <      <arg value="-tag"/>
381 <      <arg value="${javadoc.jls.option}"/>
382 < <!-- @apiNote currently unused -->
383 < <!--       <arg value="-tag"/> -->
384 < <!--       <arg value="apiNote:a:API Note:"/> -->
385 <      <arg value="-tag"/>
475 <      <arg value="implSpec:a:Implementation Requirements:"/>
476 <      <arg value="-tag"/>
477 <      <arg value="implNote:a:Implementation Note:"/>
478 < <!-- tags added in jdk9: currently unused -->
479 < <!--       <arg value="-tag"/> -->
480 < <!--       <arg value="revised:X"/> -->
481 < <!--       <arg value="-tag"/> -->
482 < <!--       <arg value="spec:X"/> -->
380 >      <arg value="--frames" if:set="use-frames"/>
381 >      <arg value="--override-methods=summary"/>
382 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
383 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
384 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
385 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
386      </javadoc>
387    </target>
388  
486
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
491
492  <target name="release"
493          depends="dist"
494          description="Puts entire CVS tree, plus distribution productions, in a jar">
495
496    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
497
498    <jar basedir="${basedir}" destfile="${release.jar}">
499      <!-- <exclude name="build/**"/> -->
500      <exclude name="${release.jar}"/>
501      <exclude name="user.properties"/>
502      <exclude name="etc/notes/**"/>
503      <exclude name="src/emulation/**"/>
504      <exclude name="**/SyntaxTest.java"/>
505      <exclude name="**/SuperfluousAbstract.java"/>
506      <manifest>
507        <attribute name="Built-By" value="${user.name}"/>
508        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
509      </manifest>
510    </jar>
511  </target>
512
513
393    <target name="clean"
394            description="Removes all build products">
395      <delete dir="${build.dir}"/>
396    </target>
397  
519
398    <target name="dist-clean"
399            description="Removes all build and distribution products">
400      <delete dir="${build.dir}"/>
401      <delete dir="${dist.dir}"/>
402    </target>
403  
526
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 535 | Line 412
412    </target>
413  
414    <target name="tck"
415 <          depends="jar"
415 >          depends="jar"
416            description="Runs tck tests for src/main directly">
540
417      <run-tck-tests
418 <      target="${build.main.java.version}"
418 >      target="${java.runtime.target}"
419        workdir="${build.dir}"
420        classes="${product.jar}">
421        <javac-elements>
422 <        <compilerarg value="-Werror"/>
422 >        <!-- <compilerarg value="-Werror"/> -->
423        </javac-elements>
424      </run-tck-tests>
425    </target>
# Line 570 | Line 446
446    </target>
447  
448    <target name="jtreg"
449 <          depends="jar"
449 >          depends="jar"
450            description="Runs jtreg tests for src/main using the jtreg ant task">
451      <run-jtreg-tests
452 <       target="${build.main.java.version}"
452 >       target="${java.runtime.target}"
453         workdir="${build.dir}"
454         classes="${product.jar}"/>
455    </target>
# Line 582 | Line 458
458            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
459            description="Runs tck and jtreg tests for src/main"/>
460  
461 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
462 <
463 < <!--     <antcall target="jtreg"> -->
588 < <!--       <param name="build.main.java.version" value="8"/> -->
589 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
590 < <!--     </antcall> -->
591 <
592 < <!--   </target> -->
593 <
594 < <!--   <target name="test89" -->
595 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
596 <
597 < <!--     <antcall target="clean"/> -->
598 < <!--     <antcall target="test"> -->
599 < <!--       <param name="build.main.java.version" value="8"/> -->
600 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
601 < <!--     </antcall> -->
602 <
603 < <!--     <antcall target="clean"/> -->
604 < <!--     <antcall target="test"> -->
605 < <!--       <param name="build.main.java.version" value="9"/> -->
606 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
607 < <!--     </antcall> -->
461 >  <target name="test-version-permutations"
462 >          depends="test17, test19, clean, test, docs"
463 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
464  
609 <!--   </target> -->
465  
466 +  <target name="test17">
467 +    <antcall>
468 +      <param name="java.runtime.target" value="17"/>
469 +      <param name="build.main.javac" value="${javac17}"/>
470 +      <param name="build.main.javadoc" value="${javadoc17}"/>
471 +      <param name="build.main.javadoc.source" value="17"/>
472 +      <target name="clean"/>
473 +      <target name="test"/>
474 +      <target name="docs"/>
475 +    </antcall>
476 +  </target>
477 +  <target name="test19">
478 +    <antcall>
479 +      <param name="java.runtime.target" value="19"/>
480 +      <param name="build.main.javac" value="${javac19}"/>
481 +      <param name="build.main.javadoc" value="${javadoc19}"/>
482 +      <param name="build.main.javadoc.source" value="19"/>
483 +      <target name="clean"/>
484 +      <target name="test"/>
485 +      <target name="docs"/>
486 +    </antcall>
487 +  </target>
488  
489  
490    <target name="configure-compiler">
# Line 630 | Line 507
507    </target>
508  
509  
633
634  <!-- Various demos and test programs -->
635
636
637  <!-- description="Benchmark from Doug Lea's AQS paper" -->
638  <target name="loops" depends="configure-compiler">
639
640    <mkdir dir="${build.loops.dir}"/>
641
642    <javac srcdir="${loops.src.dir}"
643          destdir="${build.loops.dir}"
644            debug="${build.debug}"
645       debuglevel="${build.debuglevel}"
646      deprecation="${build.deprecation}"
647           source="${build.sourcelevel}"
648           target="${build.sourcelevel}"
649         encoding="ASCII"
650             fork="true">
651
652      <compilerarg line="${build.args}"/>
653      <classpath refid="loops.classpath"/>
654      <compilerarg value="-XDignore.symbol.file=true"/>
655
656    </javac>
657
658    <java classname="ALoops" fork="true">
659      <classpath refid="loops.classpath"/>
660    </java>
661  </target>
662
663
510    <target name="compile-test-loops" depends="jar"
511            description="Compiles all the perf tests in src/test/loops">
512  
# Line 674 | Line 520
520             includeAntRuntime="false"
521             includeJavaRuntime="false"
522             encoding="ASCII"
523 <           executable="${javac9}"
523 >           executable="${build.main.javac}"
524             fork="true">
525  
526        <include name="*.java"/>
527        <compilerarg value="-XDignore.symbol.file=true"/>
528 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
529 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
684 <      <compilerarg line="${build.args}"/>
685 <    </javac>
686 <  </target>
687 <
688 <
689 <  <!-- jsr166 4jdk8 -->
690 <
691 <  <target name="4jdk8compile"
692 <          depends="configure-compiler"
693 <          description="Compiles src/jdk8 sources, targeting jdk8">
694 <
695 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
696 <
697 <    <javac srcdir="${4jdk8src.dir}"
698 <           destdir="${build.4jdk8.classes.dir}"
699 <           debug="${build.debug}"
700 <           debuglevel="${build.debuglevel}"
701 <           deprecation="${build.deprecation}"
702 <           source="8"
703 <           target="8"
704 <           classpath=""
705 <           bootclasspath="${bootclasspath8}"
706 <           includeAntRuntime="false"
707 <           includeJavaRuntime="false"
708 <           encoding="ASCII"
709 <           executable="${javac8}"
710 <           fork="true">
711 <      <include name="**/*.java"/>
712 <      <compilerarg value="-Xprefer:source"/>
713 <      <compilerarg value="-XDignore.symbol.file=true"/>
714 <      <compilerarg value="-Xlint:all"/>
715 <      <compilerarg value="-Werror"/>
716 <      <compilerarg line="${build.args}"/>
717 <    </javac>
718 <  </target>
719 <
720 <  <target name="4jdk8doclint"
721 <          depends="configure-compiler"
722 <          description="Finds doclint warnings">
723 <
724 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
725 <
726 <    <javac srcdir="${4jdk8src.dir}"
727 <           destdir="${build.4jdk8.classes.dir}"
728 <           debug="${build.debug}"
729 <           debuglevel="${build.debuglevel}"
730 <           deprecation="${build.deprecation}"
731 <           source="8"
732 <           target="8"
733 <           classpath=""
734 <           bootclasspath="${bootclasspath8}"
735 <           includeAntRuntime="false"
736 <           includeJavaRuntime="false"
737 <           encoding="ASCII"
738 <           executable="${javac8}"
739 <           fork="true">
740 <      <include name="**/*.java"/>
741 <      <compilerarg value="-Xprefer:source"/>
742 <      <compilerarg value="-XDignore.symbol.file=true"/>
743 <      <compilerarg value="-Xlint:all"/>
744 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
528 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
529 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
530        <compilerarg line="${build.args}"/>
531      </javac>
532    </target>
533  
534  
535 <  <target name="4jdk8jar"
536 <          depends="4jdk8compile"
752 <          description="Builds library jar from compiled sources">
753 <
754 <    <jar destfile="${4jdk8product.jar}">
755 <      <fileset dir="${build.4jdk8.classes.dir}"/>
756 <      <manifest>
757 <        <attribute name="Built-By" value="${user.name}"/>
758 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
759 <      </manifest>
760 <    </jar>
761 <  </target>
762 <
763 <
764 <  <target name="4jdk8-tck"
765 <          depends="4jdk8jar"
766 <          description="Runs tck tests for jsr166-4jdk8 directly">
767 <
768 <    <run-tck-tests
769 <      target="8"
770 <      workdir="${build.4jdk8.dir}"
771 <      classes="${4jdk8product.jar}">
772 <      <javac-elements>
773 <        <!-- JDK9+ test classes -->
774 <        <exclude name="*9Test.java"/>
775 <        <exclude name="*10Test.java"/>
776 <        <compilerarg value="-Werror"/>
777 <      </javac-elements>
778 <    </run-tck-tests>
779 <  </target>
780 <
781 <
782 <  <target name="4jdk8-jtreg"
783 <          depends="4jdk8jar"
784 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
785 <    <run-jtreg-tests
786 <       target="8"
787 <       workdir="${build.4jdk8.dir}"
788 <       classes="${4jdk8product.jar}"/>
789 <  </target>
790 <
791 <
792 <  <target name="4jdk8-test"
793 <          depends="4jdk8-tck, 4jdk8-jtreg"
794 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
795 <
796 <
797 <  <target name="4jdk8docs"
798 <          description="Builds javadocs for src/jdk8 to dist dir">
799 <
800 <    <delete dir="${4jdk8docs.dir}"/>
801 <    <mkdir dir="${4jdk8docs.dir}"/>
802 <
803 <    <javadoc destdir="${4jdk8docs.dir}"
804 <             packagenames="none"
805 <             link="${java8.api.url}"
806 <             overview="${4jdk8src.dir}/intro.html"
807 <             access="${build.javadoc.access}"
808 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
809 <             classpath=""
810 <             executable="${javadoc8}"
811 <             failonerror = "true">
812 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
813 <        <include name="**/*.java"/>
814 <      </fileset>
815 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
816 <      <arg value="-XDignore.symbol.file=true"/>
817 <      <arg value="-tag"/>
818 <      <arg value="${javadoc.jls.option}"/>
819 < <!-- @apiNote currently unused -->
820 < <!--       <arg value="-tag"/> -->
821 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
822 <      <arg value="-tag"/>
823 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
824 <      <arg value="-tag"/>
825 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
826 <    </javadoc>
827 <  </target>
828 <
829 <
830 <  <target name="4jdk8dist"
831 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
832 <          description="Puts all distributable products in single hierarchy"/>
833 <
834 <
835 <  <target name="4jdk8clean"
836 <          description="Removes all 4jdk8 build products">
837 <    <delete dir="${build.4jdk8.dir}"/>
838 <  </target>
839 <
840 <
841 <  <target name="4jdk8dist-jar"
842 <          depends="4jdk8clean, 4jdk8jar">
843 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
844 <  </target>
845 <
846 <
847 <  <target name="4jdk8dist-docs"
848 <          depends="4jdk8clean, 4jdk8docs">
849 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
850 <  </target>
851 <
852 <
535 >  <!-- old branches no longer maintained.  build support deleted -->
536 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
537    <!-- jsr166 4jdk7 (no longer maintained) -->
854
855  <target name="4jdk7compile" depends="configure-compiler">
856    <mkdir dir="${build.4jdk7.classes.dir}"/>
857
858    <javac srcdir="${4jdk7src.dir}"
859           destdir="${build.4jdk7.classes.dir}"
860           debug="${build.debug}"
861           debuglevel="${build.debuglevel}"
862           deprecation="${build.deprecation}"
863           source="6"
864           target="6"
865           classpath=""
866           bootclasspath="${bootclasspath6}"
867           includeAntRuntime="false"
868           includeJavaRuntime="false"
869           encoding="ASCII"
870           executable="${javac7}"
871           fork="true">
872
873      <include name="**/*.java"/>
874      <compilerarg value="-Xprefer:source"/>
875      <compilerarg value="-XDignore.symbol.file=true"/>
876      <compilerarg value="-Xlint:all"/>
877      <compilerarg value="-Werror"/>
878      <compilerarg line="${build.args}"/>
879    </javac>
880  </target>
881
882  <target name="4jdk7doclint" depends="configure-compiler">
883    <mkdir dir="${build.4jdk7.classes.dir}"/>
884
885    <javac srcdir="${4jdk7src.dir}"
886           destdir="${build.4jdk7.classes.dir}"
887           debug="${build.debug}"
888           debuglevel="${build.debuglevel}"
889           deprecation="${build.deprecation}"
890           source="6"
891           target="6"
892           classpath=""
893           bootclasspath="${bootclasspath6}"
894           includeAntRuntime="false"
895           includeJavaRuntime="false"
896           encoding="ASCII"
897           executable="${javac8}"
898           fork="true">
899
900      <include name="**/*.java"/>
901      <compilerarg value="-Xprefer:source"/>
902      <compilerarg value="-XDignore.symbol.file=true"/>
903      <compilerarg value="-Xlint:all"/>
904      <compilerarg value="-Xdoclint:all/protected"/>
905      <compilerarg line="${build.args}"/>
906    </javac>
907  </target>
908
909  <target name="4jdk7jar" depends="4jdk7compile">
910    <jar destfile="${4jdk7product.jar}">
911      <fileset dir="${build.4jdk7.classes.dir}"/>
912      <manifest>
913        <attribute name="Built-By" value="${user.name}"/>
914        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
915      </manifest>
916    </jar>
917  </target>
918
919  <target name="4jdk7-tck" depends="4jdk7jar">
920    <run-tck-tests
921      target="7"
922      workdir="${build.4jdk7.dir}"
923      classes="${4jdk7product.jar}">
924      <javac-elements>
925        <!-- JDK8+ test classes -->
926        <exclude name="*8Test.java"/>
927        <exclude name="*9Test.java"/>
928        <exclude name="*10Test.java"/>
929        <exclude name="DoubleAccumulatorTest.java"/>
930        <exclude name="DoubleAdderTest.java"/>
931        <exclude name="LongAccumulatorTest.java"/>
932        <exclude name="LongAdderTest.java"/>
933        <exclude name="CompletableFutureTest.java"/>
934        <exclude name="SplittableRandomTest.java"/>
935        <exclude name="StampedLockTest.java"/>
936        <exclude name="SubmissionPublisherTest.java"/>
937        <compilerarg value="-Werror"/>
938      </javac-elements>
939    </run-tck-tests>
940  </target>
941
942  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
943  <target name="4jdk7-tck-junit" depends="4jdk7compile">
944
945    <junit printsummary="true"
946           showoutput="true"
947           errorProperty="junit.failed"
948           failureProperty="junit.failed"
949           includeantruntime="true"
950           jvm="${java7}"
951           fork="true">
952
953      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
954      <jvmarg value="-server"/>
955
956      <classpath>
957        <pathelement location="${junit.jar}"/>
958        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
959      </classpath>
960
961      <formatter type="brief"/>
962
963      <test name="${jsr166.tckTestClass}" haltonfailure="no">
964      </test>
965    </junit>
966  </target>
967
968  <target name="4jdk7-jtreg" depends="4jdk7jar">
969    <run-jtreg-tests
970       target="7"
971       workdir="${build.4jdk7.dir}"
972       classes="${4jdk7product.jar}"/>
973  </target>
974
975  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
976
977  <target name="4jdk7docs">
978    <delete dir="${4jdk7docs.dir}"/>
979    <mkdir dir="${4jdk7docs.dir}"/>
980
981    <javadoc destdir="${4jdk7docs.dir}"
982             packagenames="none"
983             link="${java7.api.url}"
984             overview="${4jdk7src.dir}/intro.html"
985             access="${build.javadoc.access}"
986             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
987             classpath=""
988             executable="${javadoc7}"
989             failonerror = "true">
990      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
991        <include name="**/*.java"/>
992      </fileset>
993      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
994      <arg value="-XDignore.symbol.file=true"/>
995    </javadoc>
996  </target>
997
998  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
999
1000  <target name="4jdk7clean">
1001    <delete dir="${build.4jdk7.dir}"/>
1002  </target>
1003
1004  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1005    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1006  </target>
1007
1008  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1009    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1010  </target>
1011
1012
538    <!-- jsr166x (no longer maintained) -->
1014
1015  <target name="jsr166xcompile" depends="configure-compiler">
1016    <mkdir dir="${build.jsr166x.classes.dir}"/>
1017
1018    <javac srcdir="${topsrc.dir}"
1019           destdir="${build.jsr166x.classes.dir}"
1020           debug="${build.debug}"
1021           debuglevel="${build.debuglevel}"
1022           deprecation="${build.deprecation}"
1023           classpath=""
1024           bootclasspath="${bootclasspath6}"
1025           source="5"
1026           target="5"
1027           includeAntRuntime="false"
1028           includeJavaRuntime="false"
1029           encoding="ASCII"
1030           executable="${javac7}"
1031           fork="true">
1032      <include name="jsr166x/**/*.java"/>
1033      <compilerarg value="-XDignore.symbol.file=true"/>
1034      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1035      <compilerarg value="-Werror"/>
1036      <compilerarg line="${build.args}"/>
1037    </javac>
1038  </target>
1039
1040  <target name="jsr166xjar" depends="jsr166xcompile">
1041    <jar destfile="${jsr166x.jar}">
1042      <fileset dir="${build.jsr166x.classes.dir}"/>
1043      <manifest>
1044        <attribute name="Built-By" value="${user.name}"/>
1045        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1046      </manifest>
1047    </jar>
1048  </target>
1049
1050  <target name="jsr166xdocs">
1051    <delete dir="${jsr166xdocs.dir}"/>
1052    <mkdir dir="${jsr166xdocs.dir}"/>
1053
1054    <javadoc destdir="${jsr166xdocs.dir}"
1055             packagenames="jsr166x.*"
1056             link="${java.api.url}"
1057             access="${build.javadoc.access}"
1058             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1059             bootclasspath="${bootclasspath6}"
1060             source="5"
1061             executable="${javadoc7}"
1062             failonerror = "true">
1063      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1064      <arg value="-XDignore.symbol.file=true"/>
1065    </javadoc>
1066  </target>
1067
1068  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1069
1070  <target name="jsr166xclean">
1071    <delete dir="${build.jsr166x.dir}"/>
1072  </target>
1073
1074  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1075    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1076  </target>
1077
1078  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1079    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1080  </target>
1081
1082
539    <!-- jsr166y (no longer maintained) -->
1084
1085  <target name="jsr166ycompile" depends="configure-compiler">
1086    <mkdir dir="${build.jsr166y.classes.dir}"/>
1087
1088    <javac srcdir="${topsrc.dir}"
1089           destdir="${build.jsr166y.classes.dir}"
1090           debug="${build.debug}"
1091           debuglevel="${build.debuglevel}"
1092           deprecation="${build.deprecation}"
1093           source="6"
1094           target="6"
1095           classpath=""
1096           bootclasspath="${bootclasspath6}"
1097           includeAntRuntime="false"
1098           includeJavaRuntime="false"
1099           encoding="ASCII"
1100           executable="${javac7}"
1101           fork="true">
1102
1103      <include name="jsr166y/**/*.java"/>
1104      <compilerarg value="-XDignore.symbol.file=true"/>
1105      <compilerarg value="-Xlint:all"/>
1106      <compilerarg value="-Werror"/>
1107      <compilerarg line="${build.args}"/>
1108    </javac>
1109  </target>
1110
1111  <target name="jsr166yjar" depends="jsr166ycompile">
1112    <jar destfile="${jsr166y.jar}" index="true">
1113      <fileset dir="${build.jsr166y.classes.dir}"/>
1114      <manifest>
1115        <attribute name="Built-By" value="${user.name}"/>
1116        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1117      </manifest>
1118    </jar>
1119  </target>
1120
1121  <target name="jsr166ydocs">
1122    <delete dir="${jsr166ydocs.dir}"/>
1123    <mkdir dir="${jsr166ydocs.dir}"/>
1124
1125    <javadoc destdir="${jsr166ydocs.dir}"
1126             packagenames="jsr166y.*"
1127             link="${java.api.url}"
1128             access="${build.javadoc.access}"
1129             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1130             bootclasspath="${bootclasspath6}"
1131             source="6"
1132             executable="${javadoc7}"
1133             failonerror = "true">
1134      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1135      <arg value="-XDignore.symbol.file=true"/>
1136    </javadoc>
1137  </target>
1138
1139  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1140
1141  <target name="jsr166yclean">
1142    <delete dir="${build.jsr166y.dir}"/>
1143  </target>
1144
1145  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1146    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1147  </target>
1148
1149  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1150    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1151  </target>
1152
1153
540    <!-- extra166y (no longer maintained) -->
1155
1156  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1157    <mkdir dir="${build.extra166y.classes.dir}"/>
1158
1159    <javac srcdir="${topsrc.dir}"
1160           destdir="${build.extra166y.classes.dir}"
1161           debug="${build.debug}"
1162           debuglevel="${build.debuglevel}"
1163           deprecation="${build.deprecation}"
1164           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1165           classpath=""
1166           source="6"
1167           target="6"
1168           includeAntRuntime="false"
1169           includeJavaRuntime="false"
1170           encoding="ASCII"
1171           executable="${javac7}"
1172           fork="true">
1173
1174      <include name="extra166y/**/*.java"/>
1175      <compilerarg value="-XDignore.symbol.file=true"/>
1176      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1177      <compilerarg value="-Werror"/>
1178      <compilerarg line="${build.args}"/>
1179    </javac>
1180  </target>
1181
1182  <target name="extra166yjar" depends="extra166ycompile">
1183    <jar destfile="${extra166y.jar}" index="true">
1184      <fileset dir="${build.extra166y.classes.dir}"/>
1185      <manifest>
1186        <attribute name="Built-By" value="${user.name}"/>
1187        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1188      </manifest>
1189    </jar>
1190  </target>
1191
1192  <target name="extra166ydocs">
1193    <delete dir="${extra166ydocs.dir}"/>
1194    <mkdir dir="${extra166ydocs.dir}"/>
1195
1196    <javadoc destdir="${extra166ydocs.dir}"
1197             packagenames="extra166y.*"
1198             link="${java.api.url}"
1199             access="${build.javadoc.access}"
1200             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1201             bootclasspath="${bootclasspath6}"
1202             source="6"
1203             executable="${javadoc7}">
1204      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1205      <arg value="-XDignore.symbol.file=true"/>
1206    </javadoc>
1207  </target>
1208
1209  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1210
1211  <target name="extra166yclean">
1212    <delete dir="${build.extra166y.dir}"/>
1213  </target>
1214
1215  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1216    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1217  </target>
1218
1219  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1220    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1221  </target>
1222
1223
541    <!-- jsr166e (no longer maintained) -->
542  
1226  <property name="build.jsr166e.java.version" value="6"/>
1227  <property name="build.jsr166e.javac" value="${javac6}"/>
1228
1229  <target name="jsr166ecompile" depends="configure-compiler">
1230    <mkdir dir="${build.jsr166e.classes.dir}"/>
1231
1232    <javac srcdir="${topsrc.dir}"
1233           destdir="${build.jsr166e.classes.dir}"
1234           debug="${build.debug}"
1235           debuglevel="${build.debuglevel}"
1236           deprecation="${build.deprecation}"
1237           source="${build.jsr166e.java.version}"
1238           target="${build.jsr166e.java.version}"
1239           classpath=""
1240           includeAntRuntime="false"
1241           includeJavaRuntime="false"
1242           executable="${build.jsr166e.javac}"
1243           fork="true">
1244
1245      <include name="jsr166e/**/*.java"/>
1246      <compilerarg value="-XDignore.symbol.file=true"/>
1247      <compilerarg value="-Xlint:all"/>
1248      <compilerarg value="-Werror"/>
1249      <compilerarg line="${build.args}"/>
1250    </javac>
1251  </target>
1252
1253  <target name="jsr166edoclint">
1254    <mkdir dir="${build.jsr166e.classes.dir}"/>
1255
1256    <javac srcdir="${topsrc.dir}"
1257           destdir="${build.jsr166e.classes.dir}"
1258           debug="${build.debug}"
1259           debuglevel="${build.debuglevel}"
1260           deprecation="${build.deprecation}"
1261           source="${build.jsr166e.java.version}"
1262           target="${build.jsr166e.java.version}"
1263           classpath=""
1264           bootclasspath="${bootclasspath6}"
1265           includeAntRuntime="false"
1266           includeJavaRuntime="false"
1267           executable="${javac8}"
1268           fork="true">
1269
1270      <include name="jsr166e/**/*.java"/>
1271      <compilerarg value="-XDignore.symbol.file=true"/>
1272      <compilerarg value="-Xlint:all"/>
1273      <compilerarg value="-Werror"/>
1274      <compilerarg value="-Xdoclint:all/protected"/>
1275    </javac>
1276  </target>
1277
1278  <target name="jsr166ejar" depends="jsr166ecompile">
1279    <jar destfile="${jsr166e.jar}" index="true">
1280      <fileset dir="${build.jsr166e.classes.dir}"/>
1281      <manifest>
1282        <attribute name="Built-By" value="${user.name}"/>
1283        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1284      </manifest>
1285    </jar>
1286  </target>
1287
1288  <target name="jsr166edocs">
1289    <delete dir="${jsr166edocs.dir}"/>
1290    <mkdir dir="${jsr166edocs.dir}"/>
1291
1292    <javadoc destdir="${jsr166edocs.dir}"
1293             packagenames="jsr166e.*"
1294             link="${java.api.url}"
1295             access="${build.javadoc.access}"
1296             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1297             source="${build.jsr166e.java.version}"
1298             executable="${javadoc7}"
1299             failonerror = "true">
1300      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1301      <arg value="-XDignore.symbol.file=true"/>
1302    </javadoc>
1303  </target>
1304
1305  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1306    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1307    <run-tck-tests
1308      tck.src.dir="${test.src.dir}/tck-jsr166e"
1309      target="${build.jsr166e.java.version}"
1310      workdir="${build.jsr166e.dir}"
1311      classes="${jsr166e.jar}"/>
1312  </target>
1313
1314  <target name="jsr166e-tck">
1315
1316 <!--     <antcall target="clean"/> -->
1317 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1318 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1319 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1320 <!--     </antcall> -->
1321
1322    <antcall target="clean"/>
1323    <antcall target="jsr166e-tck-one-java-version">
1324      <param name="build.jsr166e.java.version" value="7"/>
1325      <param name="build.jsr166e.javac" value="${javac7}"/>
1326    </antcall>
1327
1328    <antcall target="clean"/>
1329    <antcall target="jsr166e-tck-one-java-version">
1330      <param name="build.jsr166e.java.version" value="6"/>
1331      <param name="build.jsr166e.javac" value="${javac6}"/>
1332    </antcall>
1333  </target>
1334
1335  <target name="jsr166e-test" depends="jsr166e-tck"/>
1336
1337  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1338
1339  <target name="jsr166eclean">
1340    <delete dir="${build.jsr166e.dir}"/>
1341  </target>
1342
1343  <target name="jsr166edist-jar"
1344          depends="jsr166eclean, jsr166ejar">
1345    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1346  </target>
1347
1348  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1349    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1350  </target>
1351
1352
543   <!-- Find buglets that can be detected by static build tools -->
544  
545 <  <target name="lint">
546 <    <antcall target="dists">
547 <      <param name="build.javadoc.access" value="public"/>
548 <    </antcall>
549 <  </target>
545 > <!--   <target name="lint"> -->
546 > <!--     <antcall target="dists"> -->
547 > <!--       <param name="build.javadoc.access" value="protected"/> -->
548 > <!--     </antcall> -->
549 > <!--   </target> -->
550  
551   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
552 <  <target name="lint-private">
552 >  <target name="doclint-private">
553      <antcall target="dist">
554        <param name="build.javadoc.access" value="private"/>
555      </antcall>
# Line 1367 | Line 557
557  
558  
559   <!-- ==============================================================
560 <  Experimental errorprone support - http://errorprone.info
561 <  You may need to bring your own errorprone jar.
560 >  Experimental errorprone support
561 >  https://errorprone.info
562 >  https://errorprone.info/docs/installation
563 >  https://github.com/google/error-prone/issues/1143
564   =================================================================== -->
565 +  <path id="errorprone.processorpath.path">
566 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
567 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
568 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
569 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
570 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
571 +  </path>
572 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
573 +  <property name="errorprone.jsr166.user.flags" value=""/>
574 +  <property name="errorprone.jsr166.flags"
575 +            value="-Xep:HashtableContains:OFF
576 +                   -Xep:PreferJavaTimeOverload:OFF
577 +                   -Xep:JdkObsolete:OFF
578 +                   -Xep:MissingOverride:OFF
579 +                   -Xep:MissingFail:OFF
580 +                   -Xep:ThreadPriorityCheck:OFF
581 +                   -Xep:MixedArrayDimensions:ERROR
582 +                   -Xep:RemoveUnusedImports:ERROR
583 +                   -Xep:EmptyIf:ERROR
584 +                   -Xep:MultipleTopLevelClasses:ERROR
585 +                   -Xep:ClassName:ERROR
586 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
587 +                   -Xep:RedundantThrows:ERROR
588 +                   -Xep:IdentityBinaryExpression:WARN
589 +                   -Xep:ConstructorInvokesOverridable:WARN
590 +                   -Xep:MethodCanBeStatic:WARN
591 +                   ${errorprone.jsr166.user.flags}"/>
592 +  <!-- -Xep:WildcardImport:ERROR -->
593 +  <property name="errorprone.jsr166.test.flags"
594 +            value="-Xep:StringSplitter:OFF
595 +                   -Xep:BoxedPrimitiveConstructor:OFF
596 +                   -Xep:UnnecessaryParentheses:OFF
597 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
598 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
599    <target name="errorprone"
600            depends="clean, configure-compiler"
601            description="Run errorprone over jsr166 source code (experimental)">
# Line 1391 | Line 617
617             fork="true">
618  
619        <include name="**/*.java"/>
620 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
621 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
622 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
623 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
624 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1399 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1400 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1401 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1402 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1403 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
620 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
621 >      <compilerarg value="-J--illegal-access=permit"/>
622 >      <compilerarg value="-XDcompilePolicy=simple"/>
623 >      <compilerarg value="-processorpath"/>
624 >      <compilerarg pathref="errorprone.processorpath.path"/>
625        <compilerarg value="-Xplugin:ErrorProne
626 <                          -Xep:IdentityBinaryExpression:WARN
1406 <                          -Xep:MissingOverride:OFF
1407 <                          -Xep:MixedArrayDimensions:WARN
1408 <                          -Xep:RemoveUnusedImports:ERROR
1409 <                          -Xep:ClassName:ERROR
1410 <                          -Xep:MultipleTopLevelClasses:ERROR
1411 <                          -Xep:EmptyIf:ERROR
1412 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1413 <                          -Xep:ArgumentParameterSwap:ERROR
1414 <                          -Xep:RedundantThrows:ERROR
1415 <                          -Xep:MethodCanBeStatic:WARN"/>
626 >                          ${errorprone.jsr166.flags}"/>
627        <compilerarg value="--patch-module=java.base=${src.dir}"/>
628        <compilerarg value="-Xprefer:source"/>
629        <compilerarg value="-XDignore.symbol.file=true"/>
630        <compilerarg value="-Xlint:all"/>
631        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
632 <      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
632 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
633 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
634        <compilerarg line="${build.args}"/>
635      </javac>
636  
# Line 1427 | Line 639
639      </jar>
640  
641      <run-tck-tests
642 <      target="${build.main.java.version}"
642 >      target="${java.runtime.target}"
643        workdir="${build.dir}"
644        classes="${product.jar}">
645        <javac-elements>
646 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
647 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
648 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
649 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1438 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1439 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1440 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1441 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1442 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1443 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
646 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
647 >        <compilerarg value="-J--illegal-access=permit"/>
648 >        <compilerarg value="-XDcompilePolicy=simple"/>
649 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
650          <compilerarg value="-Xplugin:ErrorProne
651 <                            -Xep:IdentityBinaryExpression:WARN
652 <                            -Xep:BoxedPrimitiveConstructor:OFF
653 <                            -Xep:HashtableContains:OFF
654 <                            -Xep:ModifyingCollectionWithItself:OFF
1449 <                            -Xep:MissingOverride:OFF
1450 <                            -Xep:MixedArrayDimensions:WARN
1451 <                            -Xep:RemoveUnusedImports:ERROR
1452 <                            -Xep:ClassName:ERROR
1453 <                            -Xep:MultipleTopLevelClasses:ERROR
1454 <                            -Xep:EmptyIf:ERROR
1455 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1456 <                            -Xep:ArgumentParameterSwap:ERROR
1457 <                            -Xep:RedundantThrows:ERROR
1458 <                            -Xep:MethodCanBeStatic:WARN"/>
1459 <        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
651 >                            ${errorprone.jsr166.flags}
652 >                            ${errorprone.jsr166.test.flags}"/>
653 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
654 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
655        </javac-elements>
656      </run-tck-tests>
657    </target>
658  
659 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
660 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
661 +  <target name="errorprone-jtreg"
662 +          depends="jar"
663 +          description="Run errorprone over jtreg tests (experimental)">
664 +
665 +    <run-jtreg-tests
666 +       target="${java.runtime.target}"
667 +       workdir="${build.dir}"
668 +       classes="${product.jar}"
669 +       verbose="all">
670 +      <jtreg-elements>
671 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
672 +        <arg value="-javacoption:-processorpath"/>
673 +        <arg value="-javacoption:${errorprone.processorpath}"/>
674 +        <arg value="-javacoption:-Xplugin:ErrorProne
675 +                            ${errorprone.jsr166.flags}
676 +                            ${errorprone.jsr166.test.flags}
677 +                            -Xep:MultipleTopLevelClasses:WARN
678 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
679 +      </jtreg-elements>
680 +    </run-jtreg-tests>
681 +  </target>
682 +
683  
684   <!-- ==============================================================
685    Running guava tests against jsr166 code
# Line 1514 | Line 733
733      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
734           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
735      <junit printsummary="true" showoutput="true" haltonfailure="true"
736 <           jvm="${java9}" fork="true">
737 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
736 >           jvm="${build.main.java}" fork="true">
737 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
738        <formatter type="brief"/>
739        <classpath>
740          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines