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.235 by jsr166, Sun Mar 19 01:37:51 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/jdk7
23 <  $HOME/jdk/jdk8
23 <  $HOME/jdk/jdk9
24 <  $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/jdk7
26 <  $HOME/jdk/src/jdk8
28 <  $HOME/jdk/src/jdk9
29 <  $HOME/jdk/src/jdk10
30 <  where each of the above is a complete JDK source tree
31 <  (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 7 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 52 | Line 50
50  
51  
52    <!-- Compilation options -->
55  <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 64 | Line 61
61    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62    <property name="build.loops.dir"             location="${build.dir}/loops"/>
63  
67  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71
72  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76
77  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
80  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
81
82  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
83  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
84  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
85  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
86
64    <!-- JDK locations -->
65    <property name="jdks.home"  location="${user.home}/jdk"/>
66  
# Line 95 | 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"/>
99 <    <available property="have.java.base"
100 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102 <      if:set="have.java.base"/>
103 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104 <      unless:set="have.java.base"/>
105 <    <local name="modules"/>
106 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107 <    <local name="boot.jar.dir"/>
108 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
109 <    <path id="bootclasspath@{v}" unless:set="modules">
110 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
111 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
112 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
113 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
114 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
115 <    </path>
116 <    <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 129 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="6"/>
92 <  <defjdklocations v="7"/>
93 <  <defjdklocations v="8"/>
94 <  <defjdklocations v="9"/>
136 <  <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"/>
151  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
152  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
153  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
154  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
155  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
156  <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"/>
161 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
162 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
163 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
164 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
165 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
166 <
167 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
168 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
169 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
170 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
171 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
172 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
173 <  <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"/>
177  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
178  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
179  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
180  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
181  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
182  <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"/>
193 <  <!-- Default jdk doc location (latest stable release seems best) -->
194 <  <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/"/>
201 <  <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 206 | 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 229 | Line 159
159  
160      <sequential>
161  
232    <local name="modules"/>
233    <condition property="modules">
234      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
235    </condition>
236
162      <mkdir dir="@{workdir}/tck-classes"/>
163  
164      <javac srcdir="@{tck.src.dir}"
# Line 254 | Line 179
179        <compilerarg value="-XDignore.symbol.file=true"/>
180        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
181        <compilerarg value="-Xdoclint:reference/private"/>
182 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
258 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
182 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
183        <compilerarg line="${build.args}"/>
184        <javac-elements/>
185  
# Line 265 | 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"/>
289 <        </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>
312 <  </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">
318    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
319    <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}"/>
346 <      <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 358 | 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, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
304 >          depends="dist"
305            description="Builds all public jars and docs"/>
306  
307    <target name="compile"
308            depends="configure-compiler"
309            description="Compiles src/main sources to build dir">
310  
377    <local name="modules"/>
378    <condition property="modules">
379      <and>
380        <available file="${jdk9.home}/jmods" type="dir"/>
381        <equals arg1="9" arg2="${build.main.java.version}"/>
382      </and>
383    </condition>
384
311      <local name="destdir"/>
312 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
387 <    <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 401 | 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 value="-Xdoclint:all/protected"/>
334 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
335        <compilerarg value="-Werror"/>
409      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
336        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
337        <compilerarg line="${build.args}"/>
412
338      </javac>
339    </target>
340  
416
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 431 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
358 <
435 <    <delete dir="${docs.dir}"/>
358 >    <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
437
438    <!-- the packagenames="none" hack below prevents scanning the -->
439    <!-- sourcepath for packages -->
440
441 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
442 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
443 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
444 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
445 <!-- 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"/>
467 <      <arg value="implSpec:a:Implementation Requirements:"/>
468 <      <arg value="-tag"/>
469 <      <arg value="implNote:a:Implementation Note:"/>
470 < <!-- tags added in jdk9: currently unused -->
471 < <!--       <arg value="-tag"/> -->
472 < <!--       <arg value="revised:X"/> -->
473 < <!--       <arg value="-tag"/> -->
474 < <!--       <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  
478
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
483
484  <target name="release"
485          depends="dist"
486          description="Puts entire CVS tree, plus distribution productions, in a jar">
487
488    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
489
490    <jar basedir="${basedir}" destfile="${release.jar}">
491      <!-- <exclude name="build/**"/> -->
492      <exclude name="${release.jar}"/>
493      <exclude name="user.properties"/>
494      <exclude name="etc/notes/**"/>
495      <exclude name="src/emulation/**"/>
496      <exclude name="**/SyntaxTest.java"/>
497      <exclude name="**/SuperfluousAbstract.java"/>
498      <manifest>
499        <attribute name="Built-By" value="${user.name}"/>
500        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
501      </manifest>
502    </jar>
503  </target>
504
505
393    <target name="clean"
394            description="Removes all build products">
508
395      <delete dir="${build.dir}"/>
510
396    </target>
397  
513
398    <target name="dist-clean"
399            description="Removes all build and distribution products">
516
400      <delete dir="${build.dir}"/>
401      <delete dir="${dist.dir}"/>
519
402    </target>
403  
522
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 531 | Line 412
412    </target>
413  
414    <target name="tck"
415 <          depends="jar"
415 >          depends="jar"
416            description="Runs tck tests for src/main directly">
536
417      <run-tck-tests
418 <      target="${build.main.java.version}"
418 >      target="${java.runtime.target}"
419        workdir="${build.dir}"
420 <      classes="${product.jar}"/>
420 >      classes="${product.jar}">
421 >      <javac-elements>
422 >        <!-- <compilerarg value="-Werror"/> -->
423 >      </javac-elements>
424 >    </run-tck-tests>
425    </target>
426  
427    <target name="tck-parallelism-1"
# Line 562 | 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>
456  
457    <target name="test"
458            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
459 <          description="Runs tck and jtreg tests for src/main">
576 <  </target>
577 <
578 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
579 <
580 < <!--     <antcall target="jtreg"> -->
581 < <!--       <param name="build.main.java.version" value="8"/> -->
582 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
583 < <!--     </antcall> -->
584 <
585 < <!--   </target> -->
586 <
587 < <!--   <target name="test89" -->
588 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
589 <
590 < <!--     <antcall target="clean"/> -->
591 < <!--     <antcall target="test"> -->
592 < <!--       <param name="build.main.java.version" value="8"/> -->
593 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
594 < <!--     </antcall> -->
595 <
596 < <!--     <antcall target="clean"/> -->
597 < <!--     <antcall target="test"> -->
598 < <!--       <param name="build.main.java.version" value="9"/> -->
599 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
600 < <!--     </antcall> -->
601 <
602 < <!--   </target> -->
459 >          description="Runs tck and jtreg tests for src/main"/>
460  
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 +
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">
491      <fail message="ant version too old">
492 <      <condition>
609 <        <not> <antversion atleast="1.9.1"/> </not>
610 <      </condition>
492 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
493      </fail>
494  
495      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 625 | Line 507
507    </target>
508  
509  
628
629  <!-- Various demos and test programs -->
630
631
632  <!-- description="Benchmark from Doug Lea's AQS paper" -->
633  <target name="loops" depends="configure-compiler">
634
635    <mkdir dir="${build.loops.dir}"/>
636
637    <javac srcdir="${loops.src.dir}"
638          destdir="${build.loops.dir}"
639            debug="${build.debug}"
640       debuglevel="${build.debuglevel}"
641      deprecation="${build.deprecation}"
642           source="${build.sourcelevel}"
643           target="${build.sourcelevel}"
644         encoding="ASCII"
645             fork="true">
646
647      <compilerarg line="${build.args}"/>
648      <classpath refid="loops.classpath"/>
649      <compilerarg value="-XDignore.symbol.file=true"/>
650
651    </javac>
652
653    <java classname="ALoops" fork="true">
654      <classpath refid="loops.classpath"/>
655    </java>
656
657  </target>
658
659
510    <target name="compile-test-loops" depends="jar"
511 <          description="compile all the perf tests in src/test/loops">
511 >          description="Compiles all the perf tests in src/test/loops">
512  
513      <mkdir dir="${build.dir}/test/loops"/>
514  
# Line 670 | 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}"/>
528 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
529 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
530        <compilerarg line="${build.args}"/>
681
531      </javac>
683
532    </target>
533  
534  
535 <  <!-- jsr166 4jdk8 -->
536 <
537 <  <target name="4jdk8compile"
538 <          depends="configure-compiler"
539 <          description="Compiles src/jdk8 sources, targeting jdk8">
540 <
541 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
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) -->
538 >  <!-- jsr166x (no longer maintained) -->
539 >  <!-- jsr166y (no longer maintained) -->
540 >  <!-- extra166y (no longer maintained) -->
541 >  <!-- jsr166e (no longer maintained) -->
542  
543 <    <javac srcdir="${4jdk8src.dir}"
696 <           destdir="${build.4jdk8.classes.dir}"
697 <           debug="${build.debug}"
698 <           debuglevel="${build.debuglevel}"
699 <           deprecation="${build.deprecation}"
700 <           source="8"
701 <           target="8"
702 <           classpath=""
703 <           bootclasspath="${bootclasspath8}"
704 <           includeAntRuntime="false"
705 <           includeJavaRuntime="false"
706 <           encoding="ASCII"
707 <           executable="${javac8}"
708 <           fork="true">
709 <
710 <      <include name="**/*.java"/>
711 <      <compilerarg value="-Xprefer:source"/>
712 <      <compilerarg value="-XDignore.symbol.file=true"/>
713 <      <compilerarg value="-Xlint:all"/>
714 <      <compilerarg value="-Werror"/>
715 <      <compilerarg line="${build.args}"/>
716 <
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 <
741 <      <include name="**/*.java"/>
742 <      <compilerarg value="-Xprefer:source"/>
743 <      <compilerarg value="-XDignore.symbol.file=true"/>
744 <      <compilerarg value="-Xlint:all"/>
745 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
746 <      <compilerarg line="${build.args}"/>
747 <
748 <    </javac>
749 <  </target>
750 <
751 <
752 <  <target name="4jdk8jar"
753 <          depends="4jdk8compile"
754 <          description="Builds library jar from compiled sources">
755 <
756 <    <jar destfile="${4jdk8product.jar}">
757 <      <fileset dir="${build.4jdk8.classes.dir}"/>
758 <      <manifest>
759 <        <attribute name="Built-By" value="${user.name}"/>
760 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
761 <      </manifest>
762 <    </jar>
763 <
764 <  </target>
765 <
766 <
767 <  <target name="4jdk8-tck"
768 <          depends="4jdk8jar"
769 <          description="Runs tck tests for jsr166-4jdk8 directly">
770 <
771 <    <run-tck-tests
772 <      target="8"
773 <      workdir="${build.4jdk8.dir}"
774 <      classes="${4jdk8product.jar}">
775 <      <javac-elements>
776 <        <!-- JDK9+ test classes -->
777 <        <exclude name="*9Test.java"/>
778 <        <exclude name="*10Test.java"/>
779 <      </javac-elements>
780 <    </run-tck-tests>
781 <  </target>
782 <
783 <
784 <  <target name="4jdk8-jtreg"
785 <          depends="4jdk8jar"
786 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
787 <    <run-jtreg-tests
788 <       target="8"
789 <       workdir="${build.4jdk8.dir}"
790 <       classes="${4jdk8product.jar}"/>
791 <  </target>
792 <
793 <
794 <  <target name="4jdk8-test"
795 <          depends="4jdk8-tck, 4jdk8-jtreg"
796 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
797 <  </target>
798 <
799 <
800 <  <target name="4jdk8docs"
801 <          description="Builds javadocs for src/jdk8 to dist dir">
802 <
803 <    <delete dir="${4jdk8docs.dir}"/>
804 <    <mkdir dir="${4jdk8docs.dir}"/>
805 <
806 <    <javadoc destdir="${4jdk8docs.dir}"
807 <             packagenames="none"
808 <             link="${java8.api.url}"
809 <             overview="${4jdk8src.dir}/intro.html"
810 <             access="${build.javadoc.access}"
811 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
812 <             classpath=""
813 <             executable="${javadoc8}"
814 <             failonerror = "true">
815 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
816 <        <include name="**/*.java"/>
817 <      </fileset>
818 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
819 <      <arg value="-XDignore.symbol.file=true"/>
820 <      <arg value="-tag"/>
821 <      <arg value="${javadoc.jls.option}"/>
822 < <!-- @apiNote currently unused -->
823 < <!--       <arg value="-tag"/> -->
824 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
825 <      <arg value="-tag"/>
826 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
827 <      <arg value="-tag"/>
828 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
829 <    </javadoc>
830 <  </target>
831 <
832 <
833 <  <target name="4jdk8dist"
834 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
835 <          description="Puts all distributable products in single hierarchy"/>
836 <
837 <
838 <  <target name="4jdk8clean"
839 <          description="Removes all 4jdk8 build products">
840 <
841 <    <delete dir="${build.4jdk8.dir}"/>
842 <
843 <  </target>
844 <
845 <
846 <  <target name="4jdk8dist-jar"
847 <          depends="4jdk8clean, 4jdk8jar">
848 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
849 <  </target>
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="protected"/> -->
548 + <!--     </antcall> -->
549 + <!--   </target> -->
550  
551 <  <target name="4jdk8dist-docs"
552 <          depends="4jdk8clean, 4jdk8docs">
553 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
551 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
552 >  <target name="doclint-private">
553 >    <antcall target="dist">
554 >      <param name="build.javadoc.access" value="private"/>
555 >    </antcall>
556    </target>
557  
558  
559 + <!-- ==============================================================
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)">
602  
603 <  <!-- jsr166 4jdk7 -->
604 <
605 <  <target name="4jdk7compile"
862 <          depends="configure-compiler"
863 <          description="Compiles src/jdk7 sources, targeting jdk7">
864 <
865 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
866 <
867 <    <javac srcdir="${4jdk7src.dir}"
868 <           destdir="${build.4jdk7.classes.dir}"
869 <           debug="${build.debug}"
870 <           debuglevel="${build.debuglevel}"
871 <           deprecation="${build.deprecation}"
872 <           source="6"
873 <           target="6"
874 <           classpath=""
875 <           bootclasspath="${bootclasspath6}"
876 <           includeAntRuntime="false"
877 <           includeJavaRuntime="false"
878 <           encoding="ASCII"
879 <           executable="${javac7}"
880 <           fork="true">
881 <
882 <      <include name="**/*.java"/>
883 <      <compilerarg value="-Xprefer:source"/>
884 <      <compilerarg value="-XDignore.symbol.file=true"/>
885 <      <compilerarg value="-Xlint:all"/>
886 <      <compilerarg value="-Werror"/>
887 <      <compilerarg line="${build.args}"/>
888 <
889 <    </javac>
890 <  </target>
891 <
892 <  <target name="4jdk7doclint"
893 <          depends="configure-compiler"
894 <          description="Finds doclint warnings">
895 <
896 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
603 >    <local name="destdir"/>
604 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
605 >    <mkdir dir="${destdir}"/>
606  
607 <    <javac srcdir="${4jdk7src.dir}"
608 <           destdir="${build.4jdk7.classes.dir}"
607 >    <javac srcdir="${src.dir}"
608 >           destdir="${destdir}"
609             debug="${build.debug}"
610             debuglevel="${build.debuglevel}"
611             deprecation="${build.deprecation}"
903           source="6"
904           target="6"
612             classpath=""
906           bootclasspath="${bootclasspath6}"
613             includeAntRuntime="false"
614             includeJavaRuntime="false"
615             encoding="ASCII"
616 <           executable="${javac8}"
616 >           executable="${build.main.javac}"
617             fork="true">
618  
619        <include name="**/*.java"/>
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 +                          ${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"/>
631 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
632 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
633 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
634        <compilerarg line="${build.args}"/>
919
635      </javac>
921  </target>
922
923
924  <target name="4jdk7jar"
925          depends="4jdk7compile"
926          description="Builds library jar from compiled sources">
636  
637 <    <jar destfile="${4jdk7product.jar}">
638 <      <fileset dir="${build.4jdk7.classes.dir}"/>
930 <      <manifest>
931 <        <attribute name="Built-By" value="${user.name}"/>
932 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
933 <      </manifest>
637 >    <jar destfile="${product.jar}">
638 >      <fileset dir="${destdir}"/>
639      </jar>
640  
936  </target>
937
938
939  <target name="4jdk7-tck"
940          depends="4jdk7jar"
941          description="Runs tck tests for jsr166-4jdk7 directly">
942
641      <run-tck-tests
642 <      target="7"
643 <      workdir="${build.4jdk7.dir}"
644 <      classes="${4jdk7product.jar}">
642 >      target="${java.runtime.target}"
643 >      workdir="${build.dir}"
644 >      classes="${product.jar}">
645        <javac-elements>
646 <        <!-- JDK8+ test classes -->
647 <        <exclude name="*8Test.java"/>
648 <        <exclude name="*9Test.java"/>
649 <        <exclude name="*10Test.java"/>
650 <        <exclude name="DoubleAccumulatorTest.java"/>
651 <        <exclude name="DoubleAdderTest.java"/>
652 <        <exclude name="LongAccumulatorTest.java"/>
653 <        <exclude name="LongAdderTest.java"/>
654 <        <exclude name="CompletableFutureTest.java"/>
957 <        <exclude name="SplittableRandomTest.java"/>
958 <        <exclude name="StampedLockTest.java"/>
959 <        <exclude name="SubmissionPublisherTest.java"/>
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 >                            ${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  
965  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
966  <target name="4jdk7-tck-junit"
967          depends="4jdk7compile">
968
969    <junit printsummary="true"
970           showoutput="true"
971           errorProperty="junit.failed"
972           failureProperty="junit.failed"
973           includeantruntime="true"
974           jvm="${java7}"
975           fork="true">
976
977      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
978      <jvmarg value="-server"/>
979
980      <classpath>
981        <pathelement location="${junit.jar}"/>
982        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
983      </classpath>
984
985      <formatter type="brief"/>
986
987      <test name="${jsr166.tckTestClass}" haltonfailure="no">
988      </test>
989
990    </junit>
991  </target>
992
993  <target name="4jdk7-jtreg"
994          depends="4jdk7jar"
995          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
665      <run-jtreg-tests
666 <       target="7"
667 <       workdir="${build.4jdk7.dir}"
668 <       classes="${4jdk7product.jar}"/>
669 <  </target>
670 <
671 <
672 <  <target name="4jdk7-test"
673 <          depends="4jdk7-tck, 4jdk7-jtreg"
674 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
675 <  </target>
676 <
677 <
678 <  <target name="4jdk7docs"
679 <          description="Builds javadocs for src/jdk7 to dist dir">
680 <
1012 <    <delete dir="${4jdk7docs.dir}"/>
1013 <    <mkdir dir="${4jdk7docs.dir}"/>
1014 <
1015 <    <javadoc destdir="${4jdk7docs.dir}"
1016 <             packagenames="none"
1017 <             link="${java7.api.url}"
1018 <             overview="${4jdk7src.dir}/intro.html"
1019 <             access="${build.javadoc.access}"
1020 <             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1021 <             classpath=""
1022 <             executable="${javadoc7}"
1023 <             failonerror = "true">
1024 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1025 <        <include name="**/*.java"/>
1026 <      </fileset>
1027 <      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1028 <      <arg value="-XDignore.symbol.file=true"/>
1029 <    </javadoc>
1030 <  </target>
1031 <
1032 <
1033 <  <target name="4jdk7dist"
1034 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1035 <          description="Puts all distributable products in single hierarchy"/>
1036 <
1037 <
1038 <  <target name="4jdk7clean"
1039 <          description="Removes all 4jdk7 build products">
1040 <
1041 <    <delete dir="${build.4jdk7.dir}"/>
1042 <
1043 <  </target>
1044 <
1045 <
1046 <  <target name="4jdk7dist-jar"
1047 <          depends="4jdk7clean, 4jdk7jar">
1048 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1049 <  </target>
1050 <
1051 <
1052 <  <target name="4jdk7dist-docs"
1053 <          depends="4jdk7clean, 4jdk7docs">
1054 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1055 <  </target>
1056 <
1057 <
1058 <  <!-- jsr166x -->
1059 <
1060 <  <target name="jsr166xcompile"
1061 <          depends="configure-compiler"
1062 <          description="Compiles jsr166x sources to build dir">
1063 <
1064 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
1065 <
1066 <    <javac srcdir="${topsrc.dir}"
1067 <           destdir="${build.jsr166x.classes.dir}"
1068 <           debug="${build.debug}"
1069 <           debuglevel="${build.debuglevel}"
1070 <           deprecation="${build.deprecation}"
1071 <           classpath=""
1072 <           bootclasspath="${bootclasspath6}"
1073 <           source="5"
1074 <           target="5"
1075 <           includeAntRuntime="false"
1076 <           includeJavaRuntime="false"
1077 <           encoding="ASCII"
1078 <           executable="${javac7}"
1079 <           fork="true">
1080 <
1081 <      <include name="jsr166x/**/*.java"/>
1082 <      <compilerarg value="-XDignore.symbol.file=true"/>
1083 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1084 <      <compilerarg value="-Werror"/>
1085 <      <compilerarg line="${build.args}"/>
1086 <
1087 <    </javac>
1088 <  </target>
1089 <
1090 <
1091 <  <target name="jsr166xjar"
1092 <          depends="jsr166xcompile"
1093 <          description="Builds library jar from compiled sources">
1094 <
1095 <    <jar destfile="${jsr166x.jar}">
1096 <      <fileset dir="${build.jsr166x.classes.dir}"/>
1097 <      <manifest>
1098 <        <attribute name="Built-By" value="${user.name}"/>
1099 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1100 <      </manifest>
1101 <    </jar>
1102 <
1103 <  </target>
1104 <
1105 <
1106 <  <target name="jsr166xdocs"
1107 <          description="Builds javadocs to dist dir">
1108 <
1109 <    <delete dir="${jsr166xdocs.dir}"/>
1110 <    <mkdir dir="${jsr166xdocs.dir}"/>
1111 <
1112 <    <javadoc destdir="${jsr166xdocs.dir}"
1113 <             packagenames="jsr166x.*"
1114 <             link="${java.api.url}"
1115 <             access="${build.javadoc.access}"
1116 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1117 <             bootclasspath="${bootclasspath6}"
1118 <             source="5"
1119 <             executable="${javadoc7}"
1120 <             failonerror = "true">
1121 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1122 <      <arg value="-XDignore.symbol.file=true"/>
1123 <
1124 <    </javadoc>
1125 <  </target>
1126 <
1127 <
1128 <  <target name="jsr166xdist"
1129 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1130 <          description="Puts all distributable products in single hierarchy"/>
1131 <
1132 <
1133 <  <target name="jsr166xclean"
1134 <          description="Removes all jsr166x build products">
1135 <
1136 <    <delete dir="${build.jsr166x.dir}"/>
1137 <
1138 <  </target>
1139 <
1140 <
1141 <  <target name="jsr166xdist-jar"
1142 <          depends="jsr166xclean, jsr166xjar">
1143 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1144 <  </target>
1145 <
1146 <  <target name="jsr166xdist-docs"
1147 <          depends="jsr166xclean, jsr166xdocs">
1148 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1149 <  </target>
1150 <
1151 <  <!-- jsr166y -->
1152 <
1153 <
1154 <  <target name="jsr166ycompile"
1155 <          depends="configure-compiler"
1156 <          description="Compiles jsr166y sources">
1157 <
1158 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
1159 <
1160 <    <javac srcdir="${topsrc.dir}"
1161 <           destdir="${build.jsr166y.classes.dir}"
1162 <           debug="${build.debug}"
1163 <           debuglevel="${build.debuglevel}"
1164 <           deprecation="${build.deprecation}"
1165 <           source="6"
1166 <           target="6"
1167 <           classpath=""
1168 <           bootclasspath="${bootclasspath6}"
1169 <           includeAntRuntime="false"
1170 <           includeJavaRuntime="false"
1171 <           encoding="ASCII"
1172 <           executable="${javac7}"
1173 <           fork="true">
1174 <
1175 <      <include name="jsr166y/**/*.java"/>
1176 <      <compilerarg value="-XDignore.symbol.file=true"/>
1177 <      <compilerarg value="-Xlint:all"/>
1178 <      <compilerarg value="-Werror"/>
1179 <      <compilerarg line="${build.args}"/>
1180 <
1181 <    </javac>
1182 <  </target>
1183 <
1184 <
1185 <  <target name="jsr166yjar"
1186 <          depends="jsr166ycompile"
1187 <          description="Builds library jar from compiled sources">
1188 <
1189 <    <jar destfile="${jsr166y.jar}" index="true">
1190 <      <fileset dir="${build.jsr166y.classes.dir}"/>
1191 <      <manifest>
1192 <        <attribute name="Built-By" value="${user.name}"/>
1193 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1194 <      </manifest>
1195 <    </jar>
1196 <
1197 <  </target>
1198 <
1199 <
1200 <  <target name="jsr166ydocs"
1201 <          description="Builds javadocs to dist dir">
1202 <
1203 <    <delete dir="${jsr166ydocs.dir}"/>
1204 <    <mkdir dir="${jsr166ydocs.dir}"/>
1205 <
1206 <    <javadoc destdir="${jsr166ydocs.dir}"
1207 <             packagenames="jsr166y.*"
1208 <             link="${java.api.url}"
1209 <             access="${build.javadoc.access}"
1210 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1211 <             bootclasspath="${bootclasspath6}"
1212 <             source="6"
1213 <             executable="${javadoc7}"
1214 <             failonerror = "true">
1215 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1216 <      <arg value="-XDignore.symbol.file=true"/>
1217 <
1218 <    </javadoc>
1219 <  </target>
1220 <
1221 <
1222 <  <target name="jsr166ydist"
1223 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1224 <          description="Puts all distributable products in single hierarchy"/>
1225 <
1226 <
1227 <  <target name="jsr166yclean"
1228 <          description="Removes all jsr166y build products">
1229 <
1230 <    <delete dir="${build.jsr166y.dir}"/>
1231 <
1232 <  </target>
1233 <
1234 <
1235 <  <target name="jsr166ydist-jar"
1236 <          depends="jsr166yclean, jsr166yjar">
1237 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1238 <  </target>
1239 <
1240 <  <target name="jsr166ydist-docs"
1241 <          depends="jsr166yclean, jsr166ydocs">
1242 <    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1243 <  </target>
1244 <
1245 <
1246 <  <!-- extra166y -->
1247 <
1248 <
1249 <  <target name="extra166ycompile"
1250 <          depends="configure-compiler, jsr166yjar"
1251 <          description="Compiles extra166y sources">
1252 <
1253 <    <mkdir dir="${build.extra166y.classes.dir}"/>
1254 <
1255 <    <javac srcdir="${topsrc.dir}"
1256 <           destdir="${build.extra166y.classes.dir}"
1257 <           debug="${build.debug}"
1258 <           debuglevel="${build.debuglevel}"
1259 <           deprecation="${build.deprecation}"
1260 <           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1261 <           classpath=""
1262 <           source="6"
1263 <           target="6"
1264 <           includeAntRuntime="false"
1265 <           includeJavaRuntime="false"
1266 <           encoding="ASCII"
1267 <           executable="${javac7}"
1268 <           fork="true">
1269 <
1270 <      <include name="extra166y/**/*.java"/>
1271 <      <compilerarg value="-XDignore.symbol.file=true"/>
1272 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1273 <      <compilerarg value="-Werror"/>
1274 <      <compilerarg line="${build.args}"/>
1275 <
1276 <    </javac>
1277 <  </target>
1278 <
1279 <
1280 <  <target name="extra166yjar"
1281 <          depends="extra166ycompile"
1282 <          description="Builds library jar from compiled sources">
1283 <
1284 <    <jar destfile="${extra166y.jar}" index="true">
1285 <      <fileset dir="${build.extra166y.classes.dir}"/>
1286 <      <manifest>
1287 <        <attribute name="Built-By" value="${user.name}"/>
1288 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1289 <      </manifest>
1290 <    </jar>
1291 <
1292 <  </target>
1293 <
1294 <
1295 <  <target name="extra166ydocs"
1296 <          description="Builds javadocs to build dir">
1297 <
1298 <    <delete dir="${extra166ydocs.dir}"/>
1299 <    <mkdir dir="${extra166ydocs.dir}"/>
1300 <
1301 <    <javadoc destdir="${extra166ydocs.dir}"
1302 <             packagenames="extra166y.*"
1303 <             link="${java.api.url}"
1304 <             access="${build.javadoc.access}"
1305 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1306 <             bootclasspath="${bootclasspath6}"
1307 <             source="6"
1308 <             executable="${javadoc7}">
1309 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1310 <      <arg value="-XDignore.symbol.file=true"/>
1311 <
1312 <    </javadoc>
1313 <  </target>
1314 <
1315 <
1316 <  <target name="extra166ydist"
1317 <          depends="extra166ydist-jar, extra166ydist-docs"
1318 <          description="Puts all distributable products in single hierarchy"/>
1319 <
1320 <
1321 <  <target name="extra166yclean"
1322 <          description="Removes all extra166y build products">
1323 <
1324 <    <delete dir="${build.extra166y.dir}"/>
1325 <
1326 <  </target>
1327 <
1328 <
1329 <  <target name="extra166ydist-jar"
1330 <          depends="extra166yclean, extra166yjar">
1331 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1332 <  </target>
1333 <
1334 <  <target name="extra166ydist-docs"
1335 <          depends="extra166yclean, extra166ydocs">
1336 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1337 <  </target>
1338 <
1339 <  <!-- jsr166e -->
1340 <
1341 <  <property name="build.jsr166e.java.version" value="6"/>
1342 <  <property name="build.jsr166e.javac" value="${javac6}"/>
1343 <
1344 <  <target name="jsr166ecompile"
1345 <          depends="configure-compiler"
1346 <          description="Compiles jsr166e sources">
1347 <
1348 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
1349 <
1350 <    <javac srcdir="${topsrc.dir}"
1351 <           destdir="${build.jsr166e.classes.dir}"
1352 <           debug="${build.debug}"
1353 <           debuglevel="${build.debuglevel}"
1354 <           deprecation="${build.deprecation}"
1355 <           source="${build.jsr166e.java.version}"
1356 <           target="${build.jsr166e.java.version}"
1357 <           classpath=""
1358 <           includeAntRuntime="false"
1359 <           includeJavaRuntime="false"
1360 <           executable="${build.jsr166e.javac}"
1361 <           fork="true">
1362 <
1363 <      <include name="jsr166e/**/*.java"/>
1364 <      <compilerarg value="-XDignore.symbol.file=true"/>
1365 <      <compilerarg value="-Xlint:all"/>
1366 <      <compilerarg value="-Werror"/>
1367 <      <compilerarg line="${build.args}"/>
1368 <
1369 <    </javac>
1370 <  </target>
1371 <
1372 <  <!-- jsr166e: find doclint errors -->
1373 <  <target name="jsr166edoclint">
1374 <
1375 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
1376 <
1377 <    <javac srcdir="${topsrc.dir}"
1378 <           destdir="${build.jsr166e.classes.dir}"
1379 <           debug="${build.debug}"
1380 <           debuglevel="${build.debuglevel}"
1381 <           deprecation="${build.deprecation}"
1382 <           source="${build.jsr166e.java.version}"
1383 <           target="${build.jsr166e.java.version}"
1384 <           classpath=""
1385 <           bootclasspath="${bootclasspath6}"
1386 <           includeAntRuntime="false"
1387 <           includeJavaRuntime="false"
1388 <           executable="${javac8}"
1389 <           fork="true">
1390 <
1391 <      <include name="jsr166e/**/*.java"/>
1392 <      <compilerarg value="-XDignore.symbol.file=true"/>
1393 <      <compilerarg value="-Xlint:all"/>
1394 <      <compilerarg value="-Werror"/>
1395 <      <compilerarg value="-Xdoclint:all/protected"/>
1396 <
1397 <    </javac>
1398 <  </target>
1399 <
1400 <
1401 <  <target name="jsr166ejar"
1402 <          depends="jsr166ecompile"
1403 <          description="Builds library jar from compiled sources">
1404 <
1405 <    <jar destfile="${jsr166e.jar}" index="true">
1406 <      <fileset dir="${build.jsr166e.classes.dir}"/>
1407 <      <manifest>
1408 <        <attribute name="Built-By" value="${user.name}"/>
1409 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1410 <      </manifest>
1411 <    </jar>
1412 <
1413 <  </target>
1414 <
1415 <
1416 <  <target name="jsr166edocs"
1417 <          description="Builds javadocs to build dir">
1418 <
1419 <    <delete dir="${jsr166edocs.dir}"/>
1420 <    <mkdir dir="${jsr166edocs.dir}"/>
1421 <
1422 <    <javadoc destdir="${jsr166edocs.dir}"
1423 <             packagenames="jsr166e.*"
1424 <             link="${java.api.url}"
1425 <             access="${build.javadoc.access}"
1426 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1427 <             source="${build.jsr166e.java.version}"
1428 <             executable="${javadoc7}"
1429 <             failonerror = "true">
1430 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1431 <      <arg value="-XDignore.symbol.file=true"/>
1432 <
1433 <    </javadoc>
1434 <  </target>
1435 <
1436 <
1437 <  <target name="jsr166e-tck-one-java-version"
1438 <          depends="jsr166ejar">
1439 <
1440 <    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1441 <
1442 <    <run-tck-tests
1443 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
1444 <      target="${build.jsr166e.java.version}"
1445 <      workdir="${build.jsr166e.dir}"
1446 <      classes="${jsr166e.jar}"/>
1447 <  </target>
1448 <
1449 <  <target name="jsr166e-tck"
1450 <          description="Runs tck tests for jsr166e for multiple java versions">
1451 <
1452 < <!--     <antcall target="clean"/> -->
1453 < <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1454 < <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1455 < <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1456 < <!--     </antcall> -->
1457 <
1458 <    <antcall target="clean"/>
1459 <    <antcall target="jsr166e-tck-one-java-version">
1460 <      <param name="build.jsr166e.java.version" value="7"/>
1461 <      <param name="build.jsr166e.javac" value="${javac7}"/>
1462 <    </antcall>
1463 <
1464 <    <antcall target="clean"/>
1465 <    <antcall target="jsr166e-tck-one-java-version">
1466 <      <param name="build.jsr166e.java.version" value="6"/>
1467 <      <param name="build.jsr166e.javac" value="${javac6}"/>
1468 <    </antcall>
1469 <  </target>
1470 <
1471 <
1472 <  <target name="jsr166e-test"
1473 <          depends="jsr166e-tck"
1474 <          description="Runs all tests for jsr166e">
1475 <  </target>
1476 <
1477 <  <target name="jsr166edist"
1478 <          depends="jsr166edist-jar, jsr166edist-docs"
1479 <          description="Puts all distributable products in single hierarchy"/>
1480 <
1481 <
1482 <  <target name="jsr166eclean"
1483 <          description="Removes all jsr166e build products">
1484 <    <delete dir="${build.jsr166e.dir}"/>
1485 <  </target>
1486 <
1487 <
1488 <  <target name="jsr166edist-jar"
1489 <          depends="jsr166eclean, jsr166ejar">
1490 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1491 <  </target>
1492 <
1493 <  <target name="jsr166edist-docs"
1494 <          depends="jsr166eclean, jsr166edocs">
1495 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1496 <  </target>
1497 <
1498 <
1499 < <!-- Find buglets that can be detected by static build tools -->
1500 <
1501 <  <target name="lint">
1502 <    <antcall target="dists">
1503 <      <param name="build.javadoc.access" value="public"/>
1504 <    </antcall>
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  
1507 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1508  <target name="lint-private">
1509    <antcall target="dist">
1510      <param name="build.javadoc.access" value="private"/>
1511    </antcall>
1512  </target>
683  
684   <!-- ==============================================================
685    Running guava tests against jsr166 code
# Line 1563 | 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