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.275 by jsr166, Wed Jul 18 01:16:42 2018 UTC vs.
Revision 1.320 by jsr166, Tue Sep 15 19:09:50 2020 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if"
2 >  xmlns:if="ant:if"
3    xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
# Line 19 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22  $HOME/jdk/jdk8
23  $HOME/jdk/jdk9
24  $HOME/jdk/jdk10
22    $HOME/jdk/jdk11
23    $HOME/jdk/jdk12
24 +  $HOME/jdk/jdk13
25 +  $HOME/jdk/jdk14
26 +  $HOME/jdk/jdk15
27 +  $HOME/jdk/jdk16
28    where each of the above is a JDK or a symlink to same, and
28  $HOME/jdk/src/jdk8
29  $HOME/jdk/src/jdk9
30  $HOME/jdk/src/jdk10
29    $HOME/jdk/src/jdk11
30    $HOME/jdk/src/jdk12
31 <  where each of the above is a complete JDK source tree
32 <  (e.g. mercurial forest) or a symlink to same.
31 >  $HOME/jdk/src/jdk13
32 >  $HOME/jdk/src/jdk14
33 >  $HOME/jdk/src/jdk15
34 >  $HOME/jdk/src/jdk16
35 >  where each of the above is a JDK source tree or a symlink to same.
36  
37    Alternatively, define ant variables thus:
38    ant -Djdk$N.home=... -Djdk$N.src.home=...
39 <  for $N in 8 9 10 ...
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 55 | Line 58
58  
59  
60    <!-- Compilation options -->
58  <property name="build.sourcelevel"    value="6"/>
61    <property name="build.debug"          value="true"/>
62    <property name="build.debuglevel"     value="source,lines,vars"/>
63    <property name="build.deprecation"    value="false"/>
# 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="6"/>
136  <defjdklocations v="7"/>
137  <defjdklocations v="8"/>
138  <defjdklocations v="9"/>
139  <defjdklocations v="10"/>
99    <defjdklocations v="11"/>
100    <defjdklocations v="12"/>
101 +  <defjdklocations v="13"/>
102 +  <defjdklocations v="14"/>
103 +  <defjdklocations v="15"/>
104 +  <defjdklocations v="16"/>
105  
106    <!-- Source locations -->
107    <property name="src.dir"              location="${basedir}/src/main"/>
108    <property name="test.src.dir"         location="${basedir}/src/test"/>
109    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
110    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
148  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
149  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
150  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
111    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
112    <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
113 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
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"/>
158  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
159  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
160  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
161  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
162  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
163  <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"/>
168 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
169 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
170 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
171 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
172 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
173 <
174 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
175 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
176 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
177 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
178 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
179 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
180 <  <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"/>
184  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
185  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
186  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
187  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
188  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
189  <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"/>
198 <  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
199 <  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/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="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
138 <  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
139 <  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
140 <  <property name="java12.docroot.url" value="http://download.java.net/java/jdk12/docs"/>
141 <  <!-- Default jdk doc location (latest stable release seems best) -->
142 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
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="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 -->
209  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
210  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
211  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
212  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
213  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
214  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
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 221 | 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 244 | Line 183
183  
184      <sequential>
185  
247    <local name="modules"/>
248    <condition property="modules">
249      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
250    </condition>
251
252    <local name="use-doclint"/>
253    <condition property="use-doclint">
254      <not> <equals arg1="@{target}" arg2="7"/> </not>
255    </condition>
256
186      <mkdir dir="@{workdir}/tck-classes"/>
187  
188      <javac srcdir="@{tck.src.dir}"
# Line 273 | 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"/>
278 <      <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 285 | 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"/>
309 <        </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 327 | 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"/>
332  <defjtregtests v="10"/>
333  <defjtregtests v="9"/>
334  <defjtregtests v="8"/>
335  <defjtregtests v="7"/>
263  
264    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
265    <property name="jtreg.flags" value=""/>
266  
267    <macrodef name="run-jtreg-tests">
268 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
268 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
269      <attribute name="target"/>
270      <attribute name="workdir"/>
271      <attribute name="classes"/>
# Line 351 | Line 278
278      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
279      <property name="jtreg.verbose" value="nopass,fail,error"/>
280  
354    <local name="modules"/>
355    <condition property="modules">
356      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
357    </condition>
358
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 383 | Line 305
305    </path>
306  
307    <!-- Support @jls tag, used in jdk8+ javadoc -->
308 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
309    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
310    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
311  
312    <!-- Main targets -->
313  
314 <  <property name="build.main.java.version" value="9"/>
315 <  <!-- Workaround "no nested properties in ant" -->
316 <  <macrodef name="define-build-main-properties">
317 <    <attribute name="v"/>
318 <    <sequential>
319 <      <property name="build.main.java"    value="${java@{v}}"/>
320 <      <property name="build.main.javac"   value="${javac@{v}}"/>
321 <      <!-- Force javadoc version to be at least 10,
322 <           so we can use override-methods=summary -->
323 <      <condition property="build.main.javadoc"
324 <                 value="${javadoc11}"
325 <                 else="${javadoc@{v}}">
326 <        <equals arg1="@{v}" arg2="9"/>
327 <      </condition>
328 <    </sequential>
406 <  </macrodef>
407 <  <define-build-main-properties v="${build.main.java.version}"/>
314 >  <!-- Default values: may seem strange ... -->
315 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
316 >  <!-- But at build time, target jdk9, for maximal binary portability -->
317 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
318 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
319 >    o override-methods=summary
320 >    o {@systemProperty ...}
321 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
322 >    o 8202628: javadoc generates bad links in TestModules.java
323 >    -->
324 >  <property name="java.runtime.target" value="11"/>
325 >  <property name="build.main.java" value="${java11}"/>
326 >  <property name="build.main.javac" value="${javac11}"/>
327 >  <property name="build.main.javadoc" value="${javadoc12}"/>
328 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
329  
330    <target name="dists"
331 <          depends="dist, 4jdk8dist"
331 >          depends="dist"
332            description="Builds all public jars and docs"/>
412          <!--
413              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
414          -->
333  
334    <target name="compile"
335            depends="configure-compiler"
# Line 438 | Line 356
356        <compilerarg value="--patch-module=java.base=${src.dir}"/>
357        <compilerarg value="-Xprefer:source"/>
358        <compilerarg value="-XDignore.symbol.file=true"/>
359 <      <compilerarg value="-Xlint:all"/>
359 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
360 >      <compilerarg value="-Xlint:all,-removal"/>
361        <compilerarg line="--doclint-format html5"/>
362 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
362 > <!--  Temporarily disable doclint for private elements, due to -->
363 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
364 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
365 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
366 >      <compilerarg value="-Xdoclint:all/protected"/>
367 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
368        <compilerarg value="-Werror"/>
369        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
370        <compilerarg line="${build.args}"/>
# Line 467 | 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 480 | Line 411
411   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
412      <javadoc destdir="${docs.dir}"
413               packagenames="none"
414 <             link="${java9.api.url}"
414 >             link="${java.api.url}"
415               overview="${src.dir}/intro.html"
416               access="${build.javadoc.access}"
417               sourcepath="${src.dir}"
418               classpath=""
419 <             source="9"
419 >             source="${build.main.javadoc.source}"
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 ${java9.docroot.url}"/>
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 +      <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 512 | Line 447
447            description="Puts all distributable products in single hierarchy"/>
448  
449  
515  <target name="release"
516          depends="dist"
517          description="Puts entire CVS tree, plus distribution productions, in a jar">
518
519    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
520
521    <jar basedir="${basedir}" destfile="${release.jar}">
522      <!-- <exclude name="build/**"/> -->
523      <exclude name="${release.jar}"/>
524      <exclude name="user.properties"/>
525      <exclude name="etc/notes/**"/>
526      <exclude name="src/emulation/**"/>
527      <exclude name="**/SyntaxTest.java"/>
528      <exclude name="**/SuperfluousAbstract.java"/>
529      <manifest>
530        <attribute name="Built-By" value="${user.name}"/>
531        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
532      </manifest>
533    </jar>
534  </target>
535
536
450    <target name="clean"
451            description="Removes all build products">
452      <delete dir="${build.dir}"/>
# Line 558 | 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
478 <      target="${build.main.java.version}"
478 >      target="${java.runtime.target}"
479        workdir="${build.dir}"
480        classes="${product.jar}">
481        <javac-elements>
# Line 593 | 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="${build.main.java.version}"
512 >       target="${java.runtime.target}"
513         workdir="${build.dir}"
514         classes="${product.jar}"/>
515    </target>
# Line 605 | Line 518
518            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
519            description="Runs tck and jtreg tests for src/main"/>
520  
521 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
521 >  <target name="test-version-permutations"
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">
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 < <!--     <antcall target="jtreg"> -->
540 < <!--       <param name="build.main.java.version" value="8"/> -->
541 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
542 < <!--     </antcall> -->
539 >  <target name="test12">
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> -->
551 >  <target name="test13">
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="test9101112"
564 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
563 >  <target name="test14">
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 <    <antcall target="clean"/>
576 <    <antcall target="test">
577 <      <param name="build.main.java.version" value="9"/>
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 <    <antcall target="clean"/>
588 <    <antcall target="test">
589 <      <param name="build.main.java.version" value="10"/>
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 <    <antcall target="clean"/>
600 <    <antcall target="test">
601 <      <param name="build.main.java.version" value="11"/>
599 >  <target name="test11-12">
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 <    <antcall target="clean"/>
612 <    <antcall target="test">
613 <      <param name="build.main.java.version" value="12"/>
611 >  <target name="test11-13">
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 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
624 <    <antcall target="clean"/>
623 >  <target name="test11-14">
624 >    <antcall>
625 >      <param name="java.runtime.target" value="14"/>
626 >      <param name="build.main.javac" value="${javac11}"/>
627 >      <param name="build.main.javadoc" value="${javadoc14}"/>
628 >      <param name="build.main.javadoc.source" value="11"/>
629 >      <target name="clean"/>
630 >      <target name="test"/>
631 >      <target name="docs"/>
632 >    </antcall>
633 >  </target>
634 >
635 >  <target name="test11-15">
636 >    <antcall>
637 >      <param name="java.runtime.target" value="15"/>
638 >      <param name="build.main.javac" value="${javac11}"/>
639 >      <param name="build.main.javadoc" value="${javadoc15}"/>
640 >      <param name="build.main.javadoc.source" value="11"/>
641 >      <target name="clean"/>
642 >      <target name="test"/>
643 >      <target name="docs"/>
644 >    </antcall>
645 >  </target>
646  
647 +  <target name="test11-16">
648 +    <antcall>
649 +      <param name="java.runtime.target" value="16"/>
650 +      <param name="build.main.javac" value="${javac11}"/>
651 +      <param name="build.main.javadoc" value="${javadoc16}"/>
652 +      <param name="build.main.javadoc.source" value="11"/>
653 +      <target name="clean"/>
654 +      <target name="test"/>
655 +      <target name="docs"/>
656 +    </antcall>
657    </target>
658  
659 +  <target name="docs16">
660 +    <antcall>
661 +      <param name="java.runtime.target" value="16"/>
662 +      <param name="build.main.javac" value="${javac16}"/>
663 +      <param name="build.main.javadoc" value="${javadoc16}"/>
664 +      <param name="build.main.javadoc.source" value="16"/>
665 +      <target name="clean"/>
666 +      <target name="docs"/>
667 +    </antcall>
668 +  </target>
669  
670  
671    <target name="configure-compiler">
# Line 664 | Line 688
688    </target>
689  
690  
667
668  <!-- Various demos and test programs -->
669
670
671  <!-- description="Benchmark from Doug Lea's AQS paper" -->
672  <target name="loops" depends="configure-compiler">
673
674    <mkdir dir="${build.loops.dir}"/>
675
676    <javac srcdir="${loops.src.dir}"
677          destdir="${build.loops.dir}"
678            debug="${build.debug}"
679       debuglevel="${build.debuglevel}"
680      deprecation="${build.deprecation}"
681           source="${build.sourcelevel}"
682           target="${build.sourcelevel}"
683         encoding="ASCII"
684             fork="true">
685
686      <compilerarg line="${build.args}"/>
687      <classpath refid="loops.classpath"/>
688      <compilerarg value="-XDignore.symbol.file=true"/>
689
690    </javac>
691
692    <java classname="ALoops" fork="true">
693      <classpath refid="loops.classpath"/>
694    </java>
695  </target>
696
697
691    <target name="compile-test-loops" depends="jar"
692            description="Compiles all the perf tests in src/test/loops">
693  
# Line 713 | 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}"/>
718 <      <compilerarg line="${build.args}"/>
719 <    </javac>
720 <  </target>
721 <
722 <
723 <  <!-- jsr166 4jdk8 -->
724 <
725 <  <target name="4jdk8compile"
726 <          depends="configure-compiler"
727 <          description="Compiles src/jdk8 sources, targeting jdk8">
728 <
729 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
730 <
731 <    <javac srcdir="${4jdk8src.dir}"
732 <           destdir="${build.4jdk8.classes.dir}"
733 <           debug="${build.debug}"
734 <           debuglevel="${build.debuglevel}"
735 <           deprecation="${build.deprecation}"
736 <           source="8"
737 <           target="8"
738 <           classpath=""
739 <           bootclasspath="${bootclasspath8}"
740 <           includeAntRuntime="false"
741 <           includeJavaRuntime="false"
742 <           encoding="ASCII"
743 <           executable="${javac8}"
744 <           fork="true">
745 <      <include name="**/*.java"/>
746 <      <compilerarg value="-Xprefer:source"/>
747 <      <compilerarg value="-XDignore.symbol.file=true"/>
748 <      <compilerarg value="-Xlint:all"/>
749 <      <compilerarg value="-Werror"/>
750 <      <compilerarg line="${build.args}"/>
751 <    </javac>
752 <  </target>
753 <
754 <  <target name="4jdk8doclint"
755 <          depends="configure-compiler"
756 <          description="Finds doclint warnings">
757 <
758 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
759 <
760 <    <javac srcdir="${4jdk8src.dir}"
761 <           destdir="${build.4jdk8.classes.dir}"
762 <           debug="${build.debug}"
763 <           debuglevel="${build.debuglevel}"
764 <           deprecation="${build.deprecation}"
765 <           source="8"
766 <           target="8"
767 <           classpath=""
768 <           bootclasspath="${bootclasspath8}"
769 <           includeAntRuntime="false"
770 <           includeJavaRuntime="false"
771 <           encoding="ASCII"
772 <           executable="${javac8}"
773 <           fork="true">
774 <      <include name="**/*.java"/>
775 <      <compilerarg value="-Xprefer:source"/>
776 <      <compilerarg value="-XDignore.symbol.file=true"/>
777 <      <compilerarg value="-Xlint:all"/>
778 <      <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"
786 <          description="Builds library jar from compiled sources">
787 <
788 <    <jar destfile="${4jdk8product.jar}">
789 <      <fileset dir="${build.4jdk8.classes.dir}"/>
790 <      <manifest>
791 <        <attribute name="Built-By" value="${user.name}"/>
792 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
793 <      </manifest>
794 <    </jar>
795 <  </target>
796 <
797 <
798 <  <target name="4jdk8-tck"
799 <          depends="4jdk8jar"
800 <          description="Runs tck tests for jsr166-4jdk8 directly">
801 <
802 <    <run-tck-tests
803 <      target="8"
804 <      workdir="${build.4jdk8.dir}"
805 <      classes="${4jdk8product.jar}">
806 <      <javac-elements>
807 <        <!-- JDK9+ test classes -->
808 <        <exclude name="*9Test.java"/>
809 <        <exclude name="*10Test.java"/>
810 <        <compilerarg value="-Werror"/>
811 <      </javac-elements>
812 <    </run-tck-tests>
813 <  </target>
814 <
815 <
816 <  <target name="4jdk8-jtreg"
817 <          depends="4jdk8jar"
818 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
819 <    <run-jtreg-tests
820 <       target="8"
821 <       workdir="${build.4jdk8.dir}"
822 <       classes="${4jdk8product.jar}"/>
823 <  </target>
824 <
825 <
826 <  <target name="4jdk8-test"
827 <          depends="4jdk8-tck, 4jdk8-jtreg"
828 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
829 <
830 <
831 <  <target name="4jdk8docs"
832 <          description="Builds javadocs for src/jdk8 to dist dir">
833 <
834 <    <delete dir="${4jdk8docs.dir}"/>
835 <    <mkdir dir="${4jdk8docs.dir}"/>
836 <
837 <    <javadoc destdir="${4jdk8docs.dir}"
838 <             packagenames="none"
839 <             link="${java8.api.url}"
840 <             overview="${4jdk8src.dir}/intro.html"
841 <             access="${build.javadoc.access}"
842 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
843 <             classpath=""
844 <             source="8"
845 <             executable="${javadoc8}"
846 <             failonerror = "true">
847 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
848 <        <include name="**/*.java"/>
849 <      </fileset>
850 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
851 <      <arg value="-XDignore.symbol.file=true"/>
852 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
853 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
854 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
855 < <!-- @apiNote tag currently unused -->
856 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
857 <    </javadoc>
858 <  </target>
859 <
860 <
861 <  <target name="4jdk8dist"
862 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
863 <          description="Puts all distributable products in single hierarchy"/>
864 <
865 <
866 <  <target name="4jdk8clean"
867 <          description="Removes all 4jdk8 build products">
868 <    <delete dir="${build.4jdk8.dir}"/>
869 <  </target>
870 <
871 <
872 <  <target name="4jdk8dist-jar"
873 <          depends="4jdk8clean, 4jdk8jar">
874 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
875 <  </target>
876 <
877 <
878 <  <target name="4jdk8dist-docs"
879 <          depends="4jdk8clean, 4jdk8docs">
880 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
881 <  </target>
882 <
883 <
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) -->
885
886  <target name="4jdk7compile" depends="configure-compiler">
887    <mkdir dir="${build.4jdk7.classes.dir}"/>
888
889    <javac srcdir="${4jdk7src.dir}"
890           destdir="${build.4jdk7.classes.dir}"
891           debug="${build.debug}"
892           debuglevel="${build.debuglevel}"
893           deprecation="${build.deprecation}"
894           source="6"
895           target="6"
896           classpath=""
897           bootclasspath="${bootclasspath6}"
898           includeAntRuntime="false"
899           includeJavaRuntime="false"
900           encoding="ASCII"
901           executable="${javac7}"
902           fork="true">
903
904      <include name="**/*.java"/>
905      <compilerarg value="-Xprefer:source"/>
906      <compilerarg value="-XDignore.symbol.file=true"/>
907      <compilerarg value="-Xlint:all"/>
908      <compilerarg value="-Werror"/>
909      <compilerarg line="${build.args}"/>
910    </javac>
911  </target>
912
913  <target name="4jdk7doclint" depends="configure-compiler">
914    <mkdir dir="${build.4jdk7.classes.dir}"/>
915
916    <javac srcdir="${4jdk7src.dir}"
917           destdir="${build.4jdk7.classes.dir}"
918           debug="${build.debug}"
919           debuglevel="${build.debuglevel}"
920           deprecation="${build.deprecation}"
921           source="6"
922           target="6"
923           classpath=""
924           bootclasspath="${bootclasspath6}"
925           includeAntRuntime="false"
926           includeJavaRuntime="false"
927           encoding="ASCII"
928           executable="${javac8}"
929           fork="true">
930
931      <include name="**/*.java"/>
932      <compilerarg value="-Xprefer:source"/>
933      <compilerarg value="-XDignore.symbol.file=true"/>
934      <compilerarg value="-Xlint:all"/>
935      <compilerarg value="-Xdoclint:all/protected"/>
936      <compilerarg line="${build.args}"/>
937    </javac>
938  </target>
939
940  <target name="4jdk7jar" depends="4jdk7compile">
941    <jar destfile="${4jdk7product.jar}">
942      <fileset dir="${build.4jdk7.classes.dir}"/>
943      <manifest>
944        <attribute name="Built-By" value="${user.name}"/>
945        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
946      </manifest>
947    </jar>
948  </target>
949
950  <target name="4jdk7-tck" depends="4jdk7jar">
951    <run-tck-tests
952      target="7"
953      workdir="${build.4jdk7.dir}"
954      classes="${4jdk7product.jar}">
955      <javac-elements>
956        <!-- JDK8+ test classes -->
957        <exclude name="*8Test.java"/>
958        <exclude name="*9Test.java"/>
959        <exclude name="*10Test.java"/>
960        <exclude name="DoubleAccumulatorTest.java"/>
961        <exclude name="DoubleAdderTest.java"/>
962        <exclude name="LongAccumulatorTest.java"/>
963        <exclude name="LongAdderTest.java"/>
964        <exclude name="CompletableFutureTest.java"/>
965        <exclude name="SplittableRandomTest.java"/>
966        <exclude name="StampedLockTest.java"/>
967        <exclude name="SubmissionPublisherTest.java"/>
968        <compilerarg value="-Werror"/>
969      </javac-elements>
970    </run-tck-tests>
971  </target>
972
973  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
974  <target name="4jdk7-tck-junit" depends="4jdk7compile">
975
976    <junit printsummary="true"
977           showoutput="true"
978           errorProperty="junit.failed"
979           failureProperty="junit.failed"
980           includeantruntime="true"
981           jvm="${java7}"
982           fork="true">
983
984      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
985      <jvmarg value="-server"/>
986
987      <classpath>
988        <pathelement location="${junit.jar}"/>
989        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
990      </classpath>
991
992      <formatter type="brief"/>
993
994      <test name="${jsr166.tckTestClass}" haltonfailure="no">
995      </test>
996    </junit>
997  </target>
998
999  <target name="4jdk7-jtreg" depends="4jdk7jar">
1000    <run-jtreg-tests
1001       target="7"
1002       workdir="${build.4jdk7.dir}"
1003       classes="${4jdk7product.jar}"/>
1004  </target>
1005
1006  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1007
1008  <target name="4jdk7docs">
1009    <delete dir="${4jdk7docs.dir}"/>
1010    <mkdir dir="${4jdk7docs.dir}"/>
1011
1012    <javadoc destdir="${4jdk7docs.dir}"
1013             packagenames="none"
1014             link="${java7.api.url}"
1015             overview="${4jdk7src.dir}/intro.html"
1016             access="${build.javadoc.access}"
1017             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1018             classpath=""
1019             executable="${javadoc7}"
1020             failonerror = "true">
1021      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1022        <include name="**/*.java"/>
1023      </fileset>
1024      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1025      <arg value="-XDignore.symbol.file=true"/>
1026    </javadoc>
1027  </target>
1028
1029  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1030
1031  <target name="4jdk7clean">
1032    <delete dir="${build.4jdk7.dir}"/>
1033  </target>
1034
1035  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1036    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1037  </target>
1038
1039  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1040    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1041  </target>
1042
1043
719    <!-- jsr166x (no longer maintained) -->
1045
1046  <target name="jsr166xcompile" depends="configure-compiler">
1047    <mkdir dir="${build.jsr166x.classes.dir}"/>
1048
1049    <javac srcdir="${topsrc.dir}"
1050           destdir="${build.jsr166x.classes.dir}"
1051           debug="${build.debug}"
1052           debuglevel="${build.debuglevel}"
1053           deprecation="${build.deprecation}"
1054           classpath=""
1055           bootclasspath="${bootclasspath6}"
1056           source="5"
1057           target="5"
1058           includeAntRuntime="false"
1059           includeJavaRuntime="false"
1060           encoding="ASCII"
1061           executable="${javac7}"
1062           fork="true">
1063      <include name="jsr166x/**/*.java"/>
1064      <compilerarg value="-XDignore.symbol.file=true"/>
1065      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1066      <compilerarg value="-Werror"/>
1067      <compilerarg line="${build.args}"/>
1068    </javac>
1069  </target>
1070
1071  <target name="jsr166xjar" depends="jsr166xcompile">
1072    <jar destfile="${jsr166x.jar}">
1073      <fileset dir="${build.jsr166x.classes.dir}"/>
1074      <manifest>
1075        <attribute name="Built-By" value="${user.name}"/>
1076        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1077      </manifest>
1078    </jar>
1079  </target>
1080
1081  <target name="jsr166xdocs">
1082    <delete dir="${jsr166xdocs.dir}"/>
1083    <mkdir dir="${jsr166xdocs.dir}"/>
1084
1085    <javadoc destdir="${jsr166xdocs.dir}"
1086             packagenames="jsr166x.*"
1087             link="${java.api.url}"
1088             access="${build.javadoc.access}"
1089             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1090             bootclasspath="${bootclasspath6}"
1091             source="5"
1092             executable="${javadoc7}"
1093             failonerror = "true">
1094      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1095      <arg value="-XDignore.symbol.file=true"/>
1096    </javadoc>
1097  </target>
1098
1099  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1100
1101  <target name="jsr166xclean">
1102    <delete dir="${build.jsr166x.dir}"/>
1103  </target>
1104
1105  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1106    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1107  </target>
1108
1109  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1110    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1111  </target>
1112
1113
720    <!-- jsr166y (no longer maintained) -->
1115
1116  <target name="jsr166ycompile" depends="configure-compiler">
1117    <mkdir dir="${build.jsr166y.classes.dir}"/>
1118
1119    <javac srcdir="${topsrc.dir}"
1120           destdir="${build.jsr166y.classes.dir}"
1121           debug="${build.debug}"
1122           debuglevel="${build.debuglevel}"
1123           deprecation="${build.deprecation}"
1124           source="6"
1125           target="6"
1126           classpath=""
1127           bootclasspath="${bootclasspath6}"
1128           includeAntRuntime="false"
1129           includeJavaRuntime="false"
1130           encoding="ASCII"
1131           executable="${javac7}"
1132           fork="true">
1133
1134      <include name="jsr166y/**/*.java"/>
1135      <compilerarg value="-XDignore.symbol.file=true"/>
1136      <compilerarg value="-Xlint:all"/>
1137      <compilerarg value="-Werror"/>
1138      <compilerarg line="${build.args}"/>
1139    </javac>
1140  </target>
1141
1142  <target name="jsr166yjar" depends="jsr166ycompile">
1143    <jar destfile="${jsr166y.jar}" index="true">
1144      <fileset dir="${build.jsr166y.classes.dir}"/>
1145      <manifest>
1146        <attribute name="Built-By" value="${user.name}"/>
1147        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1148      </manifest>
1149    </jar>
1150  </target>
1151
1152  <target name="jsr166ydocs">
1153    <delete dir="${jsr166ydocs.dir}"/>
1154    <mkdir dir="${jsr166ydocs.dir}"/>
1155
1156    <javadoc destdir="${jsr166ydocs.dir}"
1157             packagenames="jsr166y.*"
1158             link="${java.api.url}"
1159             access="${build.javadoc.access}"
1160             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1161             bootclasspath="${bootclasspath6}"
1162             source="6"
1163             executable="${javadoc7}"
1164             failonerror = "true">
1165      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1166      <arg value="-XDignore.symbol.file=true"/>
1167    </javadoc>
1168  </target>
1169
1170  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1171
1172  <target name="jsr166yclean">
1173    <delete dir="${build.jsr166y.dir}"/>
1174  </target>
1175
1176  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1177    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1178  </target>
1179
1180  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1181    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1182  </target>
1183
1184
721    <!-- extra166y (no longer maintained) -->
1186
1187  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1188    <mkdir dir="${build.extra166y.classes.dir}"/>
1189
1190    <javac srcdir="${topsrc.dir}"
1191           destdir="${build.extra166y.classes.dir}"
1192           debug="${build.debug}"
1193           debuglevel="${build.debuglevel}"
1194           deprecation="${build.deprecation}"
1195           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1196           classpath=""
1197           source="6"
1198           target="6"
1199           includeAntRuntime="false"
1200           includeJavaRuntime="false"
1201           encoding="ASCII"
1202           executable="${javac7}"
1203           fork="true">
1204
1205      <include name="extra166y/**/*.java"/>
1206      <compilerarg value="-XDignore.symbol.file=true"/>
1207      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1208      <compilerarg value="-Werror"/>
1209      <compilerarg line="${build.args}"/>
1210    </javac>
1211  </target>
1212
1213  <target name="extra166yjar" depends="extra166ycompile">
1214    <jar destfile="${extra166y.jar}" index="true">
1215      <fileset dir="${build.extra166y.classes.dir}"/>
1216      <manifest>
1217        <attribute name="Built-By" value="${user.name}"/>
1218        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1219      </manifest>
1220    </jar>
1221  </target>
1222
1223  <target name="extra166ydocs">
1224    <delete dir="${extra166ydocs.dir}"/>
1225    <mkdir dir="${extra166ydocs.dir}"/>
1226
1227    <javadoc destdir="${extra166ydocs.dir}"
1228             packagenames="extra166y.*"
1229             link="${java.api.url}"
1230             access="${build.javadoc.access}"
1231             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1232             bootclasspath="${bootclasspath6}"
1233             source="6"
1234             executable="${javadoc7}">
1235      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1236      <arg value="-XDignore.symbol.file=true"/>
1237    </javadoc>
1238  </target>
1239
1240  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1241
1242  <target name="extra166yclean">
1243    <delete dir="${build.extra166y.dir}"/>
1244  </target>
1245
1246  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1247    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1248  </target>
1249
1250  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1251    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1252  </target>
1253
1254
722    <!-- jsr166e (no longer maintained) -->
723  
1257  <property name="build.jsr166e.java.version" value="6"/>
1258  <property name="build.jsr166e.javac" value="${javac6}"/>
1259
1260  <target name="jsr166ecompile" depends="configure-compiler">
1261    <mkdir dir="${build.jsr166e.classes.dir}"/>
1262
1263    <javac srcdir="${topsrc.dir}"
1264           destdir="${build.jsr166e.classes.dir}"
1265           debug="${build.debug}"
1266           debuglevel="${build.debuglevel}"
1267           deprecation="${build.deprecation}"
1268           source="${build.jsr166e.java.version}"
1269           target="${build.jsr166e.java.version}"
1270           classpath=""
1271           includeAntRuntime="false"
1272           includeJavaRuntime="false"
1273           executable="${build.jsr166e.javac}"
1274           fork="true">
1275
1276      <include name="jsr166e/**/*.java"/>
1277      <compilerarg value="-XDignore.symbol.file=true"/>
1278      <compilerarg value="-Xlint:all"/>
1279      <compilerarg value="-Werror"/>
1280      <compilerarg line="${build.args}"/>
1281    </javac>
1282  </target>
1283
1284  <target name="jsr166edoclint">
1285    <mkdir dir="${build.jsr166e.classes.dir}"/>
1286
1287    <javac srcdir="${topsrc.dir}"
1288           destdir="${build.jsr166e.classes.dir}"
1289           debug="${build.debug}"
1290           debuglevel="${build.debuglevel}"
1291           deprecation="${build.deprecation}"
1292           source="${build.jsr166e.java.version}"
1293           target="${build.jsr166e.java.version}"
1294           classpath=""
1295           bootclasspath="${bootclasspath6}"
1296           includeAntRuntime="false"
1297           includeJavaRuntime="false"
1298           executable="${javac8}"
1299           fork="true">
1300
1301      <include name="jsr166e/**/*.java"/>
1302      <compilerarg value="-XDignore.symbol.file=true"/>
1303      <compilerarg value="-Xlint:all"/>
1304      <compilerarg value="-Werror"/>
1305      <compilerarg value="-Xdoclint:all/protected"/>
1306    </javac>
1307  </target>
1308
1309  <target name="jsr166ejar" depends="jsr166ecompile">
1310    <jar destfile="${jsr166e.jar}" index="true">
1311      <fileset dir="${build.jsr166e.classes.dir}"/>
1312      <manifest>
1313        <attribute name="Built-By" value="${user.name}"/>
1314        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1315      </manifest>
1316    </jar>
1317  </target>
1318
1319  <target name="jsr166edocs">
1320    <delete dir="${jsr166edocs.dir}"/>
1321    <mkdir dir="${jsr166edocs.dir}"/>
1322
1323    <javadoc destdir="${jsr166edocs.dir}"
1324             packagenames="jsr166e.*"
1325             link="${java.api.url}"
1326             access="${build.javadoc.access}"
1327             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1328             source="${build.jsr166e.java.version}"
1329             executable="${javadoc7}"
1330             failonerror = "true">
1331      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1332      <arg value="-XDignore.symbol.file=true"/>
1333    </javadoc>
1334  </target>
1335
1336  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1337    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1338    <run-tck-tests
1339      tck.src.dir="${test.src.dir}/tck-jsr166e"
1340      target="${build.jsr166e.java.version}"
1341      workdir="${build.jsr166e.dir}"
1342      classes="${jsr166e.jar}"/>
1343  </target>
1344
1345  <target name="jsr166e-tck">
1346
1347 <!--     <antcall target="clean"/> -->
1348 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1349 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1350 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1351 <!--     </antcall> -->
1352
1353    <antcall target="clean"/>
1354    <antcall target="jsr166e-tck-one-java-version">
1355      <param name="build.jsr166e.java.version" value="7"/>
1356      <param name="build.jsr166e.javac" value="${javac7}"/>
1357    </antcall>
1358
1359    <antcall target="clean"/>
1360    <antcall target="jsr166e-tck-one-java-version">
1361      <param name="build.jsr166e.java.version" value="6"/>
1362      <param name="build.jsr166e.javac" value="${javac6}"/>
1363    </antcall>
1364  </target>
1365
1366  <target name="jsr166e-test" depends="jsr166e-tck"/>
1367
1368  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1369
1370  <target name="jsr166eclean">
1371    <delete dir="${build.jsr166e.dir}"/>
1372  </target>
1373
1374  <target name="jsr166edist-jar"
1375          depends="jsr166eclean, jsr166ejar">
1376    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1377  </target>
1378
1379  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1380    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1381  </target>
1382
1383
724   <!-- Find buglets that can be detected by static build tools -->
725  
726   <!--   <target name="lint"> -->
# Line 1398 | Line 738
738  
739  
740   <!-- ==============================================================
741 <  Experimental errorprone support - http://errorprone.info
741 >  Experimental errorprone support
742 >  https://errorprone.info
743 >  https://errorprone.info/docs/installation
744 >  https://github.com/google/error-prone/issues/1143
745   =================================================================== -->
746 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
746 >  <path id="errorprone.processorpath.path">
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
761 +                   -Xep:ThreadPriorityCheck:OFF
762                     -Xep:MixedArrayDimensions:ERROR
763                     -Xep:RemoveUnusedImports:ERROR
764                     -Xep:EmptyIf:ERROR
# Line 1415 | Line 767
767                     -Xep:LongLiteralLowerCaseSuffix:ERROR
768                     -Xep:RedundantThrows:ERROR
769                     -Xep:IdentityBinaryExpression:WARN
770 +                   -Xep:ConstructorInvokesOverridable:WARN
771                     -Xep:MethodCanBeStatic:WARN
772                     ${errorprone.jsr166.user.flags}"/>
773    <!-- -Xep:WildcardImport:ERROR -->
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"
# Line 1447 | Line 801
801        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
802        <compilerarg value="-J--illegal-access=permit"/>
803        <compilerarg value="-XDcompilePolicy=simple"/>
804 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
804 >      <compilerarg value="-processorpath"/>
805 >      <compilerarg pathref="errorprone.processorpath.path"/>
806        <compilerarg value="-Xplugin:ErrorProne
807                            ${errorprone.jsr166.flags}"/>
808        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1464 | Line 819
819      </jar>
820  
821      <run-tck-tests
822 <      target="${build.main.java.version}"
822 >      target="${java.runtime.target}"
823        workdir="${build.dir}"
824        classes="${product.jar}">
825        <javac-elements>
826          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
827          <compilerarg value="-J--illegal-access=permit"/>
828          <compilerarg value="-XDcompilePolicy=simple"/>
829 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
829 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
830          <compilerarg value="-Xplugin:ErrorProne
831                              ${errorprone.jsr166.flags}
832                              ${errorprone.jsr166.test.flags}"/>
# Line 1487 | Line 842
842            description="Run errorprone over jtreg tests (experimental)">
843  
844      <run-jtreg-tests
845 <       target="${build.main.java.version}"
845 >       target="${java.runtime.target}"
846         workdir="${build.dir}"
847         classes="${product.jar}"
848         verbose="all">
849        <jtreg-elements>
850          <arg value="-javacoption:-XDcompilePolicy=simple"/>
851          <arg value="-javacoption:-processorpath"/>
852 <        <arg value="-javacoption:${errorprone.jar}"/>
852 >        <arg value="-javacoption:${errorprone.processorpath}"/>
853          <arg value="-javacoption:-Xplugin:ErrorProne
854                              ${errorprone.jsr166.flags}
855                              ${errorprone.jsr166.test.flags}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines