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.292 by jsr166, Thu Dec 13 01:12:01 2018 UTC vs.
Revision 1.320 by jsr166, Tue Sep 15 19:09:50 2020 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/jdk9
24  $HOME/jdk/jdk10
22    $HOME/jdk/jdk11
23    $HOME/jdk/jdk12
24 +  $HOME/jdk/jdk13
25 +  $HOME/jdk/jdk14
26 +  $HOME/jdk/jdk15
27 +  $HOME/jdk/jdk16
28    where each of the above is a JDK or a symlink to same, and
28  $HOME/jdk/src/jdk8
29  $HOME/jdk/src/jdk9
30  $HOME/jdk/src/jdk10
29    $HOME/jdk/src/jdk11
30    $HOME/jdk/src/jdk12
31 <  where each of the above is a complete JDK source tree
32 <  (e.g. mercurial forest) or a symlink to same.
31 >  $HOME/jdk/src/jdk13
32 >  $HOME/jdk/src/jdk14
33 >  $HOME/jdk/src/jdk15
34 >  $HOME/jdk/src/jdk16
35 >  where each of the above is a JDK source tree or a symlink to same.
36  
37    Alternatively, define ant variables thus:
38    ant -Djdk$N.home=... -Djdk$N.src.home=...
39 <  for $N in 8 9 10 ...
39 >  for $N in 11 .. 16 ...
40  
41    As of 2016-03, the sources in src/main are for jdk9+ only.
42 +  As of 2019-08, the sources in src/main are for jdk11+ only.
43 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
44   ------------------------------------------------------------------------------
45    </description>
46  
# Line 66 | Line 69
69    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
70    <property name="build.loops.dir"             location="${build.dir}/loops"/>
71  
69  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
70  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
71  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
72  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
73
74  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
75  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
76  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
77  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
78
79  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
80  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
81  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
82  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
83
84  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
85  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
86  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
87  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
88
72    <!-- JDK locations -->
73    <property name="jdks.home"  location="${user.home}/jdk"/>
74  
# Line 97 | Line 80
80      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
81      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
82      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
83 <    <local name="have.java.base"/>
101 <    <available property="have.java.base"
102 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
103 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
104 <      if:set="have.java.base"/>
105 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
106 <      unless:set="have.java.base"/>
107 <    <local name="modules"/>
108 <    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
109 <    <local name="boot.jar.dir"/>
110 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
111 <    <path id="bootclasspath@{v}" unless:set="modules">
112 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
113 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
114 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
115 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
116 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
117 <    </path>
118 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
83 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
84      </sequential>
85    </macrodef>
86  
# Line 131 | Line 96
96      </sequential>
97    </macrodef>
98  
134  <defjdklocations v="6"/>
135  <defjdklocations v="7"/>
136  <defjdklocations v="8"/>
137  <defjdklocations v="9"/>
138  <defjdklocations v="10"/>
99    <defjdklocations v="11"/>
100    <defjdklocations v="12"/>
101 +  <defjdklocations v="13"/>
102 +  <defjdklocations v="14"/>
103 +  <defjdklocations v="15"/>
104 +  <defjdklocations v="16"/>
105  
106    <!-- Source locations -->
107    <property name="src.dir"              location="${basedir}/src/main"/>
108    <property name="test.src.dir"         location="${basedir}/src/test"/>
109    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
110    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
147  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
148  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
149  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
150  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
111    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
112    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
113 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
113 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
114 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
115 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
116 >  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
117 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
118    <property name="lib.dir"              location="${basedir}/lib"/>
119    <property name="dist.dir"             location="${basedir}/dist"/>
120    <property name="topsrc.dir"           location="${basedir}/src"/>
157  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
158  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
159  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
160  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
161  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
162  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
121  
122    <!-- Javadoc locations -->
123    <property name="docs.dir"          location="${build.dir}/docs"/>
124 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
167 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
168 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
169 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
170 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
171 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
172 <
173 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
174 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
175 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
176 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
177 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
178 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
179 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
124 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
125  
126    <!-- Jar locations -->
127    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
183  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
184  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
185  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
186  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
187  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
188  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
128    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
129  
130    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
131    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
132 <  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
133 <  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
134 <  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
135 <  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
197 <  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
198 <  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
199 <  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
132 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
133 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
134 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
135 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
136    <!-- The location of jdk early access docs (RIP) -->
201  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
202  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
137    <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
138 <  <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
138 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
139 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
140 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
141 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
142 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
143 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
144 >  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
145 >  <property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
146    <!-- Default jdk doc location (latest stable LTS release seems best) -->
147    <property name="java.docroot.url"   value="${java11.docroot.url}"/>
148  
149    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
209  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
210  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
211  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
212  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
213  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
214  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
150    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
151    <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
152 +  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
153 +  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
154 +  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
155 +  <property name="java16.api.url"     value="${java15.docroot.url}/api/"/>
156    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
157  
158    <!-- Define the "jtreg" task -->
# Line 221 | Line 160
160    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
161             classpath="${lib.dir}/jtreg.jar" />
162  
163 <  <!-- Tck options; see JSR166TestCase.java
163 >  <!-- Tck configuration options; see JSR166TestCase.java
164     To profile a single tck test class:
165     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
166     To stress test a single tck test class:
# Line 244 | Line 183
183  
184      <sequential>
185  
247    <local name="modules"/>
248    <condition property="modules">
249      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
250    </condition>
251
252    <local name="use-doclint"/>
253    <condition property="use-doclint">
254      <not> <equals arg1="@{target}" arg2="7"/> </not>
255    </condition>
256
186      <mkdir dir="@{workdir}/tck-classes"/>
187  
188      <javac srcdir="@{tck.src.dir}"
# Line 273 | Line 202
202        <include name="*.java"/>
203        <compilerarg value="-XDignore.symbol.file=true"/>
204        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
205 <      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
206 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
278 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
205 >      <compilerarg value="-Xdoclint:reference/private"/>
206 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
207        <compilerarg line="${build.args}"/>
208        <javac-elements/>
209  
# Line 285 | Line 213
213            failonerror="true"
214            jvm="${java@{target}}"
215            fork="true">
216 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
217 <        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
218 <        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
219 <        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
220 <        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
221 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
222 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
223 <        <jvmarg line="@{jvmflags}"/>
224 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
225 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
226 <
227 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
228 <        <syspropertyset id="system-properties-used-by-tck">
229 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
230 <          <propertyref prefix="jsr166."/>
231 <          <propertyref name="test.timeout.factor"/>
232 <        </syspropertyset>
233 <
234 <        <classpath>
235 <          <pathelement location="${junit.jar}"/>
236 <          <pathelement location="@{workdir}/tck-classes"/>
309 <        </classpath>
216 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
217 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
218 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
219 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
220 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
221 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
222 >        <jvmarg line="@{jvmflags}"/>
223 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
224 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
225 >
226 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
227 >        <syspropertyset id="system-properties-used-by-tck">
228 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
229 >          <propertyref prefix="jsr166."/>
230 >          <propertyref name="test.timeout.factor"/>
231 >        </syspropertyset>
232 >
233 >        <classpath>
234 >          <pathelement location="${junit.jar}"/>
235 >          <pathelement location="@{workdir}/tck-classes"/>
236 >        </classpath>
237      </java>
238  
239      </sequential>
# Line 327 | Line 254
254      </sequential>
255    </macrodef>
256  
257 +  <defjtregtests v="16"/>
258 +  <defjtregtests v="15"/>
259 +  <defjtregtests v="14"/>
260 +  <defjtregtests v="13"/>
261    <defjtregtests v="12"/>
262    <defjtregtests v="11"/>
332  <defjtregtests v="10"/>
333  <defjtregtests v="9"/>
334  <defjtregtests v="8"/>
335  <defjtregtests v="7"/>
263  
264    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
265    <property name="jtreg.flags" value=""/>
# Line 351 | Line 278
278      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
279      <property name="jtreg.verbose" value="nopass,fail,error"/>
280  
354    <local name="modules"/>
355    <condition property="modules">
356      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
357    </condition>
358
281      <delete dir="@{workdir}/JTwork"   quiet="true"/>
282      <jtreg dir="${jtreg@{target}.src.dir}"
283             jdk="${jdk@{target}.home}"
284             workDir="@{workdir}/JTwork">
285        <patternset refid="jdk@{target}.jtreg.tests"/>
286 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
287 <      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
288 <      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
286 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
287 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
288 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
289        <arg value="-agentvm"/>
290        <arg value="-noreport"/>
291        <arg value="-verbose:@{verbose}"/>
# Line 383 | Line 305
305    </path>
306  
307    <!-- Support @jls tag, used in jdk8+ javadoc -->
308 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
309    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
310    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
311  
# Line 391 | Line 314
314    <!-- Default values: may seem strange ... -->
315    <!-- At runtime, target latest LTS, i.e. jdk11 -->
316    <!-- But at build time, target jdk9, for maximal binary portability -->
317 +  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
318    <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
319      o override-methods=summary
320      o {@systemProperty ...}
# Line 399 | Line 323
323      -->
324    <property name="java.runtime.target" value="11"/>
325    <property name="build.main.java" value="${java11}"/>
326 <  <property name="build.main.javac" value="${javac9}"/>
326 >  <property name="build.main.javac" value="${javac11}"/>
327    <property name="build.main.javadoc" value="${javadoc12}"/>
328    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
329  
330    <target name="dists"
331 <          depends="dist, 4jdk8dist"
331 >          depends="dist"
332            description="Builds all public jars and docs"/>
409          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
333  
334    <target name="compile"
335            depends="configure-compiler"
# Line 433 | Line 356
356        <compilerarg value="--patch-module=java.base=${src.dir}"/>
357        <compilerarg value="-Xprefer:source"/>
358        <compilerarg value="-XDignore.symbol.file=true"/>
359 + <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
360        <compilerarg value="-Xlint:all,-removal"/>
361        <compilerarg line="--doclint-format html5"/>
362 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
362 > <!--  Temporarily disable doclint for private elements, due to -->
363 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
364 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
365 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
366 >      <compilerarg value="-Xdoclint:all/protected"/>
367 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
368        <compilerarg value="-Werror"/>
369        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
370        <compilerarg line="${build.args}"/>
# Line 462 | Line 391
391    <target name="docs"
392            description="Builds javadocs for src/main to dist dir">
393  
394 <    <delete dir="${docs.dir}"/>
394 >    <delete dir="${docs.dir}" quiet="true"/>
395      <mkdir dir="${docs.dir}"/>
396  
397 +    <!-- old school frames via docs/index.html?overview-summary.html -->
398 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
399 +    <local name="use-frames"/>
400 +    <condition property="use-frames">
401 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
402 +    </condition>
403 +
404      <!-- the packagenames="none" hack below prevents scanning the -->
405      <!-- sourcepath for packages -->
406  
# Line 484 | Line 420
420               executable="${build.main.javadoc}">
421   <!-- TODO: JDK-8214571 failonerror = "true" -->
422        <fileset dir="${src.dir}" defaultexcludes="yes">
423 <        <include name="**/*.java"/>
423 >        <include name="java/**/*.java"/>
424        </fileset>
425        <arg line="-Xdocrootparent ${java.docroot.url}"/>
426        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
427 +      <arg value="-quiet"/>
428        <arg value="-XDignore.symbol.file=true"/>
429        <arg value="-html5"/>
430 +      <arg value="-Xdoclint:all,-missing"/>
431        <arg value="--patch-module=java.base=${src.dir}"/>
432 < <!-- old school frames via docs/index.html?overview-summary.html -->
495 <      <arg value="--frames"/>
432 >      <arg value="--frames" if:set="use-frames"/>
433        <arg value="--override-methods=summary"/>
434        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
435        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
# Line 534 | Line 471
471    </target>
472  
473    <target name="tck"
474 <          depends="jar"
474 >          depends="jar"
475            description="Runs tck tests for src/main directly">
476  
477      <run-tck-tests
# Line 569 | Line 506
506    </target>
507  
508    <target name="jtreg"
509 <          depends="jar"
509 >          depends="jar"
510            description="Runs jtreg tests for src/main using the jtreg ant task">
511      <run-jtreg-tests
512         target="${java.runtime.target}"
# Line 582 | Line 519
519            description="Runs tck and jtreg tests for src/main"/>
520  
521    <target name="test-version-permutations"
522 <          depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
523 <  </target>
522 >          depends="test11, test12, test13, test14, test15, test16,
523 >          test11-12, test11-13, test11-14, test11-15, test11-16,
524 >          clean, test, docs"
525 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
526  
527 <  <target name="test9">
589 <    <antcall target="clean"/>
527 >  <target name="test11">
528      <antcall>
529 <      <param name="java.runtime.target" value="9"/>
530 <      <param name="build.main.javac" value="${javac9}"/>
529 >      <param name="java.runtime.target" value="11"/>
530 >      <param name="build.main.javac" value="${javac11}"/>
531        <param name="build.main.javadoc" value="${javadoc12}"/>
532 <      <param name="build.main.javadoc.source" value="9"/>
532 >      <param name="build.main.javadoc.source" value="11"/>
533 >      <target name="clean"/>
534        <target name="test"/>
535        <target name="docs"/>
536      </antcall>
537    </target>
538  
539 <  <target name="test10">
601 <    <antcall target="clean"/>
539 >  <target name="test12">
540      <antcall>
541 <      <param name="java.runtime.target" value="10"/>
542 <      <param name="build.main.javac" value="${javac10}"/>
541 >      <param name="java.runtime.target" value="12"/>
542 >      <param name="build.main.javac" value="${javac12}"/>
543        <param name="build.main.javadoc" value="${javadoc12}"/>
544 <      <param name="build.main.javadoc.source" value="10"/>
544 >      <param name="build.main.javadoc.source" value="12"/>
545 >      <target name="clean"/>
546        <target name="test"/>
547        <target name="docs"/>
548      </antcall>
549    </target>
550  
551 <  <target name="test11">
613 <    <antcall target="clean"/>
551 >  <target name="test13">
552      <antcall>
553 <      <param name="java.runtime.target" value="11"/>
553 >      <param name="java.runtime.target" value="13"/>
554 >      <param name="build.main.javac" value="${javac13}"/>
555 >      <param name="build.main.javadoc" value="${javadoc13}"/>
556 >      <param name="build.main.javadoc.source" value="13"/>
557 >      <target name="clean"/>
558 >      <target name="test"/>
559 >      <target name="docs"/>
560 >    </antcall>
561 >  </target>
562 >
563 >  <target name="test14">
564 >    <antcall>
565 >      <param name="java.runtime.target" value="14"/>
566 >      <param name="build.main.javac" value="${javac14}"/>
567 >      <param name="build.main.javadoc" value="${javadoc14}"/>
568 >      <param name="build.main.javadoc.source" value="14"/>
569 >      <target name="clean"/>
570 >      <target name="test"/>
571 >      <target name="docs"/>
572 >    </antcall>
573 >  </target>
574 >
575 >  <target name="test15">
576 >    <antcall>
577 >      <param name="java.runtime.target" value="15"/>
578 >      <param name="build.main.javac" value="${javac15}"/>
579 >      <param name="build.main.javadoc" value="${javadoc15}"/>
580 >      <param name="build.main.javadoc.source" value="15"/>
581 >      <target name="clean"/>
582 >      <target name="test"/>
583 >      <target name="docs"/>
584 >    </antcall>
585 >  </target>
586 >
587 >  <target name="test16">
588 >    <antcall>
589 >      <param name="java.runtime.target" value="16"/>
590 >      <param name="build.main.javac" value="${javac16}"/>
591 >      <param name="build.main.javadoc" value="${javadoc16}"/>
592 >      <param name="build.main.javadoc.source" value="16"/>
593 >      <target name="clean"/>
594 >      <target name="test"/>
595 >      <target name="docs"/>
596 >    </antcall>
597 >  </target>
598 >
599 >  <target name="test11-12">
600 >    <antcall>
601 >      <param name="java.runtime.target" value="12"/>
602        <param name="build.main.javac" value="${javac11}"/>
603        <param name="build.main.javadoc" value="${javadoc12}"/>
604        <param name="build.main.javadoc.source" value="11"/>
605 +      <target name="clean"/>
606        <target name="test"/>
607        <target name="docs"/>
608      </antcall>
609    </target>
610  
611 <  <target name="test12">
625 <    <antcall target="clean"/>
611 >  <target name="test11-13">
612      <antcall>
613 <      <param name="java.runtime.target" value="12"/>
614 <      <param name="build.main.javac" value="${javac12}"/>
615 <      <param name="build.main.javadoc" value="${javadoc12}"/>
616 <      <param name="build.main.javadoc.source" value="12"/>
613 >      <param name="java.runtime.target" value="13"/>
614 >      <param name="build.main.javac" value="${javac11}"/>
615 >      <param name="build.main.javadoc" value="${javadoc13}"/>
616 >      <param name="build.main.javadoc.source" value="11"/>
617 >      <target name="clean"/>
618        <target name="test"/>
619        <target name="docs"/>
620      </antcall>
621    </target>
622  
623 <  <target name="test9-11">
637 <    <antcall target="clean"/>
623 >  <target name="test11-14">
624      <antcall>
625 <      <param name="java.runtime.target" value="11"/>
626 <      <param name="build.main.javac" value="${javac9}"/>
627 <      <param name="build.main.javadoc" value="${javadoc12}"/>
628 <      <param name="build.main.javadoc.source" value="9"/>
625 >      <param name="java.runtime.target" value="14"/>
626 >      <param name="build.main.javac" value="${javac11}"/>
627 >      <param name="build.main.javadoc" value="${javadoc14}"/>
628 >      <param name="build.main.javadoc.source" value="11"/>
629 >      <target name="clean"/>
630        <target name="test"/>
631        <target name="docs"/>
632      </antcall>
633    </target>
634  
635 <  <target name="test9-12">
649 <    <antcall target="clean"/>
635 >  <target name="test11-15">
636      <antcall>
637 <      <param name="java.runtime.target" value="12"/>
638 <      <param name="build.main.javac" value="${javac9}"/>
639 <      <param name="build.main.javadoc" value="${javadoc12}"/>
640 <      <param name="build.main.javadoc.source" value="9"/>
637 >      <param name="java.runtime.target" value="15"/>
638 >      <param name="build.main.javac" value="${javac11}"/>
639 >      <param name="build.main.javadoc" value="${javadoc15}"/>
640 >      <param name="build.main.javadoc.source" value="11"/>
641 >      <target name="clean"/>
642        <target name="test"/>
643        <target name="docs"/>
644      </antcall>
645    </target>
646  
647 +  <target name="test11-16">
648 +    <antcall>
649 +      <param name="java.runtime.target" value="16"/>
650 +      <param name="build.main.javac" value="${javac11}"/>
651 +      <param name="build.main.javadoc" value="${javadoc16}"/>
652 +      <param name="build.main.javadoc.source" value="11"/>
653 +      <target name="clean"/>
654 +      <target name="test"/>
655 +      <target name="docs"/>
656 +    </antcall>
657 +  </target>
658 +
659 +  <target name="docs16">
660 +    <antcall>
661 +      <param name="java.runtime.target" value="16"/>
662 +      <param name="build.main.javac" value="${javac16}"/>
663 +      <param name="build.main.javadoc" value="${javadoc16}"/>
664 +      <param name="build.main.javadoc.source" value="16"/>
665 +      <target name="clean"/>
666 +      <target name="docs"/>
667 +    </antcall>
668 +  </target>
669 +
670  
671    <target name="configure-compiler">
672      <fail message="ant version too old">
# Line 696 | Line 706
706  
707        <include name="*.java"/>
708        <compilerarg value="-XDignore.symbol.file=true"/>
709 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
710 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
701 <      <compilerarg line="${build.args}"/>
702 <    </javac>
703 <  </target>
704 <
705 <
706 <  <!-- jsr166 4jdk8 -->
707 <
708 <  <target name="4jdk8compile"
709 <          depends="configure-compiler"
710 <          description="Compiles src/jdk8 sources, targeting jdk8">
711 <
712 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
713 <
714 <    <javac srcdir="${4jdk8src.dir}"
715 <           destdir="${build.4jdk8.classes.dir}"
716 <           debug="${build.debug}"
717 <           debuglevel="${build.debuglevel}"
718 <           deprecation="${build.deprecation}"
719 <           source="8"
720 <           target="8"
721 <           classpath=""
722 <           bootclasspath="${bootclasspath8}"
723 <           includeAntRuntime="false"
724 <           includeJavaRuntime="false"
725 <           encoding="ASCII"
726 <           executable="${javac8}"
727 <           fork="true">
728 <      <include name="**/*.java"/>
729 <      <compilerarg value="-Xprefer:source"/>
730 <      <compilerarg value="-XDignore.symbol.file=true"/>
731 <      <compilerarg value="-Xlint:all"/>
732 <      <compilerarg value="-Werror"/>
733 <      <compilerarg line="${build.args}"/>
734 <    </javac>
735 <  </target>
736 <
737 <  <target name="4jdk8doclint"
738 <          depends="configure-compiler"
739 <          description="Finds doclint warnings">
740 <
741 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
742 <
743 <    <javac srcdir="${4jdk8src.dir}"
744 <           destdir="${build.4jdk8.classes.dir}"
745 <           debug="${build.debug}"
746 <           debuglevel="${build.debuglevel}"
747 <           deprecation="${build.deprecation}"
748 <           source="8"
749 <           target="8"
750 <           classpath=""
751 <           bootclasspath="${bootclasspath8}"
752 <           includeAntRuntime="false"
753 <           includeJavaRuntime="false"
754 <           encoding="ASCII"
755 <           executable="${javac8}"
756 <           fork="true">
757 <      <include name="**/*.java"/>
758 <      <compilerarg value="-Xprefer:source"/>
759 <      <compilerarg value="-XDignore.symbol.file=true"/>
760 <      <compilerarg value="-Xlint:all"/>
761 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
709 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
710 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
711        <compilerarg line="${build.args}"/>
712      </javac>
713    </target>
714  
715  
716 <  <target name="4jdk8jar"
717 <          depends="4jdk8compile"
769 <          description="Builds library jar from compiled sources">
770 <
771 <    <jar destfile="${4jdk8product.jar}">
772 <      <fileset dir="${build.4jdk8.classes.dir}"/>
773 <      <manifest>
774 <        <attribute name="Built-By" value="${user.name}"/>
775 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
776 <      </manifest>
777 <    </jar>
778 <  </target>
779 <
780 <
781 <  <target name="4jdk8-tck"
782 <          depends="4jdk8jar"
783 <          description="Runs tck tests for jsr166-4jdk8 directly">
784 <
785 <    <run-tck-tests
786 <      target="8"
787 <      workdir="${build.4jdk8.dir}"
788 <      classes="${4jdk8product.jar}">
789 <      <javac-elements>
790 <        <!-- JDK9+ test classes -->
791 <        <exclude name="*9Test.java"/>
792 <        <exclude name="*10Test.java"/>
793 <        <compilerarg value="-Werror"/>
794 <      </javac-elements>
795 <    </run-tck-tests>
796 <  </target>
797 <
798 <
799 <  <target name="4jdk8-jtreg"
800 <          depends="4jdk8jar"
801 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
802 <    <run-jtreg-tests
803 <       target="8"
804 <       workdir="${build.4jdk8.dir}"
805 <       classes="${4jdk8product.jar}"/>
806 <  </target>
807 <
808 <
809 <  <target name="4jdk8-test"
810 <          depends="4jdk8-tck, 4jdk8-jtreg"
811 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
812 <
813 <
814 <  <target name="4jdk8docs"
815 <          description="Builds javadocs for src/jdk8 to dist dir">
816 <
817 <    <delete dir="${4jdk8docs.dir}"/>
818 <    <mkdir dir="${4jdk8docs.dir}"/>
819 <
820 <    <javadoc destdir="${4jdk8docs.dir}"
821 <             packagenames="none"
822 <             link="${java8.api.url}"
823 <             overview="${4jdk8src.dir}/intro.html"
824 <             access="${build.javadoc.access}"
825 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
826 <             classpath=""
827 <             source="8"
828 <             executable="${javadoc8}"
829 <             failonerror = "true">
830 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
831 <        <include name="**/*.java"/>
832 <      </fileset>
833 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
834 <      <arg value="-XDignore.symbol.file=true"/>
835 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
836 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
837 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
838 < <!-- @apiNote tag currently unused -->
839 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
840 <    </javadoc>
841 <  </target>
842 <
843 <
844 <  <target name="4jdk8dist"
845 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
846 <          description="Puts all distributable products in single hierarchy"/>
847 <
848 <
849 <  <target name="4jdk8clean"
850 <          description="Removes all 4jdk8 build products">
851 <    <delete dir="${build.4jdk8.dir}"/>
852 <  </target>
853 <
854 <
855 <  <target name="4jdk8dist-jar"
856 <          depends="4jdk8clean, 4jdk8jar">
857 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
858 <  </target>
859 <
860 <
861 <  <target name="4jdk8dist-docs"
862 <          depends="4jdk8clean, 4jdk8docs">
863 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
864 <  </target>
865 <
866 <
716 >  <!-- old branches no longer maintained.  build support deleted -->
717 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
718    <!-- jsr166 4jdk7 (no longer maintained) -->
868
869  <target name="4jdk7compile" depends="configure-compiler">
870    <mkdir dir="${build.4jdk7.classes.dir}"/>
871
872    <javac srcdir="${4jdk7src.dir}"
873           destdir="${build.4jdk7.classes.dir}"
874           debug="${build.debug}"
875           debuglevel="${build.debuglevel}"
876           deprecation="${build.deprecation}"
877           source="6"
878           target="6"
879           classpath=""
880           bootclasspath="${bootclasspath6}"
881           includeAntRuntime="false"
882           includeJavaRuntime="false"
883           encoding="ASCII"
884           executable="${javac7}"
885           fork="true">
886
887      <include name="**/*.java"/>
888      <compilerarg value="-Xprefer:source"/>
889      <compilerarg value="-XDignore.symbol.file=true"/>
890      <compilerarg value="-Xlint:all"/>
891      <compilerarg value="-Werror"/>
892      <compilerarg line="${build.args}"/>
893    </javac>
894  </target>
895
896  <target name="4jdk7doclint" depends="configure-compiler">
897    <mkdir dir="${build.4jdk7.classes.dir}"/>
898
899    <javac srcdir="${4jdk7src.dir}"
900           destdir="${build.4jdk7.classes.dir}"
901           debug="${build.debug}"
902           debuglevel="${build.debuglevel}"
903           deprecation="${build.deprecation}"
904           source="6"
905           target="6"
906           classpath=""
907           bootclasspath="${bootclasspath6}"
908           includeAntRuntime="false"
909           includeJavaRuntime="false"
910           encoding="ASCII"
911           executable="${javac8}"
912           fork="true">
913
914      <include name="**/*.java"/>
915      <compilerarg value="-Xprefer:source"/>
916      <compilerarg value="-XDignore.symbol.file=true"/>
917      <compilerarg value="-Xlint:all"/>
918      <compilerarg value="-Xdoclint:all/protected"/>
919      <compilerarg line="${build.args}"/>
920    </javac>
921  </target>
922
923  <target name="4jdk7jar" depends="4jdk7compile">
924    <jar destfile="${4jdk7product.jar}">
925      <fileset dir="${build.4jdk7.classes.dir}"/>
926      <manifest>
927        <attribute name="Built-By" value="${user.name}"/>
928        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
929      </manifest>
930    </jar>
931  </target>
932
933  <target name="4jdk7-tck" depends="4jdk7jar">
934    <run-tck-tests
935      target="7"
936      workdir="${build.4jdk7.dir}"
937      classes="${4jdk7product.jar}">
938      <javac-elements>
939        <!-- JDK8+ test classes -->
940        <exclude name="*8Test.java"/>
941        <exclude name="*9Test.java"/>
942        <exclude name="*10Test.java"/>
943        <exclude name="DoubleAccumulatorTest.java"/>
944        <exclude name="DoubleAdderTest.java"/>
945        <exclude name="LongAccumulatorTest.java"/>
946        <exclude name="LongAdderTest.java"/>
947        <exclude name="CompletableFutureTest.java"/>
948        <exclude name="SplittableRandomTest.java"/>
949        <exclude name="StampedLockTest.java"/>
950        <exclude name="SubmissionPublisherTest.java"/>
951        <compilerarg value="-Werror"/>
952      </javac-elements>
953    </run-tck-tests>
954  </target>
955
956  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
957  <target name="4jdk7-tck-junit" depends="4jdk7compile">
958
959    <junit printsummary="true"
960           showoutput="true"
961           errorProperty="junit.failed"
962           failureProperty="junit.failed"
963           includeantruntime="true"
964           jvm="${java7}"
965           fork="true">
966
967      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
968      <jvmarg value="-server"/>
969
970      <classpath>
971        <pathelement location="${junit.jar}"/>
972        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
973      </classpath>
974
975      <formatter type="brief"/>
976
977      <test name="${jsr166.tckTestClass}" haltonfailure="no">
978      </test>
979    </junit>
980  </target>
981
982  <target name="4jdk7-jtreg" depends="4jdk7jar">
983    <run-jtreg-tests
984       target="7"
985       workdir="${build.4jdk7.dir}"
986       classes="${4jdk7product.jar}"/>
987  </target>
988
989  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
990
991  <target name="4jdk7docs">
992    <delete dir="${4jdk7docs.dir}"/>
993    <mkdir dir="${4jdk7docs.dir}"/>
994
995    <javadoc destdir="${4jdk7docs.dir}"
996             packagenames="none"
997             link="${java7.api.url}"
998             overview="${4jdk7src.dir}/intro.html"
999             access="${build.javadoc.access}"
1000             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1001             classpath=""
1002             executable="${javadoc7}"
1003             failonerror = "true">
1004      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1005        <include name="**/*.java"/>
1006      </fileset>
1007      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1008      <arg value="-XDignore.symbol.file=true"/>
1009    </javadoc>
1010  </target>
1011
1012  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1013
1014  <target name="4jdk7clean">
1015    <delete dir="${build.4jdk7.dir}"/>
1016  </target>
1017
1018  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1019    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1020  </target>
1021
1022  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1023    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1024  </target>
1025
1026
719    <!-- jsr166x (no longer maintained) -->
1028
1029  <target name="jsr166xcompile" depends="configure-compiler">
1030    <mkdir dir="${build.jsr166x.classes.dir}"/>
1031
1032    <javac srcdir="${topsrc.dir}"
1033           destdir="${build.jsr166x.classes.dir}"
1034           debug="${build.debug}"
1035           debuglevel="${build.debuglevel}"
1036           deprecation="${build.deprecation}"
1037           classpath=""
1038           bootclasspath="${bootclasspath6}"
1039           source="5"
1040           target="5"
1041           includeAntRuntime="false"
1042           includeJavaRuntime="false"
1043           encoding="ASCII"
1044           executable="${javac7}"
1045           fork="true">
1046      <include name="jsr166x/**/*.java"/>
1047      <compilerarg value="-XDignore.symbol.file=true"/>
1048      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1049      <compilerarg value="-Werror"/>
1050      <compilerarg line="${build.args}"/>
1051    </javac>
1052  </target>
1053
1054  <target name="jsr166xjar" depends="jsr166xcompile">
1055    <jar destfile="${jsr166x.jar}">
1056      <fileset dir="${build.jsr166x.classes.dir}"/>
1057      <manifest>
1058        <attribute name="Built-By" value="${user.name}"/>
1059        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1060      </manifest>
1061    </jar>
1062  </target>
1063
1064  <target name="jsr166xdocs">
1065    <delete dir="${jsr166xdocs.dir}"/>
1066    <mkdir dir="${jsr166xdocs.dir}"/>
1067
1068    <javadoc destdir="${jsr166xdocs.dir}"
1069             packagenames="jsr166x.*"
1070             link="${java.api.url}"
1071             access="${build.javadoc.access}"
1072             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1073             bootclasspath="${bootclasspath6}"
1074             source="5"
1075             executable="${javadoc7}"
1076             failonerror = "true">
1077      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1078      <arg value="-XDignore.symbol.file=true"/>
1079    </javadoc>
1080  </target>
1081
1082  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1083
1084  <target name="jsr166xclean">
1085    <delete dir="${build.jsr166x.dir}"/>
1086  </target>
1087
1088  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1089    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1090  </target>
1091
1092  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1093    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1094  </target>
1095
1096
720    <!-- jsr166y (no longer maintained) -->
1098
1099  <target name="jsr166ycompile" depends="configure-compiler">
1100    <mkdir dir="${build.jsr166y.classes.dir}"/>
1101
1102    <javac srcdir="${topsrc.dir}"
1103           destdir="${build.jsr166y.classes.dir}"
1104           debug="${build.debug}"
1105           debuglevel="${build.debuglevel}"
1106           deprecation="${build.deprecation}"
1107           source="6"
1108           target="6"
1109           classpath=""
1110           bootclasspath="${bootclasspath6}"
1111           includeAntRuntime="false"
1112           includeJavaRuntime="false"
1113           encoding="ASCII"
1114           executable="${javac7}"
1115           fork="true">
1116
1117      <include name="jsr166y/**/*.java"/>
1118      <compilerarg value="-XDignore.symbol.file=true"/>
1119      <compilerarg value="-Xlint:all"/>
1120      <compilerarg value="-Werror"/>
1121      <compilerarg line="${build.args}"/>
1122    </javac>
1123  </target>
1124
1125  <target name="jsr166yjar" depends="jsr166ycompile">
1126    <jar destfile="${jsr166y.jar}" index="true">
1127      <fileset dir="${build.jsr166y.classes.dir}"/>
1128      <manifest>
1129        <attribute name="Built-By" value="${user.name}"/>
1130        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1131      </manifest>
1132    </jar>
1133  </target>
1134
1135  <target name="jsr166ydocs">
1136    <delete dir="${jsr166ydocs.dir}"/>
1137    <mkdir dir="${jsr166ydocs.dir}"/>
1138
1139    <javadoc destdir="${jsr166ydocs.dir}"
1140             packagenames="jsr166y.*"
1141             link="${java.api.url}"
1142             access="${build.javadoc.access}"
1143             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1144             bootclasspath="${bootclasspath6}"
1145             source="6"
1146             executable="${javadoc7}"
1147             failonerror = "true">
1148      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1149      <arg value="-XDignore.symbol.file=true"/>
1150    </javadoc>
1151  </target>
1152
1153  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1154
1155  <target name="jsr166yclean">
1156    <delete dir="${build.jsr166y.dir}"/>
1157  </target>
1158
1159  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1160    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1161  </target>
1162
1163  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1164    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1165  </target>
1166
1167
721    <!-- extra166y (no longer maintained) -->
1169
1170  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1171    <mkdir dir="${build.extra166y.classes.dir}"/>
1172
1173    <javac srcdir="${topsrc.dir}"
1174           destdir="${build.extra166y.classes.dir}"
1175           debug="${build.debug}"
1176           debuglevel="${build.debuglevel}"
1177           deprecation="${build.deprecation}"
1178           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1179           classpath=""
1180           source="6"
1181           target="6"
1182           includeAntRuntime="false"
1183           includeJavaRuntime="false"
1184           encoding="ASCII"
1185           executable="${javac7}"
1186           fork="true">
1187
1188      <include name="extra166y/**/*.java"/>
1189      <compilerarg value="-XDignore.symbol.file=true"/>
1190      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1191      <compilerarg value="-Werror"/>
1192      <compilerarg line="${build.args}"/>
1193    </javac>
1194  </target>
1195
1196  <target name="extra166yjar" depends="extra166ycompile">
1197    <jar destfile="${extra166y.jar}" index="true">
1198      <fileset dir="${build.extra166y.classes.dir}"/>
1199      <manifest>
1200        <attribute name="Built-By" value="${user.name}"/>
1201        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1202      </manifest>
1203    </jar>
1204  </target>
1205
1206  <target name="extra166ydocs">
1207    <delete dir="${extra166ydocs.dir}"/>
1208    <mkdir dir="${extra166ydocs.dir}"/>
1209
1210    <javadoc destdir="${extra166ydocs.dir}"
1211             packagenames="extra166y.*"
1212             link="${java.api.url}"
1213             access="${build.javadoc.access}"
1214             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1215             bootclasspath="${bootclasspath6}"
1216             source="6"
1217             executable="${javadoc7}">
1218      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1219      <arg value="-XDignore.symbol.file=true"/>
1220    </javadoc>
1221  </target>
1222
1223  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1224
1225  <target name="extra166yclean">
1226    <delete dir="${build.extra166y.dir}"/>
1227  </target>
1228
1229  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1230    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1231  </target>
1232
1233  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1234    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1235  </target>
1236
1237
722    <!-- jsr166e (no longer maintained) -->
723  
1240  <property name="build.jsr166e.java.version" value="6"/>
1241  <property name="build.jsr166e.javac" value="${javac6}"/>
1242
1243  <target name="jsr166ecompile" depends="configure-compiler">
1244    <mkdir dir="${build.jsr166e.classes.dir}"/>
1245
1246    <javac srcdir="${topsrc.dir}"
1247           destdir="${build.jsr166e.classes.dir}"
1248           debug="${build.debug}"
1249           debuglevel="${build.debuglevel}"
1250           deprecation="${build.deprecation}"
1251           source="${build.jsr166e.java.version}"
1252           target="${build.jsr166e.java.version}"
1253           classpath=""
1254           includeAntRuntime="false"
1255           includeJavaRuntime="false"
1256           executable="${build.jsr166e.javac}"
1257           fork="true">
1258
1259      <include name="jsr166e/**/*.java"/>
1260      <compilerarg value="-XDignore.symbol.file=true"/>
1261      <compilerarg value="-Xlint:all"/>
1262      <compilerarg value="-Werror"/>
1263      <compilerarg line="${build.args}"/>
1264    </javac>
1265  </target>
1266
1267  <target name="jsr166edoclint">
1268    <mkdir dir="${build.jsr166e.classes.dir}"/>
1269
1270    <javac srcdir="${topsrc.dir}"
1271           destdir="${build.jsr166e.classes.dir}"
1272           debug="${build.debug}"
1273           debuglevel="${build.debuglevel}"
1274           deprecation="${build.deprecation}"
1275           source="${build.jsr166e.java.version}"
1276           target="${build.jsr166e.java.version}"
1277           classpath=""
1278           bootclasspath="${bootclasspath6}"
1279           includeAntRuntime="false"
1280           includeJavaRuntime="false"
1281           executable="${javac8}"
1282           fork="true">
1283
1284      <include name="jsr166e/**/*.java"/>
1285      <compilerarg value="-XDignore.symbol.file=true"/>
1286      <compilerarg value="-Xlint:all"/>
1287      <compilerarg value="-Werror"/>
1288      <compilerarg value="-Xdoclint:all/protected"/>
1289    </javac>
1290  </target>
1291
1292  <target name="jsr166ejar" depends="jsr166ecompile">
1293    <jar destfile="${jsr166e.jar}" index="true">
1294      <fileset dir="${build.jsr166e.classes.dir}"/>
1295      <manifest>
1296        <attribute name="Built-By" value="${user.name}"/>
1297        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1298      </manifest>
1299    </jar>
1300  </target>
1301
1302  <target name="jsr166edocs">
1303    <delete dir="${jsr166edocs.dir}"/>
1304    <mkdir dir="${jsr166edocs.dir}"/>
1305
1306    <javadoc destdir="${jsr166edocs.dir}"
1307             packagenames="jsr166e.*"
1308             link="${java.api.url}"
1309             access="${build.javadoc.access}"
1310             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1311             source="${build.jsr166e.java.version}"
1312             executable="${javadoc7}"
1313             failonerror = "true">
1314      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1315      <arg value="-XDignore.symbol.file=true"/>
1316    </javadoc>
1317  </target>
1318
1319  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1320    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1321    <run-tck-tests
1322      tck.src.dir="${test.src.dir}/tck-jsr166e"
1323      target="${build.jsr166e.java.version}"
1324      workdir="${build.jsr166e.dir}"
1325      classes="${jsr166e.jar}"/>
1326  </target>
1327
1328  <target name="jsr166e-tck">
1329
1330 <!--     <antcall target="clean"/> -->
1331 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1332 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1333 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1334 <!--     </antcall> -->
1335
1336    <antcall target="clean"/>
1337    <antcall target="jsr166e-tck-one-java-version">
1338      <param name="build.jsr166e.java.version" value="7"/>
1339      <param name="build.jsr166e.javac" value="${javac7}"/>
1340    </antcall>
1341
1342    <antcall target="clean"/>
1343    <antcall target="jsr166e-tck-one-java-version">
1344      <param name="build.jsr166e.java.version" value="6"/>
1345      <param name="build.jsr166e.javac" value="${javac6}"/>
1346    </antcall>
1347  </target>
1348
1349  <target name="jsr166e-test" depends="jsr166e-tck"/>
1350
1351  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1352
1353  <target name="jsr166eclean">
1354    <delete dir="${build.jsr166e.dir}"/>
1355  </target>
1356
1357  <target name="jsr166edist-jar"
1358          depends="jsr166eclean, jsr166ejar">
1359    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1360  </target>
1361
1362  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1363    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1364  </target>
1365
1366
724   <!-- Find buglets that can be detected by static build tools -->
725  
726   <!--   <target name="lint"> -->
# Line 1387 | Line 744
744    https://github.com/google/error-prone/issues/1143
745   =================================================================== -->
746    <path id="errorprone.processorpath.path">
747 <    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
747 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
748      <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
749      <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
750      <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
751 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
752    </path>
753    <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
754    <property name="errorprone.jsr166.user.flags" value=""/>
755    <property name="errorprone.jsr166.flags"
756              value="-Xep:HashtableContains:OFF
757 +                   -Xep:PreferJavaTimeOverload:OFF
758                     -Xep:JdkObsolete:OFF
759                     -Xep:MissingOverride:OFF
760                     -Xep:MissingFail:OFF
# Line 1415 | Line 774
774    <property name="errorprone.jsr166.test.flags"
775              value="-Xep:StringSplitter:OFF
776                     -Xep:BoxedPrimitiveConstructor:OFF
777 +                   -Xep:UnnecessaryParentheses:OFF
778                     -Xep:ModifyingCollectionWithItself:OFF"/>
779    <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
780    <target name="errorprone"

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines