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.258 by jsr166, Tue Oct 31 17:47:57 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    <!-- 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 <  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
141 <  <!-- The location of jdk9 early access docs (RIP) -->
142 <  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
143 <  <!-- Default jdk doc location (latest stable release seems best) -->
144 <  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
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 205 | 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 228 | Line 189
189  
190      <sequential>
191  
231    <local name="modules"/>
232    <condition property="modules">
233      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
234    </condition>
235
236    <local name="use-doclint"/>
237    <condition property="use-doclint">
238      <not> <equals arg1="@{target}" arg2="7"/> </not>
239    </condition>
240
192      <mkdir dir="@{workdir}/tck-classes"/>
193  
194      <javac srcdir="@{tck.src.dir}"
# Line 257 | 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"/>
262 <      <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 269 | 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"/>
293 <        </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}">
319 <    <patternset id="jdk7.jtreg.tests">
320 <      <include name="**/*.java"/>
321 <    </patternset>
322 <  </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"/>
# Line 338 | Line 285
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:@{verbose}"/>
357      <arg value="-vmoptions:-esa -ea"/>
308        <arg value="-automatic"/>
309        <arg value="-k:!ignore"/>
310        <arg line="@{jtregflags}"/>
# Line 370 | 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"/>
393          <!--
394              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
395          -->
348  
349    <target name="compile"
350            depends="configure-compiler"
# Line 419 | 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 448 | 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 461 | 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"/>
485 <      <arg value="implSpec:a:Implementation Requirements:"/>
486 <      <arg value="-tag"/>
487 <      <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"/> -->
491 < <!--       <arg value="-tag"/> -->
492 < <!--       <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 499 | Line 462
462            description="Puts all distributable products in single hierarchy"/>
463  
464  
502  <target name="release"
503          depends="dist"
504          description="Puts entire CVS tree, plus distribution productions, in a jar">
505
506    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
507
508    <jar basedir="${basedir}" destfile="${release.jar}">
509      <!-- <exclude name="build/**"/> -->
510      <exclude name="${release.jar}"/>
511      <exclude name="user.properties"/>
512      <exclude name="etc/notes/**"/>
513      <exclude name="src/emulation/**"/>
514      <exclude name="**/SyntaxTest.java"/>
515      <exclude name="**/SuperfluousAbstract.java"/>
516      <manifest>
517        <attribute name="Built-By" value="${user.name}"/>
518        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
519      </manifest>
520    </jar>
521  </target>
522
523
465    <target name="clean"
466            description="Removes all build products">
467      <delete dir="${build.dir}"/>
# Line 545 | 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 580 | 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 592 | 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="test910"
579 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
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 <    <antcall target="clean"/>
591 <    <antcall target="test">
592 <      <param name="build.main.java.version" value="9"/>
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 <    <antcall target="clean"/>
603 <    <antcall target="test">
604 <      <param name="build.main.java.version" value="10"/>
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 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
615 <    <antcall target="clean"/>
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 >  <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 641 | Line 703
703    </target>
704  
705  
644
645  <!-- Various demos and test programs -->
646
647
648  <!-- description="Benchmark from Doug Lea's AQS paper" -->
649  <target name="loops" depends="configure-compiler">
650
651    <mkdir dir="${build.loops.dir}"/>
652
653    <javac srcdir="${loops.src.dir}"
654          destdir="${build.loops.dir}"
655            debug="${build.debug}"
656       debuglevel="${build.debuglevel}"
657      deprecation="${build.deprecation}"
658           source="${build.sourcelevel}"
659           target="${build.sourcelevel}"
660         encoding="ASCII"
661             fork="true">
662
663      <compilerarg line="${build.args}"/>
664      <classpath refid="loops.classpath"/>
665      <compilerarg value="-XDignore.symbol.file=true"/>
666
667    </javac>
668
669    <java classname="ALoops" fork="true">
670      <classpath refid="loops.classpath"/>
671    </java>
672  </target>
673
674
706    <target name="compile-test-loops" depends="jar"
707            description="Compiles all the perf tests in src/test/loops">
708  
# Line 690 | 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}"/>
695 <      <compilerarg line="${build.args}"/>
696 <    </javac>
697 <  </target>
698 <
699 <
700 <  <!-- jsr166 4jdk8 -->
701 <
702 <  <target name="4jdk8compile"
703 <          depends="configure-compiler"
704 <          description="Compiles src/jdk8 sources, targeting jdk8">
705 <
706 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
707 <
708 <    <javac srcdir="${4jdk8src.dir}"
709 <           destdir="${build.4jdk8.classes.dir}"
710 <           debug="${build.debug}"
711 <           debuglevel="${build.debuglevel}"
712 <           deprecation="${build.deprecation}"
713 <           source="8"
714 <           target="8"
715 <           classpath=""
716 <           bootclasspath="${bootclasspath8}"
717 <           includeAntRuntime="false"
718 <           includeJavaRuntime="false"
719 <           encoding="ASCII"
720 <           executable="${javac8}"
721 <           fork="true">
722 <      <include name="**/*.java"/>
723 <      <compilerarg value="-Xprefer:source"/>
724 <      <compilerarg value="-XDignore.symbol.file=true"/>
725 <      <compilerarg value="-Xlint:all"/>
726 <      <compilerarg value="-Werror"/>
727 <      <compilerarg line="${build.args}"/>
728 <    </javac>
729 <  </target>
730 <
731 <  <target name="4jdk8doclint"
732 <          depends="configure-compiler"
733 <          description="Finds doclint warnings">
734 <
735 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
736 <
737 <    <javac srcdir="${4jdk8src.dir}"
738 <           destdir="${build.4jdk8.classes.dir}"
739 <           debug="${build.debug}"
740 <           debuglevel="${build.debuglevel}"
741 <           deprecation="${build.deprecation}"
742 <           source="8"
743 <           target="8"
744 <           classpath=""
745 <           bootclasspath="${bootclasspath8}"
746 <           includeAntRuntime="false"
747 <           includeJavaRuntime="false"
748 <           encoding="ASCII"
749 <           executable="${javac8}"
750 <           fork="true">
751 <      <include name="**/*.java"/>
752 <      <compilerarg value="-Xprefer:source"/>
753 <      <compilerarg value="-XDignore.symbol.file=true"/>
754 <      <compilerarg value="-Xlint:all"/>
755 <      <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"
763 <          description="Builds library jar from compiled sources">
764 <
765 <    <jar destfile="${4jdk8product.jar}">
766 <      <fileset dir="${build.4jdk8.classes.dir}"/>
767 <      <manifest>
768 <        <attribute name="Built-By" value="${user.name}"/>
769 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
770 <      </manifest>
771 <    </jar>
772 <  </target>
773 <
774 <
775 <  <target name="4jdk8-tck"
776 <          depends="4jdk8jar"
777 <          description="Runs tck tests for jsr166-4jdk8 directly">
778 <
779 <    <run-tck-tests
780 <      target="8"
781 <      workdir="${build.4jdk8.dir}"
782 <      classes="${4jdk8product.jar}">
783 <      <javac-elements>
784 <        <!-- JDK9+ test classes -->
785 <        <exclude name="*9Test.java"/>
786 <        <exclude name="*10Test.java"/>
787 <        <compilerarg value="-Werror"/>
788 <      </javac-elements>
789 <    </run-tck-tests>
790 <  </target>
791 <
792 <
793 <  <target name="4jdk8-jtreg"
794 <          depends="4jdk8jar"
795 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
796 <    <run-jtreg-tests
797 <       target="8"
798 <       workdir="${build.4jdk8.dir}"
799 <       classes="${4jdk8product.jar}"/>
800 <  </target>
801 <
802 <
803 <  <target name="4jdk8-test"
804 <          depends="4jdk8-tck, 4jdk8-jtreg"
805 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
806 <
807 <
808 <  <target name="4jdk8docs"
809 <          description="Builds javadocs for src/jdk8 to dist dir">
810 <
811 <    <delete dir="${4jdk8docs.dir}"/>
812 <    <mkdir dir="${4jdk8docs.dir}"/>
813 <
814 <    <javadoc destdir="${4jdk8docs.dir}"
815 <             packagenames="none"
816 <             link="${java8.api.url}"
817 <             overview="${4jdk8src.dir}/intro.html"
818 <             access="${build.javadoc.access}"
819 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
820 <             classpath=""
821 <             source="8"
822 <             executable="${javadoc8}"
823 <             failonerror = "true">
824 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
825 <        <include name="**/*.java"/>
826 <      </fileset>
827 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
828 <      <arg value="-XDignore.symbol.file=true"/>
829 <      <arg value="-tag"/>
830 <      <arg value="${javadoc.jls.option}"/>
831 < <!-- @apiNote currently unused -->
832 < <!--       <arg value="-tag"/> -->
833 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
834 <      <arg value="-tag"/>
835 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
836 <      <arg value="-tag"/>
837 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
838 <    </javadoc>
839 <  </target>
840 <
841 <
842 <  <target name="4jdk8dist"
843 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
844 <          description="Puts all distributable products in single hierarchy"/>
845 <
846 <
847 <  <target name="4jdk8clean"
848 <          description="Removes all 4jdk8 build products">
849 <    <delete dir="${build.4jdk8.dir}"/>
850 <  </target>
851 <
852 <
853 <  <target name="4jdk8dist-jar"
854 <          depends="4jdk8clean, 4jdk8jar">
855 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
856 <  </target>
857 <
858 <
859 <  <target name="4jdk8dist-docs"
860 <          depends="4jdk8clean, 4jdk8docs">
861 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
862 <  </target>
863 <
864 <
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) -->
866
867  <target name="4jdk7compile" depends="configure-compiler">
868    <mkdir dir="${build.4jdk7.classes.dir}"/>
869
870    <javac srcdir="${4jdk7src.dir}"
871           destdir="${build.4jdk7.classes.dir}"
872           debug="${build.debug}"
873           debuglevel="${build.debuglevel}"
874           deprecation="${build.deprecation}"
875           source="6"
876           target="6"
877           classpath=""
878           bootclasspath="${bootclasspath6}"
879           includeAntRuntime="false"
880           includeJavaRuntime="false"
881           encoding="ASCII"
882           executable="${javac7}"
883           fork="true">
884
885      <include name="**/*.java"/>
886      <compilerarg value="-Xprefer:source"/>
887      <compilerarg value="-XDignore.symbol.file=true"/>
888      <compilerarg value="-Xlint:all"/>
889      <compilerarg value="-Werror"/>
890      <compilerarg line="${build.args}"/>
891    </javac>
892  </target>
893
894  <target name="4jdk7doclint" depends="configure-compiler">
895    <mkdir dir="${build.4jdk7.classes.dir}"/>
896
897    <javac srcdir="${4jdk7src.dir}"
898           destdir="${build.4jdk7.classes.dir}"
899           debug="${build.debug}"
900           debuglevel="${build.debuglevel}"
901           deprecation="${build.deprecation}"
902           source="6"
903           target="6"
904           classpath=""
905           bootclasspath="${bootclasspath6}"
906           includeAntRuntime="false"
907           includeJavaRuntime="false"
908           encoding="ASCII"
909           executable="${javac8}"
910           fork="true">
911
912      <include name="**/*.java"/>
913      <compilerarg value="-Xprefer:source"/>
914      <compilerarg value="-XDignore.symbol.file=true"/>
915      <compilerarg value="-Xlint:all"/>
916      <compilerarg value="-Xdoclint:all/protected"/>
917      <compilerarg line="${build.args}"/>
918    </javac>
919  </target>
920
921  <target name="4jdk7jar" depends="4jdk7compile">
922    <jar destfile="${4jdk7product.jar}">
923      <fileset dir="${build.4jdk7.classes.dir}"/>
924      <manifest>
925        <attribute name="Built-By" value="${user.name}"/>
926        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
927      </manifest>
928    </jar>
929  </target>
930
931  <target name="4jdk7-tck" depends="4jdk7jar">
932    <run-tck-tests
933      target="7"
934      workdir="${build.4jdk7.dir}"
935      classes="${4jdk7product.jar}">
936      <javac-elements>
937        <!-- JDK8+ test classes -->
938        <exclude name="*8Test.java"/>
939        <exclude name="*9Test.java"/>
940        <exclude name="*10Test.java"/>
941        <exclude name="DoubleAccumulatorTest.java"/>
942        <exclude name="DoubleAdderTest.java"/>
943        <exclude name="LongAccumulatorTest.java"/>
944        <exclude name="LongAdderTest.java"/>
945        <exclude name="CompletableFutureTest.java"/>
946        <exclude name="SplittableRandomTest.java"/>
947        <exclude name="StampedLockTest.java"/>
948        <exclude name="SubmissionPublisherTest.java"/>
949        <compilerarg value="-Werror"/>
950      </javac-elements>
951    </run-tck-tests>
952  </target>
953
954  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
955  <target name="4jdk7-tck-junit" depends="4jdk7compile">
956
957    <junit printsummary="true"
958           showoutput="true"
959           errorProperty="junit.failed"
960           failureProperty="junit.failed"
961           includeantruntime="true"
962           jvm="${java7}"
963           fork="true">
964
965      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
966      <jvmarg value="-server"/>
967
968      <classpath>
969        <pathelement location="${junit.jar}"/>
970        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
971      </classpath>
972
973      <formatter type="brief"/>
974
975      <test name="${jsr166.tckTestClass}" haltonfailure="no">
976      </test>
977    </junit>
978  </target>
979
980  <target name="4jdk7-jtreg" depends="4jdk7jar">
981    <run-jtreg-tests
982       target="7"
983       workdir="${build.4jdk7.dir}"
984       classes="${4jdk7product.jar}"/>
985  </target>
986
987  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
988
989  <target name="4jdk7docs">
990    <delete dir="${4jdk7docs.dir}"/>
991    <mkdir dir="${4jdk7docs.dir}"/>
992
993    <javadoc destdir="${4jdk7docs.dir}"
994             packagenames="none"
995             link="${java7.api.url}"
996             overview="${4jdk7src.dir}/intro.html"
997             access="${build.javadoc.access}"
998             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
999             classpath=""
1000             executable="${javadoc7}"
1001             failonerror = "true">
1002      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1003        <include name="**/*.java"/>
1004      </fileset>
1005      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1006      <arg value="-XDignore.symbol.file=true"/>
1007    </javadoc>
1008  </target>
1009
1010  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1011
1012  <target name="4jdk7clean">
1013    <delete dir="${build.4jdk7.dir}"/>
1014  </target>
1015
1016  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1017    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1018  </target>
1019
1020  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1021    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1022  </target>
1023
1024
734    <!-- jsr166x (no longer maintained) -->
1026
1027  <target name="jsr166xcompile" depends="configure-compiler">
1028    <mkdir dir="${build.jsr166x.classes.dir}"/>
1029
1030    <javac srcdir="${topsrc.dir}"
1031           destdir="${build.jsr166x.classes.dir}"
1032           debug="${build.debug}"
1033           debuglevel="${build.debuglevel}"
1034           deprecation="${build.deprecation}"
1035           classpath=""
1036           bootclasspath="${bootclasspath6}"
1037           source="5"
1038           target="5"
1039           includeAntRuntime="false"
1040           includeJavaRuntime="false"
1041           encoding="ASCII"
1042           executable="${javac7}"
1043           fork="true">
1044      <include name="jsr166x/**/*.java"/>
1045      <compilerarg value="-XDignore.symbol.file=true"/>
1046      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1047      <compilerarg value="-Werror"/>
1048      <compilerarg line="${build.args}"/>
1049    </javac>
1050  </target>
1051
1052  <target name="jsr166xjar" depends="jsr166xcompile">
1053    <jar destfile="${jsr166x.jar}">
1054      <fileset dir="${build.jsr166x.classes.dir}"/>
1055      <manifest>
1056        <attribute name="Built-By" value="${user.name}"/>
1057        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1058      </manifest>
1059    </jar>
1060  </target>
1061
1062  <target name="jsr166xdocs">
1063    <delete dir="${jsr166xdocs.dir}"/>
1064    <mkdir dir="${jsr166xdocs.dir}"/>
1065
1066    <javadoc destdir="${jsr166xdocs.dir}"
1067             packagenames="jsr166x.*"
1068             link="${java.api.url}"
1069             access="${build.javadoc.access}"
1070             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1071             bootclasspath="${bootclasspath6}"
1072             source="5"
1073             executable="${javadoc7}"
1074             failonerror = "true">
1075      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1076      <arg value="-XDignore.symbol.file=true"/>
1077    </javadoc>
1078  </target>
1079
1080  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1081
1082  <target name="jsr166xclean">
1083    <delete dir="${build.jsr166x.dir}"/>
1084  </target>
1085
1086  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1087    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1088  </target>
1089
1090  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1091    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1092  </target>
1093
1094
735    <!-- jsr166y (no longer maintained) -->
1096
1097  <target name="jsr166ycompile" depends="configure-compiler">
1098    <mkdir dir="${build.jsr166y.classes.dir}"/>
1099
1100    <javac srcdir="${topsrc.dir}"
1101           destdir="${build.jsr166y.classes.dir}"
1102           debug="${build.debug}"
1103           debuglevel="${build.debuglevel}"
1104           deprecation="${build.deprecation}"
1105           source="6"
1106           target="6"
1107           classpath=""
1108           bootclasspath="${bootclasspath6}"
1109           includeAntRuntime="false"
1110           includeJavaRuntime="false"
1111           encoding="ASCII"
1112           executable="${javac7}"
1113           fork="true">
1114
1115      <include name="jsr166y/**/*.java"/>
1116      <compilerarg value="-XDignore.symbol.file=true"/>
1117      <compilerarg value="-Xlint:all"/>
1118      <compilerarg value="-Werror"/>
1119      <compilerarg line="${build.args}"/>
1120    </javac>
1121  </target>
1122
1123  <target name="jsr166yjar" depends="jsr166ycompile">
1124    <jar destfile="${jsr166y.jar}" index="true">
1125      <fileset dir="${build.jsr166y.classes.dir}"/>
1126      <manifest>
1127        <attribute name="Built-By" value="${user.name}"/>
1128        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1129      </manifest>
1130    </jar>
1131  </target>
1132
1133  <target name="jsr166ydocs">
1134    <delete dir="${jsr166ydocs.dir}"/>
1135    <mkdir dir="${jsr166ydocs.dir}"/>
1136
1137    <javadoc destdir="${jsr166ydocs.dir}"
1138             packagenames="jsr166y.*"
1139             link="${java.api.url}"
1140             access="${build.javadoc.access}"
1141             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1142             bootclasspath="${bootclasspath6}"
1143             source="6"
1144             executable="${javadoc7}"
1145             failonerror = "true">
1146      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1147      <arg value="-XDignore.symbol.file=true"/>
1148    </javadoc>
1149  </target>
1150
1151  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1152
1153  <target name="jsr166yclean">
1154    <delete dir="${build.jsr166y.dir}"/>
1155  </target>
1156
1157  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1158    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1159  </target>
1160
1161  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1162    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1163  </target>
1164
1165
736    <!-- extra166y (no longer maintained) -->
1167
1168  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1169    <mkdir dir="${build.extra166y.classes.dir}"/>
1170
1171    <javac srcdir="${topsrc.dir}"
1172           destdir="${build.extra166y.classes.dir}"
1173           debug="${build.debug}"
1174           debuglevel="${build.debuglevel}"
1175           deprecation="${build.deprecation}"
1176           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1177           classpath=""
1178           source="6"
1179           target="6"
1180           includeAntRuntime="false"
1181           includeJavaRuntime="false"
1182           encoding="ASCII"
1183           executable="${javac7}"
1184           fork="true">
1185
1186      <include name="extra166y/**/*.java"/>
1187      <compilerarg value="-XDignore.symbol.file=true"/>
1188      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1189      <compilerarg value="-Werror"/>
1190      <compilerarg line="${build.args}"/>
1191    </javac>
1192  </target>
1193
1194  <target name="extra166yjar" depends="extra166ycompile">
1195    <jar destfile="${extra166y.jar}" index="true">
1196      <fileset dir="${build.extra166y.classes.dir}"/>
1197      <manifest>
1198        <attribute name="Built-By" value="${user.name}"/>
1199        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1200      </manifest>
1201    </jar>
1202  </target>
1203
1204  <target name="extra166ydocs">
1205    <delete dir="${extra166ydocs.dir}"/>
1206    <mkdir dir="${extra166ydocs.dir}"/>
1207
1208    <javadoc destdir="${extra166ydocs.dir}"
1209             packagenames="extra166y.*"
1210             link="${java.api.url}"
1211             access="${build.javadoc.access}"
1212             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1213             bootclasspath="${bootclasspath6}"
1214             source="6"
1215             executable="${javadoc7}">
1216      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1217      <arg value="-XDignore.symbol.file=true"/>
1218    </javadoc>
1219  </target>
1220
1221  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1222
1223  <target name="extra166yclean">
1224    <delete dir="${build.extra166y.dir}"/>
1225  </target>
1226
1227  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1228    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1229  </target>
1230
1231  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1232    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1233  </target>
1234
1235
737    <!-- jsr166e (no longer maintained) -->
738  
1238  <property name="build.jsr166e.java.version" value="6"/>
1239  <property name="build.jsr166e.javac" value="${javac6}"/>
1240
1241  <target name="jsr166ecompile" depends="configure-compiler">
1242    <mkdir dir="${build.jsr166e.classes.dir}"/>
1243
1244    <javac srcdir="${topsrc.dir}"
1245           destdir="${build.jsr166e.classes.dir}"
1246           debug="${build.debug}"
1247           debuglevel="${build.debuglevel}"
1248           deprecation="${build.deprecation}"
1249           source="${build.jsr166e.java.version}"
1250           target="${build.jsr166e.java.version}"
1251           classpath=""
1252           includeAntRuntime="false"
1253           includeJavaRuntime="false"
1254           executable="${build.jsr166e.javac}"
1255           fork="true">
1256
1257      <include name="jsr166e/**/*.java"/>
1258      <compilerarg value="-XDignore.symbol.file=true"/>
1259      <compilerarg value="-Xlint:all"/>
1260      <compilerarg value="-Werror"/>
1261      <compilerarg line="${build.args}"/>
1262    </javac>
1263  </target>
1264
1265  <target name="jsr166edoclint">
1266    <mkdir dir="${build.jsr166e.classes.dir}"/>
1267
1268    <javac srcdir="${topsrc.dir}"
1269           destdir="${build.jsr166e.classes.dir}"
1270           debug="${build.debug}"
1271           debuglevel="${build.debuglevel}"
1272           deprecation="${build.deprecation}"
1273           source="${build.jsr166e.java.version}"
1274           target="${build.jsr166e.java.version}"
1275           classpath=""
1276           bootclasspath="${bootclasspath6}"
1277           includeAntRuntime="false"
1278           includeJavaRuntime="false"
1279           executable="${javac8}"
1280           fork="true">
1281
1282      <include name="jsr166e/**/*.java"/>
1283      <compilerarg value="-XDignore.symbol.file=true"/>
1284      <compilerarg value="-Xlint:all"/>
1285      <compilerarg value="-Werror"/>
1286      <compilerarg value="-Xdoclint:all/protected"/>
1287    </javac>
1288  </target>
1289
1290  <target name="jsr166ejar" depends="jsr166ecompile">
1291    <jar destfile="${jsr166e.jar}" index="true">
1292      <fileset dir="${build.jsr166e.classes.dir}"/>
1293      <manifest>
1294        <attribute name="Built-By" value="${user.name}"/>
1295        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1296      </manifest>
1297    </jar>
1298  </target>
1299
1300  <target name="jsr166edocs">
1301    <delete dir="${jsr166edocs.dir}"/>
1302    <mkdir dir="${jsr166edocs.dir}"/>
1303
1304    <javadoc destdir="${jsr166edocs.dir}"
1305             packagenames="jsr166e.*"
1306             link="${java.api.url}"
1307             access="${build.javadoc.access}"
1308             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1309             source="${build.jsr166e.java.version}"
1310             executable="${javadoc7}"
1311             failonerror = "true">
1312      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1313      <arg value="-XDignore.symbol.file=true"/>
1314    </javadoc>
1315  </target>
1316
1317  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1318    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1319    <run-tck-tests
1320      tck.src.dir="${test.src.dir}/tck-jsr166e"
1321      target="${build.jsr166e.java.version}"
1322      workdir="${build.jsr166e.dir}"
1323      classes="${jsr166e.jar}"/>
1324  </target>
1325
1326  <target name="jsr166e-tck">
1327
1328 <!--     <antcall target="clean"/> -->
1329 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1330 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1331 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1332 <!--     </antcall> -->
1333
1334    <antcall target="clean"/>
1335    <antcall target="jsr166e-tck-one-java-version">
1336      <param name="build.jsr166e.java.version" value="7"/>
1337      <param name="build.jsr166e.javac" value="${javac7}"/>
1338    </antcall>
1339
1340    <antcall target="clean"/>
1341    <antcall target="jsr166e-tck-one-java-version">
1342      <param name="build.jsr166e.java.version" value="6"/>
1343      <param name="build.jsr166e.javac" value="${javac6}"/>
1344    </antcall>
1345  </target>
1346
1347  <target name="jsr166e-test" depends="jsr166e-tck"/>
1348
1349  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1350
1351  <target name="jsr166eclean">
1352    <delete dir="${build.jsr166e.dir}"/>
1353  </target>
1354
1355  <target name="jsr166edist-jar"
1356          depends="jsr166eclean, jsr166ejar">
1357    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1358  </target>
1359
1360  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1361    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1362  </target>
1363
1364
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 1379 | 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 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.1.2.jar"/>
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 1403 | Line 813
813             fork="true">
814  
815        <include name="**/*.java"/>
816 <      <compilerarg line="-processorpath ${errorprone.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
1409 <                          -Xep:MissingOverride:OFF
1410 <                          -Xep:MixedArrayDimensions:ERROR
1411 <                          -Xep:RemoveUnusedImports:ERROR
1412 <                          -Xep:ClassName:ERROR
1413 <                          -Xep:MultipleTopLevelClasses:ERROR
1414 <                          -Xep:EmptyIf:ERROR
1415 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1416 <                          -Xep:RedundantThrows:ERROR
1417 <                          -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 1429 | 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 ${errorprone.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
1440 <                            -Xep:HashtableContains:OFF
1441 <                            -Xep:ModifyingCollectionWithItself:OFF
1442 <                            -Xep:MissingOverride:OFF
1443 <                            -Xep:MissingFail:OFF
1444 <                            -Xep:JdkObsolete:OFF
1445 <                            -Xep:MixedArrayDimensions:ERROR
1446 <                            -Xep:RemoveUnusedImports:ERROR
1447 <                            -Xep:ClassName:ERROR
1448 <                            -Xep:MultipleTopLevelClasses:ERROR
1449 <                            -Xep:EmptyIf:ERROR
1450 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1451 <                            -Xep:RedundantThrows:ERROR
1452 <                            -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 errorprone-jtreg |& grep -EA1 '(warning|error):' -->
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="${build.main.java.version}"
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.jar}"/>
867 >        <arg value="-javacoption:${errorprone.processorpath}"/>
868          <arg value="-javacoption:-Xplugin:ErrorProne
869 <                            -Xep:IdentityBinaryExpression:WARN
870 <                            -Xep:BoxedPrimitiveConstructor:OFF
871 <                            -Xep:HashtableContains:OFF
872 <                            -Xep:ModifyingCollectionWithItself:OFF
1476 <                            -Xep:MissingOverride:OFF
1477 <                            -Xep:JdkObsolete:OFF
1478 <                            -Xep:NonAtomicVolatileUpdate:OFF
1479 <                            -Xep:MixedArrayDimensions:ERROR
1480 <                            -Xep:RemoveUnusedImports:ERROR
1481 <                            -Xep:ClassName:ERROR
1482 <                            -Xep:MultipleTopLevelClasses:ERROR
1483 <                            -Xep:EmptyIf:ERROR
1484 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1485 <                            -Xep:RedundantThrows:ERROR
1486 <                            -Xep:MethodCanBeStatic:WARN"/>
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>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines