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.245 by jsr166, Fri Jun 16 20:50:16 2017 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:
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 >  $HOME/jdk/jdk18
30    where each of the above is a JDK or a symlink to same, and
31 <  $HOME/jdk/src/jdk8
32 <  $HOME/jdk/src/jdk9
33 <  $HOME/jdk/src/jdk10
34 <  where each of the above is a complete JDK source tree
35 <  (e.g. mercurial forest) or a symlink to same.
31 >  $HOME/jdk/src/jdk11
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 50 | Line 62
62  
63  
64    <!-- Compilation options -->
53  <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 62 | Line 73
73    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
74    <property name="build.loops.dir"             location="${build.dir}/loops"/>
75  
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
76    <!-- JDK locations -->
77    <property name="jdks.home"  location="${user.home}/jdk"/>
78  
# Line 93 | 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"/>
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"/>
87 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
88      </sequential>
89    </macrodef>
90  
# Line 127 | Line 100
100      </sequential>
101    </macrodef>
102  
103 <  <defjdklocations v="6"/>
104 <  <defjdklocations v="7"/>
105 <  <defjdklocations v="8"/>
106 <  <defjdklocations v="9"/>
107 <  <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"/>
117 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
118 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
119 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
120 <  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
121 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
117 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
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"/>
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"/>
129  
130    <!-- Javadoc locations -->
131    <property name="docs.dir"          location="${build.dir}/docs"/>
132 <  <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"/>
132 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
133  
134    <!-- Jar locations -->
135    <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"/>
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 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
140 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
141 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
142 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
143 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
144 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
145 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
146 <  <!-- Default jdk doc location (latest stable release seems best) -->
147 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
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 >  <!-- 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 -->
160 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
161 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
162 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
163 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
164 <  <property name="java9.api.url"      value="${java9.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 204 | 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 227 | Line 195
195  
196      <sequential>
197  
230    <local name="modules"/>
231    <condition property="modules">
232      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233    </condition>
234
235    <local name="use-doclint"/>
236    <condition property="use-doclint">
237      <not> <equals arg1="@{target}" arg2="7"/> </not>
238    </condition>
239
198      <mkdir dir="@{workdir}/tck-classes"/>
199  
200      <javac srcdir="@{tck.src.dir}"
# Line 256 | 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"/>
261 <      <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 268 | 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"/>
292 <        </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="${jtreg9.src.dir}">
256 <    <patternset id="jdk9.jtreg.tests">
257 <      <include name="**/*.java"/>
258 <    </patternset>
259 <  </fileset>
260 <
261 <  <fileset dir="${jtreg8.src.dir}">
262 <    <patternset id="jdk8.jtreg.tests">
263 <      <include name="**/*.java"/>
264 <    </patternset>
265 <  </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"/>
286 +    <attribute name="verbose" default="${jtreg.verbose}"/>
287      <attribute name="jtregflags" default=""/>
288 +    <element name="jtreg-elements" optional="true"/>
289  
290      <sequential>
291  
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:${jtreg.verbose}"/>
348 <      <arg value="-vmoptions:-esa -ea"/>
314 >      <arg value="-verbose:@{verbose}"/>
315        <arg value="-automatic"/>
316        <arg value="-k:!ignore"/>
317        <arg line="@{jtregflags}"/>
318        <arg line="${jtreg.flags}"/>
319 +      <jtreg-elements/>
320      </jtreg>
321      </sequential>
322    </macrodef>
# Line 360 | 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 <  <property name="build.main.javac" value="${javac9}"/>
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"/>
374          <!--
375              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
376          -->
355  
356    <target name="compile"
357            depends="configure-compiler"
358            description="Compiles src/main sources to build dir">
359  
382    <local name="modules"/>
383    <condition property="modules">
384      <and>
385        <available file="${jdk9.home}/jmods" type="dir"/>
386        <equals arg1="9" arg2="${build.main.java.version}"/>
387      </and>
388    </condition>
389
360      <local name="destdir"/>
361 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
392 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
361 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
362  
363      <mkdir dir="${destdir}"/>
364  
# Line 406 | Line 375
375             fork="true">
376  
377        <include name="**/*.java"/>
378 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
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 438 | 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 451 | 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"
442 <             executable="${javadoc9}">
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="-tag"/>
455 <      <arg value="${javadoc.jls.option}"/>
456 < <!-- @apiNote currently unused -->
457 < <!--       <arg value="-tag"/> -->
458 < <!--       <arg value="apiNote:a:API Note:"/> -->
459 <      <arg value="-tag"/>
475 <      <arg value="implSpec:a:Implementation Requirements:"/>
476 <      <arg value="-tag"/>
477 <      <arg value="implNote:a:Implementation Note:"/>
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 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
460   <!-- tags added in jdk9: currently unused -->
461 < <!--       <arg value="-tag"/> -->
462 < <!--       <arg value="revised:X"/> -->
481 < <!--       <arg value="-tag"/> -->
482 < <!--       <arg value="spec:X"/> -->
461 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
462 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
463      </javadoc>
464    </target>
465  
# Line 489 | Line 469
469            description="Puts all distributable products in single hierarchy"/>
470  
471  
492  <target name="release"
493          depends="dist"
494          description="Puts entire CVS tree, plus distribution productions, in a jar">
495
496    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
497
498    <jar basedir="${basedir}" destfile="${release.jar}">
499      <!-- <exclude name="build/**"/> -->
500      <exclude name="${release.jar}"/>
501      <exclude name="user.properties"/>
502      <exclude name="etc/notes/**"/>
503      <exclude name="src/emulation/**"/>
504      <exclude name="**/SyntaxTest.java"/>
505      <exclude name="**/SuperfluousAbstract.java"/>
506      <manifest>
507        <attribute name="Built-By" value="${user.name}"/>
508        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
509      </manifest>
510    </jar>
511  </target>
512
513
472    <target name="clean"
473            description="Removes all build products">
474      <delete dir="${build.dir}"/>
# Line 535 | 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 570 | 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 582 | 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="test89" -->
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="8"/> -->
600 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
601 < <!--     </antcall> -->
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 < <!--     <antcall target="clean"/> -->
610 < <!--     <antcall target="test"> -->
611 < <!--       <param name="build.main.java.version" value="9"/> -->
612 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
613 < <!--     </antcall> -->
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> -->
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 >  <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 +  <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 +  <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 630 | Line 710
710    </target>
711  
712  
633
634  <!-- Various demos and test programs -->
635
636
637  <!-- description="Benchmark from Doug Lea's AQS paper" -->
638  <target name="loops" depends="configure-compiler">
639
640    <mkdir dir="${build.loops.dir}"/>
641
642    <javac srcdir="${loops.src.dir}"
643          destdir="${build.loops.dir}"
644            debug="${build.debug}"
645       debuglevel="${build.debuglevel}"
646      deprecation="${build.deprecation}"
647           source="${build.sourcelevel}"
648           target="${build.sourcelevel}"
649         encoding="ASCII"
650             fork="true">
651
652      <compilerarg line="${build.args}"/>
653      <classpath refid="loops.classpath"/>
654      <compilerarg value="-XDignore.symbol.file=true"/>
655
656    </javac>
657
658    <java classname="ALoops" fork="true">
659      <classpath refid="loops.classpath"/>
660    </java>
661  </target>
662
663
713    <target name="compile-test-loops" depends="jar"
714            description="Compiles all the perf tests in src/test/loops">
715  
# Line 674 | Line 723
723             includeAntRuntime="false"
724             includeJavaRuntime="false"
725             encoding="ASCII"
726 <           executable="${javac9}"
726 >           executable="${build.main.javac}"
727             fork="true">
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}"/>
684 <      <compilerarg line="${build.args}"/>
685 <    </javac>
686 <  </target>
687 <
688 <
689 <  <!-- jsr166 4jdk8 -->
690 <
691 <  <target name="4jdk8compile"
692 <          depends="configure-compiler"
693 <          description="Compiles src/jdk8 sources, targeting jdk8">
694 <
695 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
696 <
697 <    <javac srcdir="${4jdk8src.dir}"
698 <           destdir="${build.4jdk8.classes.dir}"
699 <           debug="${build.debug}"
700 <           debuglevel="${build.debuglevel}"
701 <           deprecation="${build.deprecation}"
702 <           source="8"
703 <           target="8"
704 <           classpath=""
705 <           bootclasspath="${bootclasspath8}"
706 <           includeAntRuntime="false"
707 <           includeJavaRuntime="false"
708 <           encoding="ASCII"
709 <           executable="${javac8}"
710 <           fork="true">
711 <      <include name="**/*.java"/>
712 <      <compilerarg value="-Xprefer:source"/>
713 <      <compilerarg value="-XDignore.symbol.file=true"/>
714 <      <compilerarg value="-Xlint:all"/>
715 <      <compilerarg value="-Werror"/>
716 <      <compilerarg line="${build.args}"/>
717 <    </javac>
718 <  </target>
719 <
720 <  <target name="4jdk8doclint"
721 <          depends="configure-compiler"
722 <          description="Finds doclint warnings">
723 <
724 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
725 <
726 <    <javac srcdir="${4jdk8src.dir}"
727 <           destdir="${build.4jdk8.classes.dir}"
728 <           debug="${build.debug}"
729 <           debuglevel="${build.debuglevel}"
730 <           deprecation="${build.deprecation}"
731 <           source="8"
732 <           target="8"
733 <           classpath=""
734 <           bootclasspath="${bootclasspath8}"
735 <           includeAntRuntime="false"
736 <           includeJavaRuntime="false"
737 <           encoding="ASCII"
738 <           executable="${javac8}"
739 <           fork="true">
740 <      <include name="**/*.java"/>
741 <      <compilerarg value="-Xprefer:source"/>
742 <      <compilerarg value="-XDignore.symbol.file=true"/>
743 <      <compilerarg value="-Xlint:all"/>
744 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
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"
752 <          description="Builds library jar from compiled sources">
753 <
754 <    <jar destfile="${4jdk8product.jar}">
755 <      <fileset dir="${build.4jdk8.classes.dir}"/>
756 <      <manifest>
757 <        <attribute name="Built-By" value="${user.name}"/>
758 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
759 <      </manifest>
760 <    </jar>
761 <  </target>
762 <
763 <
764 <  <target name="4jdk8-tck"
765 <          depends="4jdk8jar"
766 <          description="Runs tck tests for jsr166-4jdk8 directly">
767 <
768 <    <run-tck-tests
769 <      target="8"
770 <      workdir="${build.4jdk8.dir}"
771 <      classes="${4jdk8product.jar}">
772 <      <javac-elements>
773 <        <!-- JDK9+ test classes -->
774 <        <exclude name="*9Test.java"/>
775 <        <exclude name="*10Test.java"/>
776 <        <compilerarg value="-Werror"/>
777 <      </javac-elements>
778 <    </run-tck-tests>
779 <  </target>
780 <
781 <
782 <  <target name="4jdk8-jtreg"
783 <          depends="4jdk8jar"
784 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
785 <    <run-jtreg-tests
786 <       target="8"
787 <       workdir="${build.4jdk8.dir}"
788 <       classes="${4jdk8product.jar}"/>
789 <  </target>
790 <
791 <
792 <  <target name="4jdk8-test"
793 <          depends="4jdk8-tck, 4jdk8-jtreg"
794 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
795 <
796 <
797 <  <target name="4jdk8docs"
798 <          description="Builds javadocs for src/jdk8 to dist dir">
799 <
800 <    <delete dir="${4jdk8docs.dir}"/>
801 <    <mkdir dir="${4jdk8docs.dir}"/>
802 <
803 <    <javadoc destdir="${4jdk8docs.dir}"
804 <             packagenames="none"
805 <             link="${java8.api.url}"
806 <             overview="${4jdk8src.dir}/intro.html"
807 <             access="${build.javadoc.access}"
808 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
809 <             classpath=""
810 <             source="8"
811 <             executable="${javadoc8}"
812 <             failonerror = "true">
813 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
814 <        <include name="**/*.java"/>
815 <      </fileset>
816 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
817 <      <arg value="-XDignore.symbol.file=true"/>
818 <      <arg value="-tag"/>
819 <      <arg value="${javadoc.jls.option}"/>
820 < <!-- @apiNote currently unused -->
821 < <!--       <arg value="-tag"/> -->
822 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
823 <      <arg value="-tag"/>
824 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
825 <      <arg value="-tag"/>
826 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
827 <    </javadoc>
828 <  </target>
829 <
830 <
831 <  <target name="4jdk8dist"
832 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
833 <          description="Puts all distributable products in single hierarchy"/>
834 <
835 <
836 <  <target name="4jdk8clean"
837 <          description="Removes all 4jdk8 build products">
838 <    <delete dir="${build.4jdk8.dir}"/>
839 <  </target>
840 <
841 <
842 <  <target name="4jdk8dist-jar"
843 <          depends="4jdk8clean, 4jdk8jar">
844 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
845 <  </target>
846 <
847 <
848 <  <target name="4jdk8dist-docs"
849 <          depends="4jdk8clean, 4jdk8docs">
850 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
851 <  </target>
852 <
853 <
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) -->
855
856  <target name="4jdk7compile" depends="configure-compiler">
857    <mkdir dir="${build.4jdk7.classes.dir}"/>
858
859    <javac srcdir="${4jdk7src.dir}"
860           destdir="${build.4jdk7.classes.dir}"
861           debug="${build.debug}"
862           debuglevel="${build.debuglevel}"
863           deprecation="${build.deprecation}"
864           source="6"
865           target="6"
866           classpath=""
867           bootclasspath="${bootclasspath6}"
868           includeAntRuntime="false"
869           includeJavaRuntime="false"
870           encoding="ASCII"
871           executable="${javac7}"
872           fork="true">
873
874      <include name="**/*.java"/>
875      <compilerarg value="-Xprefer:source"/>
876      <compilerarg value="-XDignore.symbol.file=true"/>
877      <compilerarg value="-Xlint:all"/>
878      <compilerarg value="-Werror"/>
879      <compilerarg line="${build.args}"/>
880    </javac>
881  </target>
882
883  <target name="4jdk7doclint" 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="${javac8}"
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="-Xdoclint:all/protected"/>
906      <compilerarg line="${build.args}"/>
907    </javac>
908  </target>
909
910  <target name="4jdk7jar" depends="4jdk7compile">
911    <jar destfile="${4jdk7product.jar}">
912      <fileset dir="${build.4jdk7.classes.dir}"/>
913      <manifest>
914        <attribute name="Built-By" value="${user.name}"/>
915        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
916      </manifest>
917    </jar>
918  </target>
919
920  <target name="4jdk7-tck" depends="4jdk7jar">
921    <run-tck-tests
922      target="7"
923      workdir="${build.4jdk7.dir}"
924      classes="${4jdk7product.jar}">
925      <javac-elements>
926        <!-- JDK8+ test classes -->
927        <exclude name="*8Test.java"/>
928        <exclude name="*9Test.java"/>
929        <exclude name="*10Test.java"/>
930        <exclude name="DoubleAccumulatorTest.java"/>
931        <exclude name="DoubleAdderTest.java"/>
932        <exclude name="LongAccumulatorTest.java"/>
933        <exclude name="LongAdderTest.java"/>
934        <exclude name="CompletableFutureTest.java"/>
935        <exclude name="SplittableRandomTest.java"/>
936        <exclude name="StampedLockTest.java"/>
937        <exclude name="SubmissionPublisherTest.java"/>
938        <compilerarg value="-Werror"/>
939      </javac-elements>
940    </run-tck-tests>
941  </target>
942
943  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
944  <target name="4jdk7-tck-junit" depends="4jdk7compile">
945
946    <junit printsummary="true"
947           showoutput="true"
948           errorProperty="junit.failed"
949           failureProperty="junit.failed"
950           includeantruntime="true"
951           jvm="${java7}"
952           fork="true">
953
954      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
955      <jvmarg value="-server"/>
956
957      <classpath>
958        <pathelement location="${junit.jar}"/>
959        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
960      </classpath>
961
962      <formatter type="brief"/>
963
964      <test name="${jsr166.tckTestClass}" haltonfailure="no">
965      </test>
966    </junit>
967  </target>
968
969  <target name="4jdk7-jtreg" depends="4jdk7jar">
970    <run-jtreg-tests
971       target="7"
972       workdir="${build.4jdk7.dir}"
973       classes="${4jdk7product.jar}"/>
974  </target>
975
976  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
977
978  <target name="4jdk7docs">
979    <delete dir="${4jdk7docs.dir}"/>
980    <mkdir dir="${4jdk7docs.dir}"/>
981
982    <javadoc destdir="${4jdk7docs.dir}"
983             packagenames="none"
984             link="${java7.api.url}"
985             overview="${4jdk7src.dir}/intro.html"
986             access="${build.javadoc.access}"
987             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
988             classpath=""
989             executable="${javadoc7}"
990             failonerror = "true">
991      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
992        <include name="**/*.java"/>
993      </fileset>
994      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
995      <arg value="-XDignore.symbol.file=true"/>
996    </javadoc>
997  </target>
998
999  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1000
1001  <target name="4jdk7clean">
1002    <delete dir="${build.4jdk7.dir}"/>
1003  </target>
1004
1005  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1006    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1007  </target>
1008
1009  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1010    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1011  </target>
1012
1013
741    <!-- jsr166x (no longer maintained) -->
1015
1016  <target name="jsr166xcompile" depends="configure-compiler">
1017    <mkdir dir="${build.jsr166x.classes.dir}"/>
1018
1019    <javac srcdir="${topsrc.dir}"
1020           destdir="${build.jsr166x.classes.dir}"
1021           debug="${build.debug}"
1022           debuglevel="${build.debuglevel}"
1023           deprecation="${build.deprecation}"
1024           classpath=""
1025           bootclasspath="${bootclasspath6}"
1026           source="5"
1027           target="5"
1028           includeAntRuntime="false"
1029           includeJavaRuntime="false"
1030           encoding="ASCII"
1031           executable="${javac7}"
1032           fork="true">
1033      <include name="jsr166x/**/*.java"/>
1034      <compilerarg value="-XDignore.symbol.file=true"/>
1035      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1036      <compilerarg value="-Werror"/>
1037      <compilerarg line="${build.args}"/>
1038    </javac>
1039  </target>
1040
1041  <target name="jsr166xjar" depends="jsr166xcompile">
1042    <jar destfile="${jsr166x.jar}">
1043      <fileset dir="${build.jsr166x.classes.dir}"/>
1044      <manifest>
1045        <attribute name="Built-By" value="${user.name}"/>
1046        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1047      </manifest>
1048    </jar>
1049  </target>
1050
1051  <target name="jsr166xdocs">
1052    <delete dir="${jsr166xdocs.dir}"/>
1053    <mkdir dir="${jsr166xdocs.dir}"/>
1054
1055    <javadoc destdir="${jsr166xdocs.dir}"
1056             packagenames="jsr166x.*"
1057             link="${java.api.url}"
1058             access="${build.javadoc.access}"
1059             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1060             bootclasspath="${bootclasspath6}"
1061             source="5"
1062             executable="${javadoc7}"
1063             failonerror = "true">
1064      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1065      <arg value="-XDignore.symbol.file=true"/>
1066    </javadoc>
1067  </target>
1068
1069  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1070
1071  <target name="jsr166xclean">
1072    <delete dir="${build.jsr166x.dir}"/>
1073  </target>
1074
1075  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1076    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1077  </target>
1078
1079  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1080    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1081  </target>
1082
1083
742    <!-- jsr166y (no longer maintained) -->
1085
1086  <target name="jsr166ycompile" depends="configure-compiler">
1087    <mkdir dir="${build.jsr166y.classes.dir}"/>
1088
1089    <javac srcdir="${topsrc.dir}"
1090           destdir="${build.jsr166y.classes.dir}"
1091           debug="${build.debug}"
1092           debuglevel="${build.debuglevel}"
1093           deprecation="${build.deprecation}"
1094           source="6"
1095           target="6"
1096           classpath=""
1097           bootclasspath="${bootclasspath6}"
1098           includeAntRuntime="false"
1099           includeJavaRuntime="false"
1100           encoding="ASCII"
1101           executable="${javac7}"
1102           fork="true">
1103
1104      <include name="jsr166y/**/*.java"/>
1105      <compilerarg value="-XDignore.symbol.file=true"/>
1106      <compilerarg value="-Xlint:all"/>
1107      <compilerarg value="-Werror"/>
1108      <compilerarg line="${build.args}"/>
1109    </javac>
1110  </target>
1111
1112  <target name="jsr166yjar" depends="jsr166ycompile">
1113    <jar destfile="${jsr166y.jar}" index="true">
1114      <fileset dir="${build.jsr166y.classes.dir}"/>
1115      <manifest>
1116        <attribute name="Built-By" value="${user.name}"/>
1117        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1118      </manifest>
1119    </jar>
1120  </target>
1121
1122  <target name="jsr166ydocs">
1123    <delete dir="${jsr166ydocs.dir}"/>
1124    <mkdir dir="${jsr166ydocs.dir}"/>
1125
1126    <javadoc destdir="${jsr166ydocs.dir}"
1127             packagenames="jsr166y.*"
1128             link="${java.api.url}"
1129             access="${build.javadoc.access}"
1130             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1131             bootclasspath="${bootclasspath6}"
1132             source="6"
1133             executable="${javadoc7}"
1134             failonerror = "true">
1135      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1136      <arg value="-XDignore.symbol.file=true"/>
1137    </javadoc>
1138  </target>
1139
1140  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1141
1142  <target name="jsr166yclean">
1143    <delete dir="${build.jsr166y.dir}"/>
1144  </target>
1145
1146  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1147    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1148  </target>
1149
1150  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1151    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1152  </target>
1153
1154
743    <!-- extra166y (no longer maintained) -->
1156
1157  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1158    <mkdir dir="${build.extra166y.classes.dir}"/>
1159
1160    <javac srcdir="${topsrc.dir}"
1161           destdir="${build.extra166y.classes.dir}"
1162           debug="${build.debug}"
1163           debuglevel="${build.debuglevel}"
1164           deprecation="${build.deprecation}"
1165           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1166           classpath=""
1167           source="6"
1168           target="6"
1169           includeAntRuntime="false"
1170           includeJavaRuntime="false"
1171           encoding="ASCII"
1172           executable="${javac7}"
1173           fork="true">
1174
1175      <include name="extra166y/**/*.java"/>
1176      <compilerarg value="-XDignore.symbol.file=true"/>
1177      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1178      <compilerarg value="-Werror"/>
1179      <compilerarg line="${build.args}"/>
1180    </javac>
1181  </target>
1182
1183  <target name="extra166yjar" depends="extra166ycompile">
1184    <jar destfile="${extra166y.jar}" index="true">
1185      <fileset dir="${build.extra166y.classes.dir}"/>
1186      <manifest>
1187        <attribute name="Built-By" value="${user.name}"/>
1188        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1189      </manifest>
1190    </jar>
1191  </target>
1192
1193  <target name="extra166ydocs">
1194    <delete dir="${extra166ydocs.dir}"/>
1195    <mkdir dir="${extra166ydocs.dir}"/>
1196
1197    <javadoc destdir="${extra166ydocs.dir}"
1198             packagenames="extra166y.*"
1199             link="${java.api.url}"
1200             access="${build.javadoc.access}"
1201             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1202             bootclasspath="${bootclasspath6}"
1203             source="6"
1204             executable="${javadoc7}">
1205      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1206      <arg value="-XDignore.symbol.file=true"/>
1207    </javadoc>
1208  </target>
1209
1210  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1211
1212  <target name="extra166yclean">
1213    <delete dir="${build.extra166y.dir}"/>
1214  </target>
1215
1216  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1217    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1218  </target>
1219
1220  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1221    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1222  </target>
1223
1224
744    <!-- jsr166e (no longer maintained) -->
745  
1227  <property name="build.jsr166e.java.version" value="6"/>
1228  <property name="build.jsr166e.javac" value="${javac6}"/>
1229
1230  <target name="jsr166ecompile" depends="configure-compiler">
1231    <mkdir dir="${build.jsr166e.classes.dir}"/>
1232
1233    <javac srcdir="${topsrc.dir}"
1234           destdir="${build.jsr166e.classes.dir}"
1235           debug="${build.debug}"
1236           debuglevel="${build.debuglevel}"
1237           deprecation="${build.deprecation}"
1238           source="${build.jsr166e.java.version}"
1239           target="${build.jsr166e.java.version}"
1240           classpath=""
1241           includeAntRuntime="false"
1242           includeJavaRuntime="false"
1243           executable="${build.jsr166e.javac}"
1244           fork="true">
1245
1246      <include name="jsr166e/**/*.java"/>
1247      <compilerarg value="-XDignore.symbol.file=true"/>
1248      <compilerarg value="-Xlint:all"/>
1249      <compilerarg value="-Werror"/>
1250      <compilerarg line="${build.args}"/>
1251    </javac>
1252  </target>
1253
1254  <target name="jsr166edoclint">
1255    <mkdir dir="${build.jsr166e.classes.dir}"/>
1256
1257    <javac srcdir="${topsrc.dir}"
1258           destdir="${build.jsr166e.classes.dir}"
1259           debug="${build.debug}"
1260           debuglevel="${build.debuglevel}"
1261           deprecation="${build.deprecation}"
1262           source="${build.jsr166e.java.version}"
1263           target="${build.jsr166e.java.version}"
1264           classpath=""
1265           bootclasspath="${bootclasspath6}"
1266           includeAntRuntime="false"
1267           includeJavaRuntime="false"
1268           executable="${javac8}"
1269           fork="true">
1270
1271      <include name="jsr166e/**/*.java"/>
1272      <compilerarg value="-XDignore.symbol.file=true"/>
1273      <compilerarg value="-Xlint:all"/>
1274      <compilerarg value="-Werror"/>
1275      <compilerarg value="-Xdoclint:all/protected"/>
1276    </javac>
1277  </target>
1278
1279  <target name="jsr166ejar" depends="jsr166ecompile">
1280    <jar destfile="${jsr166e.jar}" index="true">
1281      <fileset dir="${build.jsr166e.classes.dir}"/>
1282      <manifest>
1283        <attribute name="Built-By" value="${user.name}"/>
1284        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1285      </manifest>
1286    </jar>
1287  </target>
1288
1289  <target name="jsr166edocs">
1290    <delete dir="${jsr166edocs.dir}"/>
1291    <mkdir dir="${jsr166edocs.dir}"/>
1292
1293    <javadoc destdir="${jsr166edocs.dir}"
1294             packagenames="jsr166e.*"
1295             link="${java.api.url}"
1296             access="${build.javadoc.access}"
1297             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1298             source="${build.jsr166e.java.version}"
1299             executable="${javadoc7}"
1300             failonerror = "true">
1301      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1302      <arg value="-XDignore.symbol.file=true"/>
1303    </javadoc>
1304  </target>
1305
1306  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1307    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1308    <run-tck-tests
1309      tck.src.dir="${test.src.dir}/tck-jsr166e"
1310      target="${build.jsr166e.java.version}"
1311      workdir="${build.jsr166e.dir}"
1312      classes="${jsr166e.jar}"/>
1313  </target>
1314
1315  <target name="jsr166e-tck">
1316
1317 <!--     <antcall target="clean"/> -->
1318 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1319 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1320 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1321 <!--     </antcall> -->
1322
1323    <antcall target="clean"/>
1324    <antcall target="jsr166e-tck-one-java-version">
1325      <param name="build.jsr166e.java.version" value="7"/>
1326      <param name="build.jsr166e.javac" value="${javac7}"/>
1327    </antcall>
1328
1329    <antcall target="clean"/>
1330    <antcall target="jsr166e-tck-one-java-version">
1331      <param name="build.jsr166e.java.version" value="6"/>
1332      <param name="build.jsr166e.javac" value="${javac6}"/>
1333    </antcall>
1334  </target>
1335
1336  <target name="jsr166e-test" depends="jsr166e-tck"/>
1337
1338  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1339
1340  <target name="jsr166eclean">
1341    <delete dir="${build.jsr166e.dir}"/>
1342  </target>
1343
1344  <target name="jsr166edist-jar"
1345          depends="jsr166eclean, jsr166ejar">
1346    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1347  </target>
1348
1349  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1350    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1351  </target>
1352
1353
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 1368 | Line 760
760  
761  
762   <!-- ==============================================================
763 <  Experimental errorprone support - http://errorprone.info
764 <  You may need to bring your own errorprone jar.
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 +  <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
787 +                   -Xep:MultipleTopLevelClasses:ERROR
788 +                   -Xep:ClassName:ERROR
789 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
790 +                   -Xep:RedundantThrows:ERROR
791 +                   -Xep:IdentityBinaryExpression: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"
803            depends="clean, configure-compiler"
804            description="Run errorprone over jsr166 source code (experimental)">
# Line 1392 | Line 820
820             fork="true">
821  
822        <include name="**/*.java"/>
823 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
824 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
825 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
826 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
827 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1400 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1401 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1402 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1403 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1404 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
823 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
824 >      <compilerarg value="-J--illegal-access=permit"/>
825 >      <compilerarg value="-XDcompilePolicy=simple"/>
826 >      <compilerarg value="-processorpath"/>
827 >      <compilerarg pathref="errorprone.processorpath.path"/>
828        <compilerarg value="-Xplugin:ErrorProne
829 <                          -Xep:IdentityBinaryExpression:WARN
1407 <                          -Xep:MissingOverride:OFF
1408 <                          -Xep:MixedArrayDimensions:WARN
1409 <                          -Xep:RemoveUnusedImports:ERROR
1410 <                          -Xep:ClassName:ERROR
1411 <                          -Xep:MultipleTopLevelClasses:ERROR
1412 <                          -Xep:EmptyIf:ERROR
1413 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1414 <                          -Xep:ArgumentParameterSwap:ERROR
1415 <                          -Xep:RedundantThrows:ERROR
1416 <                          -Xep:MethodCanBeStatic:WARN"/>
829 >                          ${errorprone.jsr166.flags}"/>
830        <compilerarg value="--patch-module=java.base=${src.dir}"/>
831        <compilerarg value="-Xprefer:source"/>
832        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1428 | 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 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
849 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
850 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
851 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
1439 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1440 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1441 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1442 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1443 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1444 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
848 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
849 >        <compilerarg value="-J--illegal-access=permit"/>
850 >        <compilerarg value="-XDcompilePolicy=simple"/>
851 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
852          <compilerarg value="-Xplugin:ErrorProne
853 <                            -Xep:IdentityBinaryExpression:WARN
854 <                            -Xep:BoxedPrimitiveConstructor:OFF
1448 <                            -Xep:HashtableContains:OFF
1449 <                            -Xep:ModifyingCollectionWithItself:OFF
1450 <                            -Xep:MissingOverride:OFF
1451 <                            -Xep:MixedArrayDimensions:WARN
1452 <                            -Xep:RemoveUnusedImports:ERROR
1453 <                            -Xep:ClassName:ERROR
1454 <                            -Xep:MultipleTopLevelClasses:ERROR
1455 <                            -Xep:EmptyIf:ERROR
1456 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1457 <                            -Xep:ArgumentParameterSwap:ERROR
1458 <                            -Xep:RedundantThrows:ERROR
1459 <                            -Xep:MethodCanBeStatic:WARN"/>
853 >                            ${errorprone.jsr166.flags}
854 >                            ${errorprone.jsr166.test.flags}"/>
855          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
856        </javac-elements>
857      </run-tck-tests>
858    </target>
859  
860 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
861 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
862 +  <target name="errorprone-jtreg"
863 +          depends="jar"
864 +          description="Run errorprone over jtreg tests (experimental)">
865 +
866 +    <run-jtreg-tests
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.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>
882 +  </target>
883 +
884  
885   <!-- ==============================================================
886    Running guava tests against jsr166 code
# Line 1515 | Line 934
934      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
935           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
936      <junit printsummary="true" showoutput="true" haltonfailure="true"
937 <           jvm="${java9}" fork="true">
938 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
937 >           jvm="${build.main.java}" fork="true">
938 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
939        <formatter type="brief"/>
940        <classpath>
941          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines