ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines