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.302 by jsr166, Sun Aug 18 18:55:55 2019 UTC vs.
Revision 1.320 by jsr166, Tue Sep 15 19:09:50 2020 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines