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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines