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.302 by jsr166, Sun Aug 18 18:55:55 2019 UTC vs.
Revision 1.327 by jsr166, Fri Nov 25 20:33:50 2022 UTC

# 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/jdk11
24 <  $HOME/jdk/jdk12
25 <  $HOME/jdk/jdk13
26 <  $HOME/jdk/jdk14
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/jdk11
30 <  $HOME/jdk/src/jdk12
31 <  $HOME/jdk/src/jdk13
32 <  $HOME/jdk/src/jdk14
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 .. 14 ...
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 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="8"/>
92 <  <defjdklocations v="11"/>
93 <  <defjdklocations v="12"/>
94 <  <defjdklocations v="13"/>
139 <  <defjdklocations v="14"/>
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="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
102 <  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
103 <  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
104 <  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
105 <  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
151 <  <property name="jtreg.src.dir"        location="${jtreg11.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"/>
155  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
156  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
157  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
158  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
159  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
160  <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"/>
165 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
166 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
167 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
168 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
169 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
170 <
171 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
172 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
173 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
174 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
175 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
176 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
177 <  <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"/>
181  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
182  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
183  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
184  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
185  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
186  <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"/>
195 <  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
196 <  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
197 <  <!-- The location of jdk early access docs (RIP) -->
198 <  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
199 < <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
200 <  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
201 <  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
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="${java11.docroot.url}"/>
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="java8.api.url"      value="${java8.docroot.url}/api/"/>
129 <  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
130 <  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
131 <  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
210 <  <property name="java14.api.url"     value="${java14.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 215 | 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 238 | Line 159
159  
160      <sequential>
161  
241    <local name="modules"/>
242    <condition property="modules">
243      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
244    </condition>
245
246    <local name="use-doclint"/>
247    <condition property="use-doclint">
248      <not> <equals arg1="@{target}" arg2="7"/> </not>
249    </condition>
250
162      <mkdir dir="@{workdir}/tck-classes"/>
163  
164      <javac srcdir="@{tck.src.dir}"
# Line 267 | 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"/>
272 <      <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 279 | 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"/>
303 <        </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 321 | Line 230
230      </sequential>
231    </macrodef>
232  
233 <  <defjtregtests v="14"/>
234 <  <defjtregtests v="13"/>
235 <  <defjtregtests v="12"/>
236 <  <defjtregtests v="11"/>
328 <  <defjtregtests v="8"/>
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">
334    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
242      <attribute name="target"/>
243      <attribute name="workdir"/>
244      <attribute name="classes"/>
# Line 344 | 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}"/>
363      <arg value="-vmoptions:-esa -ea"/>
274        <arg value="-automatic"/>
275        <arg value="-k:!ignore"/>
276        <arg line="@{jtregflags}"/>
# Line 383 | Line 293
293    <!-- Main targets -->
294  
295    <!-- Default values: may seem strange ... -->
296 <  <!-- At runtime, target latest LTS, i.e. jdk11 -->
297 <  <!-- But at build time, target jdk9, for maximal binary portability -->
298 <  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
299 <  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
300 <    o override-methods=summary
391 <    o {@systemProperty ...}
392 <    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
393 <    o 8202628: javadoc generates bad links in TestModules.java
394 <    -->
395 <  <property name="java.runtime.target" value="11"/>
396 <  <property name="build.main.java" value="${java11}"/>
397 <  <property name="build.main.javac" value="${javac11}"/>
398 <  <property name="build.main.javadoc" value="${javadoc12}"/>
296 >  <!-- At runtime, target latest, but build for current LTS -->
297 >  <property name="java.runtime.target" value="19"/>
298 >  <property name="build.main.java" value="${java17}"/>
299 >  <property name="build.main.javac" value="${javac17}"/>
300 >  <property name="build.main.javadoc" value="${javadoc19}"/>
301    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
302  
303    <target name="dists"
304 <          depends="dist, 4jdk8dist"
304 >          depends="dist"
305            description="Builds all public jars and docs"/>
404          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
306  
307    <target name="compile"
308            depends="configure-compiler"
# Line 428 | Line 329
329        <compilerarg value="--patch-module=java.base=${src.dir}"/>
330        <compilerarg value="-Xprefer:source"/>
331        <compilerarg value="-XDignore.symbol.file=true"/>
332 < <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
333 <      <compilerarg value="-Xlint:all,-removal"/>
433 <      <compilerarg line="--doclint-format html5"/>
434 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
332 >      <compilerarg value="-Xlint:all"/>
333 >      <compilerarg value="-Xdoclint:all/protected"/>
334        <compilerarg value="-Xdoclint/package:java.util.*"/>
335        <compilerarg value="-Werror"/>
336        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
337        <compilerarg line="${build.args}"/>
439
338      </javac>
339    </target>
340  
443
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 458 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
358 <
462 <    <delete dir="${docs.dir}"/>
358 >    <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
464
465    <!-- the packagenames="none" hack below prevents scanning the -->
466    <!-- sourcepath for packages -->
467
468 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
469 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
470 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
471 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
472 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
360      <javadoc destdir="${docs.dir}"
361               packagenames="none"
362               link="${java.api.url}"
# Line 479 | Line 366
366               classpath=""
367               source="${build.main.javadoc.source}"
368               executable="${build.main.javadoc}">
482 <!-- TODO: JDK-8214571 failonerror = "true" -->
369        <fileset dir="${src.dir}" defaultexcludes="yes">
370 <        <include name="**/*.java"/>
370 >        <include name="java/**/*.java"/>
371        </fileset>
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 < <!-- old school frames via docs/index.html?overview-summary.html -->
492 < <!-- TODO: - -frames no longer a supported option in jdk13+ -->
493 <      <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:"/>
499 <!-- tags added in jdk9: currently unused -->
500 <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
501 <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
386      </javadoc>
387    </target>
388  
505
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
510
393    <target name="clean"
394            description="Removes all build products">
395      <delete dir="${build.dir}"/>
396    </target>
397  
516
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  
523
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 532 | Line 412
412    </target>
413  
414    <target name="tck"
415 <          depends="jar"
415 >          depends="jar"
416            description="Runs tck tests for src/main directly">
537
417      <run-tck-tests
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 567 | 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="${java.runtime.target}"
# Line 580 | Line 459
459            description="Runs tck and jtreg tests for src/main"/>
460  
461    <target name="test-version-permutations"
462 <          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
463 <  </target>
585 <
586 <  <!-- jdk9 is unsupported as of 2019-08 -->
587 < <!--   <target name="test9"> -->
588 < <!--     <antcall target="clean"/> -->
589 < <!--     <antcall> -->
590 < <!--       <param name="java.runtime.target" value="9"/> -->
591 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
592 < <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
593 < <!--       <param name="build.main.javadoc.source" value="9"/> -->
594 < <!--       <target name="test"/> -->
595 < <!--       <target name="docs"/> -->
596 < <!--     </antcall> -->
597 < <!--   </target> -->
598 <
599 <  <!-- jdk10 is unsupported as of 2019-08 -->
600 < <!--   <target name="test10"> -->
601 < <!--     <antcall target="clean"/> -->
602 < <!--     <antcall> -->
603 < <!--       <param name="java.runtime.target" value="10"/> -->
604 < <!--       <param name="build.main.javac" value="${javac10}"/> -->
605 < <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
606 < <!--       <param name="build.main.javadoc.source" value="10"/> -->
607 < <!--       <target name="test"/> -->
608 < <!--       <target name="docs"/> -->
609 < <!--     </antcall> -->
610 < <!--   </target> -->
611 <
612 <  <target name="test11">
613 <    <antcall target="clean"/>
614 <    <antcall>
615 <      <param name="java.runtime.target" value="11"/>
616 <      <param name="build.main.javac" value="${javac11}"/>
617 <      <param name="build.main.javadoc" value="${javadoc12}"/>
618 <      <param name="build.main.javadoc.source" value="11"/>
619 <      <target name="test"/>
620 <      <target name="docs"/>
621 <    </antcall>
622 <  </target>
623 <
624 <  <target name="test12">
625 <    <antcall target="clean"/>
626 <    <antcall>
627 <      <param name="java.runtime.target" value="12"/>
628 <      <param name="build.main.javac" value="${javac12}"/>
629 <      <param name="build.main.javadoc" value="${javadoc12}"/>
630 <      <param name="build.main.javadoc.source" value="12"/>
631 <      <target name="test"/>
632 <      <target name="docs"/>
633 <    </antcall>
634 <  </target>
635 <
636 <  <target name="test13">
637 <    <antcall target="clean"/>
638 <    <antcall>
639 <      <param name="java.runtime.target" value="13"/>
640 <      <param name="build.main.javac" value="${javac13}"/>
641 <      <param name="build.main.javadoc" value="${javadoc13}"/>
642 <      <param name="build.main.javadoc.source" value="13"/>
643 <      <target name="test"/>
644 <      <target name="docs"/>
645 <    </antcall>
646 <  </target>
647 <
648 <  <target name="test14">
649 <    <antcall target="clean"/>
650 <    <antcall>
651 <      <param name="java.runtime.target" value="14"/>
652 <      <param name="build.main.javac" value="${javac14}"/>
653 <      <param name="build.main.javadoc" value="${javadoc14}"/>
654 <      <param name="build.main.javadoc.source" value="14"/>
655 <      <target name="test"/>
656 <      <target name="docs"/>
657 <    </antcall>
658 <  </target>
462 >          depends="test17, test19, clean, test, docs"
463 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
464  
660  <target name="test11-12">
661    <antcall target="clean"/>
662    <antcall>
663      <param name="java.runtime.target" value="12"/>
664      <param name="build.main.javac" value="${javac11}"/>
665      <param name="build.main.javadoc" value="${javadoc12}"/>
666      <param name="build.main.javadoc.source" value="11"/>
667      <target name="test"/>
668      <target name="docs"/>
669    </antcall>
670  </target>
465  
466 <  <target name="test11-13">
673 <    <antcall target="clean"/>
466 >  <target name="test17">
467      <antcall>
468 <      <param name="java.runtime.target" value="13"/>
469 <      <param name="build.main.javac" value="${javac11}"/>
470 <      <param name="build.main.javadoc" value="${javadoc13}"/>
471 <      <param name="build.main.javadoc.source" value="11"/>
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 <
684 <  <target name="test11-14">
685 <    <antcall target="clean"/>
477 >  <target name="test19">
478      <antcall>
479 <      <param name="java.runtime.target" value="14"/>
480 <      <param name="build.main.javac" value="${javac11}"/>
481 <      <param name="build.main.javadoc" value="${javadoc14}"/>
482 <      <param name="build.main.javadoc.source" value="11"/>
479 >      <param name="java.runtime.target" value="19"/>
480 >      <param name="build.main.javac" value="${javac19}"/>
481 >      <param name="build.main.javadoc" value="${javadoc19}"/>
482 >      <param name="build.main.javadoc.source" value="19"/>
483 >      <target name="clean"/>
484        <target name="test"/>
485        <target name="docs"/>
486      </antcall>
# Line 732 | 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}"/>
737 <      <compilerarg line="${build.args}"/>
738 <    </javac>
739 <  </target>
740 <
741 <
742 <  <!-- jsr166 4jdk8 -->
743 <
744 <  <target name="4jdk8compile"
745 <          depends="configure-compiler"
746 <          description="Compiles src/jdk8 sources, targeting jdk8">
747 <
748 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
749 <
750 <    <javac srcdir="${4jdk8src.dir}"
751 <           destdir="${build.4jdk8.classes.dir}"
752 <           debug="${build.debug}"
753 <           debuglevel="${build.debuglevel}"
754 <           deprecation="${build.deprecation}"
755 <           source="8"
756 <           target="8"
757 <           classpath=""
758 <           bootclasspath="${bootclasspath8}"
759 <           includeAntRuntime="false"
760 <           includeJavaRuntime="false"
761 <           encoding="ASCII"
762 <           executable="${javac8}"
763 <           fork="true">
764 <      <include name="**/*.java"/>
765 <      <compilerarg value="-Xprefer:source"/>
766 <      <compilerarg value="-XDignore.symbol.file=true"/>
767 <      <compilerarg value="-Xlint:all"/>
768 <      <compilerarg value="-Werror"/>
769 <      <compilerarg line="${build.args}"/>
770 <    </javac>
771 <  </target>
772 <
773 <  <target name="4jdk8doclint"
774 <          depends="configure-compiler"
775 <          description="Finds doclint warnings">
776 <
777 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
778 <
779 <    <javac srcdir="${4jdk8src.dir}"
780 <           destdir="${build.4jdk8.classes.dir}"
781 <           debug="${build.debug}"
782 <           debuglevel="${build.debuglevel}"
783 <           deprecation="${build.deprecation}"
784 <           source="8"
785 <           target="8"
786 <           classpath=""
787 <           bootclasspath="${bootclasspath8}"
788 <           includeAntRuntime="false"
789 <           includeJavaRuntime="false"
790 <           encoding="ASCII"
791 <           executable="${javac8}"
792 <           fork="true">
793 <      <include name="**/*.java"/>
794 <      <compilerarg value="-Xprefer:source"/>
795 <      <compilerarg value="-XDignore.symbol.file=true"/>
796 <      <compilerarg value="-Xlint:all"/>
797 <      <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"
805 <          description="Builds library jar from compiled sources">
806 <
807 <    <jar destfile="${4jdk8product.jar}">
808 <      <fileset dir="${build.4jdk8.classes.dir}"/>
809 <      <manifest>
810 <        <attribute name="Built-By" value="${user.name}"/>
811 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
812 <      </manifest>
813 <    </jar>
814 <  </target>
815 <
816 <
817 <  <target name="4jdk8-tck"
818 <          depends="4jdk8jar"
819 <          description="Runs tck tests for jsr166-4jdk8 directly">
820 <
821 <    <run-tck-tests
822 <      target="8"
823 <      workdir="${build.4jdk8.dir}"
824 <      classes="${4jdk8product.jar}">
825 <      <javac-elements>
826 <        <!-- JDK9+ test classes -->
827 <        <exclude name="*9Test.java"/>
828 <        <exclude name="*10Test.java"/>
829 <        <compilerarg value="-Werror"/>
830 <      </javac-elements>
831 <    </run-tck-tests>
832 <  </target>
833 <
834 <
835 <  <target name="4jdk8-jtreg"
836 <          depends="4jdk8jar"
837 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
838 <    <run-jtreg-tests
839 <       target="8"
840 <       workdir="${build.4jdk8.dir}"
841 <       classes="${4jdk8product.jar}"/>
842 <  </target>
843 <
844 <
845 <  <target name="4jdk8-test"
846 <          depends="4jdk8-tck, 4jdk8-jtreg"
847 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
848 <
849 <
850 <  <target name="4jdk8docs"
851 <          description="Builds javadocs for src/jdk8 to dist dir">
852 <
853 <    <delete dir="${4jdk8docs.dir}"/>
854 <    <mkdir dir="${4jdk8docs.dir}"/>
855 <
856 <    <javadoc destdir="${4jdk8docs.dir}"
857 <             packagenames="none"
858 <             link="${java8.api.url}"
859 <             overview="${4jdk8src.dir}/intro.html"
860 <             access="${build.javadoc.access}"
861 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
862 <             classpath=""
863 <             source="8"
864 <             executable="${javadoc8}"
865 <             failonerror = "true">
866 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
867 <        <include name="**/*.java"/>
868 <      </fileset>
869 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
870 <      <arg value="-XDignore.symbol.file=true"/>
871 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
872 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
873 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
874 < <!-- @apiNote tag currently unused -->
875 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
876 <    </javadoc>
877 <  </target>
878 <
879 <
880 <  <target name="4jdk8dist"
881 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
882 <          description="Puts all distributable products in single hierarchy"/>
883 <
884 <
885 <  <target name="4jdk8clean"
886 <          description="Removes all 4jdk8 build products">
887 <    <delete dir="${build.4jdk8.dir}"/>
888 <  </target>
889 <
890 <
891 <  <target name="4jdk8dist-jar"
892 <          depends="4jdk8clean, 4jdk8jar">
893 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
894 <  </target>
895 <
896 <
897 <  <target name="4jdk8dist-docs"
898 <          depends="4jdk8clean, 4jdk8docs">
899 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
900 <  </target>
901 <
902 <
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) -->
904
905  <target name="4jdk7compile" depends="configure-compiler">
906    <mkdir dir="${build.4jdk7.classes.dir}"/>
907
908    <javac srcdir="${4jdk7src.dir}"
909           destdir="${build.4jdk7.classes.dir}"
910           debug="${build.debug}"
911           debuglevel="${build.debuglevel}"
912           deprecation="${build.deprecation}"
913           source="6"
914           target="6"
915           classpath=""
916           bootclasspath="${bootclasspath6}"
917           includeAntRuntime="false"
918           includeJavaRuntime="false"
919           encoding="ASCII"
920           executable="${javac7}"
921           fork="true">
922
923      <include name="**/*.java"/>
924      <compilerarg value="-Xprefer:source"/>
925      <compilerarg value="-XDignore.symbol.file=true"/>
926      <compilerarg value="-Xlint:all"/>
927      <compilerarg value="-Werror"/>
928      <compilerarg line="${build.args}"/>
929    </javac>
930  </target>
931
932  <target name="4jdk7doclint" depends="configure-compiler">
933    <mkdir dir="${build.4jdk7.classes.dir}"/>
934
935    <javac srcdir="${4jdk7src.dir}"
936           destdir="${build.4jdk7.classes.dir}"
937           debug="${build.debug}"
938           debuglevel="${build.debuglevel}"
939           deprecation="${build.deprecation}"
940           source="6"
941           target="6"
942           classpath=""
943           bootclasspath="${bootclasspath6}"
944           includeAntRuntime="false"
945           includeJavaRuntime="false"
946           encoding="ASCII"
947           executable="${javac8}"
948           fork="true">
949
950      <include name="**/*.java"/>
951      <compilerarg value="-Xprefer:source"/>
952      <compilerarg value="-XDignore.symbol.file=true"/>
953      <compilerarg value="-Xlint:all"/>
954      <compilerarg value="-Xdoclint:all/protected"/>
955      <compilerarg line="${build.args}"/>
956    </javac>
957  </target>
958
959  <target name="4jdk7jar" depends="4jdk7compile">
960    <jar destfile="${4jdk7product.jar}">
961      <fileset dir="${build.4jdk7.classes.dir}"/>
962      <manifest>
963        <attribute name="Built-By" value="${user.name}"/>
964        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
965      </manifest>
966    </jar>
967  </target>
968
969  <target name="4jdk7-tck" depends="4jdk7jar">
970    <run-tck-tests
971      target="7"
972      workdir="${build.4jdk7.dir}"
973      classes="${4jdk7product.jar}">
974      <javac-elements>
975        <!-- JDK8+ test classes -->
976        <exclude name="*8Test.java"/>
977        <exclude name="*9Test.java"/>
978        <exclude name="*10Test.java"/>
979        <exclude name="DoubleAccumulatorTest.java"/>
980        <exclude name="DoubleAdderTest.java"/>
981        <exclude name="LongAccumulatorTest.java"/>
982        <exclude name="LongAdderTest.java"/>
983        <exclude name="CompletableFutureTest.java"/>
984        <exclude name="SplittableRandomTest.java"/>
985        <exclude name="StampedLockTest.java"/>
986        <exclude name="SubmissionPublisherTest.java"/>
987        <compilerarg value="-Werror"/>
988      </javac-elements>
989    </run-tck-tests>
990  </target>
991
992  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
993  <target name="4jdk7-tck-junit" depends="4jdk7compile">
994
995    <junit printsummary="true"
996           showoutput="true"
997           errorProperty="junit.failed"
998           failureProperty="junit.failed"
999           includeantruntime="true"
1000           jvm="${java7}"
1001           fork="true">
1002
1003      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
1004      <jvmarg value="-server"/>
1005
1006      <classpath>
1007        <pathelement location="${junit.jar}"/>
1008        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
1009      </classpath>
1010
1011      <formatter type="brief"/>
1012
1013      <test name="${jsr166.tckTestClass}" haltonfailure="no">
1014      </test>
1015    </junit>
1016  </target>
1017
1018  <target name="4jdk7-jtreg" depends="4jdk7jar">
1019    <run-jtreg-tests
1020       target="7"
1021       workdir="${build.4jdk7.dir}"
1022       classes="${4jdk7product.jar}"/>
1023  </target>
1024
1025  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1026
1027  <target name="4jdk7docs">
1028    <delete dir="${4jdk7docs.dir}"/>
1029    <mkdir dir="${4jdk7docs.dir}"/>
1030
1031    <javadoc destdir="${4jdk7docs.dir}"
1032             packagenames="none"
1033             link="${java7.api.url}"
1034             overview="${4jdk7src.dir}/intro.html"
1035             access="${build.javadoc.access}"
1036             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1037             classpath=""
1038             executable="${javadoc7}"
1039             failonerror = "true">
1040      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1041        <include name="**/*.java"/>
1042      </fileset>
1043      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1044      <arg value="-XDignore.symbol.file=true"/>
1045    </javadoc>
1046  </target>
1047
1048  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1049
1050  <target name="4jdk7clean">
1051    <delete dir="${build.4jdk7.dir}"/>
1052  </target>
1053
1054  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1055    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1056  </target>
1057
1058  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1059    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1060  </target>
1061
1062
538    <!-- jsr166x (no longer maintained) -->
1064
1065  <target name="jsr166xcompile" depends="configure-compiler">
1066    <mkdir dir="${build.jsr166x.classes.dir}"/>
1067
1068    <javac srcdir="${topsrc.dir}"
1069           destdir="${build.jsr166x.classes.dir}"
1070           debug="${build.debug}"
1071           debuglevel="${build.debuglevel}"
1072           deprecation="${build.deprecation}"
1073           classpath=""
1074           bootclasspath="${bootclasspath6}"
1075           source="5"
1076           target="5"
1077           includeAntRuntime="false"
1078           includeJavaRuntime="false"
1079           encoding="ASCII"
1080           executable="${javac7}"
1081           fork="true">
1082      <include name="jsr166x/**/*.java"/>
1083      <compilerarg value="-XDignore.symbol.file=true"/>
1084      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1085      <compilerarg value="-Werror"/>
1086      <compilerarg line="${build.args}"/>
1087    </javac>
1088  </target>
1089
1090  <target name="jsr166xjar" depends="jsr166xcompile">
1091    <jar destfile="${jsr166x.jar}">
1092      <fileset dir="${build.jsr166x.classes.dir}"/>
1093      <manifest>
1094        <attribute name="Built-By" value="${user.name}"/>
1095        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1096      </manifest>
1097    </jar>
1098  </target>
1099
1100  <target name="jsr166xdocs">
1101    <delete dir="${jsr166xdocs.dir}"/>
1102    <mkdir dir="${jsr166xdocs.dir}"/>
1103
1104    <javadoc destdir="${jsr166xdocs.dir}"
1105             packagenames="jsr166x.*"
1106             link="${java.api.url}"
1107             access="${build.javadoc.access}"
1108             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1109             bootclasspath="${bootclasspath6}"
1110             source="5"
1111             executable="${javadoc7}"
1112             failonerror = "true">
1113      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1114      <arg value="-XDignore.symbol.file=true"/>
1115    </javadoc>
1116  </target>
1117
1118  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1119
1120  <target name="jsr166xclean">
1121    <delete dir="${build.jsr166x.dir}"/>
1122  </target>
1123
1124  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1125    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1126  </target>
1127
1128  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1129    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1130  </target>
1131
1132
539    <!-- jsr166y (no longer maintained) -->
1134
1135  <target name="jsr166ycompile" depends="configure-compiler">
1136    <mkdir dir="${build.jsr166y.classes.dir}"/>
1137
1138    <javac srcdir="${topsrc.dir}"
1139           destdir="${build.jsr166y.classes.dir}"
1140           debug="${build.debug}"
1141           debuglevel="${build.debuglevel}"
1142           deprecation="${build.deprecation}"
1143           source="6"
1144           target="6"
1145           classpath=""
1146           bootclasspath="${bootclasspath6}"
1147           includeAntRuntime="false"
1148           includeJavaRuntime="false"
1149           encoding="ASCII"
1150           executable="${javac7}"
1151           fork="true">
1152
1153      <include name="jsr166y/**/*.java"/>
1154      <compilerarg value="-XDignore.symbol.file=true"/>
1155      <compilerarg value="-Xlint:all"/>
1156      <compilerarg value="-Werror"/>
1157      <compilerarg line="${build.args}"/>
1158    </javac>
1159  </target>
1160
1161  <target name="jsr166yjar" depends="jsr166ycompile">
1162    <jar destfile="${jsr166y.jar}" index="true">
1163      <fileset dir="${build.jsr166y.classes.dir}"/>
1164      <manifest>
1165        <attribute name="Built-By" value="${user.name}"/>
1166        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1167      </manifest>
1168    </jar>
1169  </target>
1170
1171  <target name="jsr166ydocs">
1172    <delete dir="${jsr166ydocs.dir}"/>
1173    <mkdir dir="${jsr166ydocs.dir}"/>
1174
1175    <javadoc destdir="${jsr166ydocs.dir}"
1176             packagenames="jsr166y.*"
1177             link="${java.api.url}"
1178             access="${build.javadoc.access}"
1179             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1180             bootclasspath="${bootclasspath6}"
1181             source="6"
1182             executable="${javadoc7}"
1183             failonerror = "true">
1184      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1185      <arg value="-XDignore.symbol.file=true"/>
1186    </javadoc>
1187  </target>
1188
1189  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1190
1191  <target name="jsr166yclean">
1192    <delete dir="${build.jsr166y.dir}"/>
1193  </target>
1194
1195  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1196    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1197  </target>
1198
1199  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1200    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1201  </target>
1202
1203
540    <!-- extra166y (no longer maintained) -->
1205
1206  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1207    <mkdir dir="${build.extra166y.classes.dir}"/>
1208
1209    <javac srcdir="${topsrc.dir}"
1210           destdir="${build.extra166y.classes.dir}"
1211           debug="${build.debug}"
1212           debuglevel="${build.debuglevel}"
1213           deprecation="${build.deprecation}"
1214           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1215           classpath=""
1216           source="6"
1217           target="6"
1218           includeAntRuntime="false"
1219           includeJavaRuntime="false"
1220           encoding="ASCII"
1221           executable="${javac7}"
1222           fork="true">
1223
1224      <include name="extra166y/**/*.java"/>
1225      <compilerarg value="-XDignore.symbol.file=true"/>
1226      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1227      <compilerarg value="-Werror"/>
1228      <compilerarg line="${build.args}"/>
1229    </javac>
1230  </target>
1231
1232  <target name="extra166yjar" depends="extra166ycompile">
1233    <jar destfile="${extra166y.jar}" index="true">
1234      <fileset dir="${build.extra166y.classes.dir}"/>
1235      <manifest>
1236        <attribute name="Built-By" value="${user.name}"/>
1237        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1238      </manifest>
1239    </jar>
1240  </target>
1241
1242  <target name="extra166ydocs">
1243    <delete dir="${extra166ydocs.dir}"/>
1244    <mkdir dir="${extra166ydocs.dir}"/>
1245
1246    <javadoc destdir="${extra166ydocs.dir}"
1247             packagenames="extra166y.*"
1248             link="${java.api.url}"
1249             access="${build.javadoc.access}"
1250             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1251             bootclasspath="${bootclasspath6}"
1252             source="6"
1253             executable="${javadoc7}">
1254      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1255      <arg value="-XDignore.symbol.file=true"/>
1256    </javadoc>
1257  </target>
1258
1259  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1260
1261  <target name="extra166yclean">
1262    <delete dir="${build.extra166y.dir}"/>
1263  </target>
1264
1265  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1266    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1267  </target>
1268
1269  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1270    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1271  </target>
1272
1273
541    <!-- jsr166e (no longer maintained) -->
542  
1276  <property name="build.jsr166e.java.version" value="6"/>
1277  <property name="build.jsr166e.javac" value="${javac6}"/>
1278
1279  <target name="jsr166ecompile" depends="configure-compiler">
1280    <mkdir dir="${build.jsr166e.classes.dir}"/>
1281
1282    <javac srcdir="${topsrc.dir}"
1283           destdir="${build.jsr166e.classes.dir}"
1284           debug="${build.debug}"
1285           debuglevel="${build.debuglevel}"
1286           deprecation="${build.deprecation}"
1287           source="${build.jsr166e.java.version}"
1288           target="${build.jsr166e.java.version}"
1289           classpath=""
1290           includeAntRuntime="false"
1291           includeJavaRuntime="false"
1292           executable="${build.jsr166e.javac}"
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 line="${build.args}"/>
1300    </javac>
1301  </target>
1302
1303  <target name="jsr166edoclint">
1304    <mkdir dir="${build.jsr166e.classes.dir}"/>
1305
1306    <javac srcdir="${topsrc.dir}"
1307           destdir="${build.jsr166e.classes.dir}"
1308           debug="${build.debug}"
1309           debuglevel="${build.debuglevel}"
1310           deprecation="${build.deprecation}"
1311           source="${build.jsr166e.java.version}"
1312           target="${build.jsr166e.java.version}"
1313           classpath=""
1314           bootclasspath="${bootclasspath6}"
1315           includeAntRuntime="false"
1316           includeJavaRuntime="false"
1317           executable="${javac8}"
1318           fork="true">
1319
1320      <include name="jsr166e/**/*.java"/>
1321      <compilerarg value="-XDignore.symbol.file=true"/>
1322      <compilerarg value="-Xlint:all"/>
1323      <compilerarg value="-Werror"/>
1324      <compilerarg value="-Xdoclint:all/protected"/>
1325    </javac>
1326  </target>
1327
1328  <target name="jsr166ejar" depends="jsr166ecompile">
1329    <jar destfile="${jsr166e.jar}" index="true">
1330      <fileset dir="${build.jsr166e.classes.dir}"/>
1331      <manifest>
1332        <attribute name="Built-By" value="${user.name}"/>
1333        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1334      </manifest>
1335    </jar>
1336  </target>
1337
1338  <target name="jsr166edocs">
1339    <delete dir="${jsr166edocs.dir}"/>
1340    <mkdir dir="${jsr166edocs.dir}"/>
1341
1342    <javadoc destdir="${jsr166edocs.dir}"
1343             packagenames="jsr166e.*"
1344             link="${java.api.url}"
1345             access="${build.javadoc.access}"
1346             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1347             source="${build.jsr166e.java.version}"
1348             executable="${javadoc7}"
1349             failonerror = "true">
1350      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1351      <arg value="-XDignore.symbol.file=true"/>
1352    </javadoc>
1353  </target>
1354
1355  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1356    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1357    <run-tck-tests
1358      tck.src.dir="${test.src.dir}/tck-jsr166e"
1359      target="${build.jsr166e.java.version}"
1360      workdir="${build.jsr166e.dir}"
1361      classes="${jsr166e.jar}"/>
1362  </target>
1363
1364  <target name="jsr166e-tck">
1365
1366 <!--     <antcall target="clean"/> -->
1367 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1368 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1369 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1370 <!--     </antcall> -->
1371
1372    <antcall target="clean"/>
1373    <antcall target="jsr166e-tck-one-java-version">
1374      <param name="build.jsr166e.java.version" value="7"/>
1375      <param name="build.jsr166e.javac" value="${javac7}"/>
1376    </antcall>
1377
1378    <antcall target="clean"/>
1379    <antcall target="jsr166e-tck-one-java-version">
1380      <param name="build.jsr166e.java.version" value="6"/>
1381      <param name="build.jsr166e.javac" value="${javac6}"/>
1382    </antcall>
1383  </target>
1384
1385  <target name="jsr166e-test" depends="jsr166e-tck"/>
1386
1387  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1388
1389  <target name="jsr166eclean">
1390    <delete dir="${build.jsr166e.dir}"/>
1391  </target>
1392
1393  <target name="jsr166edist-jar"
1394          depends="jsr166eclean, jsr166ejar">
1395    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1396  </target>
1397
1398  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1399    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1400  </target>
1401
1402
543   <!-- Find buglets that can be detected by static build tools -->
544  
545   <!--   <target name="lint"> -->
# Line 1423 | Line 563
563    https://github.com/google/error-prone/issues/1143
564   =================================================================== -->
565    <path id="errorprone.processorpath.path">
566 <    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
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
# Line 1451 | Line 593
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 1486 | 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 1506 | Line 650
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>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines