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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines