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.263 by jsr166, Tue Jan 23 06:09:53 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" xmlns:unless="ant:unless"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
# Line 18 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22 <  $HOME/jdk/jdk8
23 <  $HOME/jdk/jdk9
23 <  $HOME/jdk/jdk10
24 <  $HOME/jdk/jdk11
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
28 <  $HOME/jdk/src/jdk10
29 <  $HOME/jdk/src/jdk11
30 <  where each of the above is a complete JDK source tree
31 <  (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 52 | Line 50
50  
51  
52    <!-- Compilation options -->
55  <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 64 | Line 61
61    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62    <property name="build.loops.dir"             location="${build.dir}/loops"/>
63  
67  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71
72  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76
77  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
80  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
81
82  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
83  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
84  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
85  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
86
64    <!-- JDK locations -->
65    <property name="jdks.home"  location="${user.home}/jdk"/>
66  
# Line 95 | 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"/>
99 <    <available property="have.java.base"
100 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102 <      if:set="have.java.base"/>
103 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104 <      unless:set="have.java.base"/>
105 <    <local name="modules"/>
106 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107 <    <local name="boot.jar.dir"/>
108 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
109 <    <path id="bootclasspath@{v}" unless:set="modules">
110 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
111 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
112 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
113 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
114 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
115 <    </path>
116 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
75 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
76      </sequential>
77    </macrodef>
78  
# Line 129 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="6"/>
92 <  <defjdklocations v="7"/>
93 <  <defjdklocations v="8"/>
94 <  <defjdklocations v="9"/>
136 <  <defjdklocations v="10"/>
137 <  <defjdklocations v="11"/>
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"/>
149 <  <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"/>
153  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
154  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
155  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
156  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
157  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
158  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
109  
110    <!-- Javadoc locations -->
111    <property name="docs.dir"          location="${build.dir}/docs"/>
112 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
163 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
164 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
165 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
166 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
167 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
168 <
169 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
170 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
171 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
172 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
173 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
174 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
175 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
112 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
113  
114    <!-- Jar locations -->
115    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
179  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
180  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
181  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
182  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
183  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
184  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
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 <  <!-- The location of jdk9 early access docs (RIP) -->
195 <  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
196 <  <!-- Default jdk doc location (latest stable release seems best) -->
197 <  <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
198 <  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
199 <  <property name="java.docroot.url"   value="${java9.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/"/>
206 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
207 <  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
208 <  <property name="java11.api.url"     value="${java11.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 213 | 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 236 | Line 159
159  
160      <sequential>
161  
239    <local name="modules"/>
240    <condition property="modules">
241      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
242    </condition>
243
244    <local name="use-doclint"/>
245    <condition property="use-doclint">
246      <not> <equals arg1="@{target}" arg2="7"/> </not>
247    </condition>
248
162      <mkdir dir="@{workdir}/tck-classes"/>
163  
164      <javac srcdir="@{tck.src.dir}"
# Line 265 | 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"/>
270 <      <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 277 | 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"/>
301 <        </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>
216    </macrodef>
217  
218    <!-- Define jtreg test sets for different jdk versions -->
219 <  <fileset dir="${jtreg11.src.dir}">
220 <    <patternset id="jdk11.jtreg.tests">
221 <      <include name="**/*.java"/>
222 <    </patternset>
223 <  </fileset>
224 <
225 <  <fileset dir="${jtreg10.src.dir}">
226 <    <patternset id="jdk10.jtreg.tests">
227 <      <include name="**/*.java"/>
228 <    </patternset>
229 <  </fileset>
230 <
231 <  <fileset dir="${jtreg9.src.dir}">
321 <    <patternset id="jdk9.jtreg.tests">
322 <      <include name="**/*.java"/>
323 <    </patternset>
324 <  </fileset>
325 <
326 <  <fileset dir="${jtreg8.src.dir}">
327 <    <patternset id="jdk8.jtreg.tests">
328 <      <include name="**/*.java"/>
329 <    </patternset>
330 <  </fileset>
219 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
220 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
221 >  <property name="jtreg.test.pattern" value="**/*.java"/>
222 >  <macrodef name="defjtregtests">
223 >    <attribute name="v"/>
224 >    <sequential>
225 >      <fileset dir="${jtreg@{v}.src.dir}">
226 >        <patternset id="jdk@{v}.jtreg.tests">
227 >          <include name="${jtreg.test.pattern}"/>
228 >        </patternset>
229 >      </fileset>
230 >    </sequential>
231 >  </macrodef>
232  
233 <  <fileset dir="${jtreg7.src.dir}">
234 <    <patternset id="jdk7.jtreg.tests">
235 <      <include name="**/*.java"/>
236 <    </patternset>
336 <  </fileset>
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">
342    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
242      <attribute name="target"/>
243      <attribute name="workdir"/>
244      <attribute name="classes"/>
# Line 352 | 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}/jmods" type="dir"/>
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}"/>
371      <arg value="-vmoptions:-esa -ea"/>
274        <arg value="-automatic"/>
275        <arg value="-k:!ignore"/>
276        <arg line="@{jtregflags}"/>
# Line 384 | 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="9"/>
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}}"/>
399 <      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
400 <    </sequential>
401 <  </macrodef>
402 <  <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"/>
407          <!--
408              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
409          -->
306  
307    <target name="compile"
308            depends="configure-compiler"
# Line 434 | 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}"/>
442
338      </javac>
339    </target>
340  
446
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 461 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
358 <
465 <    <delete dir="${docs.dir}"/>
358 >    <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
467
468    <!-- the packagenames="none" hack below prevents scanning the -->
469    <!-- sourcepath for packages -->
470
471 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
472 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
473 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
474 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
475 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
360      <javadoc destdir="${docs.dir}"
361               packagenames="none"
362 <             link="${java9.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="9"
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 ${java9.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="-tag"/>
381 <      <arg value="${javadoc.jls.option}"/>
382 < <!-- @apiNote currently unused -->
383 < <!--       <arg value="-tag"/> -->
384 < <!--       <arg value="apiNote:a:API Note:"/> -->
385 <      <arg value="-tag"/>
499 <      <arg value="implSpec:a:Implementation Requirements:"/>
500 <      <arg value="-tag"/>
501 <      <arg value="implNote:a:Implementation Note:"/>
502 < <!-- tags added in jdk9: currently unused -->
503 < <!--       <arg value="-tag"/> -->
504 < <!--       <arg value="revised:X"/> -->
505 < <!--       <arg value="-tag"/> -->
506 < <!--       <arg value="spec:X"/> -->
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:"/>
386      </javadoc>
387    </target>
388  
510
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
515
516  <target name="release"
517          depends="dist"
518          description="Puts entire CVS tree, plus distribution productions, in a jar">
519
520    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
521
522    <jar basedir="${basedir}" destfile="${release.jar}">
523      <!-- <exclude name="build/**"/> -->
524      <exclude name="${release.jar}"/>
525      <exclude name="user.properties"/>
526      <exclude name="etc/notes/**"/>
527      <exclude name="src/emulation/**"/>
528      <exclude name="**/SyntaxTest.java"/>
529      <exclude name="**/SuperfluousAbstract.java"/>
530      <manifest>
531        <attribute name="Built-By" value="${user.name}"/>
532        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
533      </manifest>
534    </jar>
535  </target>
536
537
393    <target name="clean"
394            description="Removes all build products">
395      <delete dir="${build.dir}"/>
396    </target>
397  
543
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  
550
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 559 | Line 412
412    </target>
413  
414    <target name="tck"
415 <          depends="jar"
415 >          depends="jar"
416            description="Runs tck tests for src/main directly">
564
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 594 | 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 606 | 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"> -->
612 < <!--       <param name="build.main.java.version" value="8"/> -->
613 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
614 < <!--     </antcall> -->
615 <
616 < <!--   </target> -->
617 <
618 <  <target name="test91011"
619 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
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  
621    <antcall target="clean"/>
622    <antcall target="test">
623      <param name="build.main.java.version" value="9"/>
624    </antcall>
465  
466 <    <antcall target="clean"/>
467 <    <antcall target="test">
468 <      <param name="build.main.java.version" value="10"/>
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 <
477 <    <antcall target="clean"/>
478 <    <antcall target="test">
479 <      <param name="build.main.java.version" value="11"/>
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>
635
636    <!-- Clean up to avoid obscure wrong class file version bugs -->
637    <antcall target="clean"/>
638
487    </target>
488  
489  
642
490    <target name="configure-compiler">
491      <fail message="ant version too old">
492        <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
# Line 660 | Line 507
507    </target>
508  
509  
663
664  <!-- Various demos and test programs -->
665
666
667  <!-- description="Benchmark from Doug Lea's AQS paper" -->
668  <target name="loops" depends="configure-compiler">
669
670    <mkdir dir="${build.loops.dir}"/>
671
672    <javac srcdir="${loops.src.dir}"
673          destdir="${build.loops.dir}"
674            debug="${build.debug}"
675       debuglevel="${build.debuglevel}"
676      deprecation="${build.deprecation}"
677           source="${build.sourcelevel}"
678           target="${build.sourcelevel}"
679         encoding="ASCII"
680             fork="true">
681
682      <compilerarg line="${build.args}"/>
683      <classpath refid="loops.classpath"/>
684      <compilerarg value="-XDignore.symbol.file=true"/>
685
686    </javac>
687
688    <java classname="ALoops" fork="true">
689      <classpath refid="loops.classpath"/>
690    </java>
691  </target>
692
693
510    <target name="compile-test-loops" depends="jar"
511            description="Compiles all the perf tests in src/test/loops">
512  
# Line 709 | 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}"/>
714 <      <compilerarg line="${build.args}"/>
715 <    </javac>
716 <  </target>
717 <
718 <
719 <  <!-- jsr166 4jdk8 -->
720 <
721 <  <target name="4jdk8compile"
722 <          depends="configure-compiler"
723 <          description="Compiles src/jdk8 sources, targeting jdk8">
724 <
725 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
726 <
727 <    <javac srcdir="${4jdk8src.dir}"
728 <           destdir="${build.4jdk8.classes.dir}"
729 <           debug="${build.debug}"
730 <           debuglevel="${build.debuglevel}"
731 <           deprecation="${build.deprecation}"
732 <           source="8"
733 <           target="8"
734 <           classpath=""
735 <           bootclasspath="${bootclasspath8}"
736 <           includeAntRuntime="false"
737 <           includeJavaRuntime="false"
738 <           encoding="ASCII"
739 <           executable="${javac8}"
740 <           fork="true">
741 <      <include name="**/*.java"/>
742 <      <compilerarg value="-Xprefer:source"/>
743 <      <compilerarg value="-XDignore.symbol.file=true"/>
744 <      <compilerarg value="-Xlint:all"/>
745 <      <compilerarg value="-Werror"/>
746 <      <compilerarg line="${build.args}"/>
747 <    </javac>
748 <  </target>
749 <
750 <  <target name="4jdk8doclint"
751 <          depends="configure-compiler"
752 <          description="Finds doclint warnings">
753 <
754 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
755 <
756 <    <javac srcdir="${4jdk8src.dir}"
757 <           destdir="${build.4jdk8.classes.dir}"
758 <           debug="${build.debug}"
759 <           debuglevel="${build.debuglevel}"
760 <           deprecation="${build.deprecation}"
761 <           source="8"
762 <           target="8"
763 <           classpath=""
764 <           bootclasspath="${bootclasspath8}"
765 <           includeAntRuntime="false"
766 <           includeJavaRuntime="false"
767 <           encoding="ASCII"
768 <           executable="${javac8}"
769 <           fork="true">
770 <      <include name="**/*.java"/>
771 <      <compilerarg value="-Xprefer:source"/>
772 <      <compilerarg value="-XDignore.symbol.file=true"/>
773 <      <compilerarg value="-Xlint:all"/>
774 <      <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"
782 <          description="Builds library jar from compiled sources">
783 <
784 <    <jar destfile="${4jdk8product.jar}">
785 <      <fileset dir="${build.4jdk8.classes.dir}"/>
786 <      <manifest>
787 <        <attribute name="Built-By" value="${user.name}"/>
788 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
789 <      </manifest>
790 <    </jar>
791 <  </target>
792 <
793 <
794 <  <target name="4jdk8-tck"
795 <          depends="4jdk8jar"
796 <          description="Runs tck tests for jsr166-4jdk8 directly">
797 <
798 <    <run-tck-tests
799 <      target="8"
800 <      workdir="${build.4jdk8.dir}"
801 <      classes="${4jdk8product.jar}">
802 <      <javac-elements>
803 <        <!-- JDK9+ test classes -->
804 <        <exclude name="*9Test.java"/>
805 <        <exclude name="*10Test.java"/>
806 <        <compilerarg value="-Werror"/>
807 <      </javac-elements>
808 <    </run-tck-tests>
809 <  </target>
810 <
811 <
812 <  <target name="4jdk8-jtreg"
813 <          depends="4jdk8jar"
814 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
815 <    <run-jtreg-tests
816 <       target="8"
817 <       workdir="${build.4jdk8.dir}"
818 <       classes="${4jdk8product.jar}"/>
819 <  </target>
820 <
821 <
822 <  <target name="4jdk8-test"
823 <          depends="4jdk8-tck, 4jdk8-jtreg"
824 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
825 <
826 <
827 <  <target name="4jdk8docs"
828 <          description="Builds javadocs for src/jdk8 to dist dir">
829 <
830 <    <delete dir="${4jdk8docs.dir}"/>
831 <    <mkdir dir="${4jdk8docs.dir}"/>
832 <
833 <    <javadoc destdir="${4jdk8docs.dir}"
834 <             packagenames="none"
835 <             link="${java8.api.url}"
836 <             overview="${4jdk8src.dir}/intro.html"
837 <             access="${build.javadoc.access}"
838 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
839 <             classpath=""
840 <             source="8"
841 <             executable="${javadoc8}"
842 <             failonerror = "true">
843 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
844 <        <include name="**/*.java"/>
845 <      </fileset>
846 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
847 <      <arg value="-XDignore.symbol.file=true"/>
848 <      <arg value="-tag"/>
849 <      <arg value="${javadoc.jls.option}"/>
850 < <!-- @apiNote currently unused -->
851 < <!--       <arg value="-tag"/> -->
852 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
853 <      <arg value="-tag"/>
854 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
855 <      <arg value="-tag"/>
856 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
857 <    </javadoc>
858 <  </target>
859 <
860 <
861 <  <target name="4jdk8dist"
862 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
863 <          description="Puts all distributable products in single hierarchy"/>
864 <
865 <
866 <  <target name="4jdk8clean"
867 <          description="Removes all 4jdk8 build products">
868 <    <delete dir="${build.4jdk8.dir}"/>
869 <  </target>
870 <
871 <
872 <  <target name="4jdk8dist-jar"
873 <          depends="4jdk8clean, 4jdk8jar">
874 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
875 <  </target>
876 <
877 <
878 <  <target name="4jdk8dist-docs"
879 <          depends="4jdk8clean, 4jdk8docs">
880 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
881 <  </target>
882 <
883 <
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) -->
885
886  <target name="4jdk7compile" depends="configure-compiler">
887    <mkdir dir="${build.4jdk7.classes.dir}"/>
888
889    <javac srcdir="${4jdk7src.dir}"
890           destdir="${build.4jdk7.classes.dir}"
891           debug="${build.debug}"
892           debuglevel="${build.debuglevel}"
893           deprecation="${build.deprecation}"
894           source="6"
895           target="6"
896           classpath=""
897           bootclasspath="${bootclasspath6}"
898           includeAntRuntime="false"
899           includeJavaRuntime="false"
900           encoding="ASCII"
901           executable="${javac7}"
902           fork="true">
903
904      <include name="**/*.java"/>
905      <compilerarg value="-Xprefer:source"/>
906      <compilerarg value="-XDignore.symbol.file=true"/>
907      <compilerarg value="-Xlint:all"/>
908      <compilerarg value="-Werror"/>
909      <compilerarg line="${build.args}"/>
910    </javac>
911  </target>
912
913  <target name="4jdk7doclint" depends="configure-compiler">
914    <mkdir dir="${build.4jdk7.classes.dir}"/>
915
916    <javac srcdir="${4jdk7src.dir}"
917           destdir="${build.4jdk7.classes.dir}"
918           debug="${build.debug}"
919           debuglevel="${build.debuglevel}"
920           deprecation="${build.deprecation}"
921           source="6"
922           target="6"
923           classpath=""
924           bootclasspath="${bootclasspath6}"
925           includeAntRuntime="false"
926           includeJavaRuntime="false"
927           encoding="ASCII"
928           executable="${javac8}"
929           fork="true">
930
931      <include name="**/*.java"/>
932      <compilerarg value="-Xprefer:source"/>
933      <compilerarg value="-XDignore.symbol.file=true"/>
934      <compilerarg value="-Xlint:all"/>
935      <compilerarg value="-Xdoclint:all/protected"/>
936      <compilerarg line="${build.args}"/>
937    </javac>
938  </target>
939
940  <target name="4jdk7jar" depends="4jdk7compile">
941    <jar destfile="${4jdk7product.jar}">
942      <fileset dir="${build.4jdk7.classes.dir}"/>
943      <manifest>
944        <attribute name="Built-By" value="${user.name}"/>
945        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
946      </manifest>
947    </jar>
948  </target>
949
950  <target name="4jdk7-tck" depends="4jdk7jar">
951    <run-tck-tests
952      target="7"
953      workdir="${build.4jdk7.dir}"
954      classes="${4jdk7product.jar}">
955      <javac-elements>
956        <!-- JDK8+ test classes -->
957        <exclude name="*8Test.java"/>
958        <exclude name="*9Test.java"/>
959        <exclude name="*10Test.java"/>
960        <exclude name="DoubleAccumulatorTest.java"/>
961        <exclude name="DoubleAdderTest.java"/>
962        <exclude name="LongAccumulatorTest.java"/>
963        <exclude name="LongAdderTest.java"/>
964        <exclude name="CompletableFutureTest.java"/>
965        <exclude name="SplittableRandomTest.java"/>
966        <exclude name="StampedLockTest.java"/>
967        <exclude name="SubmissionPublisherTest.java"/>
968        <compilerarg value="-Werror"/>
969      </javac-elements>
970    </run-tck-tests>
971  </target>
972
973  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
974  <target name="4jdk7-tck-junit" depends="4jdk7compile">
975
976    <junit printsummary="true"
977           showoutput="true"
978           errorProperty="junit.failed"
979           failureProperty="junit.failed"
980           includeantruntime="true"
981           jvm="${java7}"
982           fork="true">
983
984      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
985      <jvmarg value="-server"/>
986
987      <classpath>
988        <pathelement location="${junit.jar}"/>
989        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
990      </classpath>
991
992      <formatter type="brief"/>
993
994      <test name="${jsr166.tckTestClass}" haltonfailure="no">
995      </test>
996    </junit>
997  </target>
998
999  <target name="4jdk7-jtreg" depends="4jdk7jar">
1000    <run-jtreg-tests
1001       target="7"
1002       workdir="${build.4jdk7.dir}"
1003       classes="${4jdk7product.jar}"/>
1004  </target>
1005
1006  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1007
1008  <target name="4jdk7docs">
1009    <delete dir="${4jdk7docs.dir}"/>
1010    <mkdir dir="${4jdk7docs.dir}"/>
1011
1012    <javadoc destdir="${4jdk7docs.dir}"
1013             packagenames="none"
1014             link="${java7.api.url}"
1015             overview="${4jdk7src.dir}/intro.html"
1016             access="${build.javadoc.access}"
1017             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1018             classpath=""
1019             executable="${javadoc7}"
1020             failonerror = "true">
1021      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1022        <include name="**/*.java"/>
1023      </fileset>
1024      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1025      <arg value="-XDignore.symbol.file=true"/>
1026    </javadoc>
1027  </target>
1028
1029  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1030
1031  <target name="4jdk7clean">
1032    <delete dir="${build.4jdk7.dir}"/>
1033  </target>
1034
1035  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1036    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1037  </target>
1038
1039  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1040    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1041  </target>
1042
1043
538    <!-- jsr166x (no longer maintained) -->
1045
1046  <target name="jsr166xcompile" depends="configure-compiler">
1047    <mkdir dir="${build.jsr166x.classes.dir}"/>
1048
1049    <javac srcdir="${topsrc.dir}"
1050           destdir="${build.jsr166x.classes.dir}"
1051           debug="${build.debug}"
1052           debuglevel="${build.debuglevel}"
1053           deprecation="${build.deprecation}"
1054           classpath=""
1055           bootclasspath="${bootclasspath6}"
1056           source="5"
1057           target="5"
1058           includeAntRuntime="false"
1059           includeJavaRuntime="false"
1060           encoding="ASCII"
1061           executable="${javac7}"
1062           fork="true">
1063      <include name="jsr166x/**/*.java"/>
1064      <compilerarg value="-XDignore.symbol.file=true"/>
1065      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1066      <compilerarg value="-Werror"/>
1067      <compilerarg line="${build.args}"/>
1068    </javac>
1069  </target>
1070
1071  <target name="jsr166xjar" depends="jsr166xcompile">
1072    <jar destfile="${jsr166x.jar}">
1073      <fileset dir="${build.jsr166x.classes.dir}"/>
1074      <manifest>
1075        <attribute name="Built-By" value="${user.name}"/>
1076        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1077      </manifest>
1078    </jar>
1079  </target>
1080
1081  <target name="jsr166xdocs">
1082    <delete dir="${jsr166xdocs.dir}"/>
1083    <mkdir dir="${jsr166xdocs.dir}"/>
1084
1085    <javadoc destdir="${jsr166xdocs.dir}"
1086             packagenames="jsr166x.*"
1087             link="${java.api.url}"
1088             access="${build.javadoc.access}"
1089             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1090             bootclasspath="${bootclasspath6}"
1091             source="5"
1092             executable="${javadoc7}"
1093             failonerror = "true">
1094      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1095      <arg value="-XDignore.symbol.file=true"/>
1096    </javadoc>
1097  </target>
1098
1099  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1100
1101  <target name="jsr166xclean">
1102    <delete dir="${build.jsr166x.dir}"/>
1103  </target>
1104
1105  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1106    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1107  </target>
1108
1109  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1110    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1111  </target>
1112
1113
539    <!-- jsr166y (no longer maintained) -->
1115
1116  <target name="jsr166ycompile" depends="configure-compiler">
1117    <mkdir dir="${build.jsr166y.classes.dir}"/>
1118
1119    <javac srcdir="${topsrc.dir}"
1120           destdir="${build.jsr166y.classes.dir}"
1121           debug="${build.debug}"
1122           debuglevel="${build.debuglevel}"
1123           deprecation="${build.deprecation}"
1124           source="6"
1125           target="6"
1126           classpath=""
1127           bootclasspath="${bootclasspath6}"
1128           includeAntRuntime="false"
1129           includeJavaRuntime="false"
1130           encoding="ASCII"
1131           executable="${javac7}"
1132           fork="true">
1133
1134      <include name="jsr166y/**/*.java"/>
1135      <compilerarg value="-XDignore.symbol.file=true"/>
1136      <compilerarg value="-Xlint:all"/>
1137      <compilerarg value="-Werror"/>
1138      <compilerarg line="${build.args}"/>
1139    </javac>
1140  </target>
1141
1142  <target name="jsr166yjar" depends="jsr166ycompile">
1143    <jar destfile="${jsr166y.jar}" index="true">
1144      <fileset dir="${build.jsr166y.classes.dir}"/>
1145      <manifest>
1146        <attribute name="Built-By" value="${user.name}"/>
1147        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1148      </manifest>
1149    </jar>
1150  </target>
1151
1152  <target name="jsr166ydocs">
1153    <delete dir="${jsr166ydocs.dir}"/>
1154    <mkdir dir="${jsr166ydocs.dir}"/>
1155
1156    <javadoc destdir="${jsr166ydocs.dir}"
1157             packagenames="jsr166y.*"
1158             link="${java.api.url}"
1159             access="${build.javadoc.access}"
1160             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1161             bootclasspath="${bootclasspath6}"
1162             source="6"
1163             executable="${javadoc7}"
1164             failonerror = "true">
1165      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1166      <arg value="-XDignore.symbol.file=true"/>
1167    </javadoc>
1168  </target>
1169
1170  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1171
1172  <target name="jsr166yclean">
1173    <delete dir="${build.jsr166y.dir}"/>
1174  </target>
1175
1176  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1177    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1178  </target>
1179
1180  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1181    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1182  </target>
1183
1184
540    <!-- extra166y (no longer maintained) -->
1186
1187  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1188    <mkdir dir="${build.extra166y.classes.dir}"/>
1189
1190    <javac srcdir="${topsrc.dir}"
1191           destdir="${build.extra166y.classes.dir}"
1192           debug="${build.debug}"
1193           debuglevel="${build.debuglevel}"
1194           deprecation="${build.deprecation}"
1195           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1196           classpath=""
1197           source="6"
1198           target="6"
1199           includeAntRuntime="false"
1200           includeJavaRuntime="false"
1201           encoding="ASCII"
1202           executable="${javac7}"
1203           fork="true">
1204
1205      <include name="extra166y/**/*.java"/>
1206      <compilerarg value="-XDignore.symbol.file=true"/>
1207      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1208      <compilerarg value="-Werror"/>
1209      <compilerarg line="${build.args}"/>
1210    </javac>
1211  </target>
1212
1213  <target name="extra166yjar" depends="extra166ycompile">
1214    <jar destfile="${extra166y.jar}" index="true">
1215      <fileset dir="${build.extra166y.classes.dir}"/>
1216      <manifest>
1217        <attribute name="Built-By" value="${user.name}"/>
1218        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1219      </manifest>
1220    </jar>
1221  </target>
1222
1223  <target name="extra166ydocs">
1224    <delete dir="${extra166ydocs.dir}"/>
1225    <mkdir dir="${extra166ydocs.dir}"/>
1226
1227    <javadoc destdir="${extra166ydocs.dir}"
1228             packagenames="extra166y.*"
1229             link="${java.api.url}"
1230             access="${build.javadoc.access}"
1231             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1232             bootclasspath="${bootclasspath6}"
1233             source="6"
1234             executable="${javadoc7}">
1235      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1236      <arg value="-XDignore.symbol.file=true"/>
1237    </javadoc>
1238  </target>
1239
1240  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1241
1242  <target name="extra166yclean">
1243    <delete dir="${build.extra166y.dir}"/>
1244  </target>
1245
1246  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1247    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1248  </target>
1249
1250  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1251    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1252  </target>
1253
1254
541    <!-- jsr166e (no longer maintained) -->
542  
1257  <property name="build.jsr166e.java.version" value="6"/>
1258  <property name="build.jsr166e.javac" value="${javac6}"/>
1259
1260  <target name="jsr166ecompile" depends="configure-compiler">
1261    <mkdir dir="${build.jsr166e.classes.dir}"/>
1262
1263    <javac srcdir="${topsrc.dir}"
1264           destdir="${build.jsr166e.classes.dir}"
1265           debug="${build.debug}"
1266           debuglevel="${build.debuglevel}"
1267           deprecation="${build.deprecation}"
1268           source="${build.jsr166e.java.version}"
1269           target="${build.jsr166e.java.version}"
1270           classpath=""
1271           includeAntRuntime="false"
1272           includeJavaRuntime="false"
1273           executable="${build.jsr166e.javac}"
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 line="${build.args}"/>
1281    </javac>
1282  </target>
1283
1284  <target name="jsr166edoclint">
1285    <mkdir dir="${build.jsr166e.classes.dir}"/>
1286
1287    <javac srcdir="${topsrc.dir}"
1288           destdir="${build.jsr166e.classes.dir}"
1289           debug="${build.debug}"
1290           debuglevel="${build.debuglevel}"
1291           deprecation="${build.deprecation}"
1292           source="${build.jsr166e.java.version}"
1293           target="${build.jsr166e.java.version}"
1294           classpath=""
1295           bootclasspath="${bootclasspath6}"
1296           includeAntRuntime="false"
1297           includeJavaRuntime="false"
1298           executable="${javac8}"
1299           fork="true">
1300
1301      <include name="jsr166e/**/*.java"/>
1302      <compilerarg value="-XDignore.symbol.file=true"/>
1303      <compilerarg value="-Xlint:all"/>
1304      <compilerarg value="-Werror"/>
1305      <compilerarg value="-Xdoclint:all/protected"/>
1306    </javac>
1307  </target>
1308
1309  <target name="jsr166ejar" depends="jsr166ecompile">
1310    <jar destfile="${jsr166e.jar}" index="true">
1311      <fileset dir="${build.jsr166e.classes.dir}"/>
1312      <manifest>
1313        <attribute name="Built-By" value="${user.name}"/>
1314        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1315      </manifest>
1316    </jar>
1317  </target>
1318
1319  <target name="jsr166edocs">
1320    <delete dir="${jsr166edocs.dir}"/>
1321    <mkdir dir="${jsr166edocs.dir}"/>
1322
1323    <javadoc destdir="${jsr166edocs.dir}"
1324             packagenames="jsr166e.*"
1325             link="${java.api.url}"
1326             access="${build.javadoc.access}"
1327             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1328             source="${build.jsr166e.java.version}"
1329             executable="${javadoc7}"
1330             failonerror = "true">
1331      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1332      <arg value="-XDignore.symbol.file=true"/>
1333    </javadoc>
1334  </target>
1335
1336  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1337    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1338    <run-tck-tests
1339      tck.src.dir="${test.src.dir}/tck-jsr166e"
1340      target="${build.jsr166e.java.version}"
1341      workdir="${build.jsr166e.dir}"
1342      classes="${jsr166e.jar}"/>
1343  </target>
1344
1345  <target name="jsr166e-tck">
1346
1347 <!--     <antcall target="clean"/> -->
1348 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1349 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1350 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1351 <!--     </antcall> -->
1352
1353    <antcall target="clean"/>
1354    <antcall target="jsr166e-tck-one-java-version">
1355      <param name="build.jsr166e.java.version" value="7"/>
1356      <param name="build.jsr166e.javac" value="${javac7}"/>
1357    </antcall>
1358
1359    <antcall target="clean"/>
1360    <antcall target="jsr166e-tck-one-java-version">
1361      <param name="build.jsr166e.java.version" value="6"/>
1362      <param name="build.jsr166e.javac" value="${javac6}"/>
1363    </antcall>
1364  </target>
1365
1366  <target name="jsr166e-test" depends="jsr166e-tck"/>
1367
1368  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1369
1370  <target name="jsr166eclean">
1371    <delete dir="${build.jsr166e.dir}"/>
1372  </target>
1373
1374  <target name="jsr166edist-jar"
1375          depends="jsr166eclean, jsr166ejar">
1376    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1377  </target>
1378
1379  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1380    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1381  </target>
1382
1383
543   <!-- Find buglets that can be detected by static build tools -->
544  
545 <  <target name="lint">
546 <    <antcall target="dists">
547 <      <param name="build.javadoc.access" value="public"/>
548 <    </antcall>
549 <  </target>
545 > <!--   <target name="lint"> -->
546 > <!--     <antcall target="dists"> -->
547 > <!--       <param name="build.javadoc.access" value="protected"/> -->
548 > <!--     </antcall> -->
549 > <!--   </target> -->
550  
551   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
552 <  <target name="lint-private">
552 >  <target name="doclint-private">
553      <antcall target="dist">
554        <param name="build.javadoc.access" value="private"/>
555      </antcall>
# Line 1398 | Line 557
557  
558  
559   <!-- ==============================================================
560 <  Experimental errorprone support - http://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.2.0.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 1414 | Line 586
586                     -Xep:LongLiteralLowerCaseSuffix:ERROR
587                     -Xep:RedundantThrows:ERROR
588                     -Xep:IdentityBinaryExpression:WARN
589 <                   -Xep:MethodCanBeStatic: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 1442 | Line 617
617             fork="true">
618  
619        <include name="**/*.java"/>
620 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
620 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
621 >      <compilerarg value="-J--illegal-access=permit"/>
622 >      <compilerarg value="-XDcompilePolicy=simple"/>
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 1450 | 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 1459 | 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 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
646 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
647 >        <compilerarg value="-J--illegal-access=permit"/>
648 >        <compilerarg value="-XDcompilePolicy=simple"/>
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 1479 | 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=byfile"/>
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}
677 +                            -Xep:MultipleTopLevelClasses:WARN
678                              -Xep:NonAtomicVolatileUpdate:OFF"/>
679        </jtreg-elements>
680      </run-jtreg-tests>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines