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.293 by jsr166, Thu Dec 13 01:15:07 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
29  $HOME/jdk/src/jdk8
30  $HOME/jdk/src/jdk9
31  $HOME/jdk/src/jdk10
29    $HOME/jdk/src/jdk11
30    $HOME/jdk/src/jdk12
31    $HOME/jdk/src/jdk13
32 <  where each of the above is a complete JDK source tree
33 <  (e.g. mercurial forest) or a symlink to same.
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 .. 13 ...
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 68 | Line 69
69    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
70    <property name="build.loops.dir"             location="${build.dir}/loops"/>
71  
71  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
72  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
73  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
74  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
75
76  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
77  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
78  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
79  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
80
81  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
82  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
83  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
84  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
85
86  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
87  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
88  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
89  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
90
72    <!-- JDK locations -->
73    <property name="jdks.home"  location="${user.home}/jdk"/>
74  
# Line 99 | 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"/>
103 <    <available property="have.java.base"
104 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
105 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
106 <      if:set="have.java.base"/>
107 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
108 <      unless:set="have.java.base"/>
109 <    <local name="modules"/>
110 <    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
111 <    <local name="boot.jar.dir"/>
112 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
113 <    <path id="bootclasspath@{v}" unless:set="modules">
114 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
115 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
116 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
117 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
118 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
119 <    </path>
120 <    <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 133 | Line 96
96      </sequential>
97    </macrodef>
98  
136  <defjdklocations v="6"/>
137  <defjdklocations v="7"/>
138  <defjdklocations v="8"/>
139  <defjdklocations v="9"/>
140  <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"/>
149  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
150  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
151  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
152  <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"/>
159  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
160  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
161  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
162  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
163  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
164  <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"/>
169 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
170 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
171 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
172 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
173 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
174 <
175 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
176 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
177 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
178 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
179 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
180 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
181 <  <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"/>
185  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
186  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
187  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
188  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
189  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
190  <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"/>
199 <  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
200 <  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
201 <  <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) -->
203  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
204  <!-- <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 -->
211  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
212  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
213  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
214  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
215  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
216  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
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 223 | 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 246 | Line 183
183  
184      <sequential>
185  
249    <local name="modules"/>
250    <condition property="modules">
251      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
252    </condition>
253
254    <local name="use-doclint"/>
255    <condition property="use-doclint">
256      <not> <equals arg1="@{target}" arg2="7"/> </not>
257    </condition>
258
186      <mkdir dir="@{workdir}/tck-classes"/>
187  
188      <javac srcdir="@{tck.src.dir}"
# Line 275 | 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"/>
280 <      <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 287 | 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"/>
311 <        </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 329 | 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"/>
334  <defjtregtests v="10"/>
335  <defjtregtests v="9"/>
336  <defjtregtests v="8"/>
337  <defjtregtests v="7"/>
263  
264    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
265    <property name="jtreg.flags" value=""/>
# Line 353 | Line 278
278      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
279      <property name="jtreg.verbose" value="nopass,fail,error"/>
280  
356    <local name="modules"/>
357    <condition property="modules">
358      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
359    </condition>
360
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 385 | 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 393 | 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 401 | 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"/>
411          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
333  
334    <target name="compile"
335            depends="configure-compiler"
# Line 435 | 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 464 | 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 486 | 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 -->
497 <      <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 536 | 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 571 | 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 584 | 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">
591 <    <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">
603 <    <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">
615 <    <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">
627 <    <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">
639 <    <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">
651 <    <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 698 | 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}"/>
703 <      <compilerarg line="${build.args}"/>
704 <    </javac>
705 <  </target>
706 <
707 <
708 <  <!-- jsr166 4jdk8 -->
709 <
710 <  <target name="4jdk8compile"
711 <          depends="configure-compiler"
712 <          description="Compiles src/jdk8 sources, targeting jdk8">
713 <
714 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
715 <
716 <    <javac srcdir="${4jdk8src.dir}"
717 <           destdir="${build.4jdk8.classes.dir}"
718 <           debug="${build.debug}"
719 <           debuglevel="${build.debuglevel}"
720 <           deprecation="${build.deprecation}"
721 <           source="8"
722 <           target="8"
723 <           classpath=""
724 <           bootclasspath="${bootclasspath8}"
725 <           includeAntRuntime="false"
726 <           includeJavaRuntime="false"
727 <           encoding="ASCII"
728 <           executable="${javac8}"
729 <           fork="true">
730 <      <include name="**/*.java"/>
731 <      <compilerarg value="-Xprefer:source"/>
732 <      <compilerarg value="-XDignore.symbol.file=true"/>
733 <      <compilerarg value="-Xlint:all"/>
734 <      <compilerarg value="-Werror"/>
735 <      <compilerarg line="${build.args}"/>
736 <    </javac>
737 <  </target>
738 <
739 <  <target name="4jdk8doclint"
740 <          depends="configure-compiler"
741 <          description="Finds doclint warnings">
742 <
743 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
744 <
745 <    <javac srcdir="${4jdk8src.dir}"
746 <           destdir="${build.4jdk8.classes.dir}"
747 <           debug="${build.debug}"
748 <           debuglevel="${build.debuglevel}"
749 <           deprecation="${build.deprecation}"
750 <           source="8"
751 <           target="8"
752 <           classpath=""
753 <           bootclasspath="${bootclasspath8}"
754 <           includeAntRuntime="false"
755 <           includeJavaRuntime="false"
756 <           encoding="ASCII"
757 <           executable="${javac8}"
758 <           fork="true">
759 <      <include name="**/*.java"/>
760 <      <compilerarg value="-Xprefer:source"/>
761 <      <compilerarg value="-XDignore.symbol.file=true"/>
762 <      <compilerarg value="-Xlint:all"/>
763 <      <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"
771 <          description="Builds library jar from compiled sources">
772 <
773 <    <jar destfile="${4jdk8product.jar}">
774 <      <fileset dir="${build.4jdk8.classes.dir}"/>
775 <      <manifest>
776 <        <attribute name="Built-By" value="${user.name}"/>
777 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
778 <      </manifest>
779 <    </jar>
780 <  </target>
781 <
782 <
783 <  <target name="4jdk8-tck"
784 <          depends="4jdk8jar"
785 <          description="Runs tck tests for jsr166-4jdk8 directly">
786 <
787 <    <run-tck-tests
788 <      target="8"
789 <      workdir="${build.4jdk8.dir}"
790 <      classes="${4jdk8product.jar}">
791 <      <javac-elements>
792 <        <!-- JDK9+ test classes -->
793 <        <exclude name="*9Test.java"/>
794 <        <exclude name="*10Test.java"/>
795 <        <compilerarg value="-Werror"/>
796 <      </javac-elements>
797 <    </run-tck-tests>
798 <  </target>
799 <
800 <
801 <  <target name="4jdk8-jtreg"
802 <          depends="4jdk8jar"
803 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
804 <    <run-jtreg-tests
805 <       target="8"
806 <       workdir="${build.4jdk8.dir}"
807 <       classes="${4jdk8product.jar}"/>
808 <  </target>
809 <
810 <
811 <  <target name="4jdk8-test"
812 <          depends="4jdk8-tck, 4jdk8-jtreg"
813 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
814 <
815 <
816 <  <target name="4jdk8docs"
817 <          description="Builds javadocs for src/jdk8 to dist dir">
818 <
819 <    <delete dir="${4jdk8docs.dir}"/>
820 <    <mkdir dir="${4jdk8docs.dir}"/>
821 <
822 <    <javadoc destdir="${4jdk8docs.dir}"
823 <             packagenames="none"
824 <             link="${java8.api.url}"
825 <             overview="${4jdk8src.dir}/intro.html"
826 <             access="${build.javadoc.access}"
827 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
828 <             classpath=""
829 <             source="8"
830 <             executable="${javadoc8}"
831 <             failonerror = "true">
832 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
833 <        <include name="**/*.java"/>
834 <      </fileset>
835 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
836 <      <arg value="-XDignore.symbol.file=true"/>
837 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
838 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
839 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
840 < <!-- @apiNote tag currently unused -->
841 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
842 <    </javadoc>
843 <  </target>
844 <
845 <
846 <  <target name="4jdk8dist"
847 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
848 <          description="Puts all distributable products in single hierarchy"/>
849 <
850 <
851 <  <target name="4jdk8clean"
852 <          description="Removes all 4jdk8 build products">
853 <    <delete dir="${build.4jdk8.dir}"/>
854 <  </target>
855 <
856 <
857 <  <target name="4jdk8dist-jar"
858 <          depends="4jdk8clean, 4jdk8jar">
859 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
860 <  </target>
861 <
862 <
863 <  <target name="4jdk8dist-docs"
864 <          depends="4jdk8clean, 4jdk8docs">
865 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
866 <  </target>
867 <
868 <
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) -->
870
871  <target name="4jdk7compile" depends="configure-compiler">
872    <mkdir dir="${build.4jdk7.classes.dir}"/>
873
874    <javac srcdir="${4jdk7src.dir}"
875           destdir="${build.4jdk7.classes.dir}"
876           debug="${build.debug}"
877           debuglevel="${build.debuglevel}"
878           deprecation="${build.deprecation}"
879           source="6"
880           target="6"
881           classpath=""
882           bootclasspath="${bootclasspath6}"
883           includeAntRuntime="false"
884           includeJavaRuntime="false"
885           encoding="ASCII"
886           executable="${javac7}"
887           fork="true">
888
889      <include name="**/*.java"/>
890      <compilerarg value="-Xprefer:source"/>
891      <compilerarg value="-XDignore.symbol.file=true"/>
892      <compilerarg value="-Xlint:all"/>
893      <compilerarg value="-Werror"/>
894      <compilerarg line="${build.args}"/>
895    </javac>
896  </target>
897
898  <target name="4jdk7doclint" depends="configure-compiler">
899    <mkdir dir="${build.4jdk7.classes.dir}"/>
900
901    <javac srcdir="${4jdk7src.dir}"
902           destdir="${build.4jdk7.classes.dir}"
903           debug="${build.debug}"
904           debuglevel="${build.debuglevel}"
905           deprecation="${build.deprecation}"
906           source="6"
907           target="6"
908           classpath=""
909           bootclasspath="${bootclasspath6}"
910           includeAntRuntime="false"
911           includeJavaRuntime="false"
912           encoding="ASCII"
913           executable="${javac8}"
914           fork="true">
915
916      <include name="**/*.java"/>
917      <compilerarg value="-Xprefer:source"/>
918      <compilerarg value="-XDignore.symbol.file=true"/>
919      <compilerarg value="-Xlint:all"/>
920      <compilerarg value="-Xdoclint:all/protected"/>
921      <compilerarg line="${build.args}"/>
922    </javac>
923  </target>
924
925  <target name="4jdk7jar" depends="4jdk7compile">
926    <jar destfile="${4jdk7product.jar}">
927      <fileset dir="${build.4jdk7.classes.dir}"/>
928      <manifest>
929        <attribute name="Built-By" value="${user.name}"/>
930        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
931      </manifest>
932    </jar>
933  </target>
934
935  <target name="4jdk7-tck" depends="4jdk7jar">
936    <run-tck-tests
937      target="7"
938      workdir="${build.4jdk7.dir}"
939      classes="${4jdk7product.jar}">
940      <javac-elements>
941        <!-- JDK8+ test classes -->
942        <exclude name="*8Test.java"/>
943        <exclude name="*9Test.java"/>
944        <exclude name="*10Test.java"/>
945        <exclude name="DoubleAccumulatorTest.java"/>
946        <exclude name="DoubleAdderTest.java"/>
947        <exclude name="LongAccumulatorTest.java"/>
948        <exclude name="LongAdderTest.java"/>
949        <exclude name="CompletableFutureTest.java"/>
950        <exclude name="SplittableRandomTest.java"/>
951        <exclude name="StampedLockTest.java"/>
952        <exclude name="SubmissionPublisherTest.java"/>
953        <compilerarg value="-Werror"/>
954      </javac-elements>
955    </run-tck-tests>
956  </target>
957
958  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
959  <target name="4jdk7-tck-junit" depends="4jdk7compile">
960
961    <junit printsummary="true"
962           showoutput="true"
963           errorProperty="junit.failed"
964           failureProperty="junit.failed"
965           includeantruntime="true"
966           jvm="${java7}"
967           fork="true">
968
969      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
970      <jvmarg value="-server"/>
971
972      <classpath>
973        <pathelement location="${junit.jar}"/>
974        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
975      </classpath>
976
977      <formatter type="brief"/>
978
979      <test name="${jsr166.tckTestClass}" haltonfailure="no">
980      </test>
981    </junit>
982  </target>
983
984  <target name="4jdk7-jtreg" depends="4jdk7jar">
985    <run-jtreg-tests
986       target="7"
987       workdir="${build.4jdk7.dir}"
988       classes="${4jdk7product.jar}"/>
989  </target>
990
991  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
992
993  <target name="4jdk7docs">
994    <delete dir="${4jdk7docs.dir}"/>
995    <mkdir dir="${4jdk7docs.dir}"/>
996
997    <javadoc destdir="${4jdk7docs.dir}"
998             packagenames="none"
999             link="${java7.api.url}"
1000             overview="${4jdk7src.dir}/intro.html"
1001             access="${build.javadoc.access}"
1002             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1003             classpath=""
1004             executable="${javadoc7}"
1005             failonerror = "true">
1006      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1007        <include name="**/*.java"/>
1008      </fileset>
1009      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1010      <arg value="-XDignore.symbol.file=true"/>
1011    </javadoc>
1012  </target>
1013
1014  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1015
1016  <target name="4jdk7clean">
1017    <delete dir="${build.4jdk7.dir}"/>
1018  </target>
1019
1020  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1021    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1022  </target>
1023
1024  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1025    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1026  </target>
1027
1028
719    <!-- jsr166x (no longer maintained) -->
1030
1031  <target name="jsr166xcompile" depends="configure-compiler">
1032    <mkdir dir="${build.jsr166x.classes.dir}"/>
1033
1034    <javac srcdir="${topsrc.dir}"
1035           destdir="${build.jsr166x.classes.dir}"
1036           debug="${build.debug}"
1037           debuglevel="${build.debuglevel}"
1038           deprecation="${build.deprecation}"
1039           classpath=""
1040           bootclasspath="${bootclasspath6}"
1041           source="5"
1042           target="5"
1043           includeAntRuntime="false"
1044           includeJavaRuntime="false"
1045           encoding="ASCII"
1046           executable="${javac7}"
1047           fork="true">
1048      <include name="jsr166x/**/*.java"/>
1049      <compilerarg value="-XDignore.symbol.file=true"/>
1050      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1051      <compilerarg value="-Werror"/>
1052      <compilerarg line="${build.args}"/>
1053    </javac>
1054  </target>
1055
1056  <target name="jsr166xjar" depends="jsr166xcompile">
1057    <jar destfile="${jsr166x.jar}">
1058      <fileset dir="${build.jsr166x.classes.dir}"/>
1059      <manifest>
1060        <attribute name="Built-By" value="${user.name}"/>
1061        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1062      </manifest>
1063    </jar>
1064  </target>
1065
1066  <target name="jsr166xdocs">
1067    <delete dir="${jsr166xdocs.dir}"/>
1068    <mkdir dir="${jsr166xdocs.dir}"/>
1069
1070    <javadoc destdir="${jsr166xdocs.dir}"
1071             packagenames="jsr166x.*"
1072             link="${java.api.url}"
1073             access="${build.javadoc.access}"
1074             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1075             bootclasspath="${bootclasspath6}"
1076             source="5"
1077             executable="${javadoc7}"
1078             failonerror = "true">
1079      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1080      <arg value="-XDignore.symbol.file=true"/>
1081    </javadoc>
1082  </target>
1083
1084  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1085
1086  <target name="jsr166xclean">
1087    <delete dir="${build.jsr166x.dir}"/>
1088  </target>
1089
1090  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1091    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1092  </target>
1093
1094  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1095    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1096  </target>
1097
1098
720    <!-- jsr166y (no longer maintained) -->
1100
1101  <target name="jsr166ycompile" depends="configure-compiler">
1102    <mkdir dir="${build.jsr166y.classes.dir}"/>
1103
1104    <javac srcdir="${topsrc.dir}"
1105           destdir="${build.jsr166y.classes.dir}"
1106           debug="${build.debug}"
1107           debuglevel="${build.debuglevel}"
1108           deprecation="${build.deprecation}"
1109           source="6"
1110           target="6"
1111           classpath=""
1112           bootclasspath="${bootclasspath6}"
1113           includeAntRuntime="false"
1114           includeJavaRuntime="false"
1115           encoding="ASCII"
1116           executable="${javac7}"
1117           fork="true">
1118
1119      <include name="jsr166y/**/*.java"/>
1120      <compilerarg value="-XDignore.symbol.file=true"/>
1121      <compilerarg value="-Xlint:all"/>
1122      <compilerarg value="-Werror"/>
1123      <compilerarg line="${build.args}"/>
1124    </javac>
1125  </target>
1126
1127  <target name="jsr166yjar" depends="jsr166ycompile">
1128    <jar destfile="${jsr166y.jar}" index="true">
1129      <fileset dir="${build.jsr166y.classes.dir}"/>
1130      <manifest>
1131        <attribute name="Built-By" value="${user.name}"/>
1132        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1133      </manifest>
1134    </jar>
1135  </target>
1136
1137  <target name="jsr166ydocs">
1138    <delete dir="${jsr166ydocs.dir}"/>
1139    <mkdir dir="${jsr166ydocs.dir}"/>
1140
1141    <javadoc destdir="${jsr166ydocs.dir}"
1142             packagenames="jsr166y.*"
1143             link="${java.api.url}"
1144             access="${build.javadoc.access}"
1145             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1146             bootclasspath="${bootclasspath6}"
1147             source="6"
1148             executable="${javadoc7}"
1149             failonerror = "true">
1150      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1151      <arg value="-XDignore.symbol.file=true"/>
1152    </javadoc>
1153  </target>
1154
1155  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1156
1157  <target name="jsr166yclean">
1158    <delete dir="${build.jsr166y.dir}"/>
1159  </target>
1160
1161  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1162    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1163  </target>
1164
1165  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1166    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1167  </target>
1168
1169
721    <!-- extra166y (no longer maintained) -->
1171
1172  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1173    <mkdir dir="${build.extra166y.classes.dir}"/>
1174
1175    <javac srcdir="${topsrc.dir}"
1176           destdir="${build.extra166y.classes.dir}"
1177           debug="${build.debug}"
1178           debuglevel="${build.debuglevel}"
1179           deprecation="${build.deprecation}"
1180           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1181           classpath=""
1182           source="6"
1183           target="6"
1184           includeAntRuntime="false"
1185           includeJavaRuntime="false"
1186           encoding="ASCII"
1187           executable="${javac7}"
1188           fork="true">
1189
1190      <include name="extra166y/**/*.java"/>
1191      <compilerarg value="-XDignore.symbol.file=true"/>
1192      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1193      <compilerarg value="-Werror"/>
1194      <compilerarg line="${build.args}"/>
1195    </javac>
1196  </target>
1197
1198  <target name="extra166yjar" depends="extra166ycompile">
1199    <jar destfile="${extra166y.jar}" index="true">
1200      <fileset dir="${build.extra166y.classes.dir}"/>
1201      <manifest>
1202        <attribute name="Built-By" value="${user.name}"/>
1203        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1204      </manifest>
1205    </jar>
1206  </target>
1207
1208  <target name="extra166ydocs">
1209    <delete dir="${extra166ydocs.dir}"/>
1210    <mkdir dir="${extra166ydocs.dir}"/>
1211
1212    <javadoc destdir="${extra166ydocs.dir}"
1213             packagenames="extra166y.*"
1214             link="${java.api.url}"
1215             access="${build.javadoc.access}"
1216             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1217             bootclasspath="${bootclasspath6}"
1218             source="6"
1219             executable="${javadoc7}">
1220      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1221      <arg value="-XDignore.symbol.file=true"/>
1222    </javadoc>
1223  </target>
1224
1225  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1226
1227  <target name="extra166yclean">
1228    <delete dir="${build.extra166y.dir}"/>
1229  </target>
1230
1231  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1232    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1233  </target>
1234
1235  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1236    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1237  </target>
1238
1239
722    <!-- jsr166e (no longer maintained) -->
723  
1242  <property name="build.jsr166e.java.version" value="6"/>
1243  <property name="build.jsr166e.javac" value="${javac6}"/>
1244
1245  <target name="jsr166ecompile" depends="configure-compiler">
1246    <mkdir dir="${build.jsr166e.classes.dir}"/>
1247
1248    <javac srcdir="${topsrc.dir}"
1249           destdir="${build.jsr166e.classes.dir}"
1250           debug="${build.debug}"
1251           debuglevel="${build.debuglevel}"
1252           deprecation="${build.deprecation}"
1253           source="${build.jsr166e.java.version}"
1254           target="${build.jsr166e.java.version}"
1255           classpath=""
1256           includeAntRuntime="false"
1257           includeJavaRuntime="false"
1258           executable="${build.jsr166e.javac}"
1259           fork="true">
1260
1261      <include name="jsr166e/**/*.java"/>
1262      <compilerarg value="-XDignore.symbol.file=true"/>
1263      <compilerarg value="-Xlint:all"/>
1264      <compilerarg value="-Werror"/>
1265      <compilerarg line="${build.args}"/>
1266    </javac>
1267  </target>
1268
1269  <target name="jsr166edoclint">
1270    <mkdir dir="${build.jsr166e.classes.dir}"/>
1271
1272    <javac srcdir="${topsrc.dir}"
1273           destdir="${build.jsr166e.classes.dir}"
1274           debug="${build.debug}"
1275           debuglevel="${build.debuglevel}"
1276           deprecation="${build.deprecation}"
1277           source="${build.jsr166e.java.version}"
1278           target="${build.jsr166e.java.version}"
1279           classpath=""
1280           bootclasspath="${bootclasspath6}"
1281           includeAntRuntime="false"
1282           includeJavaRuntime="false"
1283           executable="${javac8}"
1284           fork="true">
1285
1286      <include name="jsr166e/**/*.java"/>
1287      <compilerarg value="-XDignore.symbol.file=true"/>
1288      <compilerarg value="-Xlint:all"/>
1289      <compilerarg value="-Werror"/>
1290      <compilerarg value="-Xdoclint:all/protected"/>
1291    </javac>
1292  </target>
1293
1294  <target name="jsr166ejar" depends="jsr166ecompile">
1295    <jar destfile="${jsr166e.jar}" index="true">
1296      <fileset dir="${build.jsr166e.classes.dir}"/>
1297      <manifest>
1298        <attribute name="Built-By" value="${user.name}"/>
1299        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1300      </manifest>
1301    </jar>
1302  </target>
1303
1304  <target name="jsr166edocs">
1305    <delete dir="${jsr166edocs.dir}"/>
1306    <mkdir dir="${jsr166edocs.dir}"/>
1307
1308    <javadoc destdir="${jsr166edocs.dir}"
1309             packagenames="jsr166e.*"
1310             link="${java.api.url}"
1311             access="${build.javadoc.access}"
1312             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1313             source="${build.jsr166e.java.version}"
1314             executable="${javadoc7}"
1315             failonerror = "true">
1316      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1317      <arg value="-XDignore.symbol.file=true"/>
1318    </javadoc>
1319  </target>
1320
1321  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1322    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1323    <run-tck-tests
1324      tck.src.dir="${test.src.dir}/tck-jsr166e"
1325      target="${build.jsr166e.java.version}"
1326      workdir="${build.jsr166e.dir}"
1327      classes="${jsr166e.jar}"/>
1328  </target>
1329
1330  <target name="jsr166e-tck">
1331
1332 <!--     <antcall target="clean"/> -->
1333 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1334 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1335 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1336 <!--     </antcall> -->
1337
1338    <antcall target="clean"/>
1339    <antcall target="jsr166e-tck-one-java-version">
1340      <param name="build.jsr166e.java.version" value="7"/>
1341      <param name="build.jsr166e.javac" value="${javac7}"/>
1342    </antcall>
1343
1344    <antcall target="clean"/>
1345    <antcall target="jsr166e-tck-one-java-version">
1346      <param name="build.jsr166e.java.version" value="6"/>
1347      <param name="build.jsr166e.javac" value="${javac6}"/>
1348    </antcall>
1349  </target>
1350
1351  <target name="jsr166e-test" depends="jsr166e-tck"/>
1352
1353  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1354
1355  <target name="jsr166eclean">
1356    <delete dir="${build.jsr166e.dir}"/>
1357  </target>
1358
1359  <target name="jsr166edist-jar"
1360          depends="jsr166eclean, jsr166ejar">
1361    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1362  </target>
1363
1364  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1365    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1366  </target>
1367
1368
724   <!-- Find buglets that can be detected by static build tools -->
725  
726   <!--   <target name="lint"> -->
# Line 1389 | 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 1417 | 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