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.300 by jsr166, Sat Jul 13 18:31:40 2019 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
30  $HOME/jdk/src/jdk8
31  $HOME/jdk/src/jdk9
32  $HOME/jdk/src/jdk10
31    $HOME/jdk/src/jdk11
32    $HOME/jdk/src/jdk12
33    $HOME/jdk/src/jdk13
34    $HOME/jdk/src/jdk14
35 <  where each of the above is a complete JDK source tree
36 <  (e.g. mercurial forest) or a symlink to same.
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 .. 14 ...
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 70 | Line 73
73    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
74    <property name="build.loops.dir"             location="${build.dir}/loops"/>
75  
73  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
74  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
75  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
76  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
77
78  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
79  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
80  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
81  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
82
83  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
84  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
85  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
86  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
87
88  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
89  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
90  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
91  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
92
76    <!-- JDK locations -->
77    <property name="jdks.home"  location="${user.home}/jdk"/>
78  
# Line 101 | 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"/>
105 <    <available property="have.java.base"
106 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
107 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
108 <      if:set="have.java.base"/>
109 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
110 <      unless:set="have.java.base"/>
111 <    <local name="modules"/>
112 <    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
113 <    <local name="boot.jar.dir"/>
114 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
115 <    <path id="bootclasspath@{v}" unless:set="modules">
116 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
117 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
118 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
119 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
120 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
121 <    </path>
122 <    <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 135 | Line 100
100      </sequential>
101    </macrodef>
102  
138  <defjdklocations v="6"/>
139  <defjdklocations v="7"/>
140  <defjdklocations v="8"/>
141  <defjdklocations v="9"/>
142  <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"/>
153  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
154  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
155  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
156  <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="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
120    <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
121 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
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"/>
165  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
166  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
167  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
168  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
169  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
170  <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"/>
175 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
176 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
177 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
178 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
179 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
180 <
181 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
182 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
183 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
184 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
185 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
186 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
187 <  <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"/>
191  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
192  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
193  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
194  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
195  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
196  <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"/>
205 <  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
206 <  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
207 <  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
208 <  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/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) -->
210  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
211  <!-- <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"/> -->
147 <  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
148 <  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/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 -->
220  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
221  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
222  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
223  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
224  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
225  <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 234 | 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 257 | Line 195
195  
196      <sequential>
197  
260    <local name="modules"/>
261    <condition property="modules">
262      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
263    </condition>
264
265    <local name="use-doclint"/>
266    <condition property="use-doclint">
267      <not> <equals arg1="@{target}" arg2="7"/> </not>
268    </condition>
269
198      <mkdir dir="@{workdir}/tck-classes"/>
199  
200      <javac srcdir="@{tck.src.dir}"
# Line 286 | 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"/>
291 <      <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 298 | 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"/>
322 <        </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 340 | 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"/>
347  <defjtregtests v="10"/>
348  <defjtregtests v="9"/>
349  <defjtregtests v="8"/>
350  <defjtregtests v="7"/>
277  
278    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
279    <property name="jtreg.flags" value=""/>
# Line 366 | 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}"/>
385      <arg value="-vmoptions:-esa -ea"/>
315        <arg value="-automatic"/>
316        <arg value="-k:!ignore"/>
317        <arg line="@{jtregflags}"/>
# Line 407 | 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 415 | 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"/>
425          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
355  
356    <target name="compile"
357            depends="configure-compiler"
# Line 449 | 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"/>
# Line 479 | 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 501 | 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 -->
512 < <!-- TODO: - -frames no longer a supported option in jdk13+ -->
513 <      <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 552 | 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 587 | 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 600 | 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, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">
545 <  </target>
546 <
547 <  <target name="test9">
607 <    <antcall target="clean"/>
608 <    <antcall>
609 <      <param name="java.runtime.target" value="9"/>
610 <      <param name="build.main.javac" value="${javac9}"/>
611 <      <param name="build.main.javadoc" value="${javadoc12}"/>
612 <      <param name="build.main.javadoc.source" value="9"/>
613 <      <target name="test"/>
614 <      <target name="docs"/>
615 <    </antcall>
616 <  </target>
617 <
618 <  <target name="test10">
619 <    <antcall target="clean"/>
620 <    <antcall>
621 <      <param name="java.runtime.target" value="10"/>
622 <      <param name="build.main.javac" value="${javac10}"/>
623 <      <param name="build.main.javadoc" value="${javadoc12}"/>
624 <      <param name="build.main.javadoc.source" value="10"/>
625 <      <target name="test"/>
626 <      <target name="docs"/>
627 <    </antcall>
628 <  </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="test11">
631    <antcall target="clean"/>
550      <antcall>
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="11"/>
555 +      <target name="clean"/>
556        <target name="test"/>
557        <target name="docs"/>
558      </antcall>
559    </target>
560  
561    <target name="test12">
643    <antcall target="clean"/>
562      <antcall>
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="12"/>
567 +      <target name="clean"/>
568        <target name="test"/>
569        <target name="docs"/>
570      </antcall>
571    </target>
572  
573    <target name="test13">
655    <antcall target="clean"/>
574      <antcall>
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">
667    <antcall target="clean"/>
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="test9-11">
679 <    <antcall target="clean"/>
597 >  <target name="test15">
598      <antcall>
599 <      <param name="java.runtime.target" value="11"/>
600 <      <param name="build.main.javac" value="${javac9}"/>
601 <      <param name="build.main.javadoc" value="${javadoc12}"/>
602 <      <param name="build.main.javadoc.source" value="9"/>
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="test9-12">
610 <    <antcall target="clean"/>
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="${javac9}"/>
624 >      <param name="build.main.javac" value="${javac11}"/>
625        <param name="build.main.javadoc" value="${javadoc12}"/>
626 <      <param name="build.main.javadoc.source" value="9"/>
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="test9-13">
703 <    <antcall target="clean"/>
633 >  <target name="test11-13">
634      <antcall>
635        <param name="java.runtime.target" value="13"/>
636 <      <param name="build.main.javac" value="${javac9}"/>
636 >      <param name="build.main.javac" value="${javac11}"/>
637        <param name="build.main.javadoc" value="${javadoc13}"/>
638 <      <param name="build.main.javadoc.source" value="9"/>
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-14">
715 <    <antcall target="clean"/>
645 >  <target name="test11-14">
646      <antcall>
647        <param name="java.runtime.target" value="14"/>
648 <      <param name="build.main.javac" value="${javac9}"/>
648 >      <param name="build.main.javac" value="${javac11}"/>
649        <param name="build.main.javadoc" value="${javadoc14}"/>
650 <      <param name="build.main.javadoc.source" value="9"/>
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="test11-15">
658 +    <antcall>
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 762 | 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}"/>
767 <      <compilerarg line="${build.args}"/>
768 <    </javac>
769 <  </target>
770 <
771 <
772 <  <!-- jsr166 4jdk8 -->
773 <
774 <  <target name="4jdk8compile"
775 <          depends="configure-compiler"
776 <          description="Compiles src/jdk8 sources, targeting jdk8">
777 <
778 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
779 <
780 <    <javac srcdir="${4jdk8src.dir}"
781 <           destdir="${build.4jdk8.classes.dir}"
782 <           debug="${build.debug}"
783 <           debuglevel="${build.debuglevel}"
784 <           deprecation="${build.deprecation}"
785 <           source="8"
786 <           target="8"
787 <           classpath=""
788 <           bootclasspath="${bootclasspath8}"
789 <           includeAntRuntime="false"
790 <           includeJavaRuntime="false"
791 <           encoding="ASCII"
792 <           executable="${javac8}"
793 <           fork="true">
794 <      <include name="**/*.java"/>
795 <      <compilerarg value="-Xprefer:source"/>
796 <      <compilerarg value="-XDignore.symbol.file=true"/>
797 <      <compilerarg value="-Xlint:all"/>
798 <      <compilerarg value="-Werror"/>
799 <      <compilerarg line="${build.args}"/>
800 <    </javac>
801 <  </target>
802 <
803 <  <target name="4jdk8doclint"
804 <          depends="configure-compiler"
805 <          description="Finds doclint warnings">
806 <
807 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
808 <
809 <    <javac srcdir="${4jdk8src.dir}"
810 <           destdir="${build.4jdk8.classes.dir}"
811 <           debug="${build.debug}"
812 <           debuglevel="${build.debuglevel}"
813 <           deprecation="${build.deprecation}"
814 <           source="8"
815 <           target="8"
816 <           classpath=""
817 <           bootclasspath="${bootclasspath8}"
818 <           includeAntRuntime="false"
819 <           includeJavaRuntime="false"
820 <           encoding="ASCII"
821 <           executable="${javac8}"
822 <           fork="true">
823 <      <include name="**/*.java"/>
824 <      <compilerarg value="-Xprefer:source"/>
825 <      <compilerarg value="-XDignore.symbol.file=true"/>
826 <      <compilerarg value="-Xlint:all"/>
827 <      <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"
835 <          description="Builds library jar from compiled sources">
836 <
837 <    <jar destfile="${4jdk8product.jar}">
838 <      <fileset dir="${build.4jdk8.classes.dir}"/>
839 <      <manifest>
840 <        <attribute name="Built-By" value="${user.name}"/>
841 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
842 <      </manifest>
843 <    </jar>
844 <  </target>
845 <
846 <
847 <  <target name="4jdk8-tck"
848 <          depends="4jdk8jar"
849 <          description="Runs tck tests for jsr166-4jdk8 directly">
850 <
851 <    <run-tck-tests
852 <      target="8"
853 <      workdir="${build.4jdk8.dir}"
854 <      classes="${4jdk8product.jar}">
855 <      <javac-elements>
856 <        <!-- JDK9+ test classes -->
857 <        <exclude name="*9Test.java"/>
858 <        <exclude name="*10Test.java"/>
859 <        <compilerarg value="-Werror"/>
860 <      </javac-elements>
861 <    </run-tck-tests>
862 <  </target>
863 <
864 <
865 <  <target name="4jdk8-jtreg"
866 <          depends="4jdk8jar"
867 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
868 <    <run-jtreg-tests
869 <       target="8"
870 <       workdir="${build.4jdk8.dir}"
871 <       classes="${4jdk8product.jar}"/>
872 <  </target>
873 <
874 <
875 <  <target name="4jdk8-test"
876 <          depends="4jdk8-tck, 4jdk8-jtreg"
877 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
878 <
879 <
880 <  <target name="4jdk8docs"
881 <          description="Builds javadocs for src/jdk8 to dist dir">
882 <
883 <    <delete dir="${4jdk8docs.dir}"/>
884 <    <mkdir dir="${4jdk8docs.dir}"/>
885 <
886 <    <javadoc destdir="${4jdk8docs.dir}"
887 <             packagenames="none"
888 <             link="${java8.api.url}"
889 <             overview="${4jdk8src.dir}/intro.html"
890 <             access="${build.javadoc.access}"
891 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
892 <             classpath=""
893 <             source="8"
894 <             executable="${javadoc8}"
895 <             failonerror = "true">
896 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
897 <        <include name="**/*.java"/>
898 <      </fileset>
899 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
900 <      <arg value="-XDignore.symbol.file=true"/>
901 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
902 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
903 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
904 < <!-- @apiNote tag currently unused -->
905 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
906 <    </javadoc>
907 <  </target>
908 <
909 <
910 <  <target name="4jdk8dist"
911 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
912 <          description="Puts all distributable products in single hierarchy"/>
913 <
914 <
915 <  <target name="4jdk8clean"
916 <          description="Removes all 4jdk8 build products">
917 <    <delete dir="${build.4jdk8.dir}"/>
918 <  </target>
919 <
920 <
921 <  <target name="4jdk8dist-jar"
922 <          depends="4jdk8clean, 4jdk8jar">
923 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
924 <  </target>
925 <
926 <
927 <  <target name="4jdk8dist-docs"
928 <          depends="4jdk8clean, 4jdk8docs">
929 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
930 <  </target>
931 <
932 <
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) -->
934
935  <target name="4jdk7compile" depends="configure-compiler">
936    <mkdir dir="${build.4jdk7.classes.dir}"/>
937
938    <javac srcdir="${4jdk7src.dir}"
939           destdir="${build.4jdk7.classes.dir}"
940           debug="${build.debug}"
941           debuglevel="${build.debuglevel}"
942           deprecation="${build.deprecation}"
943           source="6"
944           target="6"
945           classpath=""
946           bootclasspath="${bootclasspath6}"
947           includeAntRuntime="false"
948           includeJavaRuntime="false"
949           encoding="ASCII"
950           executable="${javac7}"
951           fork="true">
952
953      <include name="**/*.java"/>
954      <compilerarg value="-Xprefer:source"/>
955      <compilerarg value="-XDignore.symbol.file=true"/>
956      <compilerarg value="-Xlint:all"/>
957      <compilerarg value="-Werror"/>
958      <compilerarg line="${build.args}"/>
959    </javac>
960  </target>
961
962  <target name="4jdk7doclint" depends="configure-compiler">
963    <mkdir dir="${build.4jdk7.classes.dir}"/>
964
965    <javac srcdir="${4jdk7src.dir}"
966           destdir="${build.4jdk7.classes.dir}"
967           debug="${build.debug}"
968           debuglevel="${build.debuglevel}"
969           deprecation="${build.deprecation}"
970           source="6"
971           target="6"
972           classpath=""
973           bootclasspath="${bootclasspath6}"
974           includeAntRuntime="false"
975           includeJavaRuntime="false"
976           encoding="ASCII"
977           executable="${javac8}"
978           fork="true">
979
980      <include name="**/*.java"/>
981      <compilerarg value="-Xprefer:source"/>
982      <compilerarg value="-XDignore.symbol.file=true"/>
983      <compilerarg value="-Xlint:all"/>
984      <compilerarg value="-Xdoclint:all/protected"/>
985      <compilerarg line="${build.args}"/>
986    </javac>
987  </target>
988
989  <target name="4jdk7jar" depends="4jdk7compile">
990    <jar destfile="${4jdk7product.jar}">
991      <fileset dir="${build.4jdk7.classes.dir}"/>
992      <manifest>
993        <attribute name="Built-By" value="${user.name}"/>
994        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
995      </manifest>
996    </jar>
997  </target>
998
999  <target name="4jdk7-tck" depends="4jdk7jar">
1000    <run-tck-tests
1001      target="7"
1002      workdir="${build.4jdk7.dir}"
1003      classes="${4jdk7product.jar}">
1004      <javac-elements>
1005        <!-- JDK8+ test classes -->
1006        <exclude name="*8Test.java"/>
1007        <exclude name="*9Test.java"/>
1008        <exclude name="*10Test.java"/>
1009        <exclude name="DoubleAccumulatorTest.java"/>
1010        <exclude name="DoubleAdderTest.java"/>
1011        <exclude name="LongAccumulatorTest.java"/>
1012        <exclude name="LongAdderTest.java"/>
1013        <exclude name="CompletableFutureTest.java"/>
1014        <exclude name="SplittableRandomTest.java"/>
1015        <exclude name="StampedLockTest.java"/>
1016        <exclude name="SubmissionPublisherTest.java"/>
1017        <compilerarg value="-Werror"/>
1018      </javac-elements>
1019    </run-tck-tests>
1020  </target>
1021
1022  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
1023  <target name="4jdk7-tck-junit" depends="4jdk7compile">
1024
1025    <junit printsummary="true"
1026           showoutput="true"
1027           errorProperty="junit.failed"
1028           failureProperty="junit.failed"
1029           includeantruntime="true"
1030           jvm="${java7}"
1031           fork="true">
1032
1033      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
1034      <jvmarg value="-server"/>
1035
1036      <classpath>
1037        <pathelement location="${junit.jar}"/>
1038        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
1039      </classpath>
1040
1041      <formatter type="brief"/>
1042
1043      <test name="${jsr166.tckTestClass}" haltonfailure="no">
1044      </test>
1045    </junit>
1046  </target>
1047
1048  <target name="4jdk7-jtreg" depends="4jdk7jar">
1049    <run-jtreg-tests
1050       target="7"
1051       workdir="${build.4jdk7.dir}"
1052       classes="${4jdk7product.jar}"/>
1053  </target>
1054
1055  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1056
1057  <target name="4jdk7docs">
1058    <delete dir="${4jdk7docs.dir}"/>
1059    <mkdir dir="${4jdk7docs.dir}"/>
1060
1061    <javadoc destdir="${4jdk7docs.dir}"
1062             packagenames="none"
1063             link="${java7.api.url}"
1064             overview="${4jdk7src.dir}/intro.html"
1065             access="${build.javadoc.access}"
1066             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1067             classpath=""
1068             executable="${javadoc7}"
1069             failonerror = "true">
1070      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1071        <include name="**/*.java"/>
1072      </fileset>
1073      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1074      <arg value="-XDignore.symbol.file=true"/>
1075    </javadoc>
1076  </target>
1077
1078  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1079
1080  <target name="4jdk7clean">
1081    <delete dir="${build.4jdk7.dir}"/>
1082  </target>
1083
1084  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1085    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1086  </target>
1087
1088  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1089    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1090  </target>
1091
1092
741    <!-- jsr166x (no longer maintained) -->
1094
1095  <target name="jsr166xcompile" depends="configure-compiler">
1096    <mkdir dir="${build.jsr166x.classes.dir}"/>
1097
1098    <javac srcdir="${topsrc.dir}"
1099           destdir="${build.jsr166x.classes.dir}"
1100           debug="${build.debug}"
1101           debuglevel="${build.debuglevel}"
1102           deprecation="${build.deprecation}"
1103           classpath=""
1104           bootclasspath="${bootclasspath6}"
1105           source="5"
1106           target="5"
1107           includeAntRuntime="false"
1108           includeJavaRuntime="false"
1109           encoding="ASCII"
1110           executable="${javac7}"
1111           fork="true">
1112      <include name="jsr166x/**/*.java"/>
1113      <compilerarg value="-XDignore.symbol.file=true"/>
1114      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1115      <compilerarg value="-Werror"/>
1116      <compilerarg line="${build.args}"/>
1117    </javac>
1118  </target>
1119
1120  <target name="jsr166xjar" depends="jsr166xcompile">
1121    <jar destfile="${jsr166x.jar}">
1122      <fileset dir="${build.jsr166x.classes.dir}"/>
1123      <manifest>
1124        <attribute name="Built-By" value="${user.name}"/>
1125        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1126      </manifest>
1127    </jar>
1128  </target>
1129
1130  <target name="jsr166xdocs">
1131    <delete dir="${jsr166xdocs.dir}"/>
1132    <mkdir dir="${jsr166xdocs.dir}"/>
1133
1134    <javadoc destdir="${jsr166xdocs.dir}"
1135             packagenames="jsr166x.*"
1136             link="${java.api.url}"
1137             access="${build.javadoc.access}"
1138             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1139             bootclasspath="${bootclasspath6}"
1140             source="5"
1141             executable="${javadoc7}"
1142             failonerror = "true">
1143      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1144      <arg value="-XDignore.symbol.file=true"/>
1145    </javadoc>
1146  </target>
1147
1148  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1149
1150  <target name="jsr166xclean">
1151    <delete dir="${build.jsr166x.dir}"/>
1152  </target>
1153
1154  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1155    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1156  </target>
1157
1158  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1159    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1160  </target>
1161
1162
742    <!-- jsr166y (no longer maintained) -->
1164
1165  <target name="jsr166ycompile" depends="configure-compiler">
1166    <mkdir dir="${build.jsr166y.classes.dir}"/>
1167
1168    <javac srcdir="${topsrc.dir}"
1169           destdir="${build.jsr166y.classes.dir}"
1170           debug="${build.debug}"
1171           debuglevel="${build.debuglevel}"
1172           deprecation="${build.deprecation}"
1173           source="6"
1174           target="6"
1175           classpath=""
1176           bootclasspath="${bootclasspath6}"
1177           includeAntRuntime="false"
1178           includeJavaRuntime="false"
1179           encoding="ASCII"
1180           executable="${javac7}"
1181           fork="true">
1182
1183      <include name="jsr166y/**/*.java"/>
1184      <compilerarg value="-XDignore.symbol.file=true"/>
1185      <compilerarg value="-Xlint:all"/>
1186      <compilerarg value="-Werror"/>
1187      <compilerarg line="${build.args}"/>
1188    </javac>
1189  </target>
1190
1191  <target name="jsr166yjar" depends="jsr166ycompile">
1192    <jar destfile="${jsr166y.jar}" index="true">
1193      <fileset dir="${build.jsr166y.classes.dir}"/>
1194      <manifest>
1195        <attribute name="Built-By" value="${user.name}"/>
1196        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1197      </manifest>
1198    </jar>
1199  </target>
1200
1201  <target name="jsr166ydocs">
1202    <delete dir="${jsr166ydocs.dir}"/>
1203    <mkdir dir="${jsr166ydocs.dir}"/>
1204
1205    <javadoc destdir="${jsr166ydocs.dir}"
1206             packagenames="jsr166y.*"
1207             link="${java.api.url}"
1208             access="${build.javadoc.access}"
1209             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1210             bootclasspath="${bootclasspath6}"
1211             source="6"
1212             executable="${javadoc7}"
1213             failonerror = "true">
1214      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1215      <arg value="-XDignore.symbol.file=true"/>
1216    </javadoc>
1217  </target>
1218
1219  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1220
1221  <target name="jsr166yclean">
1222    <delete dir="${build.jsr166y.dir}"/>
1223  </target>
1224
1225  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1226    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1227  </target>
1228
1229  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1230    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1231  </target>
1232
1233
743    <!-- extra166y (no longer maintained) -->
1235
1236  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1237    <mkdir dir="${build.extra166y.classes.dir}"/>
1238
1239    <javac srcdir="${topsrc.dir}"
1240           destdir="${build.extra166y.classes.dir}"
1241           debug="${build.debug}"
1242           debuglevel="${build.debuglevel}"
1243           deprecation="${build.deprecation}"
1244           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1245           classpath=""
1246           source="6"
1247           target="6"
1248           includeAntRuntime="false"
1249           includeJavaRuntime="false"
1250           encoding="ASCII"
1251           executable="${javac7}"
1252           fork="true">
1253
1254      <include name="extra166y/**/*.java"/>
1255      <compilerarg value="-XDignore.symbol.file=true"/>
1256      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1257      <compilerarg value="-Werror"/>
1258      <compilerarg line="${build.args}"/>
1259    </javac>
1260  </target>
1261
1262  <target name="extra166yjar" depends="extra166ycompile">
1263    <jar destfile="${extra166y.jar}" index="true">
1264      <fileset dir="${build.extra166y.classes.dir}"/>
1265      <manifest>
1266        <attribute name="Built-By" value="${user.name}"/>
1267        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1268      </manifest>
1269    </jar>
1270  </target>
1271
1272  <target name="extra166ydocs">
1273    <delete dir="${extra166ydocs.dir}"/>
1274    <mkdir dir="${extra166ydocs.dir}"/>
1275
1276    <javadoc destdir="${extra166ydocs.dir}"
1277             packagenames="extra166y.*"
1278             link="${java.api.url}"
1279             access="${build.javadoc.access}"
1280             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1281             bootclasspath="${bootclasspath6}"
1282             source="6"
1283             executable="${javadoc7}">
1284      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1285      <arg value="-XDignore.symbol.file=true"/>
1286    </javadoc>
1287  </target>
1288
1289  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1290
1291  <target name="extra166yclean">
1292    <delete dir="${build.extra166y.dir}"/>
1293  </target>
1294
1295  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1296    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1297  </target>
1298
1299  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1300    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1301  </target>
1302
1303
744    <!-- jsr166e (no longer maintained) -->
745  
1306  <property name="build.jsr166e.java.version" value="6"/>
1307  <property name="build.jsr166e.javac" value="${javac6}"/>
1308
1309  <target name="jsr166ecompile" depends="configure-compiler">
1310    <mkdir dir="${build.jsr166e.classes.dir}"/>
1311
1312    <javac srcdir="${topsrc.dir}"
1313           destdir="${build.jsr166e.classes.dir}"
1314           debug="${build.debug}"
1315           debuglevel="${build.debuglevel}"
1316           deprecation="${build.deprecation}"
1317           source="${build.jsr166e.java.version}"
1318           target="${build.jsr166e.java.version}"
1319           classpath=""
1320           includeAntRuntime="false"
1321           includeJavaRuntime="false"
1322           executable="${build.jsr166e.javac}"
1323           fork="true">
1324
1325      <include name="jsr166e/**/*.java"/>
1326      <compilerarg value="-XDignore.symbol.file=true"/>
1327      <compilerarg value="-Xlint:all"/>
1328      <compilerarg value="-Werror"/>
1329      <compilerarg line="${build.args}"/>
1330    </javac>
1331  </target>
1332
1333  <target name="jsr166edoclint">
1334    <mkdir dir="${build.jsr166e.classes.dir}"/>
1335
1336    <javac srcdir="${topsrc.dir}"
1337           destdir="${build.jsr166e.classes.dir}"
1338           debug="${build.debug}"
1339           debuglevel="${build.debuglevel}"
1340           deprecation="${build.deprecation}"
1341           source="${build.jsr166e.java.version}"
1342           target="${build.jsr166e.java.version}"
1343           classpath=""
1344           bootclasspath="${bootclasspath6}"
1345           includeAntRuntime="false"
1346           includeJavaRuntime="false"
1347           executable="${javac8}"
1348           fork="true">
1349
1350      <include name="jsr166e/**/*.java"/>
1351      <compilerarg value="-XDignore.symbol.file=true"/>
1352      <compilerarg value="-Xlint:all"/>
1353      <compilerarg value="-Werror"/>
1354      <compilerarg value="-Xdoclint:all/protected"/>
1355    </javac>
1356  </target>
1357
1358  <target name="jsr166ejar" depends="jsr166ecompile">
1359    <jar destfile="${jsr166e.jar}" index="true">
1360      <fileset dir="${build.jsr166e.classes.dir}"/>
1361      <manifest>
1362        <attribute name="Built-By" value="${user.name}"/>
1363        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1364      </manifest>
1365    </jar>
1366  </target>
1367
1368  <target name="jsr166edocs">
1369    <delete dir="${jsr166edocs.dir}"/>
1370    <mkdir dir="${jsr166edocs.dir}"/>
1371
1372    <javadoc destdir="${jsr166edocs.dir}"
1373             packagenames="jsr166e.*"
1374             link="${java.api.url}"
1375             access="${build.javadoc.access}"
1376             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1377             source="${build.jsr166e.java.version}"
1378             executable="${javadoc7}"
1379             failonerror = "true">
1380      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1381      <arg value="-XDignore.symbol.file=true"/>
1382    </javadoc>
1383  </target>
1384
1385  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1386    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1387    <run-tck-tests
1388      tck.src.dir="${test.src.dir}/tck-jsr166e"
1389      target="${build.jsr166e.java.version}"
1390      workdir="${build.jsr166e.dir}"
1391      classes="${jsr166e.jar}"/>
1392  </target>
1393
1394  <target name="jsr166e-tck">
1395
1396 <!--     <antcall target="clean"/> -->
1397 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1398 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1399 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1400 <!--     </antcall> -->
1401
1402    <antcall target="clean"/>
1403    <antcall target="jsr166e-tck-one-java-version">
1404      <param name="build.jsr166e.java.version" value="7"/>
1405      <param name="build.jsr166e.javac" value="${javac7}"/>
1406    </antcall>
1407
1408    <antcall target="clean"/>
1409    <antcall target="jsr166e-tck-one-java-version">
1410      <param name="build.jsr166e.java.version" value="6"/>
1411      <param name="build.jsr166e.javac" value="${javac6}"/>
1412    </antcall>
1413  </target>
1414
1415  <target name="jsr166e-test" depends="jsr166e-tck"/>
1416
1417  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1418
1419  <target name="jsr166eclean">
1420    <delete dir="${build.jsr166e.dir}"/>
1421  </target>
1422
1423  <target name="jsr166edist-jar"
1424          depends="jsr166eclean, jsr166ejar">
1425    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1426  </target>
1427
1428  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1429    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1430  </target>
1431
1432
746   <!-- Find buglets that can be detected by static build tools -->
747  
748   <!--   <target name="lint"> -->
# Line 1453 | 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 1481 | 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