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.284 by jsr166, Sat Oct 27 01:16:23 2018 UTC vs.
Revision 1.327 by jsr166, Fri Nov 25 20:33:50 2022 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if"
2 >  xmlns:if="ant:if"
3    xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
# Line 19 | 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
25 <  $HOME/jdk/jdk11
26 <  $HOME/jdk/jdk12
22 >  $HOME/jdk/jdk17
23 >  $HOME/jdk/jdk19
24    where each of the above is a JDK or a symlink to same, and
25 <  $HOME/jdk/src/jdk8
26 <  $HOME/jdk/src/jdk9
30 <  $HOME/jdk/src/jdk10
31 <  $HOME/jdk/src/jdk11
32 <  $HOME/jdk/src/jdk12
33 <  where each of the above is a complete JDK source tree
34 <  (e.g. mercurial forest) or a symlink to same.
25 >  $HOME/jdk/src/jdk17
26 >  where each of the above is a JDK source tree or a symlink to same.
27  
28    Alternatively, define ant variables thus:
29    ant -Djdk$N.home=... -Djdk$N.src.home=...
30 <  for $N in 8 9 10 ...
30 >  for $N in 17 .. 19 ...
31  
32    As of 2016-03, the sources in src/main are for jdk9+ only.
33 +  As of 2019-08, the sources in src/main are for jdk11+ only.
34 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
35 +  As of 2022-02, the sources in src/main are for jdk17+ only.
36   ------------------------------------------------------------------------------
37    </description>
38  
# Line 66 | Line 61
61    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62    <property name="build.loops.dir"             location="${build.dir}/loops"/>
63  
69  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
70  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
71  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
72  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
73
74  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
75  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
76  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
77  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
78
79  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
80  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
81  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
82  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
83
84  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
85  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
86  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
87  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
88
64    <!-- JDK locations -->
65    <property name="jdks.home"  location="${user.home}/jdk"/>
66  
# Line 97 | Line 72
72      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
73      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
74      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
75 <    <local name="have.java.base"/>
101 <    <available property="have.java.base"
102 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
103 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
104 <      if:set="have.java.base"/>
105 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
106 <      unless:set="have.java.base"/>
107 <    <local name="modules"/>
108 <    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
109 <    <local name="boot.jar.dir"/>
110 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
111 <    <path id="bootclasspath@{v}" unless:set="modules">
112 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
113 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
114 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
115 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
116 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
117 <    </path>
118 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
75 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
76      </sequential>
77    </macrodef>
78  
# Line 131 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="6"/>
92 <  <defjdklocations v="7"/>
93 <  <defjdklocations v="8"/>
94 <  <defjdklocations v="9"/>
138 <  <defjdklocations v="10"/>
139 <  <defjdklocations v="11"/>
140 <  <defjdklocations v="12"/>
91 >  <defjdklocations v="17"/>
92 >  <defjdklocations v="18"/>
93 >  <defjdklocations v="19"/>
94 >  <defjdklocations v="20"/>
95  
96    <!-- Source locations -->
97    <property name="src.dir"              location="${basedir}/src/main"/>
98    <property name="test.src.dir"         location="${basedir}/src/test"/>
99    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
100    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
101 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
102 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
103 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
104 <  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
105 <  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
152 <  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
153 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
101 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
102 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
103 >  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
104 >  <property name="jtreg20.src.dir"      location="${test.src.dir}/jtreg"/>
105 >  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
106    <property name="lib.dir"              location="${basedir}/lib"/>
107    <property name="dist.dir"             location="${basedir}/dist"/>
108    <property name="topsrc.dir"           location="${basedir}/src"/>
157  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
158  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
159  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
160  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
161  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
162  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
109  
110    <!-- Javadoc locations -->
111    <property name="docs.dir"          location="${build.dir}/docs"/>
112 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
167 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
168 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
169 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
170 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
171 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
172 <
173 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
174 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
175 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
176 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
177 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
178 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
179 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
112 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
113  
114    <!-- Jar locations -->
115    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
183  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
184  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
185  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
186  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
187  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
188  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
116    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
117  
118    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
119    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
120 <  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
121 <  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
122 <  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
123 <  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
124 <  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
125 <  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
199 <  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
200 <  <!-- The location of jdk early access docs (RIP) -->
201 <  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202 <  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203 <  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
204 <  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
205 <  <!-- Default jdk doc location (latest stable release seems best) -->
206 <  <!-- But pin to jdk 10 until fix for -->
207 <  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
208 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
120 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
121 >  <property name="java18.docroot.url" value="https://docs.oracle.com/en/java/javase/18/docs"/>
122 >  <property name="java19.docroot.url" value="https://docs.oracle.com/en/java/javase/19/docs"/>
123 >  <property name="java20.docroot.url" value="https://download.java.net/java/early_access/jdk20/docs"/>
124 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
125 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
126  
127    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
128 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
129 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
130 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
131 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
215 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
216 <  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
217 <  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
218 <  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
128 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
129 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
130 >  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
131 >  <property name="java20.api.url"     value="${java20.docroot.url}/api/"/>
132    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
133  
134    <!-- Define the "jtreg" task -->
# Line 223 | Line 136
136    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
137             classpath="${lib.dir}/jtreg.jar" />
138  
139 <  <!-- Tck options; see JSR166TestCase.java
139 >  <!-- Tck configuration options; see JSR166TestCase.java
140     To profile a single tck test class:
141     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
142     To stress test a single tck test class:
# Line 246 | Line 159
159  
160      <sequential>
161  
249    <local name="modules"/>
250    <condition property="modules">
251      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
252    </condition>
253
254    <local name="use-doclint"/>
255    <condition property="use-doclint">
256      <not> <equals arg1="@{target}" arg2="7"/> </not>
257    </condition>
258
162      <mkdir dir="@{workdir}/tck-classes"/>
163  
164      <javac srcdir="@{tck.src.dir}"
# Line 275 | Line 178
178        <include name="*.java"/>
179        <compilerarg value="-XDignore.symbol.file=true"/>
180        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
181 <      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
182 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
280 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
181 >      <compilerarg value="-Xdoclint:reference/private"/>
182 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
183        <compilerarg line="${build.args}"/>
184        <javac-elements/>
185  
# Line 287 | Line 189
189            failonerror="true"
190            jvm="${java@{target}}"
191            fork="true">
192 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
193 <        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
194 <        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
195 <        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
196 <        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
197 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
198 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
199 <        <jvmarg line="@{jvmflags}"/>
200 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
201 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
202 <
203 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
204 <        <syspropertyset id="system-properties-used-by-tck">
205 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
206 <          <propertyref prefix="jsr166."/>
207 <          <propertyref name="test.timeout.factor"/>
208 <        </syspropertyset>
209 <
210 <        <classpath>
211 <          <pathelement location="${junit.jar}"/>
212 <          <pathelement location="@{workdir}/tck-classes"/>
311 <        </classpath>
192 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
193 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
194 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
195 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
196 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
197 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
198 >        <jvmarg line="@{jvmflags}"/>
199 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
200 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
201 >
202 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
203 >        <syspropertyset id="system-properties-used-by-tck">
204 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
205 >          <propertyref prefix="jsr166."/>
206 >          <propertyref name="test.timeout.factor"/>
207 >        </syspropertyset>
208 >
209 >        <classpath>
210 >          <pathelement location="${junit.jar}"/>
211 >          <pathelement location="@{workdir}/tck-classes"/>
212 >        </classpath>
213      </java>
214  
215      </sequential>
# Line 329 | Line 230
230      </sequential>
231    </macrodef>
232  
233 <  <defjtregtests v="12"/>
234 <  <defjtregtests v="11"/>
235 <  <defjtregtests v="10"/>
236 <  <defjtregtests v="9"/>
336 <  <defjtregtests v="8"/>
337 <  <defjtregtests v="7"/>
233 >  <defjtregtests v="17"/>
234 >  <defjtregtests v="18"/>
235 >  <defjtregtests v="19"/>
236 >  <defjtregtests v="20"/>
237  
238    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
239    <property name="jtreg.flags" value=""/>
240  
241    <macrodef name="run-jtreg-tests">
343    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
242      <attribute name="target"/>
243      <attribute name="workdir"/>
244      <attribute name="classes"/>
# Line 353 | Line 251
251      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
252      <property name="jtreg.verbose" value="nopass,fail,error"/>
253  
254 <    <local name="modules"/>
255 <    <condition property="modules">
256 <      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
257 <    </condition>
254 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
255 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
256 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
257 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
258 >    <property name="jtreg.concurrency" value="3"/>
259  
260 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
260 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
261      <jtreg dir="${jtreg@{target}.src.dir}"
262             jdk="${jdk@{target}.home}"
263             workDir="@{workdir}/JTwork">
264        <patternset refid="jdk@{target}.jtreg.tests"/>
265 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266 <      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
267 <      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
265 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
266 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
267 >      <arg value="-vmoption:-Xmx256m"/>
268 >      <arg value="-concurrency:${jtreg.concurrency}"/>
269 >      <arg value="-vmoptions:-esa -ea"/>
270 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
271        <arg value="-agentvm"/>
272        <arg value="-noreport"/>
273        <arg value="-verbose:@{verbose}"/>
372      <arg value="-vmoptions:-esa -ea"/>
274        <arg value="-automatic"/>
275        <arg value="-k:!ignore"/>
276        <arg line="@{jtregflags}"/>
# Line 385 | Line 286
286    </path>
287  
288    <!-- Support @jls tag, used in jdk8+ javadoc -->
289 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
290    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
291    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
292  
293    <!-- Main targets -->
294  
295    <!-- Default values: may seem strange ... -->
296 <  <!-- At runtime, target latest LTS, i.e. jdk11 -->
297 <  <!-- But at build time, target jdk9, for maximal binary portability -->
298 <  <!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
299 <  <property name="build.main.java.version" value="11"/>
300 <  <property name="build.main.java" value="${java11}"/>
301 <  <property name="build.main.javac" value="${javac9}"/>
400 <  <property name="build.main.javadoc" value="${javadoc12}"/>
296 >  <!-- At runtime, target latest, but build for current LTS -->
297 >  <property name="java.runtime.target" value="19"/>
298 >  <property name="build.main.java" value="${java17}"/>
299 >  <property name="build.main.javac" value="${javac17}"/>
300 >  <property name="build.main.javadoc" value="${javadoc19}"/>
301 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
302  
303    <target name="dists"
304 <          depends="dist, 4jdk8dist"
304 >          depends="dist"
305            description="Builds all public jars and docs"/>
405          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
306  
307    <target name="compile"
308            depends="configure-compiler"
# Line 429 | Line 329
329        <compilerarg value="--patch-module=java.base=${src.dir}"/>
330        <compilerarg value="-Xprefer:source"/>
331        <compilerarg value="-XDignore.symbol.file=true"/>
332 <      <compilerarg value="-Xlint:all,-removal"/>
333 <      <compilerarg line="--doclint-format html5"/>
334 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
332 >      <compilerarg value="-Xlint:all"/>
333 >      <compilerarg value="-Xdoclint:all/protected"/>
334 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
335        <compilerarg value="-Werror"/>
336        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
337        <compilerarg line="${build.args}"/>
438
338      </javac>
339    </target>
340  
442
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 457 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
358 <
461 <    <delete dir="${docs.dir}"/>
358 >    <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
463
464    <!-- the packagenames="none" hack below prevents scanning the -->
465    <!-- sourcepath for packages -->
466
467 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
468 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
469 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
470 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
471 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
360      <javadoc destdir="${docs.dir}"
361               packagenames="none"
362 <             link="${java11.api.url}"
362 >             link="${java.api.url}"
363               overview="${src.dir}/intro.html"
364               access="${build.javadoc.access}"
365               sourcepath="${src.dir}"
366               classpath=""
367 <             source="11"
367 >             source="${build.main.javadoc.source}"
368               executable="${build.main.javadoc}">
369        <fileset dir="${src.dir}" defaultexcludes="yes">
370 <        <include name="**/*.java"/>
370 >        <include name="java/**/*.java"/>
371        </fileset>
372 <      <arg line="-Xdocrootparent ${java10.docroot.url}"/>
372 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
373        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
374 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
375 +      <arg value="-quiet"/>
376        <arg value="-XDignore.symbol.file=true"/>
377        <arg value="-html5"/>
378 +      <arg value="-Xdoclint:all,-missing"/>
379        <arg value="--patch-module=java.base=${src.dir}"/>
380 <      <arg value="--frames"/>
380 >      <arg value="--frames" if:set="use-frames"/>
381        <arg value="--override-methods=summary"/>
382        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
383        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
384        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
385        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
495 <!-- tags added in jdk9: currently unused -->
496 <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
497 <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
386      </javadoc>
387    </target>
388  
501
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
506
393    <target name="clean"
394            description="Removes all build products">
395      <delete dir="${build.dir}"/>
396    </target>
397  
512
398    <target name="dist-clean"
399            description="Removes all build and distribution products">
400      <delete dir="${build.dir}"/>
401      <delete dir="${dist.dir}"/>
402    </target>
403  
519
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 528 | Line 412
412    </target>
413  
414    <target name="tck"
415 <          depends="jar"
415 >          depends="jar"
416            description="Runs tck tests for src/main directly">
533
417      <run-tck-tests
418 <      target="${build.main.java.version}"
418 >      target="${java.runtime.target}"
419        workdir="${build.dir}"
420        classes="${product.jar}">
421        <javac-elements>
422 <        <compilerarg value="-Werror"/>
422 >        <!-- <compilerarg value="-Werror"/> -->
423        </javac-elements>
424      </run-tck-tests>
425    </target>
# Line 563 | Line 446
446    </target>
447  
448    <target name="jtreg"
449 <          depends="jar"
449 >          depends="jar"
450            description="Runs jtreg tests for src/main using the jtreg ant task">
451      <run-jtreg-tests
452 <       target="${build.main.java.version}"
452 >       target="${java.runtime.target}"
453         workdir="${build.dir}"
454         classes="${product.jar}"/>
455    </target>
# Line 576 | Line 459
459            description="Runs tck and jtreg tests for src/main"/>
460  
461    <target name="test-version-permutations"
462 <          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
463 <  </target>
462 >          depends="test17, test19, clean, test, docs"
463 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
464  
582  <target name="test9">
583    <antcall target="clean"/>
584    <antcall>
585      <param name="build.main.java.version" value="9"/>
586      <param name="build.main.java" value="${java9}"/>
587      <param name="build.main.javac" value="${javac9}"/>
588      <target name="test"/>
589    </antcall>
590  </target>
465  
466 <  <target name="test10">
593 <    <antcall target="clean"/>
466 >  <target name="test17">
467      <antcall>
468 <      <param name="build.main.java.version" value="10"/>
469 <      <param name="build.main.java" value="${java10}"/>
470 <      <param name="build.main.javac" value="${javac10}"/>
471 <      <param name="build.main.javadoc" value="${javadoc10}"/>
468 >      <param name="java.runtime.target" value="17"/>
469 >      <param name="build.main.javac" value="${javac17}"/>
470 >      <param name="build.main.javadoc" value="${javadoc17}"/>
471 >      <param name="build.main.javadoc.source" value="17"/>
472 >      <target name="clean"/>
473        <target name="test"/>
474        <target name="docs"/>
475      </antcall>
476    </target>
477 <
604 <  <target name="test11">
605 <    <antcall target="clean"/>
477 >  <target name="test19">
478      <antcall>
479 <      <param name="build.main.java.version" value="11"/>
480 <      <param name="build.main.java" value="${java11}"/>
481 <      <param name="build.main.javac" value="${javac11}"/>
482 <      <param name="build.main.javadoc" value="${javadoc11}"/>
483 <      <target name="test"/>
612 <      <target name="docs"/>
613 <    </antcall>
614 <  </target>
615 <
616 <  <target name="test12">
617 <    <antcall target="clean"/>
618 <    <antcall>
619 <      <param name="build.main.java.version" value="12"/>
620 <      <param name="build.main.java" value="${java12}"/>
621 <      <param name="build.main.javac" value="${javac12}"/>
622 <      <param name="build.main.javadoc" value="${javadoc12}"/>
623 <      <target name="test"/>
624 <      <target name="docs"/>
625 <    </antcall>
626 <  </target>
627 <
628 <  <target name="test9-11">
629 <    <antcall target="clean"/>
630 <    <antcall>
631 <      <param name="build.main.java.version" value="11"/>
632 <      <param name="build.main.java" value="${java11}"/>
633 <      <param name="build.main.javac" value="${javac9}"/>
634 <      <param name="build.main.javadoc" value="${javadoc11}"/>
635 <      <target name="test"/>
636 <      <target name="docs"/>
637 <    </antcall>
638 <  </target>
639 <
640 <  <target name="test9-12">
641 <    <antcall target="clean"/>
642 <    <antcall>
643 <      <param name="build.main.java.version" value="12"/>
644 <      <param name="build.main.java" value="${java12}"/>
645 <      <param name="build.main.javac" value="${javac9}"/>
646 <      <param name="build.main.javadoc" value="${javadoc12}"/>
479 >      <param name="java.runtime.target" value="19"/>
480 >      <param name="build.main.javac" value="${javac19}"/>
481 >      <param name="build.main.javadoc" value="${javadoc19}"/>
482 >      <param name="build.main.javadoc.source" value="19"/>
483 >      <target name="clean"/>
484        <target name="test"/>
485        <target name="docs"/>
486      </antcall>
# Line 688 | Line 525
525  
526        <include name="*.java"/>
527        <compilerarg value="-XDignore.symbol.file=true"/>
528 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
529 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
693 <      <compilerarg line="${build.args}"/>
694 <    </javac>
695 <  </target>
696 <
697 <
698 <  <!-- jsr166 4jdk8 -->
699 <
700 <  <target name="4jdk8compile"
701 <          depends="configure-compiler"
702 <          description="Compiles src/jdk8 sources, targeting jdk8">
703 <
704 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
705 <
706 <    <javac srcdir="${4jdk8src.dir}"
707 <           destdir="${build.4jdk8.classes.dir}"
708 <           debug="${build.debug}"
709 <           debuglevel="${build.debuglevel}"
710 <           deprecation="${build.deprecation}"
711 <           source="8"
712 <           target="8"
713 <           classpath=""
714 <           bootclasspath="${bootclasspath8}"
715 <           includeAntRuntime="false"
716 <           includeJavaRuntime="false"
717 <           encoding="ASCII"
718 <           executable="${javac8}"
719 <           fork="true">
720 <      <include name="**/*.java"/>
721 <      <compilerarg value="-Xprefer:source"/>
722 <      <compilerarg value="-XDignore.symbol.file=true"/>
723 <      <compilerarg value="-Xlint:all"/>
724 <      <compilerarg value="-Werror"/>
725 <      <compilerarg line="${build.args}"/>
726 <    </javac>
727 <  </target>
728 <
729 <  <target name="4jdk8doclint"
730 <          depends="configure-compiler"
731 <          description="Finds doclint warnings">
732 <
733 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
734 <
735 <    <javac srcdir="${4jdk8src.dir}"
736 <           destdir="${build.4jdk8.classes.dir}"
737 <           debug="${build.debug}"
738 <           debuglevel="${build.debuglevel}"
739 <           deprecation="${build.deprecation}"
740 <           source="8"
741 <           target="8"
742 <           classpath=""
743 <           bootclasspath="${bootclasspath8}"
744 <           includeAntRuntime="false"
745 <           includeJavaRuntime="false"
746 <           encoding="ASCII"
747 <           executable="${javac8}"
748 <           fork="true">
749 <      <include name="**/*.java"/>
750 <      <compilerarg value="-Xprefer:source"/>
751 <      <compilerarg value="-XDignore.symbol.file=true"/>
752 <      <compilerarg value="-Xlint:all"/>
753 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
528 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
529 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
530        <compilerarg line="${build.args}"/>
531      </javac>
532    </target>
533  
534  
535 <  <target name="4jdk8jar"
536 <          depends="4jdk8compile"
761 <          description="Builds library jar from compiled sources">
762 <
763 <    <jar destfile="${4jdk8product.jar}">
764 <      <fileset dir="${build.4jdk8.classes.dir}"/>
765 <      <manifest>
766 <        <attribute name="Built-By" value="${user.name}"/>
767 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
768 <      </manifest>
769 <    </jar>
770 <  </target>
771 <
772 <
773 <  <target name="4jdk8-tck"
774 <          depends="4jdk8jar"
775 <          description="Runs tck tests for jsr166-4jdk8 directly">
776 <
777 <    <run-tck-tests
778 <      target="8"
779 <      workdir="${build.4jdk8.dir}"
780 <      classes="${4jdk8product.jar}">
781 <      <javac-elements>
782 <        <!-- JDK9+ test classes -->
783 <        <exclude name="*9Test.java"/>
784 <        <exclude name="*10Test.java"/>
785 <        <compilerarg value="-Werror"/>
786 <      </javac-elements>
787 <    </run-tck-tests>
788 <  </target>
789 <
790 <
791 <  <target name="4jdk8-jtreg"
792 <          depends="4jdk8jar"
793 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
794 <    <run-jtreg-tests
795 <       target="8"
796 <       workdir="${build.4jdk8.dir}"
797 <       classes="${4jdk8product.jar}"/>
798 <  </target>
799 <
800 <
801 <  <target name="4jdk8-test"
802 <          depends="4jdk8-tck, 4jdk8-jtreg"
803 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
804 <
805 <
806 <  <target name="4jdk8docs"
807 <          description="Builds javadocs for src/jdk8 to dist dir">
808 <
809 <    <delete dir="${4jdk8docs.dir}"/>
810 <    <mkdir dir="${4jdk8docs.dir}"/>
811 <
812 <    <javadoc destdir="${4jdk8docs.dir}"
813 <             packagenames="none"
814 <             link="${java8.api.url}"
815 <             overview="${4jdk8src.dir}/intro.html"
816 <             access="${build.javadoc.access}"
817 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
818 <             classpath=""
819 <             source="8"
820 <             executable="${javadoc8}"
821 <             failonerror = "true">
822 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
823 <        <include name="**/*.java"/>
824 <      </fileset>
825 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
826 <      <arg value="-XDignore.symbol.file=true"/>
827 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
828 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
829 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
830 < <!-- @apiNote tag currently unused -->
831 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
832 <    </javadoc>
833 <  </target>
834 <
835 <
836 <  <target name="4jdk8dist"
837 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
838 <          description="Puts all distributable products in single hierarchy"/>
839 <
840 <
841 <  <target name="4jdk8clean"
842 <          description="Removes all 4jdk8 build products">
843 <    <delete dir="${build.4jdk8.dir}"/>
844 <  </target>
845 <
846 <
847 <  <target name="4jdk8dist-jar"
848 <          depends="4jdk8clean, 4jdk8jar">
849 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
850 <  </target>
851 <
852 <
853 <  <target name="4jdk8dist-docs"
854 <          depends="4jdk8clean, 4jdk8docs">
855 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
856 <  </target>
857 <
858 <
535 >  <!-- old branches no longer maintained.  build support deleted -->
536 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
537    <!-- jsr166 4jdk7 (no longer maintained) -->
860
861  <target name="4jdk7compile" depends="configure-compiler">
862    <mkdir dir="${build.4jdk7.classes.dir}"/>
863
864    <javac srcdir="${4jdk7src.dir}"
865           destdir="${build.4jdk7.classes.dir}"
866           debug="${build.debug}"
867           debuglevel="${build.debuglevel}"
868           deprecation="${build.deprecation}"
869           source="6"
870           target="6"
871           classpath=""
872           bootclasspath="${bootclasspath6}"
873           includeAntRuntime="false"
874           includeJavaRuntime="false"
875           encoding="ASCII"
876           executable="${javac7}"
877           fork="true">
878
879      <include name="**/*.java"/>
880      <compilerarg value="-Xprefer:source"/>
881      <compilerarg value="-XDignore.symbol.file=true"/>
882      <compilerarg value="-Xlint:all"/>
883      <compilerarg value="-Werror"/>
884      <compilerarg line="${build.args}"/>
885    </javac>
886  </target>
887
888  <target name="4jdk7doclint" depends="configure-compiler">
889    <mkdir dir="${build.4jdk7.classes.dir}"/>
890
891    <javac srcdir="${4jdk7src.dir}"
892           destdir="${build.4jdk7.classes.dir}"
893           debug="${build.debug}"
894           debuglevel="${build.debuglevel}"
895           deprecation="${build.deprecation}"
896           source="6"
897           target="6"
898           classpath=""
899           bootclasspath="${bootclasspath6}"
900           includeAntRuntime="false"
901           includeJavaRuntime="false"
902           encoding="ASCII"
903           executable="${javac8}"
904           fork="true">
905
906      <include name="**/*.java"/>
907      <compilerarg value="-Xprefer:source"/>
908      <compilerarg value="-XDignore.symbol.file=true"/>
909      <compilerarg value="-Xlint:all"/>
910      <compilerarg value="-Xdoclint:all/protected"/>
911      <compilerarg line="${build.args}"/>
912    </javac>
913  </target>
914
915  <target name="4jdk7jar" depends="4jdk7compile">
916    <jar destfile="${4jdk7product.jar}">
917      <fileset dir="${build.4jdk7.classes.dir}"/>
918      <manifest>
919        <attribute name="Built-By" value="${user.name}"/>
920        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
921      </manifest>
922    </jar>
923  </target>
924
925  <target name="4jdk7-tck" depends="4jdk7jar">
926    <run-tck-tests
927      target="7"
928      workdir="${build.4jdk7.dir}"
929      classes="${4jdk7product.jar}">
930      <javac-elements>
931        <!-- JDK8+ test classes -->
932        <exclude name="*8Test.java"/>
933        <exclude name="*9Test.java"/>
934        <exclude name="*10Test.java"/>
935        <exclude name="DoubleAccumulatorTest.java"/>
936        <exclude name="DoubleAdderTest.java"/>
937        <exclude name="LongAccumulatorTest.java"/>
938        <exclude name="LongAdderTest.java"/>
939        <exclude name="CompletableFutureTest.java"/>
940        <exclude name="SplittableRandomTest.java"/>
941        <exclude name="StampedLockTest.java"/>
942        <exclude name="SubmissionPublisherTest.java"/>
943        <compilerarg value="-Werror"/>
944      </javac-elements>
945    </run-tck-tests>
946  </target>
947
948  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
949  <target name="4jdk7-tck-junit" depends="4jdk7compile">
950
951    <junit printsummary="true"
952           showoutput="true"
953           errorProperty="junit.failed"
954           failureProperty="junit.failed"
955           includeantruntime="true"
956           jvm="${java7}"
957           fork="true">
958
959      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
960      <jvmarg value="-server"/>
961
962      <classpath>
963        <pathelement location="${junit.jar}"/>
964        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
965      </classpath>
966
967      <formatter type="brief"/>
968
969      <test name="${jsr166.tckTestClass}" haltonfailure="no">
970      </test>
971    </junit>
972  </target>
973
974  <target name="4jdk7-jtreg" depends="4jdk7jar">
975    <run-jtreg-tests
976       target="7"
977       workdir="${build.4jdk7.dir}"
978       classes="${4jdk7product.jar}"/>
979  </target>
980
981  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
982
983  <target name="4jdk7docs">
984    <delete dir="${4jdk7docs.dir}"/>
985    <mkdir dir="${4jdk7docs.dir}"/>
986
987    <javadoc destdir="${4jdk7docs.dir}"
988             packagenames="none"
989             link="${java7.api.url}"
990             overview="${4jdk7src.dir}/intro.html"
991             access="${build.javadoc.access}"
992             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
993             classpath=""
994             executable="${javadoc7}"
995             failonerror = "true">
996      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
997        <include name="**/*.java"/>
998      </fileset>
999      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1000      <arg value="-XDignore.symbol.file=true"/>
1001    </javadoc>
1002  </target>
1003
1004  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1005
1006  <target name="4jdk7clean">
1007    <delete dir="${build.4jdk7.dir}"/>
1008  </target>
1009
1010  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1011    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1012  </target>
1013
1014  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1015    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1016  </target>
1017
1018
538    <!-- jsr166x (no longer maintained) -->
1020
1021  <target name="jsr166xcompile" depends="configure-compiler">
1022    <mkdir dir="${build.jsr166x.classes.dir}"/>
1023
1024    <javac srcdir="${topsrc.dir}"
1025           destdir="${build.jsr166x.classes.dir}"
1026           debug="${build.debug}"
1027           debuglevel="${build.debuglevel}"
1028           deprecation="${build.deprecation}"
1029           classpath=""
1030           bootclasspath="${bootclasspath6}"
1031           source="5"
1032           target="5"
1033           includeAntRuntime="false"
1034           includeJavaRuntime="false"
1035           encoding="ASCII"
1036           executable="${javac7}"
1037           fork="true">
1038      <include name="jsr166x/**/*.java"/>
1039      <compilerarg value="-XDignore.symbol.file=true"/>
1040      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1041      <compilerarg value="-Werror"/>
1042      <compilerarg line="${build.args}"/>
1043    </javac>
1044  </target>
1045
1046  <target name="jsr166xjar" depends="jsr166xcompile">
1047    <jar destfile="${jsr166x.jar}">
1048      <fileset dir="${build.jsr166x.classes.dir}"/>
1049      <manifest>
1050        <attribute name="Built-By" value="${user.name}"/>
1051        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1052      </manifest>
1053    </jar>
1054  </target>
1055
1056  <target name="jsr166xdocs">
1057    <delete dir="${jsr166xdocs.dir}"/>
1058    <mkdir dir="${jsr166xdocs.dir}"/>
1059
1060    <javadoc destdir="${jsr166xdocs.dir}"
1061             packagenames="jsr166x.*"
1062             link="${java.api.url}"
1063             access="${build.javadoc.access}"
1064             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1065             bootclasspath="${bootclasspath6}"
1066             source="5"
1067             executable="${javadoc7}"
1068             failonerror = "true">
1069      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1070      <arg value="-XDignore.symbol.file=true"/>
1071    </javadoc>
1072  </target>
1073
1074  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1075
1076  <target name="jsr166xclean">
1077    <delete dir="${build.jsr166x.dir}"/>
1078  </target>
1079
1080  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1081    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1082  </target>
1083
1084  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1085    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1086  </target>
1087
1088
539    <!-- jsr166y (no longer maintained) -->
1090
1091  <target name="jsr166ycompile" depends="configure-compiler">
1092    <mkdir dir="${build.jsr166y.classes.dir}"/>
1093
1094    <javac srcdir="${topsrc.dir}"
1095           destdir="${build.jsr166y.classes.dir}"
1096           debug="${build.debug}"
1097           debuglevel="${build.debuglevel}"
1098           deprecation="${build.deprecation}"
1099           source="6"
1100           target="6"
1101           classpath=""
1102           bootclasspath="${bootclasspath6}"
1103           includeAntRuntime="false"
1104           includeJavaRuntime="false"
1105           encoding="ASCII"
1106           executable="${javac7}"
1107           fork="true">
1108
1109      <include name="jsr166y/**/*.java"/>
1110      <compilerarg value="-XDignore.symbol.file=true"/>
1111      <compilerarg value="-Xlint:all"/>
1112      <compilerarg value="-Werror"/>
1113      <compilerarg line="${build.args}"/>
1114    </javac>
1115  </target>
1116
1117  <target name="jsr166yjar" depends="jsr166ycompile">
1118    <jar destfile="${jsr166y.jar}" index="true">
1119      <fileset dir="${build.jsr166y.classes.dir}"/>
1120      <manifest>
1121        <attribute name="Built-By" value="${user.name}"/>
1122        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1123      </manifest>
1124    </jar>
1125  </target>
1126
1127  <target name="jsr166ydocs">
1128    <delete dir="${jsr166ydocs.dir}"/>
1129    <mkdir dir="${jsr166ydocs.dir}"/>
1130
1131    <javadoc destdir="${jsr166ydocs.dir}"
1132             packagenames="jsr166y.*"
1133             link="${java.api.url}"
1134             access="${build.javadoc.access}"
1135             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1136             bootclasspath="${bootclasspath6}"
1137             source="6"
1138             executable="${javadoc7}"
1139             failonerror = "true">
1140      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1141      <arg value="-XDignore.symbol.file=true"/>
1142    </javadoc>
1143  </target>
1144
1145  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1146
1147  <target name="jsr166yclean">
1148    <delete dir="${build.jsr166y.dir}"/>
1149  </target>
1150
1151  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1152    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1153  </target>
1154
1155  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1156    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1157  </target>
1158
1159
540    <!-- extra166y (no longer maintained) -->
1161
1162  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1163    <mkdir dir="${build.extra166y.classes.dir}"/>
1164
1165    <javac srcdir="${topsrc.dir}"
1166           destdir="${build.extra166y.classes.dir}"
1167           debug="${build.debug}"
1168           debuglevel="${build.debuglevel}"
1169           deprecation="${build.deprecation}"
1170           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1171           classpath=""
1172           source="6"
1173           target="6"
1174           includeAntRuntime="false"
1175           includeJavaRuntime="false"
1176           encoding="ASCII"
1177           executable="${javac7}"
1178           fork="true">
1179
1180      <include name="extra166y/**/*.java"/>
1181      <compilerarg value="-XDignore.symbol.file=true"/>
1182      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1183      <compilerarg value="-Werror"/>
1184      <compilerarg line="${build.args}"/>
1185    </javac>
1186  </target>
1187
1188  <target name="extra166yjar" depends="extra166ycompile">
1189    <jar destfile="${extra166y.jar}" index="true">
1190      <fileset dir="${build.extra166y.classes.dir}"/>
1191      <manifest>
1192        <attribute name="Built-By" value="${user.name}"/>
1193        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1194      </manifest>
1195    </jar>
1196  </target>
1197
1198  <target name="extra166ydocs">
1199    <delete dir="${extra166ydocs.dir}"/>
1200    <mkdir dir="${extra166ydocs.dir}"/>
1201
1202    <javadoc destdir="${extra166ydocs.dir}"
1203             packagenames="extra166y.*"
1204             link="${java.api.url}"
1205             access="${build.javadoc.access}"
1206             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1207             bootclasspath="${bootclasspath6}"
1208             source="6"
1209             executable="${javadoc7}">
1210      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1211      <arg value="-XDignore.symbol.file=true"/>
1212    </javadoc>
1213  </target>
1214
1215  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1216
1217  <target name="extra166yclean">
1218    <delete dir="${build.extra166y.dir}"/>
1219  </target>
1220
1221  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1222    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1223  </target>
1224
1225  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1226    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1227  </target>
1228
1229
541    <!-- jsr166e (no longer maintained) -->
542  
1232  <property name="build.jsr166e.java.version" value="6"/>
1233  <property name="build.jsr166e.javac" value="${javac6}"/>
1234
1235  <target name="jsr166ecompile" depends="configure-compiler">
1236    <mkdir dir="${build.jsr166e.classes.dir}"/>
1237
1238    <javac srcdir="${topsrc.dir}"
1239           destdir="${build.jsr166e.classes.dir}"
1240           debug="${build.debug}"
1241           debuglevel="${build.debuglevel}"
1242           deprecation="${build.deprecation}"
1243           source="${build.jsr166e.java.version}"
1244           target="${build.jsr166e.java.version}"
1245           classpath=""
1246           includeAntRuntime="false"
1247           includeJavaRuntime="false"
1248           executable="${build.jsr166e.javac}"
1249           fork="true">
1250
1251      <include name="jsr166e/**/*.java"/>
1252      <compilerarg value="-XDignore.symbol.file=true"/>
1253      <compilerarg value="-Xlint:all"/>
1254      <compilerarg value="-Werror"/>
1255      <compilerarg line="${build.args}"/>
1256    </javac>
1257  </target>
1258
1259  <target name="jsr166edoclint">
1260    <mkdir dir="${build.jsr166e.classes.dir}"/>
1261
1262    <javac srcdir="${topsrc.dir}"
1263           destdir="${build.jsr166e.classes.dir}"
1264           debug="${build.debug}"
1265           debuglevel="${build.debuglevel}"
1266           deprecation="${build.deprecation}"
1267           source="${build.jsr166e.java.version}"
1268           target="${build.jsr166e.java.version}"
1269           classpath=""
1270           bootclasspath="${bootclasspath6}"
1271           includeAntRuntime="false"
1272           includeJavaRuntime="false"
1273           executable="${javac8}"
1274           fork="true">
1275
1276      <include name="jsr166e/**/*.java"/>
1277      <compilerarg value="-XDignore.symbol.file=true"/>
1278      <compilerarg value="-Xlint:all"/>
1279      <compilerarg value="-Werror"/>
1280      <compilerarg value="-Xdoclint:all/protected"/>
1281    </javac>
1282  </target>
1283
1284  <target name="jsr166ejar" depends="jsr166ecompile">
1285    <jar destfile="${jsr166e.jar}" index="true">
1286      <fileset dir="${build.jsr166e.classes.dir}"/>
1287      <manifest>
1288        <attribute name="Built-By" value="${user.name}"/>
1289        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1290      </manifest>
1291    </jar>
1292  </target>
1293
1294  <target name="jsr166edocs">
1295    <delete dir="${jsr166edocs.dir}"/>
1296    <mkdir dir="${jsr166edocs.dir}"/>
1297
1298    <javadoc destdir="${jsr166edocs.dir}"
1299             packagenames="jsr166e.*"
1300             link="${java.api.url}"
1301             access="${build.javadoc.access}"
1302             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1303             source="${build.jsr166e.java.version}"
1304             executable="${javadoc7}"
1305             failonerror = "true">
1306      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1307      <arg value="-XDignore.symbol.file=true"/>
1308    </javadoc>
1309  </target>
1310
1311  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1312    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1313    <run-tck-tests
1314      tck.src.dir="${test.src.dir}/tck-jsr166e"
1315      target="${build.jsr166e.java.version}"
1316      workdir="${build.jsr166e.dir}"
1317      classes="${jsr166e.jar}"/>
1318  </target>
1319
1320  <target name="jsr166e-tck">
1321
1322 <!--     <antcall target="clean"/> -->
1323 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1324 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1325 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1326 <!--     </antcall> -->
1327
1328    <antcall target="clean"/>
1329    <antcall target="jsr166e-tck-one-java-version">
1330      <param name="build.jsr166e.java.version" value="7"/>
1331      <param name="build.jsr166e.javac" value="${javac7}"/>
1332    </antcall>
1333
1334    <antcall target="clean"/>
1335    <antcall target="jsr166e-tck-one-java-version">
1336      <param name="build.jsr166e.java.version" value="6"/>
1337      <param name="build.jsr166e.javac" value="${javac6}"/>
1338    </antcall>
1339  </target>
1340
1341  <target name="jsr166e-test" depends="jsr166e-tck"/>
1342
1343  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1344
1345  <target name="jsr166eclean">
1346    <delete dir="${build.jsr166e.dir}"/>
1347  </target>
1348
1349  <target name="jsr166edist-jar"
1350          depends="jsr166eclean, jsr166ejar">
1351    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1352  </target>
1353
1354  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1355    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1356  </target>
1357
1358
543   <!-- Find buglets that can be detected by static build tools -->
544  
545   <!--   <target name="lint"> -->
# Line 1373 | Line 557
557  
558  
559   <!-- ==============================================================
560 <  Experimental errorprone support - https://errorprone.info
560 >  Experimental errorprone support
561 >  https://errorprone.info
562 >  https://errorprone.info/docs/installation
563 >  https://github.com/google/error-prone/issues/1143
564   =================================================================== -->
565 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
565 >  <path id="errorprone.processorpath.path">
566 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
567 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
568 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
569 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
570 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
571 >  </path>
572 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
573    <property name="errorprone.jsr166.user.flags" value=""/>
574    <property name="errorprone.jsr166.flags"
575              value="-Xep:HashtableContains:OFF
576 +                   -Xep:PreferJavaTimeOverload:OFF
577                     -Xep:JdkObsolete:OFF
578                     -Xep:MissingOverride:OFF
579                     -Xep:MissingFail:OFF
580 +                   -Xep:ThreadPriorityCheck:OFF
581                     -Xep:MixedArrayDimensions:ERROR
582                     -Xep:RemoveUnusedImports:ERROR
583                     -Xep:EmptyIf:ERROR
# Line 1390 | Line 586
586                     -Xep:LongLiteralLowerCaseSuffix:ERROR
587                     -Xep:RedundantThrows:ERROR
588                     -Xep:IdentityBinaryExpression:WARN
589 +                   -Xep:ConstructorInvokesOverridable:WARN
590                     -Xep:MethodCanBeStatic:WARN
591                     ${errorprone.jsr166.user.flags}"/>
592    <!-- -Xep:WildcardImport:ERROR -->
593    <property name="errorprone.jsr166.test.flags"
594              value="-Xep:StringSplitter:OFF
595                     -Xep:BoxedPrimitiveConstructor:OFF
596 +                   -Xep:UnnecessaryParentheses:OFF
597                     -Xep:ModifyingCollectionWithItself:OFF"/>
598    <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
599    <target name="errorprone"
# Line 1422 | Line 620
620        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
621        <compilerarg value="-J--illegal-access=permit"/>
622        <compilerarg value="-XDcompilePolicy=simple"/>
623 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
623 >      <compilerarg value="-processorpath"/>
624 >      <compilerarg pathref="errorprone.processorpath.path"/>
625        <compilerarg value="-Xplugin:ErrorProne
626                            ${errorprone.jsr166.flags}"/>
627        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1430 | Line 629
629        <compilerarg value="-XDignore.symbol.file=true"/>
630        <compilerarg value="-Xlint:all"/>
631        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
632 <      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
632 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
633 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
634        <compilerarg line="${build.args}"/>
635      </javac>
636  
# Line 1439 | Line 639
639      </jar>
640  
641      <run-tck-tests
642 <      target="${build.main.java.version}"
642 >      target="${java.runtime.target}"
643        workdir="${build.dir}"
644        classes="${product.jar}">
645        <javac-elements>
646          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
647          <compilerarg value="-J--illegal-access=permit"/>
648          <compilerarg value="-XDcompilePolicy=simple"/>
649 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
649 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
650          <compilerarg value="-Xplugin:ErrorProne
651                              ${errorprone.jsr166.flags}
652                              ${errorprone.jsr166.test.flags}"/>
653 <        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
653 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
654 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
655        </javac-elements>
656      </run-tck-tests>
657    </target>
# Line 1462 | Line 663
663            description="Run errorprone over jtreg tests (experimental)">
664  
665      <run-jtreg-tests
666 <       target="${build.main.java.version}"
666 >       target="${java.runtime.target}"
667         workdir="${build.dir}"
668         classes="${product.jar}"
669         verbose="all">
670        <jtreg-elements>
671          <arg value="-javacoption:-XDcompilePolicy=simple"/>
672          <arg value="-javacoption:-processorpath"/>
673 <        <arg value="-javacoption:${errorprone.jar}"/>
673 >        <arg value="-javacoption:${errorprone.processorpath}"/>
674          <arg value="-javacoption:-Xplugin:ErrorProne
675                              ${errorprone.jsr166.flags}
676                              ${errorprone.jsr166.test.flags}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines