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.283 by jsr166, Wed Oct 24 22:31:14 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 55 | Line 50
50  
51  
52    <!-- Compilation options -->
58  <property name="build.sourcelevel"    value="6"/>
53    <property name="build.debug"          value="true"/>
54    <property name="build.debuglevel"     value="source,lines,vars"/>
55    <property name="build.deprecation"    value="false"/>
# Line 67 | Line 61
61    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62    <property name="build.loops.dir"             location="${build.dir}/loops"/>
63  
70  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
71  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
72  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
73  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
74
75  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
76  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
77  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
78  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
79
80  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
81  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
82  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
83  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
84
85  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
86  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
87  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
88  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
89
64    <!-- JDK locations -->
65    <property name="jdks.home"  location="${user.home}/jdk"/>
66  
# Line 98 | 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"/>
102 <    <available property="have.java.base"
103 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
104 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
105 <      if:set="have.java.base"/>
106 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107 <      unless:set="have.java.base"/>
108 <    <local name="modules"/>
109 <    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110 <    <local name="boot.jar.dir"/>
111 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112 <    <path id="bootclasspath@{v}" unless:set="modules">
113 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
114 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
115 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
116 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
117 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
118 <    </path>
119 <    <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 132 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="6"/>
92 <  <defjdklocations v="7"/>
93 <  <defjdklocations v="8"/>
94 <  <defjdklocations v="9"/>
139 <  <defjdklocations v="10"/>
140 <  <defjdklocations v="11"/>
141 <  <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"/>
153 <  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
154 <  <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"/>
158  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
159  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
160  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
161  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
162  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
163  <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"/>
168 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
169 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
170 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
171 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
172 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
173 <
174 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
175 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
176 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
177 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
178 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
179 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
180 <  <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"/>
184  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
185  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
186  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
187  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
188  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
189  <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"/>
200 <  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
201 <  <!-- The location of jdk early access docs (RIP) -->
202 <  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
203 <  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
204 <  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
205 <  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
206 <  <!-- Default jdk doc location (latest stable release seems best) -->
207 <  <!-- But pin to jdk 10 until fix for -->
208 <  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
209 <  <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/"/>
216 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
217 <  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
218 <  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
219 <  <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 224 | 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 247 | Line 159
159  
160      <sequential>
161  
250    <local name="modules"/>
251    <condition property="modules">
252      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
253    </condition>
254
255    <local name="use-doclint"/>
256    <condition property="use-doclint">
257      <not> <equals arg1="@{target}" arg2="7"/> </not>
258    </condition>
259
162      <mkdir dir="@{workdir}/tck-classes"/>
163  
164      <javac srcdir="@{tck.src.dir}"
# Line 276 | 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"/>
281 <      <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 288 | 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"/>
312 <        </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 330 | Line 230
230      </sequential>
231    </macrodef>
232  
233 <  <defjtregtests v="12"/>
234 <  <defjtregtests v="11"/>
235 <  <defjtregtests v="10"/>
236 <  <defjtregtests v="9"/>
337 <  <defjtregtests v="8"/>
338 <  <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">
344    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
242      <attribute name="target"/>
243      <attribute name="workdir"/>
244      <attribute name="classes"/>
# Line 354 | 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}"/>
373      <arg value="-vmoptions:-esa -ea"/>
274        <arg value="-automatic"/>
275        <arg value="-k:!ignore"/>
276        <arg line="@{jtregflags}"/>
# Line 386 | 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 <  <property name="build.main.java.version" value="11"/>
296 <  <!-- Workaround "no nested properties in ant" -->
297 <  <macrodef name="define-build-main-properties">
298 <    <attribute name="v"/>
299 <    <sequential>
300 <      <property name="build.main.java"    value="${java@{v}}"/>
301 <      <property name="build.main.javac"   value="${javac@{v}}"/>
401 <      <!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
402 <      <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
403 <      <condition property="build.main.javadoc"
404 <                 value="${javadoc12}"
405 <                 else="${javadoc@{v}}">
406 <        <matches pattern="^(9|10|11)$" string="@{v}"/>
407 <      </condition>
408 <    </sequential>
409 <  </macrodef>
410 <  <define-build-main-properties v="${build.main.java.version}"/>
295 >  <!-- Default values: may seem strange ... -->
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"/>
415          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
306  
307    <target name="compile"
308            depends="configure-compiler"
# Line 440 | Line 330
330        <compilerarg value="-Xprefer:source"/>
331        <compilerarg value="-XDignore.symbol.file=true"/>
332        <compilerarg value="-Xlint:all"/>
333 <      <compilerarg line="--doclint-format html5"/>
334 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
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}"/>
448
338      </javac>
339    </target>
340  
452
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 467 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
358 <
471 <    <delete dir="${docs.dir}"/>
358 >    <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
473
474    <!-- the packagenames="none" hack below prevents scanning the -->
475    <!-- sourcepath for packages -->
476
477 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
478 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
479 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
480 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
481 <!-- 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:"/>
505 <!-- tags added in jdk9: currently unused -->
506 <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
507 <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
386      </javadoc>
387    </target>
388  
511
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
516
393    <target name="clean"
394            description="Removes all build products">
395      <delete dir="${build.dir}"/>
396    </target>
397  
522
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  
529
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 538 | Line 412
412    </target>
413  
414    <target name="tck"
415 <          depends="jar"
415 >          depends="jar"
416            description="Runs tck tests for src/main directly">
543
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 573 | 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 585 | Line 458
458            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
459            description="Runs tck and jtreg tests for src/main"/>
460  
461 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
462 <
463 < <!--     <antcall target="jtreg"> -->
464 < <!--       <param name="build.main.java.version" value="8"/> -->
465 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
466 < <!--     </antcall> -->
467 <
468 < <!--   </target> -->
469 <
470 <  <target name="test9101112"
471 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
472 <
473 <    <antcall target="clean"/>
474 <    <antcall target="test">
475 <      <param name="build.main.java.version" value="9"/>
476 <      <param name="build.main.java" value="${java9}"/>
477 <      <param name="build.main.javac" value="${javac9}"/>
478 <    </antcall>
479 <
480 <    <antcall target="clean"/>
481 <    <antcall target="test">
482 <      <param name="build.main.java.version" value="10"/>
483 <      <param name="build.main.java" value="${java10}"/>
484 <      <param name="build.main.javac" value="${javac10}"/>
485 <    </antcall>
613 <
614 <    <antcall target="clean"/>
615 <    <antcall target="test">
616 <      <param name="build.main.java.version" value="11"/>
617 <      <param name="build.main.java" value="${java11}"/>
618 <      <param name="build.main.javac" value="${javac11}"/>
619 <    </antcall>
620 <
621 <    <antcall target="clean"/>
622 <    <antcall target="test">
623 <      <param name="build.main.java.version" value="12"/>
624 <      <param name="build.main.java" value="${java12}"/>
625 <      <param name="build.main.javac" value="${javac12}"/>
461 >  <target name="test-version-permutations"
462 >          depends="test17, test19, clean, test, docs"
463 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
464 >
465 >
466 >  <target name="test17">
467 >    <antcall>
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 >  <target name="test19">
478 >    <antcall>
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>
627    <antcall target="docs">
628      <param name="build.main.java.version" value="12"/>
629      <param name="build.main.java" value="${java12}"/>
630      <param name="build.main.javac" value="${javac12}"/>
631      <param name="build.main.javadoc" value="${javadoc12}"/>
632    </antcall>
633
634    <!-- Clean up to avoid obscure wrong class file version bugs -->
635    <antcall target="clean"/>
636
487    </target>
488  
489  
640
490    <target name="configure-compiler">
491      <fail message="ant version too old">
492        <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
# Line 658 | Line 507
507    </target>
508  
509  
661
662  <!-- Various demos and test programs -->
663
664
665  <!-- description="Benchmark from Doug Lea's AQS paper" -->
666  <target name="loops" depends="configure-compiler">
667
668    <mkdir dir="${build.loops.dir}"/>
669
670    <javac srcdir="${loops.src.dir}"
671          destdir="${build.loops.dir}"
672            debug="${build.debug}"
673       debuglevel="${build.debuglevel}"
674      deprecation="${build.deprecation}"
675           source="${build.sourcelevel}"
676           target="${build.sourcelevel}"
677         encoding="ASCII"
678             fork="true">
679
680      <compilerarg line="${build.args}"/>
681      <classpath refid="loops.classpath"/>
682      <compilerarg value="-XDignore.symbol.file=true"/>
683
684    </javac>
685
686    <java classname="ALoops" fork="true">
687      <classpath refid="loops.classpath"/>
688    </java>
689  </target>
690
691
510    <target name="compile-test-loops" depends="jar"
511            description="Compiles all the perf tests in src/test/loops">
512  
# Line 707 | 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}"/>
712 <      <compilerarg line="${build.args}"/>
713 <    </javac>
714 <  </target>
715 <
716 <
717 <  <!-- jsr166 4jdk8 -->
718 <
719 <  <target name="4jdk8compile"
720 <          depends="configure-compiler"
721 <          description="Compiles src/jdk8 sources, targeting jdk8">
722 <
723 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
724 <
725 <    <javac srcdir="${4jdk8src.dir}"
726 <           destdir="${build.4jdk8.classes.dir}"
727 <           debug="${build.debug}"
728 <           debuglevel="${build.debuglevel}"
729 <           deprecation="${build.deprecation}"
730 <           source="8"
731 <           target="8"
732 <           classpath=""
733 <           bootclasspath="${bootclasspath8}"
734 <           includeAntRuntime="false"
735 <           includeJavaRuntime="false"
736 <           encoding="ASCII"
737 <           executable="${javac8}"
738 <           fork="true">
739 <      <include name="**/*.java"/>
740 <      <compilerarg value="-Xprefer:source"/>
741 <      <compilerarg value="-XDignore.symbol.file=true"/>
742 <      <compilerarg value="-Xlint:all"/>
743 <      <compilerarg value="-Werror"/>
744 <      <compilerarg line="${build.args}"/>
745 <    </javac>
746 <  </target>
747 <
748 <  <target name="4jdk8doclint"
749 <          depends="configure-compiler"
750 <          description="Finds doclint warnings">
751 <
752 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
753 <
754 <    <javac srcdir="${4jdk8src.dir}"
755 <           destdir="${build.4jdk8.classes.dir}"
756 <           debug="${build.debug}"
757 <           debuglevel="${build.debuglevel}"
758 <           deprecation="${build.deprecation}"
759 <           source="8"
760 <           target="8"
761 <           classpath=""
762 <           bootclasspath="${bootclasspath8}"
763 <           includeAntRuntime="false"
764 <           includeJavaRuntime="false"
765 <           encoding="ASCII"
766 <           executable="${javac8}"
767 <           fork="true">
768 <      <include name="**/*.java"/>
769 <      <compilerarg value="-Xprefer:source"/>
770 <      <compilerarg value="-XDignore.symbol.file=true"/>
771 <      <compilerarg value="-Xlint:all"/>
772 <      <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"
780 <          description="Builds library jar from compiled sources">
781 <
782 <    <jar destfile="${4jdk8product.jar}">
783 <      <fileset dir="${build.4jdk8.classes.dir}"/>
784 <      <manifest>
785 <        <attribute name="Built-By" value="${user.name}"/>
786 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
787 <      </manifest>
788 <    </jar>
789 <  </target>
790 <
791 <
792 <  <target name="4jdk8-tck"
793 <          depends="4jdk8jar"
794 <          description="Runs tck tests for jsr166-4jdk8 directly">
795 <
796 <    <run-tck-tests
797 <      target="8"
798 <      workdir="${build.4jdk8.dir}"
799 <      classes="${4jdk8product.jar}">
800 <      <javac-elements>
801 <        <!-- JDK9+ test classes -->
802 <        <exclude name="*9Test.java"/>
803 <        <exclude name="*10Test.java"/>
804 <        <compilerarg value="-Werror"/>
805 <      </javac-elements>
806 <    </run-tck-tests>
807 <  </target>
808 <
809 <
810 <  <target name="4jdk8-jtreg"
811 <          depends="4jdk8jar"
812 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
813 <    <run-jtreg-tests
814 <       target="8"
815 <       workdir="${build.4jdk8.dir}"
816 <       classes="${4jdk8product.jar}"/>
817 <  </target>
818 <
819 <
820 <  <target name="4jdk8-test"
821 <          depends="4jdk8-tck, 4jdk8-jtreg"
822 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
823 <
824 <
825 <  <target name="4jdk8docs"
826 <          description="Builds javadocs for src/jdk8 to dist dir">
827 <
828 <    <delete dir="${4jdk8docs.dir}"/>
829 <    <mkdir dir="${4jdk8docs.dir}"/>
830 <
831 <    <javadoc destdir="${4jdk8docs.dir}"
832 <             packagenames="none"
833 <             link="${java8.api.url}"
834 <             overview="${4jdk8src.dir}/intro.html"
835 <             access="${build.javadoc.access}"
836 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
837 <             classpath=""
838 <             source="8"
839 <             executable="${javadoc8}"
840 <             failonerror = "true">
841 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
842 <        <include name="**/*.java"/>
843 <      </fileset>
844 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
845 <      <arg value="-XDignore.symbol.file=true"/>
846 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
847 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
848 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
849 < <!-- @apiNote tag currently unused -->
850 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
851 <    </javadoc>
852 <  </target>
853 <
854 <
855 <  <target name="4jdk8dist"
856 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
857 <          description="Puts all distributable products in single hierarchy"/>
858 <
859 <
860 <  <target name="4jdk8clean"
861 <          description="Removes all 4jdk8 build products">
862 <    <delete dir="${build.4jdk8.dir}"/>
863 <  </target>
864 <
865 <
866 <  <target name="4jdk8dist-jar"
867 <          depends="4jdk8clean, 4jdk8jar">
868 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
869 <  </target>
870 <
871 <
872 <  <target name="4jdk8dist-docs"
873 <          depends="4jdk8clean, 4jdk8docs">
874 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
875 <  </target>
876 <
877 <
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) -->
879
880  <target name="4jdk7compile" depends="configure-compiler">
881    <mkdir dir="${build.4jdk7.classes.dir}"/>
882
883    <javac srcdir="${4jdk7src.dir}"
884           destdir="${build.4jdk7.classes.dir}"
885           debug="${build.debug}"
886           debuglevel="${build.debuglevel}"
887           deprecation="${build.deprecation}"
888           source="6"
889           target="6"
890           classpath=""
891           bootclasspath="${bootclasspath6}"
892           includeAntRuntime="false"
893           includeJavaRuntime="false"
894           encoding="ASCII"
895           executable="${javac7}"
896           fork="true">
897
898      <include name="**/*.java"/>
899      <compilerarg value="-Xprefer:source"/>
900      <compilerarg value="-XDignore.symbol.file=true"/>
901      <compilerarg value="-Xlint:all"/>
902      <compilerarg value="-Werror"/>
903      <compilerarg line="${build.args}"/>
904    </javac>
905  </target>
906
907  <target name="4jdk7doclint" depends="configure-compiler">
908    <mkdir dir="${build.4jdk7.classes.dir}"/>
909
910    <javac srcdir="${4jdk7src.dir}"
911           destdir="${build.4jdk7.classes.dir}"
912           debug="${build.debug}"
913           debuglevel="${build.debuglevel}"
914           deprecation="${build.deprecation}"
915           source="6"
916           target="6"
917           classpath=""
918           bootclasspath="${bootclasspath6}"
919           includeAntRuntime="false"
920           includeJavaRuntime="false"
921           encoding="ASCII"
922           executable="${javac8}"
923           fork="true">
924
925      <include name="**/*.java"/>
926      <compilerarg value="-Xprefer:source"/>
927      <compilerarg value="-XDignore.symbol.file=true"/>
928      <compilerarg value="-Xlint:all"/>
929      <compilerarg value="-Xdoclint:all/protected"/>
930      <compilerarg line="${build.args}"/>
931    </javac>
932  </target>
933
934  <target name="4jdk7jar" depends="4jdk7compile">
935    <jar destfile="${4jdk7product.jar}">
936      <fileset dir="${build.4jdk7.classes.dir}"/>
937      <manifest>
938        <attribute name="Built-By" value="${user.name}"/>
939        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
940      </manifest>
941    </jar>
942  </target>
943
944  <target name="4jdk7-tck" depends="4jdk7jar">
945    <run-tck-tests
946      target="7"
947      workdir="${build.4jdk7.dir}"
948      classes="${4jdk7product.jar}">
949      <javac-elements>
950        <!-- JDK8+ test classes -->
951        <exclude name="*8Test.java"/>
952        <exclude name="*9Test.java"/>
953        <exclude name="*10Test.java"/>
954        <exclude name="DoubleAccumulatorTest.java"/>
955        <exclude name="DoubleAdderTest.java"/>
956        <exclude name="LongAccumulatorTest.java"/>
957        <exclude name="LongAdderTest.java"/>
958        <exclude name="CompletableFutureTest.java"/>
959        <exclude name="SplittableRandomTest.java"/>
960        <exclude name="StampedLockTest.java"/>
961        <exclude name="SubmissionPublisherTest.java"/>
962        <compilerarg value="-Werror"/>
963      </javac-elements>
964    </run-tck-tests>
965  </target>
966
967  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
968  <target name="4jdk7-tck-junit" depends="4jdk7compile">
969
970    <junit printsummary="true"
971           showoutput="true"
972           errorProperty="junit.failed"
973           failureProperty="junit.failed"
974           includeantruntime="true"
975           jvm="${java7}"
976           fork="true">
977
978      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
979      <jvmarg value="-server"/>
980
981      <classpath>
982        <pathelement location="${junit.jar}"/>
983        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
984      </classpath>
985
986      <formatter type="brief"/>
987
988      <test name="${jsr166.tckTestClass}" haltonfailure="no">
989      </test>
990    </junit>
991  </target>
992
993  <target name="4jdk7-jtreg" depends="4jdk7jar">
994    <run-jtreg-tests
995       target="7"
996       workdir="${build.4jdk7.dir}"
997       classes="${4jdk7product.jar}"/>
998  </target>
999
1000  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1001
1002  <target name="4jdk7docs">
1003    <delete dir="${4jdk7docs.dir}"/>
1004    <mkdir dir="${4jdk7docs.dir}"/>
1005
1006    <javadoc destdir="${4jdk7docs.dir}"
1007             packagenames="none"
1008             link="${java7.api.url}"
1009             overview="${4jdk7src.dir}/intro.html"
1010             access="${build.javadoc.access}"
1011             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1012             classpath=""
1013             executable="${javadoc7}"
1014             failonerror = "true">
1015      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1016        <include name="**/*.java"/>
1017      </fileset>
1018      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1019      <arg value="-XDignore.symbol.file=true"/>
1020    </javadoc>
1021  </target>
1022
1023  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1024
1025  <target name="4jdk7clean">
1026    <delete dir="${build.4jdk7.dir}"/>
1027  </target>
1028
1029  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1030    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1031  </target>
1032
1033  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1034    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1035  </target>
1036
1037
538    <!-- jsr166x (no longer maintained) -->
1039
1040  <target name="jsr166xcompile" depends="configure-compiler">
1041    <mkdir dir="${build.jsr166x.classes.dir}"/>
1042
1043    <javac srcdir="${topsrc.dir}"
1044           destdir="${build.jsr166x.classes.dir}"
1045           debug="${build.debug}"
1046           debuglevel="${build.debuglevel}"
1047           deprecation="${build.deprecation}"
1048           classpath=""
1049           bootclasspath="${bootclasspath6}"
1050           source="5"
1051           target="5"
1052           includeAntRuntime="false"
1053           includeJavaRuntime="false"
1054           encoding="ASCII"
1055           executable="${javac7}"
1056           fork="true">
1057      <include name="jsr166x/**/*.java"/>
1058      <compilerarg value="-XDignore.symbol.file=true"/>
1059      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1060      <compilerarg value="-Werror"/>
1061      <compilerarg line="${build.args}"/>
1062    </javac>
1063  </target>
1064
1065  <target name="jsr166xjar" depends="jsr166xcompile">
1066    <jar destfile="${jsr166x.jar}">
1067      <fileset dir="${build.jsr166x.classes.dir}"/>
1068      <manifest>
1069        <attribute name="Built-By" value="${user.name}"/>
1070        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1071      </manifest>
1072    </jar>
1073  </target>
1074
1075  <target name="jsr166xdocs">
1076    <delete dir="${jsr166xdocs.dir}"/>
1077    <mkdir dir="${jsr166xdocs.dir}"/>
1078
1079    <javadoc destdir="${jsr166xdocs.dir}"
1080             packagenames="jsr166x.*"
1081             link="${java.api.url}"
1082             access="${build.javadoc.access}"
1083             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1084             bootclasspath="${bootclasspath6}"
1085             source="5"
1086             executable="${javadoc7}"
1087             failonerror = "true">
1088      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1089      <arg value="-XDignore.symbol.file=true"/>
1090    </javadoc>
1091  </target>
1092
1093  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1094
1095  <target name="jsr166xclean">
1096    <delete dir="${build.jsr166x.dir}"/>
1097  </target>
1098
1099  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1100    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1101  </target>
1102
1103  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1104    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1105  </target>
1106
1107
539    <!-- jsr166y (no longer maintained) -->
1109
1110  <target name="jsr166ycompile" depends="configure-compiler">
1111    <mkdir dir="${build.jsr166y.classes.dir}"/>
1112
1113    <javac srcdir="${topsrc.dir}"
1114           destdir="${build.jsr166y.classes.dir}"
1115           debug="${build.debug}"
1116           debuglevel="${build.debuglevel}"
1117           deprecation="${build.deprecation}"
1118           source="6"
1119           target="6"
1120           classpath=""
1121           bootclasspath="${bootclasspath6}"
1122           includeAntRuntime="false"
1123           includeJavaRuntime="false"
1124           encoding="ASCII"
1125           executable="${javac7}"
1126           fork="true">
1127
1128      <include name="jsr166y/**/*.java"/>
1129      <compilerarg value="-XDignore.symbol.file=true"/>
1130      <compilerarg value="-Xlint:all"/>
1131      <compilerarg value="-Werror"/>
1132      <compilerarg line="${build.args}"/>
1133    </javac>
1134  </target>
1135
1136  <target name="jsr166yjar" depends="jsr166ycompile">
1137    <jar destfile="${jsr166y.jar}" index="true">
1138      <fileset dir="${build.jsr166y.classes.dir}"/>
1139      <manifest>
1140        <attribute name="Built-By" value="${user.name}"/>
1141        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1142      </manifest>
1143    </jar>
1144  </target>
1145
1146  <target name="jsr166ydocs">
1147    <delete dir="${jsr166ydocs.dir}"/>
1148    <mkdir dir="${jsr166ydocs.dir}"/>
1149
1150    <javadoc destdir="${jsr166ydocs.dir}"
1151             packagenames="jsr166y.*"
1152             link="${java.api.url}"
1153             access="${build.javadoc.access}"
1154             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1155             bootclasspath="${bootclasspath6}"
1156             source="6"
1157             executable="${javadoc7}"
1158             failonerror = "true">
1159      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1160      <arg value="-XDignore.symbol.file=true"/>
1161    </javadoc>
1162  </target>
1163
1164  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1165
1166  <target name="jsr166yclean">
1167    <delete dir="${build.jsr166y.dir}"/>
1168  </target>
1169
1170  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1171    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1172  </target>
1173
1174  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1175    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1176  </target>
1177
1178
540    <!-- extra166y (no longer maintained) -->
1180
1181  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1182    <mkdir dir="${build.extra166y.classes.dir}"/>
1183
1184    <javac srcdir="${topsrc.dir}"
1185           destdir="${build.extra166y.classes.dir}"
1186           debug="${build.debug}"
1187           debuglevel="${build.debuglevel}"
1188           deprecation="${build.deprecation}"
1189           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1190           classpath=""
1191           source="6"
1192           target="6"
1193           includeAntRuntime="false"
1194           includeJavaRuntime="false"
1195           encoding="ASCII"
1196           executable="${javac7}"
1197           fork="true">
1198
1199      <include name="extra166y/**/*.java"/>
1200      <compilerarg value="-XDignore.symbol.file=true"/>
1201      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1202      <compilerarg value="-Werror"/>
1203      <compilerarg line="${build.args}"/>
1204    </javac>
1205  </target>
1206
1207  <target name="extra166yjar" depends="extra166ycompile">
1208    <jar destfile="${extra166y.jar}" index="true">
1209      <fileset dir="${build.extra166y.classes.dir}"/>
1210      <manifest>
1211        <attribute name="Built-By" value="${user.name}"/>
1212        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1213      </manifest>
1214    </jar>
1215  </target>
1216
1217  <target name="extra166ydocs">
1218    <delete dir="${extra166ydocs.dir}"/>
1219    <mkdir dir="${extra166ydocs.dir}"/>
1220
1221    <javadoc destdir="${extra166ydocs.dir}"
1222             packagenames="extra166y.*"
1223             link="${java.api.url}"
1224             access="${build.javadoc.access}"
1225             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1226             bootclasspath="${bootclasspath6}"
1227             source="6"
1228             executable="${javadoc7}">
1229      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1230      <arg value="-XDignore.symbol.file=true"/>
1231    </javadoc>
1232  </target>
1233
1234  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1235
1236  <target name="extra166yclean">
1237    <delete dir="${build.extra166y.dir}"/>
1238  </target>
1239
1240  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1241    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1242  </target>
1243
1244  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1245    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1246  </target>
1247
1248
541    <!-- jsr166e (no longer maintained) -->
542  
1251  <property name="build.jsr166e.java.version" value="6"/>
1252  <property name="build.jsr166e.javac" value="${javac6}"/>
1253
1254  <target name="jsr166ecompile" depends="configure-compiler">
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           includeAntRuntime="false"
1266           includeJavaRuntime="false"
1267           executable="${build.jsr166e.javac}"
1268           fork="true">
1269
1270      <include name="jsr166e/**/*.java"/>
1271      <compilerarg value="-XDignore.symbol.file=true"/>
1272      <compilerarg value="-Xlint:all"/>
1273      <compilerarg value="-Werror"/>
1274      <compilerarg line="${build.args}"/>
1275    </javac>
1276  </target>
1277
1278  <target name="jsr166edoclint">
1279    <mkdir dir="${build.jsr166e.classes.dir}"/>
1280
1281    <javac srcdir="${topsrc.dir}"
1282           destdir="${build.jsr166e.classes.dir}"
1283           debug="${build.debug}"
1284           debuglevel="${build.debuglevel}"
1285           deprecation="${build.deprecation}"
1286           source="${build.jsr166e.java.version}"
1287           target="${build.jsr166e.java.version}"
1288           classpath=""
1289           bootclasspath="${bootclasspath6}"
1290           includeAntRuntime="false"
1291           includeJavaRuntime="false"
1292           executable="${javac8}"
1293           fork="true">
1294
1295      <include name="jsr166e/**/*.java"/>
1296      <compilerarg value="-XDignore.symbol.file=true"/>
1297      <compilerarg value="-Xlint:all"/>
1298      <compilerarg value="-Werror"/>
1299      <compilerarg value="-Xdoclint:all/protected"/>
1300    </javac>
1301  </target>
1302
1303  <target name="jsr166ejar" depends="jsr166ecompile">
1304    <jar destfile="${jsr166e.jar}" index="true">
1305      <fileset dir="${build.jsr166e.classes.dir}"/>
1306      <manifest>
1307        <attribute name="Built-By" value="${user.name}"/>
1308        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1309      </manifest>
1310    </jar>
1311  </target>
1312
1313  <target name="jsr166edocs">
1314    <delete dir="${jsr166edocs.dir}"/>
1315    <mkdir dir="${jsr166edocs.dir}"/>
1316
1317    <javadoc destdir="${jsr166edocs.dir}"
1318             packagenames="jsr166e.*"
1319             link="${java.api.url}"
1320             access="${build.javadoc.access}"
1321             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1322             source="${build.jsr166e.java.version}"
1323             executable="${javadoc7}"
1324             failonerror = "true">
1325      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1326      <arg value="-XDignore.symbol.file=true"/>
1327    </javadoc>
1328  </target>
1329
1330  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1331    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1332    <run-tck-tests
1333      tck.src.dir="${test.src.dir}/tck-jsr166e"
1334      target="${build.jsr166e.java.version}"
1335      workdir="${build.jsr166e.dir}"
1336      classes="${jsr166e.jar}"/>
1337  </target>
1338
1339  <target name="jsr166e-tck">
1340
1341 <!--     <antcall target="clean"/> -->
1342 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1343 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1344 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1345 <!--     </antcall> -->
1346
1347    <antcall target="clean"/>
1348    <antcall target="jsr166e-tck-one-java-version">
1349      <param name="build.jsr166e.java.version" value="7"/>
1350      <param name="build.jsr166e.javac" value="${javac7}"/>
1351    </antcall>
1352
1353    <antcall target="clean"/>
1354    <antcall target="jsr166e-tck-one-java-version">
1355      <param name="build.jsr166e.java.version" value="6"/>
1356      <param name="build.jsr166e.javac" value="${javac6}"/>
1357    </antcall>
1358  </target>
1359
1360  <target name="jsr166e-test" depends="jsr166e-tck"/>
1361
1362  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1363
1364  <target name="jsr166eclean">
1365    <delete dir="${build.jsr166e.dir}"/>
1366  </target>
1367
1368  <target name="jsr166edist-jar"
1369          depends="jsr166eclean, jsr166ejar">
1370    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1371  </target>
1372
1373  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1374    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1375  </target>
1376
1377
543   <!-- Find buglets that can be detected by static build tools -->
544  
545   <!--   <target name="lint"> -->
# Line 1392 | 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 1409 | 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 1441 | 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 1449 | 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 1458 | 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 1481 | 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