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.301 by jsr166, Sat Aug 10 16:48:04 2019 UTC vs.
Revision 1.328 by jsr166, Sat Jan 7 16:30:33 2023 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/jdk11
24 <  $HOME/jdk/jdk12
25 <  $HOME/jdk/jdk13
26 <  $HOME/jdk/jdk14
22 >  $HOME/jdk/jdk17
23 >  $HOME/jdk/jdk19
24    where each of the above is a JDK or a symlink to same, and
25 <  $HOME/jdk/src/jdk8
26 <  $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.
25 >  $HOME/jdk/src/jdk17
26 >  where each of the above is a JDK source tree or a symlink to same.
27  
28    Alternatively, define ant variables thus:
29    ant -Djdk$N.home=... -Djdk$N.src.home=...
30 <  for $N in 8 .. 14 ...
30 >  for $N in 17 .. 19 ...
31  
32    As of 2016-03, the sources in src/main are for jdk9+ only.
33    As of 2019-08, the sources in src/main are for jdk11+ only.
34 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
35 +  As of 2022-02, the sources in src/main are for jdk17+ only.
36   ------------------------------------------------------------------------------
37    </description>
38  
# Line 67 | Line 61
61    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62    <property name="build.loops.dir"             location="${build.dir}/loops"/>
63  
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
64    <!-- JDK locations -->
65    <property name="jdks.home"  location="${user.home}/jdk"/>
66  
# Line 98 | Line 72
72      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
73      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
74      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
75 <    <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"/>
75 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
76      </sequential>
77    </macrodef>
78  
# Line 132 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="8"/>
92 <  <defjdklocations v="11"/>
93 <  <defjdklocations v="12"/>
94 <  <defjdklocations v="13"/>
95 <  <defjdklocations v="14"/>
91 >  <defjdklocations v="17"/>
92 >  <defjdklocations v="18"/>
93 >  <defjdklocations v="19"/>
94 >  <defjdklocations v="20"/>
95 >  <defjdklocations v="21"/>
96  
97    <!-- Source locations -->
98    <property name="src.dir"              location="${basedir}/src/main"/>
99    <property name="test.src.dir"         location="${basedir}/src/test"/>
100    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
101    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
102 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
103 <  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
104 <  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
105 <  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
106 <  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
107 <  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
102 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
103 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
104 >  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
105 >  <property name="jtreg20.src.dir"      location="${test.src.dir}/jtreg"/>
106 >  <property name="jtreg21.src.dir"      location="${test.src.dir}/jtreg"/>
107 >  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
108    <property name="lib.dir"              location="${basedir}/lib"/>
109    <property name="dist.dir"             location="${basedir}/dist"/>
110    <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"/>
111  
112    <!-- Javadoc locations -->
113    <property name="docs.dir"          location="${build.dir}/docs"/>
114 <  <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"/>
114 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
115  
116    <!-- Jar locations -->
117    <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"/>
118    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
119  
120    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
121    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
122 <  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
123 <  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
124 <  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
125 <  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
126 <  <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"/>
197 <  <!-- The location of jdk early access docs (RIP) -->
198 <  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
199 < <!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
200 <  <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
201 <  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
122 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
123 >  <property name="java18.docroot.url" value="https://docs.oracle.com/en/java/javase/18/docs"/>
124 >  <property name="java19.docroot.url" value="https://docs.oracle.com/en/java/javase/19/docs"/>
125 >  <property name="java20.docroot.url" value="https://download.java.net/java/early_access/jdk20/docs"/>
126 >  <property name="java21.docroot.url" value="https://download.java.net/java/early_access/jdk21/docs"/>
127    <!-- Default jdk doc location (latest stable LTS release seems best) -->
128 <  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
128 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
129  
130    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
131 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
132 <  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
133 <  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
134 <  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
135 <  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
131 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
132 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
133 >  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
134 >  <property name="java20.api.url"     value="${java20.docroot.url}/api/"/>
135 >  <property name="java21.api.url"     value="${java21.docroot.url}/api/"/>
136    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
137  
138    <!-- Define the "jtreg" task -->
# Line 215 | Line 140
140    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
141             classpath="${lib.dir}/jtreg.jar" />
142  
143 <  <!-- Tck options; see JSR166TestCase.java
143 >  <!-- Tck configuration options; see JSR166TestCase.java
144     To profile a single tck test class:
145     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
146     To stress test a single tck test class:
# Line 238 | Line 163
163  
164      <sequential>
165  
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
166      <mkdir dir="@{workdir}/tck-classes"/>
167  
168      <javac srcdir="@{tck.src.dir}"
# Line 267 | Line 182
182        <include name="*.java"/>
183        <compilerarg value="-XDignore.symbol.file=true"/>
184        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
185 <      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
186 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
272 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
185 >      <compilerarg value="-Xdoclint:reference/private"/>
186 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
187        <compilerarg line="${build.args}"/>
188        <javac-elements/>
189  
# Line 279 | Line 193
193            failonerror="true"
194            jvm="${java@{target}}"
195            fork="true">
196 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
197 <        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
198 <        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
199 <        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
200 <        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
201 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
202 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
203 <        <jvmarg line="@{jvmflags}"/>
204 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
205 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
206 <
207 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
208 <        <syspropertyset id="system-properties-used-by-tck">
209 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
210 <          <propertyref prefix="jsr166."/>
211 <          <propertyref name="test.timeout.factor"/>
212 <        </syspropertyset>
213 <
214 <        <classpath>
215 <          <pathelement location="${junit.jar}"/>
216 <          <pathelement location="@{workdir}/tck-classes"/>
303 <        </classpath>
196 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
197 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
198 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
199 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
200 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
201 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
202 >        <jvmarg line="@{jvmflags}"/>
203 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
204 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
205 >
206 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
207 >        <syspropertyset id="system-properties-used-by-tck">
208 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
209 >          <propertyref prefix="jsr166."/>
210 >          <propertyref name="test.timeout.factor"/>
211 >        </syspropertyset>
212 >
213 >        <classpath>
214 >          <pathelement location="${junit.jar}"/>
215 >          <pathelement location="@{workdir}/tck-classes"/>
216 >        </classpath>
217      </java>
218  
219      </sequential>
# Line 321 | Line 234
234      </sequential>
235    </macrodef>
236  
237 <  <defjtregtests v="14"/>
238 <  <defjtregtests v="13"/>
239 <  <defjtregtests v="12"/>
240 <  <defjtregtests v="11"/>
241 <  <defjtregtests v="8"/>
237 >  <defjtregtests v="17"/>
238 >  <defjtregtests v="18"/>
239 >  <defjtregtests v="19"/>
240 >  <defjtregtests v="20"/>
241 >  <defjtregtests v="21"/>
242  
243    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
244    <property name="jtreg.flags" value=""/>
245  
246    <macrodef name="run-jtreg-tests">
334    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
247      <attribute name="target"/>
248      <attribute name="workdir"/>
249      <attribute name="classes"/>
# Line 344 | Line 256
256      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
257      <property name="jtreg.verbose" value="nopass,fail,error"/>
258  
259 <    <local name="modules"/>
260 <    <condition property="modules">
261 <      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
262 <    </condition>
259 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
260 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
261 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
262 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
263 >    <property name="jtreg.concurrency" value="3"/>
264  
265 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
265 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
266      <jtreg dir="${jtreg@{target}.src.dir}"
267             jdk="${jdk@{target}.home}"
268             workDir="@{workdir}/JTwork">
269        <patternset refid="jdk@{target}.jtreg.tests"/>
270 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
271 <      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
272 <      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
270 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
271 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
272 >      <arg value="-vmoption:-Xmx256m"/>
273 >      <arg value="-concurrency:${jtreg.concurrency}"/>
274 >      <arg value="-vmoptions:-esa -ea"/>
275 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
276        <arg value="-agentvm"/>
277        <arg value="-noreport"/>
278        <arg value="-verbose:@{verbose}"/>
363      <arg value="-vmoptions:-esa -ea"/>
279        <arg value="-automatic"/>
280        <arg value="-k:!ignore"/>
281        <arg line="@{jtregflags}"/>
# Line 383 | Line 298
298    <!-- Main targets -->
299  
300    <!-- Default values: may seem strange ... -->
301 <  <!-- At runtime, target latest LTS, i.e. jdk11 -->
302 <  <!-- But at build time, target jdk9, for maximal binary portability -->
303 <  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
304 <  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
305 <    o override-methods=summary
391 <    o {@systemProperty ...}
392 <    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
393 <    o 8202628: javadoc generates bad links in TestModules.java
394 <    -->
395 <  <property name="java.runtime.target" value="11"/>
396 <  <property name="build.main.java" value="${java11}"/>
397 <  <property name="build.main.javac" value="${javac11}"/>
398 <  <property name="build.main.javadoc" value="${javadoc12}"/>
301 >  <!-- At runtime, target latest, but build for current LTS -->
302 >  <property name="java.runtime.target" value="19"/>
303 >  <property name="build.main.java" value="${java17}"/>
304 >  <property name="build.main.javac" value="${javac17}"/>
305 >  <property name="build.main.javadoc" value="${javadoc19}"/>
306    <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
307  
308    <target name="dists"
309 <          depends="dist, 4jdk8dist"
309 >          depends="dist"
310            description="Builds all public jars and docs"/>
404          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
311  
312    <target name="compile"
313            depends="configure-compiler"
# Line 428 | Line 334
334        <compilerarg value="--patch-module=java.base=${src.dir}"/>
335        <compilerarg value="-Xprefer:source"/>
336        <compilerarg value="-XDignore.symbol.file=true"/>
337 <      <compilerarg value="-Xlint:all,-removal"/>
338 <      <compilerarg line="--doclint-format html5"/>
433 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
337 >      <compilerarg value="-Xlint:all"/>
338 >      <compilerarg value="-Xdoclint:all/protected"/>
339        <compilerarg value="-Xdoclint/package:java.util.*"/>
340        <compilerarg value="-Werror"/>
341        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
342        <compilerarg line="${build.args}"/>
438
343      </javac>
344    </target>
345  
442
346    <target name="jar"
347            depends="compile"
348            description="Builds library jar for src/main from compiled sources">
# Line 457 | Line 360
360  
361    <target name="docs"
362            description="Builds javadocs for src/main to dist dir">
363 <
461 <    <delete dir="${docs.dir}"/>
363 >    <delete dir="${docs.dir}" quiet="true"/>
364      <mkdir dir="${docs.dir}"/>
463
464    <!-- the packagenames="none" hack below prevents scanning the -->
465    <!-- sourcepath for packages -->
466
467 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
468 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
469 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
470 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
471 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
365      <javadoc destdir="${docs.dir}"
366               packagenames="none"
367               link="${java.api.url}"
# Line 478 | Line 371
371               classpath=""
372               source="${build.main.javadoc.source}"
373               executable="${build.main.javadoc}">
481 <!-- TODO: JDK-8214571 failonerror = "true" -->
374        <fileset dir="${src.dir}" defaultexcludes="yes">
375 <        <include name="**/*.java"/>
375 >        <include name="java/**/*.java"/>
376        </fileset>
377        <arg line="-Xdocrootparent ${java.docroot.url}"/>
378        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
379 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
380 +      <arg value="-quiet"/>
381        <arg value="-XDignore.symbol.file=true"/>
382        <arg value="-html5"/>
383 +      <arg value="-Xdoclint:all,-missing"/>
384        <arg value="--patch-module=java.base=${src.dir}"/>
385 < <!-- old school frames via docs/index.html?overview-summary.html -->
491 < <!-- TODO: - -frames no longer a supported option in jdk13+ -->
492 <      <arg value="--frames"/>
385 >      <arg value="--frames" if:set="use-frames"/>
386        <arg value="--override-methods=summary"/>
387        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
388        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
389        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
390        <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
498 <!-- tags added in jdk9: currently unused -->
499 <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
500 <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
391      </javadoc>
392    </target>
393  
504
394    <target name="dist"
395            depends="dist-clean, dist-jar, dist-docs"
396            description="Puts all distributable products in single hierarchy"/>
397  
509
398    <target name="clean"
399            description="Removes all build products">
400      <delete dir="${build.dir}"/>
401    </target>
402  
515
403    <target name="dist-clean"
404            description="Removes all build and distribution products">
405      <delete dir="${build.dir}"/>
406      <delete dir="${dist.dir}"/>
407    </target>
408  
522
409    <target name="dist-jar"
410            depends="clean, jar">
411      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 531 | Line 417
417    </target>
418  
419    <target name="tck"
420 <          depends="jar"
420 >          depends="jar"
421            description="Runs tck tests for src/main directly">
536
422      <run-tck-tests
423        target="${java.runtime.target}"
424        workdir="${build.dir}"
425        classes="${product.jar}">
426        <javac-elements>
427 <        <compilerarg value="-Werror"/>
427 >        <!-- <compilerarg value="-Werror"/> -->
428        </javac-elements>
429      </run-tck-tests>
430    </target>
# Line 566 | Line 451
451    </target>
452  
453    <target name="jtreg"
454 <          depends="jar"
454 >          depends="jar"
455            description="Runs jtreg tests for src/main using the jtreg ant task">
456      <run-jtreg-tests
457         target="${java.runtime.target}"
# Line 579 | Line 464
464            description="Runs tck and jtreg tests for src/main"/>
465  
466    <target name="test-version-permutations"
467 <          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
468 <  </target>
584 <
585 <  <!-- jdk9 is unsupported as of 2019-08 -->
586 < <!--   <target name="test9"> -->
587 < <!--     <antcall target="clean"/> -->
588 < <!--     <antcall> -->
589 < <!--       <param name="java.runtime.target" value="9"/> -->
590 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
591 < <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
592 < <!--       <param name="build.main.javadoc.source" value="9"/> -->
593 < <!--       <target name="test"/> -->
594 < <!--       <target name="docs"/> -->
595 < <!--     </antcall> -->
596 < <!--   </target> -->
597 <
598 <  <!-- jdk10 is unsupported as of 2019-08 -->
599 < <!--   <target name="test10"> -->
600 < <!--     <antcall target="clean"/> -->
601 < <!--     <antcall> -->
602 < <!--       <param name="java.runtime.target" value="10"/> -->
603 < <!--       <param name="build.main.javac" value="${javac10}"/> -->
604 < <!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
605 < <!--       <param name="build.main.javadoc.source" value="10"/> -->
606 < <!--       <target name="test"/> -->
607 < <!--       <target name="docs"/> -->
608 < <!--     </antcall> -->
609 < <!--   </target> -->
610 <
611 <  <target name="test11">
612 <    <antcall target="clean"/>
613 <    <antcall>
614 <      <param name="java.runtime.target" value="11"/>
615 <      <param name="build.main.javac" value="${javac11}"/>
616 <      <param name="build.main.javadoc" value="${javadoc12}"/>
617 <      <param name="build.main.javadoc.source" value="11"/>
618 <      <target name="test"/>
619 <      <target name="docs"/>
620 <    </antcall>
621 <  </target>
622 <
623 <  <target name="test12">
624 <    <antcall target="clean"/>
625 <    <antcall>
626 <      <param name="java.runtime.target" value="12"/>
627 <      <param name="build.main.javac" value="${javac12}"/>
628 <      <param name="build.main.javadoc" value="${javadoc12}"/>
629 <      <param name="build.main.javadoc.source" value="12"/>
630 <      <target name="test"/>
631 <      <target name="docs"/>
632 <    </antcall>
633 <  </target>
634 <
635 <  <target name="test13">
636 <    <antcall target="clean"/>
637 <    <antcall>
638 <      <param name="java.runtime.target" value="13"/>
639 <      <param name="build.main.javac" value="${javac13}"/>
640 <      <param name="build.main.javadoc" value="${javadoc13}"/>
641 <      <param name="build.main.javadoc.source" value="13"/>
642 <      <target name="test"/>
643 <      <target name="docs"/>
644 <    </antcall>
645 <  </target>
646 <
647 <  <target name="test14">
648 <    <antcall target="clean"/>
649 <    <antcall>
650 <      <param name="java.runtime.target" value="14"/>
651 <      <param name="build.main.javac" value="${javac14}"/>
652 <      <param name="build.main.javadoc" value="${javadoc14}"/>
653 <      <param name="build.main.javadoc.source" value="14"/>
654 <      <target name="test"/>
655 <      <target name="docs"/>
656 <    </antcall>
657 <  </target>
467 >          depends="test17, test19, clean, test, docs"
468 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
469  
659  <target name="test11-12">
660    <antcall target="clean"/>
661    <antcall>
662      <param name="java.runtime.target" value="12"/>
663      <param name="build.main.javac" value="${javac11}"/>
664      <param name="build.main.javadoc" value="${javadoc12}"/>
665      <param name="build.main.javadoc.source" value="11"/>
666      <target name="test"/>
667      <target name="docs"/>
668    </antcall>
669  </target>
470  
471 <  <target name="test11-13">
672 <    <antcall target="clean"/>
471 >  <target name="test17">
472      <antcall>
473 <      <param name="java.runtime.target" value="13"/>
474 <      <param name="build.main.javac" value="${javac11}"/>
475 <      <param name="build.main.javadoc" value="${javadoc13}"/>
476 <      <param name="build.main.javadoc.source" value="11"/>
473 >      <param name="java.runtime.target" value="17"/>
474 >      <param name="build.main.javac" value="${javac17}"/>
475 >      <param name="build.main.javadoc" value="${javadoc17}"/>
476 >      <param name="build.main.javadoc.source" value="17"/>
477 >      <target name="clean"/>
478        <target name="test"/>
479        <target name="docs"/>
480      </antcall>
481    </target>
482 <
683 <  <target name="test11-14">
684 <    <antcall target="clean"/>
482 >  <target name="test19">
483      <antcall>
484 <      <param name="java.runtime.target" value="14"/>
485 <      <param name="build.main.javac" value="${javac11}"/>
486 <      <param name="build.main.javadoc" value="${javadoc14}"/>
487 <      <param name="build.main.javadoc.source" value="11"/>
484 >      <param name="java.runtime.target" value="19"/>
485 >      <param name="build.main.javac" value="${javac19}"/>
486 >      <param name="build.main.javadoc" value="${javadoc19}"/>
487 >      <param name="build.main.javadoc.source" value="19"/>
488 >      <target name="clean"/>
489        <target name="test"/>
490        <target name="docs"/>
491      </antcall>
# Line 731 | Line 530
530  
531        <include name="*.java"/>
532        <compilerarg value="-XDignore.symbol.file=true"/>
533 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
534 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
736 <      <compilerarg line="${build.args}"/>
737 <    </javac>
738 <  </target>
739 <
740 <
741 <  <!-- jsr166 4jdk8 -->
742 <
743 <  <target name="4jdk8compile"
744 <          depends="configure-compiler"
745 <          description="Compiles src/jdk8 sources, targeting jdk8">
746 <
747 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
748 <
749 <    <javac srcdir="${4jdk8src.dir}"
750 <           destdir="${build.4jdk8.classes.dir}"
751 <           debug="${build.debug}"
752 <           debuglevel="${build.debuglevel}"
753 <           deprecation="${build.deprecation}"
754 <           source="8"
755 <           target="8"
756 <           classpath=""
757 <           bootclasspath="${bootclasspath8}"
758 <           includeAntRuntime="false"
759 <           includeJavaRuntime="false"
760 <           encoding="ASCII"
761 <           executable="${javac8}"
762 <           fork="true">
763 <      <include name="**/*.java"/>
764 <      <compilerarg value="-Xprefer:source"/>
765 <      <compilerarg value="-XDignore.symbol.file=true"/>
766 <      <compilerarg value="-Xlint:all"/>
767 <      <compilerarg value="-Werror"/>
768 <      <compilerarg line="${build.args}"/>
769 <    </javac>
770 <  </target>
771 <
772 <  <target name="4jdk8doclint"
773 <          depends="configure-compiler"
774 <          description="Finds doclint warnings">
775 <
776 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
777 <
778 <    <javac srcdir="${4jdk8src.dir}"
779 <           destdir="${build.4jdk8.classes.dir}"
780 <           debug="${build.debug}"
781 <           debuglevel="${build.debuglevel}"
782 <           deprecation="${build.deprecation}"
783 <           source="8"
784 <           target="8"
785 <           classpath=""
786 <           bootclasspath="${bootclasspath8}"
787 <           includeAntRuntime="false"
788 <           includeJavaRuntime="false"
789 <           encoding="ASCII"
790 <           executable="${javac8}"
791 <           fork="true">
792 <      <include name="**/*.java"/>
793 <      <compilerarg value="-Xprefer:source"/>
794 <      <compilerarg value="-XDignore.symbol.file=true"/>
795 <      <compilerarg value="-Xlint:all"/>
796 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
533 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
534 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
535        <compilerarg line="${build.args}"/>
536      </javac>
537    </target>
538  
539  
540 <  <target name="4jdk8jar"
541 <          depends="4jdk8compile"
804 <          description="Builds library jar from compiled sources">
805 <
806 <    <jar destfile="${4jdk8product.jar}">
807 <      <fileset dir="${build.4jdk8.classes.dir}"/>
808 <      <manifest>
809 <        <attribute name="Built-By" value="${user.name}"/>
810 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
811 <      </manifest>
812 <    </jar>
813 <  </target>
814 <
815 <
816 <  <target name="4jdk8-tck"
817 <          depends="4jdk8jar"
818 <          description="Runs tck tests for jsr166-4jdk8 directly">
819 <
820 <    <run-tck-tests
821 <      target="8"
822 <      workdir="${build.4jdk8.dir}"
823 <      classes="${4jdk8product.jar}">
824 <      <javac-elements>
825 <        <!-- JDK9+ test classes -->
826 <        <exclude name="*9Test.java"/>
827 <        <exclude name="*10Test.java"/>
828 <        <compilerarg value="-Werror"/>
829 <      </javac-elements>
830 <    </run-tck-tests>
831 <  </target>
832 <
833 <
834 <  <target name="4jdk8-jtreg"
835 <          depends="4jdk8jar"
836 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
837 <    <run-jtreg-tests
838 <       target="8"
839 <       workdir="${build.4jdk8.dir}"
840 <       classes="${4jdk8product.jar}"/>
841 <  </target>
842 <
843 <
844 <  <target name="4jdk8-test"
845 <          depends="4jdk8-tck, 4jdk8-jtreg"
846 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
847 <
848 <
849 <  <target name="4jdk8docs"
850 <          description="Builds javadocs for src/jdk8 to dist dir">
851 <
852 <    <delete dir="${4jdk8docs.dir}"/>
853 <    <mkdir dir="${4jdk8docs.dir}"/>
854 <
855 <    <javadoc destdir="${4jdk8docs.dir}"
856 <             packagenames="none"
857 <             link="${java8.api.url}"
858 <             overview="${4jdk8src.dir}/intro.html"
859 <             access="${build.javadoc.access}"
860 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
861 <             classpath=""
862 <             source="8"
863 <             executable="${javadoc8}"
864 <             failonerror = "true">
865 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
866 <        <include name="**/*.java"/>
867 <      </fileset>
868 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
869 <      <arg value="-XDignore.symbol.file=true"/>
870 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
871 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
872 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
873 < <!-- @apiNote tag currently unused -->
874 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
875 <    </javadoc>
876 <  </target>
877 <
878 <
879 <  <target name="4jdk8dist"
880 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
881 <          description="Puts all distributable products in single hierarchy"/>
882 <
883 <
884 <  <target name="4jdk8clean"
885 <          description="Removes all 4jdk8 build products">
886 <    <delete dir="${build.4jdk8.dir}"/>
887 <  </target>
888 <
889 <
890 <  <target name="4jdk8dist-jar"
891 <          depends="4jdk8clean, 4jdk8jar">
892 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
893 <  </target>
894 <
895 <
896 <  <target name="4jdk8dist-docs"
897 <          depends="4jdk8clean, 4jdk8docs">
898 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
899 <  </target>
900 <
901 <
540 >  <!-- old branches no longer maintained.  build support deleted -->
541 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
542    <!-- jsr166 4jdk7 (no longer maintained) -->
903
904  <target name="4jdk7compile" depends="configure-compiler">
905    <mkdir dir="${build.4jdk7.classes.dir}"/>
906
907    <javac srcdir="${4jdk7src.dir}"
908           destdir="${build.4jdk7.classes.dir}"
909           debug="${build.debug}"
910           debuglevel="${build.debuglevel}"
911           deprecation="${build.deprecation}"
912           source="6"
913           target="6"
914           classpath=""
915           bootclasspath="${bootclasspath6}"
916           includeAntRuntime="false"
917           includeJavaRuntime="false"
918           encoding="ASCII"
919           executable="${javac7}"
920           fork="true">
921
922      <include name="**/*.java"/>
923      <compilerarg value="-Xprefer:source"/>
924      <compilerarg value="-XDignore.symbol.file=true"/>
925      <compilerarg value="-Xlint:all"/>
926      <compilerarg value="-Werror"/>
927      <compilerarg line="${build.args}"/>
928    </javac>
929  </target>
930
931  <target name="4jdk7doclint" depends="configure-compiler">
932    <mkdir dir="${build.4jdk7.classes.dir}"/>
933
934    <javac srcdir="${4jdk7src.dir}"
935           destdir="${build.4jdk7.classes.dir}"
936           debug="${build.debug}"
937           debuglevel="${build.debuglevel}"
938           deprecation="${build.deprecation}"
939           source="6"
940           target="6"
941           classpath=""
942           bootclasspath="${bootclasspath6}"
943           includeAntRuntime="false"
944           includeJavaRuntime="false"
945           encoding="ASCII"
946           executable="${javac8}"
947           fork="true">
948
949      <include name="**/*.java"/>
950      <compilerarg value="-Xprefer:source"/>
951      <compilerarg value="-XDignore.symbol.file=true"/>
952      <compilerarg value="-Xlint:all"/>
953      <compilerarg value="-Xdoclint:all/protected"/>
954      <compilerarg line="${build.args}"/>
955    </javac>
956  </target>
957
958  <target name="4jdk7jar" depends="4jdk7compile">
959    <jar destfile="${4jdk7product.jar}">
960      <fileset dir="${build.4jdk7.classes.dir}"/>
961      <manifest>
962        <attribute name="Built-By" value="${user.name}"/>
963        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
964      </manifest>
965    </jar>
966  </target>
967
968  <target name="4jdk7-tck" depends="4jdk7jar">
969    <run-tck-tests
970      target="7"
971      workdir="${build.4jdk7.dir}"
972      classes="${4jdk7product.jar}">
973      <javac-elements>
974        <!-- JDK8+ test classes -->
975        <exclude name="*8Test.java"/>
976        <exclude name="*9Test.java"/>
977        <exclude name="*10Test.java"/>
978        <exclude name="DoubleAccumulatorTest.java"/>
979        <exclude name="DoubleAdderTest.java"/>
980        <exclude name="LongAccumulatorTest.java"/>
981        <exclude name="LongAdderTest.java"/>
982        <exclude name="CompletableFutureTest.java"/>
983        <exclude name="SplittableRandomTest.java"/>
984        <exclude name="StampedLockTest.java"/>
985        <exclude name="SubmissionPublisherTest.java"/>
986        <compilerarg value="-Werror"/>
987      </javac-elements>
988    </run-tck-tests>
989  </target>
990
991  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
992  <target name="4jdk7-tck-junit" depends="4jdk7compile">
993
994    <junit printsummary="true"
995           showoutput="true"
996           errorProperty="junit.failed"
997           failureProperty="junit.failed"
998           includeantruntime="true"
999           jvm="${java7}"
1000           fork="true">
1001
1002      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
1003      <jvmarg value="-server"/>
1004
1005      <classpath>
1006        <pathelement location="${junit.jar}"/>
1007        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
1008      </classpath>
1009
1010      <formatter type="brief"/>
1011
1012      <test name="${jsr166.tckTestClass}" haltonfailure="no">
1013      </test>
1014    </junit>
1015  </target>
1016
1017  <target name="4jdk7-jtreg" depends="4jdk7jar">
1018    <run-jtreg-tests
1019       target="7"
1020       workdir="${build.4jdk7.dir}"
1021       classes="${4jdk7product.jar}"/>
1022  </target>
1023
1024  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1025
1026  <target name="4jdk7docs">
1027    <delete dir="${4jdk7docs.dir}"/>
1028    <mkdir dir="${4jdk7docs.dir}"/>
1029
1030    <javadoc destdir="${4jdk7docs.dir}"
1031             packagenames="none"
1032             link="${java7.api.url}"
1033             overview="${4jdk7src.dir}/intro.html"
1034             access="${build.javadoc.access}"
1035             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1036             classpath=""
1037             executable="${javadoc7}"
1038             failonerror = "true">
1039      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1040        <include name="**/*.java"/>
1041      </fileset>
1042      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1043      <arg value="-XDignore.symbol.file=true"/>
1044    </javadoc>
1045  </target>
1046
1047  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1048
1049  <target name="4jdk7clean">
1050    <delete dir="${build.4jdk7.dir}"/>
1051  </target>
1052
1053  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1054    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1055  </target>
1056
1057  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1058    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1059  </target>
1060
1061
543    <!-- jsr166x (no longer maintained) -->
1063
1064  <target name="jsr166xcompile" depends="configure-compiler">
1065    <mkdir dir="${build.jsr166x.classes.dir}"/>
1066
1067    <javac srcdir="${topsrc.dir}"
1068           destdir="${build.jsr166x.classes.dir}"
1069           debug="${build.debug}"
1070           debuglevel="${build.debuglevel}"
1071           deprecation="${build.deprecation}"
1072           classpath=""
1073           bootclasspath="${bootclasspath6}"
1074           source="5"
1075           target="5"
1076           includeAntRuntime="false"
1077           includeJavaRuntime="false"
1078           encoding="ASCII"
1079           executable="${javac7}"
1080           fork="true">
1081      <include name="jsr166x/**/*.java"/>
1082      <compilerarg value="-XDignore.symbol.file=true"/>
1083      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1084      <compilerarg value="-Werror"/>
1085      <compilerarg line="${build.args}"/>
1086    </javac>
1087  </target>
1088
1089  <target name="jsr166xjar" depends="jsr166xcompile">
1090    <jar destfile="${jsr166x.jar}">
1091      <fileset dir="${build.jsr166x.classes.dir}"/>
1092      <manifest>
1093        <attribute name="Built-By" value="${user.name}"/>
1094        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1095      </manifest>
1096    </jar>
1097  </target>
1098
1099  <target name="jsr166xdocs">
1100    <delete dir="${jsr166xdocs.dir}"/>
1101    <mkdir dir="${jsr166xdocs.dir}"/>
1102
1103    <javadoc destdir="${jsr166xdocs.dir}"
1104             packagenames="jsr166x.*"
1105             link="${java.api.url}"
1106             access="${build.javadoc.access}"
1107             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1108             bootclasspath="${bootclasspath6}"
1109             source="5"
1110             executable="${javadoc7}"
1111             failonerror = "true">
1112      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1113      <arg value="-XDignore.symbol.file=true"/>
1114    </javadoc>
1115  </target>
1116
1117  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1118
1119  <target name="jsr166xclean">
1120    <delete dir="${build.jsr166x.dir}"/>
1121  </target>
1122
1123  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1124    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1125  </target>
1126
1127  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1128    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1129  </target>
1130
1131
544    <!-- jsr166y (no longer maintained) -->
1133
1134  <target name="jsr166ycompile" depends="configure-compiler">
1135    <mkdir dir="${build.jsr166y.classes.dir}"/>
1136
1137    <javac srcdir="${topsrc.dir}"
1138           destdir="${build.jsr166y.classes.dir}"
1139           debug="${build.debug}"
1140           debuglevel="${build.debuglevel}"
1141           deprecation="${build.deprecation}"
1142           source="6"
1143           target="6"
1144           classpath=""
1145           bootclasspath="${bootclasspath6}"
1146           includeAntRuntime="false"
1147           includeJavaRuntime="false"
1148           encoding="ASCII"
1149           executable="${javac7}"
1150           fork="true">
1151
1152      <include name="jsr166y/**/*.java"/>
1153      <compilerarg value="-XDignore.symbol.file=true"/>
1154      <compilerarg value="-Xlint:all"/>
1155      <compilerarg value="-Werror"/>
1156      <compilerarg line="${build.args}"/>
1157    </javac>
1158  </target>
1159
1160  <target name="jsr166yjar" depends="jsr166ycompile">
1161    <jar destfile="${jsr166y.jar}" index="true">
1162      <fileset dir="${build.jsr166y.classes.dir}"/>
1163      <manifest>
1164        <attribute name="Built-By" value="${user.name}"/>
1165        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1166      </manifest>
1167    </jar>
1168  </target>
1169
1170  <target name="jsr166ydocs">
1171    <delete dir="${jsr166ydocs.dir}"/>
1172    <mkdir dir="${jsr166ydocs.dir}"/>
1173
1174    <javadoc destdir="${jsr166ydocs.dir}"
1175             packagenames="jsr166y.*"
1176             link="${java.api.url}"
1177             access="${build.javadoc.access}"
1178             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1179             bootclasspath="${bootclasspath6}"
1180             source="6"
1181             executable="${javadoc7}"
1182             failonerror = "true">
1183      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1184      <arg value="-XDignore.symbol.file=true"/>
1185    </javadoc>
1186  </target>
1187
1188  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1189
1190  <target name="jsr166yclean">
1191    <delete dir="${build.jsr166y.dir}"/>
1192  </target>
1193
1194  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1195    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1196  </target>
1197
1198  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1199    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1200  </target>
1201
1202
545    <!-- extra166y (no longer maintained) -->
1204
1205  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1206    <mkdir dir="${build.extra166y.classes.dir}"/>
1207
1208    <javac srcdir="${topsrc.dir}"
1209           destdir="${build.extra166y.classes.dir}"
1210           debug="${build.debug}"
1211           debuglevel="${build.debuglevel}"
1212           deprecation="${build.deprecation}"
1213           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1214           classpath=""
1215           source="6"
1216           target="6"
1217           includeAntRuntime="false"
1218           includeJavaRuntime="false"
1219           encoding="ASCII"
1220           executable="${javac7}"
1221           fork="true">
1222
1223      <include name="extra166y/**/*.java"/>
1224      <compilerarg value="-XDignore.symbol.file=true"/>
1225      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1226      <compilerarg value="-Werror"/>
1227      <compilerarg line="${build.args}"/>
1228    </javac>
1229  </target>
1230
1231  <target name="extra166yjar" depends="extra166ycompile">
1232    <jar destfile="${extra166y.jar}" index="true">
1233      <fileset dir="${build.extra166y.classes.dir}"/>
1234      <manifest>
1235        <attribute name="Built-By" value="${user.name}"/>
1236        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1237      </manifest>
1238    </jar>
1239  </target>
1240
1241  <target name="extra166ydocs">
1242    <delete dir="${extra166ydocs.dir}"/>
1243    <mkdir dir="${extra166ydocs.dir}"/>
1244
1245    <javadoc destdir="${extra166ydocs.dir}"
1246             packagenames="extra166y.*"
1247             link="${java.api.url}"
1248             access="${build.javadoc.access}"
1249             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1250             bootclasspath="${bootclasspath6}"
1251             source="6"
1252             executable="${javadoc7}">
1253      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1254      <arg value="-XDignore.symbol.file=true"/>
1255    </javadoc>
1256  </target>
1257
1258  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1259
1260  <target name="extra166yclean">
1261    <delete dir="${build.extra166y.dir}"/>
1262  </target>
1263
1264  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1265    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1266  </target>
1267
1268  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1269    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1270  </target>
1271
1272
546    <!-- jsr166e (no longer maintained) -->
547  
1275  <property name="build.jsr166e.java.version" value="6"/>
1276  <property name="build.jsr166e.javac" value="${javac6}"/>
1277
1278  <target name="jsr166ecompile" depends="configure-compiler">
1279    <mkdir dir="${build.jsr166e.classes.dir}"/>
1280
1281    <javac srcdir="${topsrc.dir}"
1282           destdir="${build.jsr166e.classes.dir}"
1283           debug="${build.debug}"
1284           debuglevel="${build.debuglevel}"
1285           deprecation="${build.deprecation}"
1286           source="${build.jsr166e.java.version}"
1287           target="${build.jsr166e.java.version}"
1288           classpath=""
1289           includeAntRuntime="false"
1290           includeJavaRuntime="false"
1291           executable="${build.jsr166e.javac}"
1292           fork="true">
1293
1294      <include name="jsr166e/**/*.java"/>
1295      <compilerarg value="-XDignore.symbol.file=true"/>
1296      <compilerarg value="-Xlint:all"/>
1297      <compilerarg value="-Werror"/>
1298      <compilerarg line="${build.args}"/>
1299    </javac>
1300  </target>
1301
1302  <target name="jsr166edoclint">
1303    <mkdir dir="${build.jsr166e.classes.dir}"/>
1304
1305    <javac srcdir="${topsrc.dir}"
1306           destdir="${build.jsr166e.classes.dir}"
1307           debug="${build.debug}"
1308           debuglevel="${build.debuglevel}"
1309           deprecation="${build.deprecation}"
1310           source="${build.jsr166e.java.version}"
1311           target="${build.jsr166e.java.version}"
1312           classpath=""
1313           bootclasspath="${bootclasspath6}"
1314           includeAntRuntime="false"
1315           includeJavaRuntime="false"
1316           executable="${javac8}"
1317           fork="true">
1318
1319      <include name="jsr166e/**/*.java"/>
1320      <compilerarg value="-XDignore.symbol.file=true"/>
1321      <compilerarg value="-Xlint:all"/>
1322      <compilerarg value="-Werror"/>
1323      <compilerarg value="-Xdoclint:all/protected"/>
1324    </javac>
1325  </target>
1326
1327  <target name="jsr166ejar" depends="jsr166ecompile">
1328    <jar destfile="${jsr166e.jar}" index="true">
1329      <fileset dir="${build.jsr166e.classes.dir}"/>
1330      <manifest>
1331        <attribute name="Built-By" value="${user.name}"/>
1332        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1333      </manifest>
1334    </jar>
1335  </target>
1336
1337  <target name="jsr166edocs">
1338    <delete dir="${jsr166edocs.dir}"/>
1339    <mkdir dir="${jsr166edocs.dir}"/>
1340
1341    <javadoc destdir="${jsr166edocs.dir}"
1342             packagenames="jsr166e.*"
1343             link="${java.api.url}"
1344             access="${build.javadoc.access}"
1345             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1346             source="${build.jsr166e.java.version}"
1347             executable="${javadoc7}"
1348             failonerror = "true">
1349      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1350      <arg value="-XDignore.symbol.file=true"/>
1351    </javadoc>
1352  </target>
1353
1354  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1355    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1356    <run-tck-tests
1357      tck.src.dir="${test.src.dir}/tck-jsr166e"
1358      target="${build.jsr166e.java.version}"
1359      workdir="${build.jsr166e.dir}"
1360      classes="${jsr166e.jar}"/>
1361  </target>
1362
1363  <target name="jsr166e-tck">
1364
1365 <!--     <antcall target="clean"/> -->
1366 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1367 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1368 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1369 <!--     </antcall> -->
1370
1371    <antcall target="clean"/>
1372    <antcall target="jsr166e-tck-one-java-version">
1373      <param name="build.jsr166e.java.version" value="7"/>
1374      <param name="build.jsr166e.javac" value="${javac7}"/>
1375    </antcall>
1376
1377    <antcall target="clean"/>
1378    <antcall target="jsr166e-tck-one-java-version">
1379      <param name="build.jsr166e.java.version" value="6"/>
1380      <param name="build.jsr166e.javac" value="${javac6}"/>
1381    </antcall>
1382  </target>
1383
1384  <target name="jsr166e-test" depends="jsr166e-tck"/>
1385
1386  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1387
1388  <target name="jsr166eclean">
1389    <delete dir="${build.jsr166e.dir}"/>
1390  </target>
1391
1392  <target name="jsr166edist-jar"
1393          depends="jsr166eclean, jsr166ejar">
1394    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1395  </target>
1396
1397  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1398    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1399  </target>
1400
1401
548   <!-- Find buglets that can be detected by static build tools -->
549  
550   <!--   <target name="lint"> -->
# Line 1422 | Line 568
568    https://github.com/google/error-prone/issues/1143
569   =================================================================== -->
570    <path id="errorprone.processorpath.path">
571 <    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
571 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
572      <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
573      <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
574      <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
575 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
576    </path>
577    <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
578    <property name="errorprone.jsr166.user.flags" value=""/>
579    <property name="errorprone.jsr166.flags"
580              value="-Xep:HashtableContains:OFF
581 +                   -Xep:PreferJavaTimeOverload:OFF
582                     -Xep:JdkObsolete:OFF
583                     -Xep:MissingOverride:OFF
584                     -Xep:MissingFail:OFF
# Line 1450 | Line 598
598    <property name="errorprone.jsr166.test.flags"
599              value="-Xep:StringSplitter:OFF
600                     -Xep:BoxedPrimitiveConstructor:OFF
601 +                   -Xep:UnnecessaryParentheses:OFF
602                     -Xep:ModifyingCollectionWithItself:OFF"/>
603    <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
604    <target name="errorprone"
# Line 1485 | Line 634
634        <compilerarg value="-XDignore.symbol.file=true"/>
635        <compilerarg value="-Xlint:all"/>
636        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
637 <      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
637 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
638 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
639        <compilerarg line="${build.args}"/>
640      </javac>
641  
# Line 1505 | Line 655
655          <compilerarg value="-Xplugin:ErrorProne
656                              ${errorprone.jsr166.flags}
657                              ${errorprone.jsr166.test.flags}"/>
658 <        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
658 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
659 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
660        </javac-elements>
661      </run-tck-tests>
662    </target>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines