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.294 by jsr166, Mon Dec 31 07:05:54 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"/>
150  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
151  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
152  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
153  <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="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
114 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
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"/>
161  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
162  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
163  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
164  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
165  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
166  <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"/>
171 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
172 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
173 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
174 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
175 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
176 <
177 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
178 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
179 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
180 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
181 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
182 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
183 <  <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"/>
187  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
188  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
189  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
190  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
191  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
192  <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"/>
201 <  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
202 <  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
203 <  <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) -->
205  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
206  <!-- <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"/>
139 <  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/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 -->
214  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
215  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
216  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
217  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
218  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
219  <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 227 | 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 250 | Line 183
183  
184      <sequential>
185  
253    <local name="modules"/>
254    <condition property="modules">
255      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
256    </condition>
257
258    <local name="use-doclint"/>
259    <condition property="use-doclint">
260      <not> <equals arg1="@{target}" arg2="7"/> </not>
261    </condition>
262
186      <mkdir dir="@{workdir}/tck-classes"/>
187  
188      <javac srcdir="@{tck.src.dir}"
# Line 279 | 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"/>
284 <      <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 291 | 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"/>
315 <        </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 333 | 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"/>
339  <defjtregtests v="10"/>
340  <defjtregtests v="9"/>
341  <defjtregtests v="8"/>
342  <defjtregtests v="7"/>
263  
264    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
265    <property name="jtreg.flags" value=""/>
# Line 358 | Line 278
278      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
279      <property name="jtreg.verbose" value="nopass,fail,error"/>
280  
361    <local name="modules"/>
362    <condition property="modules">
363      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
364    </condition>
365
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 390 | 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 398 | 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 406 | 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"/>
416          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
333  
334    <target name="compile"
335            depends="configure-compiler"
# Line 440 | 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 469 | 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 491 | 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 -->
502 <      <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 541 | 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 576 | 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 589 | 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, test13, test9-11, test9-12, test9-13, clean, test, docs">
523 <  </target>
524 <
525 <  <target name="test9">
596 <    <antcall target="clean"/>
597 <    <antcall>
598 <      <param name="java.runtime.target" value="9"/>
599 <      <param name="build.main.javac" value="${javac9}"/>
600 <      <param name="build.main.javadoc" value="${javadoc12}"/>
601 <      <param name="build.main.javadoc.source" value="9"/>
602 <      <target name="test"/>
603 <      <target name="docs"/>
604 <    </antcall>
605 <  </target>
606 <
607 <  <target name="test10">
608 <    <antcall target="clean"/>
609 <    <antcall>
610 <      <param name="java.runtime.target" value="10"/>
611 <      <param name="build.main.javac" value="${javac10}"/>
612 <      <param name="build.main.javadoc" value="${javadoc12}"/>
613 <      <param name="build.main.javadoc.source" value="10"/>
614 <      <target name="test"/>
615 <      <target name="docs"/>
616 <    </antcall>
617 <  </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="test11">
620    <antcall target="clean"/>
528      <antcall>
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="11"/>
533 +      <target name="clean"/>
534        <target name="test"/>
535        <target name="docs"/>
536      </antcall>
537    </target>
538  
539    <target name="test12">
632    <antcall target="clean"/>
540      <antcall>
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="12"/>
545 +      <target name="clean"/>
546        <target name="test"/>
547        <target name="docs"/>
548      </antcall>
549    </target>
550  
551    <target name="test13">
644    <antcall target="clean"/>
552      <antcall>
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="test9-11">
656 <    <antcall target="clean"/>
563 >  <target name="test14">
564      <antcall>
565 <      <param name="java.runtime.target" value="11"/>
566 <      <param name="build.main.javac" value="${javac9}"/>
567 <      <param name="build.main.javadoc" value="${javadoc12}"/>
568 <      <param name="build.main.javadoc.source" value="9"/>
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="test9-12">
668 <    <antcall target="clean"/>
599 >  <target name="test11-12">
600      <antcall>
601        <param name="java.runtime.target" value="12"/>
602 <      <param name="build.main.javac" value="${javac9}"/>
602 >      <param name="build.main.javac" value="${javac11}"/>
603        <param name="build.main.javadoc" value="${javadoc12}"/>
604 <      <param name="build.main.javadoc.source" value="9"/>
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="test9-13">
680 <    <antcall target="clean"/>
611 >  <target name="test11-13">
612      <antcall>
613        <param name="java.runtime.target" value="13"/>
614 <      <param name="build.main.javac" value="${javac9}"/>
614 >      <param name="build.main.javac" value="${javac11}"/>
615        <param name="build.main.javadoc" value="${javadoc13}"/>
616 <      <param name="build.main.javadoc.source" value="9"/>
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="test11-14">
624 +    <antcall>
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="test11-15">
636 +    <antcall>
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 727 | 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}"/>
732 <      <compilerarg line="${build.args}"/>
733 <    </javac>
734 <  </target>
735 <
736 <
737 <  <!-- jsr166 4jdk8 -->
738 <
739 <  <target name="4jdk8compile"
740 <          depends="configure-compiler"
741 <          description="Compiles src/jdk8 sources, targeting jdk8">
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="-Werror"/>
764 <      <compilerarg line="${build.args}"/>
765 <    </javac>
766 <  </target>
767 <
768 <  <target name="4jdk8doclint"
769 <          depends="configure-compiler"
770 <          description="Finds doclint warnings">
771 <
772 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
773 <
774 <    <javac srcdir="${4jdk8src.dir}"
775 <           destdir="${build.4jdk8.classes.dir}"
776 <           debug="${build.debug}"
777 <           debuglevel="${build.debuglevel}"
778 <           deprecation="${build.deprecation}"
779 <           source="8"
780 <           target="8"
781 <           classpath=""
782 <           bootclasspath="${bootclasspath8}"
783 <           includeAntRuntime="false"
784 <           includeJavaRuntime="false"
785 <           encoding="ASCII"
786 <           executable="${javac8}"
787 <           fork="true">
788 <      <include name="**/*.java"/>
789 <      <compilerarg value="-Xprefer:source"/>
790 <      <compilerarg value="-XDignore.symbol.file=true"/>
791 <      <compilerarg value="-Xlint:all"/>
792 <      <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"
800 <          description="Builds library jar from compiled sources">
801 <
802 <    <jar destfile="${4jdk8product.jar}">
803 <      <fileset dir="${build.4jdk8.classes.dir}"/>
804 <      <manifest>
805 <        <attribute name="Built-By" value="${user.name}"/>
806 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
807 <      </manifest>
808 <    </jar>
809 <  </target>
810 <
811 <
812 <  <target name="4jdk8-tck"
813 <          depends="4jdk8jar"
814 <          description="Runs tck tests for jsr166-4jdk8 directly">
815 <
816 <    <run-tck-tests
817 <      target="8"
818 <      workdir="${build.4jdk8.dir}"
819 <      classes="${4jdk8product.jar}">
820 <      <javac-elements>
821 <        <!-- JDK9+ test classes -->
822 <        <exclude name="*9Test.java"/>
823 <        <exclude name="*10Test.java"/>
824 <        <compilerarg value="-Werror"/>
825 <      </javac-elements>
826 <    </run-tck-tests>
827 <  </target>
828 <
829 <
830 <  <target name="4jdk8-jtreg"
831 <          depends="4jdk8jar"
832 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
833 <    <run-jtreg-tests
834 <       target="8"
835 <       workdir="${build.4jdk8.dir}"
836 <       classes="${4jdk8product.jar}"/>
837 <  </target>
838 <
839 <
840 <  <target name="4jdk8-test"
841 <          depends="4jdk8-tck, 4jdk8-jtreg"
842 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
843 <
844 <
845 <  <target name="4jdk8docs"
846 <          description="Builds javadocs for src/jdk8 to dist dir">
847 <
848 <    <delete dir="${4jdk8docs.dir}"/>
849 <    <mkdir dir="${4jdk8docs.dir}"/>
850 <
851 <    <javadoc destdir="${4jdk8docs.dir}"
852 <             packagenames="none"
853 <             link="${java8.api.url}"
854 <             overview="${4jdk8src.dir}/intro.html"
855 <             access="${build.javadoc.access}"
856 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
857 <             classpath=""
858 <             source="8"
859 <             executable="${javadoc8}"
860 <             failonerror = "true">
861 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
862 <        <include name="**/*.java"/>
863 <      </fileset>
864 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
865 <      <arg value="-XDignore.symbol.file=true"/>
866 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
867 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
868 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
869 < <!-- @apiNote tag currently unused -->
870 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
871 <    </javadoc>
872 <  </target>
873 <
874 <
875 <  <target name="4jdk8dist"
876 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
877 <          description="Puts all distributable products in single hierarchy"/>
878 <
879 <
880 <  <target name="4jdk8clean"
881 <          description="Removes all 4jdk8 build products">
882 <    <delete dir="${build.4jdk8.dir}"/>
883 <  </target>
884 <
885 <
886 <  <target name="4jdk8dist-jar"
887 <          depends="4jdk8clean, 4jdk8jar">
888 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
889 <  </target>
890 <
891 <
892 <  <target name="4jdk8dist-docs"
893 <          depends="4jdk8clean, 4jdk8docs">
894 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
895 <  </target>
896 <
897 <
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) -->
899
900  <target name="4jdk7compile" depends="configure-compiler">
901    <mkdir dir="${build.4jdk7.classes.dir}"/>
902
903    <javac srcdir="${4jdk7src.dir}"
904           destdir="${build.4jdk7.classes.dir}"
905           debug="${build.debug}"
906           debuglevel="${build.debuglevel}"
907           deprecation="${build.deprecation}"
908           source="6"
909           target="6"
910           classpath=""
911           bootclasspath="${bootclasspath6}"
912           includeAntRuntime="false"
913           includeJavaRuntime="false"
914           encoding="ASCII"
915           executable="${javac7}"
916           fork="true">
917
918      <include name="**/*.java"/>
919      <compilerarg value="-Xprefer:source"/>
920      <compilerarg value="-XDignore.symbol.file=true"/>
921      <compilerarg value="-Xlint:all"/>
922      <compilerarg value="-Werror"/>
923      <compilerarg line="${build.args}"/>
924    </javac>
925  </target>
926
927  <target name="4jdk7doclint" depends="configure-compiler">
928    <mkdir dir="${build.4jdk7.classes.dir}"/>
929
930    <javac srcdir="${4jdk7src.dir}"
931           destdir="${build.4jdk7.classes.dir}"
932           debug="${build.debug}"
933           debuglevel="${build.debuglevel}"
934           deprecation="${build.deprecation}"
935           source="6"
936           target="6"
937           classpath=""
938           bootclasspath="${bootclasspath6}"
939           includeAntRuntime="false"
940           includeJavaRuntime="false"
941           encoding="ASCII"
942           executable="${javac8}"
943           fork="true">
944
945      <include name="**/*.java"/>
946      <compilerarg value="-Xprefer:source"/>
947      <compilerarg value="-XDignore.symbol.file=true"/>
948      <compilerarg value="-Xlint:all"/>
949      <compilerarg value="-Xdoclint:all/protected"/>
950      <compilerarg line="${build.args}"/>
951    </javac>
952  </target>
953
954  <target name="4jdk7jar" depends="4jdk7compile">
955    <jar destfile="${4jdk7product.jar}">
956      <fileset dir="${build.4jdk7.classes.dir}"/>
957      <manifest>
958        <attribute name="Built-By" value="${user.name}"/>
959        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
960      </manifest>
961    </jar>
962  </target>
963
964  <target name="4jdk7-tck" depends="4jdk7jar">
965    <run-tck-tests
966      target="7"
967      workdir="${build.4jdk7.dir}"
968      classes="${4jdk7product.jar}">
969      <javac-elements>
970        <!-- JDK8+ test classes -->
971        <exclude name="*8Test.java"/>
972        <exclude name="*9Test.java"/>
973        <exclude name="*10Test.java"/>
974        <exclude name="DoubleAccumulatorTest.java"/>
975        <exclude name="DoubleAdderTest.java"/>
976        <exclude name="LongAccumulatorTest.java"/>
977        <exclude name="LongAdderTest.java"/>
978        <exclude name="CompletableFutureTest.java"/>
979        <exclude name="SplittableRandomTest.java"/>
980        <exclude name="StampedLockTest.java"/>
981        <exclude name="SubmissionPublisherTest.java"/>
982        <compilerarg value="-Werror"/>
983      </javac-elements>
984    </run-tck-tests>
985  </target>
986
987  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
988  <target name="4jdk7-tck-junit" depends="4jdk7compile">
989
990    <junit printsummary="true"
991           showoutput="true"
992           errorProperty="junit.failed"
993           failureProperty="junit.failed"
994           includeantruntime="true"
995           jvm="${java7}"
996           fork="true">
997
998      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
999      <jvmarg value="-server"/>
1000
1001      <classpath>
1002        <pathelement location="${junit.jar}"/>
1003        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
1004      </classpath>
1005
1006      <formatter type="brief"/>
1007
1008      <test name="${jsr166.tckTestClass}" haltonfailure="no">
1009      </test>
1010    </junit>
1011  </target>
1012
1013  <target name="4jdk7-jtreg" depends="4jdk7jar">
1014    <run-jtreg-tests
1015       target="7"
1016       workdir="${build.4jdk7.dir}"
1017       classes="${4jdk7product.jar}"/>
1018  </target>
1019
1020  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1021
1022  <target name="4jdk7docs">
1023    <delete dir="${4jdk7docs.dir}"/>
1024    <mkdir dir="${4jdk7docs.dir}"/>
1025
1026    <javadoc destdir="${4jdk7docs.dir}"
1027             packagenames="none"
1028             link="${java7.api.url}"
1029             overview="${4jdk7src.dir}/intro.html"
1030             access="${build.javadoc.access}"
1031             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1032             classpath=""
1033             executable="${javadoc7}"
1034             failonerror = "true">
1035      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1036        <include name="**/*.java"/>
1037      </fileset>
1038      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1039      <arg value="-XDignore.symbol.file=true"/>
1040    </javadoc>
1041  </target>
1042
1043  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1044
1045  <target name="4jdk7clean">
1046    <delete dir="${build.4jdk7.dir}"/>
1047  </target>
1048
1049  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1050    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1051  </target>
1052
1053  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1054    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1055  </target>
1056
1057
719    <!-- jsr166x (no longer maintained) -->
1059
1060  <target name="jsr166xcompile" depends="configure-compiler">
1061    <mkdir dir="${build.jsr166x.classes.dir}"/>
1062
1063    <javac srcdir="${topsrc.dir}"
1064           destdir="${build.jsr166x.classes.dir}"
1065           debug="${build.debug}"
1066           debuglevel="${build.debuglevel}"
1067           deprecation="${build.deprecation}"
1068           classpath=""
1069           bootclasspath="${bootclasspath6}"
1070           source="5"
1071           target="5"
1072           includeAntRuntime="false"
1073           includeJavaRuntime="false"
1074           encoding="ASCII"
1075           executable="${javac7}"
1076           fork="true">
1077      <include name="jsr166x/**/*.java"/>
1078      <compilerarg value="-XDignore.symbol.file=true"/>
1079      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1080      <compilerarg value="-Werror"/>
1081      <compilerarg line="${build.args}"/>
1082    </javac>
1083  </target>
1084
1085  <target name="jsr166xjar" depends="jsr166xcompile">
1086    <jar destfile="${jsr166x.jar}">
1087      <fileset dir="${build.jsr166x.classes.dir}"/>
1088      <manifest>
1089        <attribute name="Built-By" value="${user.name}"/>
1090        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1091      </manifest>
1092    </jar>
1093  </target>
1094
1095  <target name="jsr166xdocs">
1096    <delete dir="${jsr166xdocs.dir}"/>
1097    <mkdir dir="${jsr166xdocs.dir}"/>
1098
1099    <javadoc destdir="${jsr166xdocs.dir}"
1100             packagenames="jsr166x.*"
1101             link="${java.api.url}"
1102             access="${build.javadoc.access}"
1103             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1104             bootclasspath="${bootclasspath6}"
1105             source="5"
1106             executable="${javadoc7}"
1107             failonerror = "true">
1108      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1109      <arg value="-XDignore.symbol.file=true"/>
1110    </javadoc>
1111  </target>
1112
1113  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1114
1115  <target name="jsr166xclean">
1116    <delete dir="${build.jsr166x.dir}"/>
1117  </target>
1118
1119  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1120    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1121  </target>
1122
1123  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1124    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1125  </target>
1126
1127
720    <!-- jsr166y (no longer maintained) -->
1129
1130  <target name="jsr166ycompile" depends="configure-compiler">
1131    <mkdir dir="${build.jsr166y.classes.dir}"/>
1132
1133    <javac srcdir="${topsrc.dir}"
1134           destdir="${build.jsr166y.classes.dir}"
1135           debug="${build.debug}"
1136           debuglevel="${build.debuglevel}"
1137           deprecation="${build.deprecation}"
1138           source="6"
1139           target="6"
1140           classpath=""
1141           bootclasspath="${bootclasspath6}"
1142           includeAntRuntime="false"
1143           includeJavaRuntime="false"
1144           encoding="ASCII"
1145           executable="${javac7}"
1146           fork="true">
1147
1148      <include name="jsr166y/**/*.java"/>
1149      <compilerarg value="-XDignore.symbol.file=true"/>
1150      <compilerarg value="-Xlint:all"/>
1151      <compilerarg value="-Werror"/>
1152      <compilerarg line="${build.args}"/>
1153    </javac>
1154  </target>
1155
1156  <target name="jsr166yjar" depends="jsr166ycompile">
1157    <jar destfile="${jsr166y.jar}" index="true">
1158      <fileset dir="${build.jsr166y.classes.dir}"/>
1159      <manifest>
1160        <attribute name="Built-By" value="${user.name}"/>
1161        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1162      </manifest>
1163    </jar>
1164  </target>
1165
1166  <target name="jsr166ydocs">
1167    <delete dir="${jsr166ydocs.dir}"/>
1168    <mkdir dir="${jsr166ydocs.dir}"/>
1169
1170    <javadoc destdir="${jsr166ydocs.dir}"
1171             packagenames="jsr166y.*"
1172             link="${java.api.url}"
1173             access="${build.javadoc.access}"
1174             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1175             bootclasspath="${bootclasspath6}"
1176             source="6"
1177             executable="${javadoc7}"
1178             failonerror = "true">
1179      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1180      <arg value="-XDignore.symbol.file=true"/>
1181    </javadoc>
1182  </target>
1183
1184  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1185
1186  <target name="jsr166yclean">
1187    <delete dir="${build.jsr166y.dir}"/>
1188  </target>
1189
1190  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1191    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1192  </target>
1193
1194  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1195    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1196  </target>
1197
1198
721    <!-- extra166y (no longer maintained) -->
1200
1201  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1202    <mkdir dir="${build.extra166y.classes.dir}"/>
1203
1204    <javac srcdir="${topsrc.dir}"
1205           destdir="${build.extra166y.classes.dir}"
1206           debug="${build.debug}"
1207           debuglevel="${build.debuglevel}"
1208           deprecation="${build.deprecation}"
1209           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1210           classpath=""
1211           source="6"
1212           target="6"
1213           includeAntRuntime="false"
1214           includeJavaRuntime="false"
1215           encoding="ASCII"
1216           executable="${javac7}"
1217           fork="true">
1218
1219      <include name="extra166y/**/*.java"/>
1220      <compilerarg value="-XDignore.symbol.file=true"/>
1221      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1222      <compilerarg value="-Werror"/>
1223      <compilerarg line="${build.args}"/>
1224    </javac>
1225  </target>
1226
1227  <target name="extra166yjar" depends="extra166ycompile">
1228    <jar destfile="${extra166y.jar}" index="true">
1229      <fileset dir="${build.extra166y.classes.dir}"/>
1230      <manifest>
1231        <attribute name="Built-By" value="${user.name}"/>
1232        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1233      </manifest>
1234    </jar>
1235  </target>
1236
1237  <target name="extra166ydocs">
1238    <delete dir="${extra166ydocs.dir}"/>
1239    <mkdir dir="${extra166ydocs.dir}"/>
1240
1241    <javadoc destdir="${extra166ydocs.dir}"
1242             packagenames="extra166y.*"
1243             link="${java.api.url}"
1244             access="${build.javadoc.access}"
1245             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1246             bootclasspath="${bootclasspath6}"
1247             source="6"
1248             executable="${javadoc7}">
1249      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1250      <arg value="-XDignore.symbol.file=true"/>
1251    </javadoc>
1252  </target>
1253
1254  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1255
1256  <target name="extra166yclean">
1257    <delete dir="${build.extra166y.dir}"/>
1258  </target>
1259
1260  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1261    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1262  </target>
1263
1264  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1265    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1266  </target>
1267
1268
722    <!-- jsr166e (no longer maintained) -->
723  
1271  <property name="build.jsr166e.java.version" value="6"/>
1272  <property name="build.jsr166e.javac" value="${javac6}"/>
1273
1274  <target name="jsr166ecompile" depends="configure-compiler">
1275    <mkdir dir="${build.jsr166e.classes.dir}"/>
1276
1277    <javac srcdir="${topsrc.dir}"
1278           destdir="${build.jsr166e.classes.dir}"
1279           debug="${build.debug}"
1280           debuglevel="${build.debuglevel}"
1281           deprecation="${build.deprecation}"
1282           source="${build.jsr166e.java.version}"
1283           target="${build.jsr166e.java.version}"
1284           classpath=""
1285           includeAntRuntime="false"
1286           includeJavaRuntime="false"
1287           executable="${build.jsr166e.javac}"
1288           fork="true">
1289
1290      <include name="jsr166e/**/*.java"/>
1291      <compilerarg value="-XDignore.symbol.file=true"/>
1292      <compilerarg value="-Xlint:all"/>
1293      <compilerarg value="-Werror"/>
1294      <compilerarg line="${build.args}"/>
1295    </javac>
1296  </target>
1297
1298  <target name="jsr166edoclint">
1299    <mkdir dir="${build.jsr166e.classes.dir}"/>
1300
1301    <javac srcdir="${topsrc.dir}"
1302           destdir="${build.jsr166e.classes.dir}"
1303           debug="${build.debug}"
1304           debuglevel="${build.debuglevel}"
1305           deprecation="${build.deprecation}"
1306           source="${build.jsr166e.java.version}"
1307           target="${build.jsr166e.java.version}"
1308           classpath=""
1309           bootclasspath="${bootclasspath6}"
1310           includeAntRuntime="false"
1311           includeJavaRuntime="false"
1312           executable="${javac8}"
1313           fork="true">
1314
1315      <include name="jsr166e/**/*.java"/>
1316      <compilerarg value="-XDignore.symbol.file=true"/>
1317      <compilerarg value="-Xlint:all"/>
1318      <compilerarg value="-Werror"/>
1319      <compilerarg value="-Xdoclint:all/protected"/>
1320    </javac>
1321  </target>
1322
1323  <target name="jsr166ejar" depends="jsr166ecompile">
1324    <jar destfile="${jsr166e.jar}" index="true">
1325      <fileset dir="${build.jsr166e.classes.dir}"/>
1326      <manifest>
1327        <attribute name="Built-By" value="${user.name}"/>
1328        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1329      </manifest>
1330    </jar>
1331  </target>
1332
1333  <target name="jsr166edocs">
1334    <delete dir="${jsr166edocs.dir}"/>
1335    <mkdir dir="${jsr166edocs.dir}"/>
1336
1337    <javadoc destdir="${jsr166edocs.dir}"
1338             packagenames="jsr166e.*"
1339             link="${java.api.url}"
1340             access="${build.javadoc.access}"
1341             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1342             source="${build.jsr166e.java.version}"
1343             executable="${javadoc7}"
1344             failonerror = "true">
1345      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1346      <arg value="-XDignore.symbol.file=true"/>
1347    </javadoc>
1348  </target>
1349
1350  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1351    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1352    <run-tck-tests
1353      tck.src.dir="${test.src.dir}/tck-jsr166e"
1354      target="${build.jsr166e.java.version}"
1355      workdir="${build.jsr166e.dir}"
1356      classes="${jsr166e.jar}"/>
1357  </target>
1358
1359  <target name="jsr166e-tck">
1360
1361 <!--     <antcall target="clean"/> -->
1362 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1363 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1364 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1365 <!--     </antcall> -->
1366
1367    <antcall target="clean"/>
1368    <antcall target="jsr166e-tck-one-java-version">
1369      <param name="build.jsr166e.java.version" value="7"/>
1370      <param name="build.jsr166e.javac" value="${javac7}"/>
1371    </antcall>
1372
1373    <antcall target="clean"/>
1374    <antcall target="jsr166e-tck-one-java-version">
1375      <param name="build.jsr166e.java.version" value="6"/>
1376      <param name="build.jsr166e.javac" value="${javac6}"/>
1377    </antcall>
1378  </target>
1379
1380  <target name="jsr166e-test" depends="jsr166e-tck"/>
1381
1382  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1383
1384  <target name="jsr166eclean">
1385    <delete dir="${build.jsr166e.dir}"/>
1386  </target>
1387
1388  <target name="jsr166edist-jar"
1389          depends="jsr166eclean, jsr166ejar">
1390    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1391  </target>
1392
1393  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1394    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1395  </target>
1396
1397
724   <!-- Find buglets that can be detected by static build tools -->
725  
726   <!--   <target name="lint"> -->
# Line 1418 | 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 1446 | 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