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.236 by jsr166, Mon Mar 20 00:03:57 2017 UTC vs.
Revision 1.322 by jsr166, Sat Dec 12 22:13:53 2020 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
# Line 18 | 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/jdk7
23 <  $HOME/jdk/jdk8
24 <  $HOME/jdk/jdk9
25 <  $HOME/jdk/jdk10
22 >  $HOME/jdk/jdk11
23 >  $HOME/jdk/jdk12
24 >  $HOME/jdk/jdk13
25 >  $HOME/jdk/jdk14
26 >  $HOME/jdk/jdk15
27 >  $HOME/jdk/jdk16
28 >  $HOME/jdk/jdk17
29    where each of the above is a JDK or a symlink to same, and
30 <  $HOME/jdk/src/jdk7
31 <  $HOME/jdk/src/jdk8
32 <  $HOME/jdk/src/jdk9
33 <  $HOME/jdk/src/jdk10
34 <  where each of the above is a complete JDK source tree
35 <  (e.g. mercurial forest) or a symlink to same.
30 >  $HOME/jdk/src/jdk11
31 >  $HOME/jdk/src/jdk12
32 >  $HOME/jdk/src/jdk13
33 >  $HOME/jdk/src/jdk14
34 >  $HOME/jdk/src/jdk15
35 >  $HOME/jdk/src/jdk16
36 >  $HOME/jdk/src/jdk17
37 >  where each of the above is a JDK source tree or a symlink to same.
38  
39    Alternatively, define ant variables thus:
40    ant -Djdk$N.home=... -Djdk$N.src.home=...
41 <  for $N in 7 8 9 10 ...
41 >  for $N in 11 .. 17 ...
42  
43    As of 2016-03, the sources in src/main are for jdk9+ only.
44 +  As of 2019-08, the sources in src/main are for jdk11+ only.
45 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
46   ------------------------------------------------------------------------------
47    </description>
48  
# Line 52 | Line 60
60  
61  
62    <!-- Compilation options -->
55  <property name="build.sourcelevel"    value="6"/>
63    <property name="build.debug"          value="true"/>
64    <property name="build.debuglevel"     value="source,lines,vars"/>
65    <property name="build.deprecation"    value="false"/>
# Line 64 | Line 71
71    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
72    <property name="build.loops.dir"             location="${build.dir}/loops"/>
73  
67  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71
72  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76
77  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
80  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
81
82  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
83  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
84  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
85  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
86
74    <!-- JDK locations -->
75    <property name="jdks.home"  location="${user.home}/jdk"/>
76  
# Line 95 | Line 82
82      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
83      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
84      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
85 <    <local name="have.java.base"/>
99 <    <available property="have.java.base"
100 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102 <      if:set="have.java.base"/>
103 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104 <      unless:set="have.java.base"/>
105 <    <local name="modules"/>
106 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107 <    <local name="boot.jar.dir"/>
108 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
109 <    <path id="bootclasspath@{v}" unless:set="modules">
110 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
111 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
112 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
113 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
114 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
115 <    </path>
116 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
85 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
86      </sequential>
87    </macrodef>
88  
# Line 129 | Line 98
98      </sequential>
99    </macrodef>
100  
101 <  <defjdklocations v="6"/>
102 <  <defjdklocations v="7"/>
103 <  <defjdklocations v="8"/>
104 <  <defjdklocations v="9"/>
105 <  <defjdklocations v="10"/>
101 >  <defjdklocations v="11"/>
102 >  <defjdklocations v="12"/>
103 >  <defjdklocations v="13"/>
104 >  <defjdklocations v="14"/>
105 >  <defjdklocations v="15"/>
106 >  <defjdklocations v="16"/>
107 >  <defjdklocations v="17"/>
108  
109    <!-- Source locations -->
110    <property name="src.dir"              location="${basedir}/src/main"/>
111    <property name="test.src.dir"         location="${basedir}/src/test"/>
112    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
113    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
114 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
115 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
116 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
117 <  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
118 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
114 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
115 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
116 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
117 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
118 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
119 >  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
120 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
121 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
122    <property name="lib.dir"              location="${basedir}/lib"/>
123    <property name="dist.dir"             location="${basedir}/dist"/>
124    <property name="topsrc.dir"           location="${basedir}/src"/>
151  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
152  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
153  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
154  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
155  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
156  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
125  
126    <!-- Javadoc locations -->
127    <property name="docs.dir"          location="${build.dir}/docs"/>
128 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
161 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
162 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
163 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
164 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
165 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
166 <
167 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
168 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
169 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
170 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
171 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
172 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
173 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
128 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
129  
130    <!-- Jar locations -->
131    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
177  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
178  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
179  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
180  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
181  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
182  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
132    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
133  
134    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
135 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
136 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
137 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
138 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
139 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
140 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
141 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
142 <  <!-- Default jdk doc location (latest stable release seems best) -->
143 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
135 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
136 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
137 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
138 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
139 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
140 >  <!-- The location of jdk early access docs (RIP) -->
141 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
142 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
143 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
144 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
145 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
146 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
147 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
148 >  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
149 >  <property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
150 >  <property name="java17.docroot.url" value="https://download.java.net/java/early_access/jdk17/docs"/>
151 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
152 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
153  
154    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
155 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
156 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
157 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
158 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
159 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
155 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
156 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
157 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
158 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
159 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
160 >  <property name="java16.api.url"     value="${java16.docroot.url}/api/"/>
161 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
162    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
163  
164    <!-- Define the "jtreg" task -->
# Line 206 | Line 166
166    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
167             classpath="${lib.dir}/jtreg.jar" />
168  
169 <  <!-- Tck options; see JSR166TestCase.java
169 >  <!-- Tck configuration options; see JSR166TestCase.java
170     To profile a single tck test class:
171     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
172     To stress test a single tck test class:
# Line 229 | Line 189
189  
190      <sequential>
191  
232    <local name="modules"/>
233    <condition property="modules">
234      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
235    </condition>
236
192      <mkdir dir="@{workdir}/tck-classes"/>
193  
194      <javac srcdir="@{tck.src.dir}"
# Line 254 | Line 209
209        <compilerarg value="-XDignore.symbol.file=true"/>
210        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
211        <compilerarg value="-Xdoclint:reference/private"/>
212 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
258 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
212 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
213        <compilerarg line="${build.args}"/>
214        <javac-elements/>
215  
# Line 265 | Line 219
219            failonerror="true"
220            jvm="${java@{target}}"
221            fork="true">
222 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
223 <        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
224 <        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
225 <        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
226 <        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
227 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
228 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
229 <        <jvmarg line="@{jvmflags}"/>
230 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
231 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
232 <
233 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
234 <        <syspropertyset id="system-properties-used-by-tck">
235 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
236 <          <propertyref prefix="jsr166."/>
237 <          <propertyref name="test.timeout.factor"/>
238 <        </syspropertyset>
239 <
240 <        <classpath>
241 <          <pathelement location="${junit.jar}"/>
242 <          <pathelement location="@{workdir}/tck-classes"/>
289 <        </classpath>
222 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
223 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
224 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
225 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
226 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
227 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
228 >        <jvmarg line="@{jvmflags}"/>
229 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
230 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
231 >
232 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
233 >        <syspropertyset id="system-properties-used-by-tck">
234 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
235 >          <propertyref prefix="jsr166."/>
236 >          <propertyref name="test.timeout.factor"/>
237 >        </syspropertyset>
238 >
239 >        <classpath>
240 >          <pathelement location="${junit.jar}"/>
241 >          <pathelement location="@{workdir}/tck-classes"/>
242 >        </classpath>
243      </java>
244  
245      </sequential>
246    </macrodef>
247  
248    <!-- Define jtreg test sets for different jdk versions -->
249 <  <fileset dir="${jtreg9.src.dir}">
250 <    <patternset id="jdk9.jtreg.tests">
251 <      <include name="**/*.java"/>
252 <    </patternset>
253 <  </fileset>
254 <
255 <  <fileset dir="${jtreg8.src.dir}">
256 <    <patternset id="jdk8.jtreg.tests">
257 <      <include name="**/*.java"/>
258 <    </patternset>
259 <  </fileset>
249 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
250 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
251 >  <property name="jtreg.test.pattern" value="**/*.java"/>
252 >  <macrodef name="defjtregtests">
253 >    <attribute name="v"/>
254 >    <sequential>
255 >      <fileset dir="${jtreg@{v}.src.dir}">
256 >        <patternset id="jdk@{v}.jtreg.tests">
257 >          <include name="${jtreg.test.pattern}"/>
258 >        </patternset>
259 >      </fileset>
260 >    </sequential>
261 >  </macrodef>
262  
263 <  <fileset dir="${jtreg7.src.dir}">
264 <    <patternset id="jdk7.jtreg.tests">
265 <      <include name="**/*.java"/>
266 <    </patternset>
267 <  </fileset>
263 >  <defjtregtests v="17"/>
264 >  <defjtregtests v="16"/>
265 >  <defjtregtests v="15"/>
266 >  <defjtregtests v="14"/>
267 >  <defjtregtests v="13"/>
268 >  <defjtregtests v="12"/>
269 >  <defjtregtests v="11"/>
270  
271    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
272    <property name="jtreg.flags" value=""/>
273  
274    <macrodef name="run-jtreg-tests">
275 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
319 <    <attribute name="source" default="7"/>
275 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
276      <attribute name="target"/>
277      <attribute name="workdir"/>
278      <attribute name="classes"/>
279 +    <attribute name="verbose" default="${jtreg.verbose}"/>
280      <attribute name="jtregflags" default=""/>
281 +    <element name="jtreg-elements" optional="true"/>
282  
283      <sequential>
284  
285      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
286      <property name="jtreg.verbose" value="nopass,fail,error"/>
287  
288 <    <local name="modules"/>
289 <    <condition property="modules">
290 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
291 <    </condition>
288 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
289 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
290 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
291 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
292 >    <property name="jtreg.concurrency" value="3"/>
293  
294 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
294 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
295      <jtreg dir="${jtreg@{target}.src.dir}"
296             jdk="${jdk@{target}.home}"
297             workDir="@{workdir}/JTwork">
298        <patternset refid="jdk@{target}.jtreg.tests"/>
299 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
300 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
301 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
299 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
300 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
301 >      <arg value="-vmoption:-Xmx256m"/>
302 >      <arg value="-concurrency:${jtreg.concurrency}"/>
303 >      <arg value="-vmoptions:-esa -ea"/>
304 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
305        <arg value="-agentvm"/>
306        <arg value="-noreport"/>
307 <      <arg value="-verbose:${jtreg.verbose}"/>
346 <      <arg value="-vmoptions:-esa -ea"/>
307 >      <arg value="-verbose:@{verbose}"/>
308        <arg value="-automatic"/>
309        <arg value="-k:!ignore"/>
310        <arg line="@{jtregflags}"/>
311        <arg line="${jtreg.flags}"/>
312 +      <jtreg-elements/>
313      </jtreg>
314      </sequential>
315    </macrodef>
# Line 358 | Line 320
320    </path>
321  
322    <!-- Support @jls tag, used in jdk8+ javadoc -->
323 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
324    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
325    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
326  
327    <!-- Main targets -->
328  
329 <  <property name="build.main.java.version" value="9"/>
330 <  <property name="build.main.javac" value="${javac9}"/>
329 >  <!-- Default values: may seem strange ... -->
330 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
331 >  <!-- But at build time, target jdk9, for maximal binary portability -->
332 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
333 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
334 >    o override-methods=summary
335 >    o {@systemProperty ...}
336 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
337 >    o 8202628: javadoc generates bad links in TestModules.java
338 >    -->
339 >  <property name="java.runtime.target" value="11"/>
340 >  <property name="build.main.java" value="${java11}"/>
341 >  <property name="build.main.javac" value="${javac11}"/>
342 >  <property name="build.main.javadoc" value="${javadoc12}"/>
343 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
344  
345    <target name="dists"
346 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
346 >          depends="dist"
347            description="Builds all public jars and docs"/>
348  
349    <target name="compile"
350            depends="configure-compiler"
351            description="Compiles src/main sources to build dir">
352  
377    <local name="modules"/>
378    <condition property="modules">
379      <and>
380        <available file="${jdk9.home}/jmods" type="dir"/>
381        <equals arg1="9" arg2="${build.main.java.version}"/>
382      </and>
383    </condition>
384
353      <local name="destdir"/>
354 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
387 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
354 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
355  
356      <mkdir dir="${destdir}"/>
357  
# Line 401 | Line 368
368             fork="true">
369  
370        <include name="**/*.java"/>
371 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
371 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
372        <compilerarg value="-Xprefer:source"/>
373        <compilerarg value="-XDignore.symbol.file=true"/>
374 <      <compilerarg value="-Xlint:all"/>
374 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
375 >      <compilerarg value="-Xlint:all,-removal"/>
376 >      <compilerarg line="--doclint-format html5"/>
377 > <!--  Temporarily disable doclint for private elements, due to -->
378 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
379 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
380 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
381 >      <compilerarg value="-Xdoclint:all/protected"/>
382 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
383        <compilerarg value="-Werror"/>
409      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
384        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
385        <compilerarg line="${build.args}"/>
386  
# Line 432 | Line 406
406    <target name="docs"
407            description="Builds javadocs for src/main to dist dir">
408  
409 <    <delete dir="${docs.dir}"/>
409 >    <delete dir="${docs.dir}" quiet="true"/>
410      <mkdir dir="${docs.dir}"/>
411  
412 +    <!-- old school frames via docs/index.html?overview-summary.html -->
413 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
414 +    <local name="use-frames"/>
415 +    <condition property="use-frames">
416 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
417 +    </condition>
418 +
419      <!-- the packagenames="none" hack below prevents scanning the -->
420      <!-- sourcepath for packages -->
421  
# Line 445 | Line 426
426   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
427      <javadoc destdir="${docs.dir}"
428               packagenames="none"
429 <             link="${java9.api.url}"
429 >             link="${java.api.url}"
430               overview="${src.dir}/intro.html"
431               access="${build.javadoc.access}"
432               sourcepath="${src.dir}"
433               classpath=""
434 <             executable="${javadoc9}">
434 >             source="${build.main.javadoc.source}"
435 >             executable="${build.main.javadoc}">
436 > <!-- TODO: JDK-8214571 failonerror = "true" -->
437        <fileset dir="${src.dir}" defaultexcludes="yes">
438 <        <include name="**/*.java"/>
438 >        <include name="java/**/*.java"/>
439        </fileset>
440 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
440 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
441        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
442 +      <arg value="-quiet"/>
443        <arg value="-XDignore.symbol.file=true"/>
444 +      <arg value="-html5"/>
445 +      <arg value="-Xdoclint:all,-missing"/>
446        <arg value="--patch-module=java.base=${src.dir}"/>
447 <      <arg value="-tag"/>
448 <      <arg value="${javadoc.jls.option}"/>
449 < <!-- @apiNote currently unused -->
450 < <!--       <arg value="-tag"/> -->
451 < <!--       <arg value="apiNote:a:API Note:"/> -->
452 <      <arg value="-tag"/>
467 <      <arg value="implSpec:a:Implementation Requirements:"/>
468 <      <arg value="-tag"/>
469 <      <arg value="implNote:a:Implementation Note:"/>
447 >      <arg value="--frames" if:set="use-frames"/>
448 >      <arg value="--override-methods=summary"/>
449 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
450 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
451 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
452 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
453   <!-- tags added in jdk9: currently unused -->
454 < <!--       <arg value="-tag"/> -->
455 < <!--       <arg value="revised:X"/> -->
473 < <!--       <arg value="-tag"/> -->
474 < <!--       <arg value="spec:X"/> -->
454 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
455 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
456      </javadoc>
457    </target>
458  
# Line 481 | Line 462
462            description="Puts all distributable products in single hierarchy"/>
463  
464  
484  <target name="release"
485          depends="dist"
486          description="Puts entire CVS tree, plus distribution productions, in a jar">
487
488    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
489
490    <jar basedir="${basedir}" destfile="${release.jar}">
491      <!-- <exclude name="build/**"/> -->
492      <exclude name="${release.jar}"/>
493      <exclude name="user.properties"/>
494      <exclude name="etc/notes/**"/>
495      <exclude name="src/emulation/**"/>
496      <exclude name="**/SyntaxTest.java"/>
497      <exclude name="**/SuperfluousAbstract.java"/>
498      <manifest>
499        <attribute name="Built-By" value="${user.name}"/>
500        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
501      </manifest>
502    </jar>
503  </target>
504
505
465    <target name="clean"
466            description="Removes all build products">
508
467      <delete dir="${build.dir}"/>
510
468    </target>
469  
470  
471    <target name="dist-clean"
472            description="Removes all build and distribution products">
516
473      <delete dir="${build.dir}"/>
474      <delete dir="${dist.dir}"/>
519
475    </target>
476  
477  
# Line 531 | Line 486
486    </target>
487  
488    <target name="tck"
489 <          depends="jar"
489 >          depends="jar"
490            description="Runs tck tests for src/main directly">
491  
492      <run-tck-tests
493 <      target="${build.main.java.version}"
493 >      target="${java.runtime.target}"
494        workdir="${build.dir}"
495        classes="${product.jar}">
496        <javac-elements>
# Line 566 | Line 521
521    </target>
522  
523    <target name="jtreg"
524 <          depends="jar"
524 >          depends="jar"
525            description="Runs jtreg tests for src/main using the jtreg ant task">
526      <run-jtreg-tests
527 <       target="${build.main.java.version}"
527 >       target="${java.runtime.target}"
528         workdir="${build.dir}"
529         classes="${product.jar}"/>
530    </target>
531  
532    <target name="test"
533            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
534 <          description="Runs tck and jtreg tests for src/main">
580 <  </target>
581 <
582 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
583 <
584 < <!--     <antcall target="jtreg"> -->
585 < <!--       <param name="build.main.java.version" value="8"/> -->
586 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
587 < <!--     </antcall> -->
588 <
589 < <!--   </target> -->
590 <
591 < <!--   <target name="test89" -->
592 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
593 <
594 < <!--     <antcall target="clean"/> -->
595 < <!--     <antcall target="test"> -->
596 < <!--       <param name="build.main.java.version" value="8"/> -->
597 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
598 < <!--     </antcall> -->
599 <
600 < <!--     <antcall target="clean"/> -->
601 < <!--     <antcall target="test"> -->
602 < <!--       <param name="build.main.java.version" value="9"/> -->
603 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
604 < <!--     </antcall> -->
605 <
606 < <!--   </target> -->
607 <
608 <
609 <
610 <  <target name="configure-compiler">
611 <    <fail message="ant version too old">
612 <      <condition>
613 <        <not> <antversion atleast="1.9.1"/> </not>
614 <      </condition>
615 <    </fail>
616 <
617 <    <property name="unchecked.option" value="-Xlint:unchecked"/>
618 <
619 <    <condition property="warnunchecked.arg" value="${unchecked.option}">
620 <      <istrue value="${build.warnunchecked}"/>
621 <    </condition>
622 <
623 <    <property name="warnunchecked.arg" value=""/>
624 <
625 <
626 <    <!-- Common options in javac invocations -->
627 <    <property name="build.args" value="${warnunchecked.arg}"/>
628 <
629 <  </target>
630 <
631 <
632 <
633 <  <!-- Various demos and test programs -->
634 <
635 <
636 <  <!-- description="Benchmark from Doug Lea's AQS paper" -->
637 <  <target name="loops" depends="configure-compiler">
638 <
639 <    <mkdir dir="${build.loops.dir}"/>
640 <
641 <    <javac srcdir="${loops.src.dir}"
642 <          destdir="${build.loops.dir}"
643 <            debug="${build.debug}"
644 <       debuglevel="${build.debuglevel}"
645 <      deprecation="${build.deprecation}"
646 <           source="${build.sourcelevel}"
647 <           target="${build.sourcelevel}"
648 <         encoding="ASCII"
649 <             fork="true">
650 <
651 <      <compilerarg line="${build.args}"/>
652 <      <classpath refid="loops.classpath"/>
653 <      <compilerarg value="-XDignore.symbol.file=true"/>
654 <
655 <    </javac>
656 <
657 <    <java classname="ALoops" fork="true">
658 <      <classpath refid="loops.classpath"/>
659 <    </java>
660 <
661 <  </target>
662 <
663 <
664 <  <target name="compile-test-loops" depends="jar"
665 <          description="compile all the perf tests in src/test/loops">
666 <
667 <    <mkdir dir="${build.dir}/test/loops"/>
668 <
669 <    <javac srcdir="${basedir}/src/test/loops"
670 <           destdir="${build.dir}/test/loops"
671 <           debug="${build.debug}"
672 <           debuglevel="${build.debuglevel}"
673 <           deprecation="${build.deprecation}"
674 <           includeAntRuntime="false"
675 <           includeJavaRuntime="false"
676 <           encoding="ASCII"
677 <           executable="${javac9}"
678 <           fork="true">
679 <
680 <      <include name="*.java"/>
681 <      <compilerarg value="-XDignore.symbol.file=true"/>
682 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
683 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
684 <      <compilerarg line="${build.args}"/>
685 <
686 <    </javac>
687 <
688 <  </target>
689 <
690 <
691 <  <!-- jsr166 4jdk8 -->
692 <
693 <  <target name="4jdk8compile"
694 <          depends="configure-compiler"
695 <          description="Compiles src/jdk8 sources, targeting jdk8">
696 <
697 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
698 <
699 <    <javac srcdir="${4jdk8src.dir}"
700 <           destdir="${build.4jdk8.classes.dir}"
701 <           debug="${build.debug}"
702 <           debuglevel="${build.debuglevel}"
703 <           deprecation="${build.deprecation}"
704 <           source="8"
705 <           target="8"
706 <           classpath=""
707 <           bootclasspath="${bootclasspath8}"
708 <           includeAntRuntime="false"
709 <           includeJavaRuntime="false"
710 <           encoding="ASCII"
711 <           executable="${javac8}"
712 <           fork="true">
713 <
714 <      <include name="**/*.java"/>
715 <      <compilerarg value="-Xprefer:source"/>
716 <      <compilerarg value="-XDignore.symbol.file=true"/>
717 <      <compilerarg value="-Xlint:all"/>
718 <      <compilerarg value="-Werror"/>
719 <      <compilerarg line="${build.args}"/>
720 <
721 <    </javac>
722 <  </target>
723 <
724 <  <target name="4jdk8doclint"
725 <          depends="configure-compiler"
726 <          description="Finds doclint warnings">
727 <
728 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
729 <
730 <    <javac srcdir="${4jdk8src.dir}"
731 <           destdir="${build.4jdk8.classes.dir}"
732 <           debug="${build.debug}"
733 <           debuglevel="${build.debuglevel}"
734 <           deprecation="${build.deprecation}"
735 <           source="8"
736 <           target="8"
737 <           classpath=""
738 <           bootclasspath="${bootclasspath8}"
739 <           includeAntRuntime="false"
740 <           includeJavaRuntime="false"
741 <           encoding="ASCII"
742 <           executable="${javac8}"
743 <           fork="true">
744 <
745 <      <include name="**/*.java"/>
746 <      <compilerarg value="-Xprefer:source"/>
747 <      <compilerarg value="-XDignore.symbol.file=true"/>
748 <      <compilerarg value="-Xlint:all"/>
749 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
750 <      <compilerarg line="${build.args}"/>
751 <
752 <    </javac>
753 <  </target>
754 <
755 <
756 <  <target name="4jdk8jar"
757 <          depends="4jdk8compile"
758 <          description="Builds library jar from compiled sources">
759 <
760 <    <jar destfile="${4jdk8product.jar}">
761 <      <fileset dir="${build.4jdk8.classes.dir}"/>
762 <      <manifest>
763 <        <attribute name="Built-By" value="${user.name}"/>
764 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
765 <      </manifest>
766 <    </jar>
767 <
768 <  </target>
769 <
770 <
771 <  <target name="4jdk8-tck"
772 <          depends="4jdk8jar"
773 <          description="Runs tck tests for jsr166-4jdk8 directly">
774 <
775 <    <run-tck-tests
776 <      target="8"
777 <      workdir="${build.4jdk8.dir}"
778 <      classes="${4jdk8product.jar}">
779 <      <javac-elements>
780 <        <!-- JDK9+ test classes -->
781 <        <exclude name="*9Test.java"/>
782 <        <exclude name="*10Test.java"/>
783 <        <compilerarg value="-Werror"/>
784 <      </javac-elements>
785 <    </run-tck-tests>
786 <  </target>
787 <
788 <
789 <  <target name="4jdk8-jtreg"
790 <          depends="4jdk8jar"
791 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
792 <    <run-jtreg-tests
793 <       target="8"
794 <       workdir="${build.4jdk8.dir}"
795 <       classes="${4jdk8product.jar}"/>
796 <  </target>
797 <
798 <
799 <  <target name="4jdk8-test"
800 <          depends="4jdk8-tck, 4jdk8-jtreg"
801 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
802 <  </target>
803 <
804 <
805 <  <target name="4jdk8docs"
806 <          description="Builds javadocs for src/jdk8 to dist dir">
807 <
808 <    <delete dir="${4jdk8docs.dir}"/>
809 <    <mkdir dir="${4jdk8docs.dir}"/>
810 <
811 <    <javadoc destdir="${4jdk8docs.dir}"
812 <             packagenames="none"
813 <             link="${java8.api.url}"
814 <             overview="${4jdk8src.dir}/intro.html"
815 <             access="${build.javadoc.access}"
816 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
817 <             classpath=""
818 <             executable="${javadoc8}"
819 <             failonerror = "true">
820 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
821 <        <include name="**/*.java"/>
822 <      </fileset>
823 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
824 <      <arg value="-XDignore.symbol.file=true"/>
825 <      <arg value="-tag"/>
826 <      <arg value="${javadoc.jls.option}"/>
827 < <!-- @apiNote currently unused -->
828 < <!--       <arg value="-tag"/> -->
829 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
830 <      <arg value="-tag"/>
831 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
832 <      <arg value="-tag"/>
833 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
834 <    </javadoc>
835 <  </target>
836 <
837 <
838 <  <target name="4jdk8dist"
839 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
840 <          description="Puts all distributable products in single hierarchy"/>
841 <
842 <
843 <  <target name="4jdk8clean"
844 <          description="Removes all 4jdk8 build products">
845 <
846 <    <delete dir="${build.4jdk8.dir}"/>
847 <
848 <  </target>
849 <
850 <
851 <  <target name="4jdk8dist-jar"
852 <          depends="4jdk8clean, 4jdk8jar">
853 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
854 <  </target>
855 <
856 <
857 <  <target name="4jdk8dist-docs"
858 <          depends="4jdk8clean, 4jdk8docs">
859 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
860 <  </target>
861 <
862 <
863 <
864 <  <!-- jsr166 4jdk7 -->
865 <
866 <  <target name="4jdk7compile"
867 <          depends="configure-compiler"
868 <          description="Compiles src/jdk7 sources, targeting jdk7">
869 <
870 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
871 <
872 <    <javac srcdir="${4jdk7src.dir}"
873 <           destdir="${build.4jdk7.classes.dir}"
874 <           debug="${build.debug}"
875 <           debuglevel="${build.debuglevel}"
876 <           deprecation="${build.deprecation}"
877 <           source="6"
878 <           target="6"
879 <           classpath=""
880 <           bootclasspath="${bootclasspath6}"
881 <           includeAntRuntime="false"
882 <           includeJavaRuntime="false"
883 <           encoding="ASCII"
884 <           executable="${javac7}"
885 <           fork="true">
886 <
887 <      <include name="**/*.java"/>
888 <      <compilerarg value="-Xprefer:source"/>
889 <      <compilerarg value="-XDignore.symbol.file=true"/>
890 <      <compilerarg value="-Xlint:all"/>
891 <      <compilerarg value="-Werror"/>
892 <      <compilerarg line="${build.args}"/>
893 <
894 <    </javac>
895 <  </target>
896 <
897 <  <target name="4jdk7doclint"
898 <          depends="configure-compiler"
899 <          description="Finds doclint warnings">
900 <
901 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
902 <
903 <    <javac srcdir="${4jdk7src.dir}"
904 <           destdir="${build.4jdk7.classes.dir}"
905 <           debug="${build.debug}"
906 <           debuglevel="${build.debuglevel}"
907 <           deprecation="${build.deprecation}"
908 <           source="6"
909 <           target="6"
910 <           classpath=""
911 <           bootclasspath="${bootclasspath6}"
912 <           includeAntRuntime="false"
913 <           includeJavaRuntime="false"
914 <           encoding="ASCII"
915 <           executable="${javac8}"
916 <           fork="true">
917 <
918 <      <include name="**/*.java"/>
919 <      <compilerarg value="-Xprefer:source"/>
920 <      <compilerarg value="-XDignore.symbol.file=true"/>
921 <      <compilerarg value="-Xlint:all"/>
922 <      <compilerarg value="-Xdoclint:all/protected"/>
923 <      <compilerarg line="${build.args}"/>
924 <
925 <    </javac>
926 <  </target>
927 <
928 <
929 <  <target name="4jdk7jar"
930 <          depends="4jdk7compile"
931 <          description="Builds library jar from compiled sources">
932 <
933 <    <jar destfile="${4jdk7product.jar}">
934 <      <fileset dir="${build.4jdk7.classes.dir}"/>
935 <      <manifest>
936 <        <attribute name="Built-By" value="${user.name}"/>
937 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
938 <      </manifest>
939 <    </jar>
940 <
941 <  </target>
942 <
943 <
944 <  <target name="4jdk7-tck"
945 <          depends="4jdk7jar"
946 <          description="Runs tck tests for jsr166-4jdk7 directly">
947 <
948 <    <run-tck-tests
949 <      target="7"
950 <      workdir="${build.4jdk7.dir}"
951 <      classes="${4jdk7product.jar}">
952 <      <javac-elements>
953 <        <!-- JDK8+ test classes -->
954 <        <exclude name="*8Test.java"/>
955 <        <exclude name="*9Test.java"/>
956 <        <exclude name="*10Test.java"/>
957 <        <exclude name="DoubleAccumulatorTest.java"/>
958 <        <exclude name="DoubleAdderTest.java"/>
959 <        <exclude name="LongAccumulatorTest.java"/>
960 <        <exclude name="LongAdderTest.java"/>
961 <        <exclude name="CompletableFutureTest.java"/>
962 <        <exclude name="SplittableRandomTest.java"/>
963 <        <exclude name="StampedLockTest.java"/>
964 <        <exclude name="SubmissionPublisherTest.java"/>
965 <        <compilerarg value="-Werror"/>
966 <      </javac-elements>
967 <    </run-tck-tests>
968 <  </target>
969 <
970 <
971 <  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
972 <  <target name="4jdk7-tck-junit"
973 <          depends="4jdk7compile">
974 <
975 <    <junit printsummary="true"
976 <           showoutput="true"
977 <           errorProperty="junit.failed"
978 <           failureProperty="junit.failed"
979 <           includeantruntime="true"
980 <           jvm="${java7}"
981 <           fork="true">
982 <
983 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
984 <      <jvmarg value="-server"/>
985 <
986 <      <classpath>
987 <        <pathelement location="${junit.jar}"/>
988 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
989 <      </classpath>
990 <
991 <      <formatter type="brief"/>
992 <
993 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
994 <      </test>
995 <
996 <    </junit>
997 <  </target>
998 <
999 <  <target name="4jdk7-jtreg"
1000 <          depends="4jdk7jar"
1001 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
1002 <    <run-jtreg-tests
1003 <       target="7"
1004 <       workdir="${build.4jdk7.dir}"
1005 <       classes="${4jdk7product.jar}"/>
1006 <  </target>
1007 <
1008 <
1009 <  <target name="4jdk7-test"
1010 <          depends="4jdk7-tck, 4jdk7-jtreg"
1011 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
1012 <  </target>
1013 <
1014 <
1015 <  <target name="4jdk7docs"
1016 <          description="Builds javadocs for src/jdk7 to dist dir">
1017 <
1018 <    <delete dir="${4jdk7docs.dir}"/>
1019 <    <mkdir dir="${4jdk7docs.dir}"/>
1020 <
1021 <    <javadoc destdir="${4jdk7docs.dir}"
1022 <             packagenames="none"
1023 <             link="${java7.api.url}"
1024 <             overview="${4jdk7src.dir}/intro.html"
1025 <             access="${build.javadoc.access}"
1026 <             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1027 <             classpath=""
1028 <             executable="${javadoc7}"
1029 <             failonerror = "true">
1030 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1031 <        <include name="**/*.java"/>
1032 <      </fileset>
1033 <      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1034 <      <arg value="-XDignore.symbol.file=true"/>
1035 <    </javadoc>
1036 <  </target>
1037 <
1038 <
1039 <  <target name="4jdk7dist"
1040 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1041 <          description="Puts all distributable products in single hierarchy"/>
1042 <
1043 <
1044 <  <target name="4jdk7clean"
1045 <          description="Removes all 4jdk7 build products">
1046 <
1047 <    <delete dir="${build.4jdk7.dir}"/>
534 >          description="Runs tck and jtreg tests for src/main"/>
535  
536 +  <target name="test-version-permutations"
537 +          depends="test11, test12, test13, test14, test15, test16,
538 +          test11-12, test11-13, test11-14, test11-15, test11-16,
539 +          clean, test, docs"
540 +          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
541 +
542 +  <target name="test11">
543 +    <antcall>
544 +      <param name="java.runtime.target" value="11"/>
545 +      <param name="build.main.javac" value="${javac11}"/>
546 +      <param name="build.main.javadoc" value="${javadoc12}"/>
547 +      <param name="build.main.javadoc.source" value="11"/>
548 +      <target name="clean"/>
549 +      <target name="test"/>
550 +      <target name="docs"/>
551 +    </antcall>
552    </target>
553  
554 <
555 <  <target name="4jdk7dist-jar"
556 <          depends="4jdk7clean, 4jdk7jar">
557 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
554 >  <target name="test12">
555 >    <antcall>
556 >      <param name="java.runtime.target" value="12"/>
557 >      <param name="build.main.javac" value="${javac12}"/>
558 >      <param name="build.main.javadoc" value="${javadoc12}"/>
559 >      <param name="build.main.javadoc.source" value="12"/>
560 >      <target name="clean"/>
561 >      <target name="test"/>
562 >      <target name="docs"/>
563 >    </antcall>
564    </target>
565  
566 <
567 <  <target name="4jdk7dist-docs"
568 <          depends="4jdk7clean, 4jdk7docs">
569 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
566 >  <target name="test13">
567 >    <antcall>
568 >      <param name="java.runtime.target" value="13"/>
569 >      <param name="build.main.javac" value="${javac13}"/>
570 >      <param name="build.main.javadoc" value="${javadoc13}"/>
571 >      <param name="build.main.javadoc.source" value="13"/>
572 >      <target name="clean"/>
573 >      <target name="test"/>
574 >      <target name="docs"/>
575 >    </antcall>
576    </target>
577  
578 <
579 <  <!-- jsr166x -->
580 <
581 <  <target name="jsr166xcompile"
582 <          depends="configure-compiler"
583 <          description="Compiles jsr166x sources to build dir">
584 <
585 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
586 <
587 <    <javac srcdir="${topsrc.dir}"
1073 <           destdir="${build.jsr166x.classes.dir}"
1074 <           debug="${build.debug}"
1075 <           debuglevel="${build.debuglevel}"
1076 <           deprecation="${build.deprecation}"
1077 <           classpath=""
1078 <           bootclasspath="${bootclasspath6}"
1079 <           source="5"
1080 <           target="5"
1081 <           includeAntRuntime="false"
1082 <           includeJavaRuntime="false"
1083 <           encoding="ASCII"
1084 <           executable="${javac7}"
1085 <           fork="true">
1086 <
1087 <      <include name="jsr166x/**/*.java"/>
1088 <      <compilerarg value="-XDignore.symbol.file=true"/>
1089 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1090 <      <compilerarg value="-Werror"/>
1091 <      <compilerarg line="${build.args}"/>
1092 <
1093 <    </javac>
578 >  <target name="test14">
579 >    <antcall>
580 >      <param name="java.runtime.target" value="14"/>
581 >      <param name="build.main.javac" value="${javac14}"/>
582 >      <param name="build.main.javadoc" value="${javadoc14}"/>
583 >      <param name="build.main.javadoc.source" value="14"/>
584 >      <target name="clean"/>
585 >      <target name="test"/>
586 >      <target name="docs"/>
587 >    </antcall>
588    </target>
589  
590 <
591 <  <target name="jsr166xjar"
592 <          depends="jsr166xcompile"
593 <          description="Builds library jar from compiled sources">
594 <
595 <    <jar destfile="${jsr166x.jar}">
596 <      <fileset dir="${build.jsr166x.classes.dir}"/>
597 <      <manifest>
598 <        <attribute name="Built-By" value="${user.name}"/>
599 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1106 <      </manifest>
1107 <    </jar>
1108 <
590 >  <target name="test15">
591 >    <antcall>
592 >      <param name="java.runtime.target" value="15"/>
593 >      <param name="build.main.javac" value="${javac15}"/>
594 >      <param name="build.main.javadoc" value="${javadoc15}"/>
595 >      <param name="build.main.javadoc.source" value="15"/>
596 >      <target name="clean"/>
597 >      <target name="test"/>
598 >      <target name="docs"/>
599 >    </antcall>
600    </target>
601  
602 <
603 <  <target name="jsr166xdocs"
604 <          description="Builds javadocs to dist dir">
605 <
606 <    <delete dir="${jsr166xdocs.dir}"/>
607 <    <mkdir dir="${jsr166xdocs.dir}"/>
608 <
609 <    <javadoc destdir="${jsr166xdocs.dir}"
610 <             packagenames="jsr166x.*"
611 <             link="${java.api.url}"
1121 <             access="${build.javadoc.access}"
1122 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1123 <             bootclasspath="${bootclasspath6}"
1124 <             source="5"
1125 <             executable="${javadoc7}"
1126 <             failonerror = "true">
1127 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1128 <      <arg value="-XDignore.symbol.file=true"/>
1129 <
1130 <    </javadoc>
602 >  <target name="test16">
603 >    <antcall>
604 >      <param name="java.runtime.target" value="16"/>
605 >      <param name="build.main.javac" value="${javac16}"/>
606 >      <param name="build.main.javadoc" value="${javadoc16}"/>
607 >      <param name="build.main.javadoc.source" value="16"/>
608 >      <target name="clean"/>
609 >      <target name="test"/>
610 >      <target name="docs"/>
611 >    </antcall>
612    </target>
613  
614 <
615 <  <target name="jsr166xdist"
616 <          depends="jsr166xdist-jar, jsr166xdist-docs"
617 <          description="Puts all distributable products in single hierarchy"/>
618 <
619 <
620 <  <target name="jsr166xclean"
621 <          description="Removes all jsr166x build products">
622 <
623 <    <delete dir="${build.jsr166x.dir}"/>
1143 <
614 >  <target name="test11-12">
615 >    <antcall>
616 >      <param name="java.runtime.target" value="12"/>
617 >      <param name="build.main.javac" value="${javac11}"/>
618 >      <param name="build.main.javadoc" value="${javadoc12}"/>
619 >      <param name="build.main.javadoc.source" value="11"/>
620 >      <target name="clean"/>
621 >      <target name="test"/>
622 >      <target name="docs"/>
623 >    </antcall>
624    </target>
625  
626 <
627 <  <target name="jsr166xdist-jar"
628 <          depends="jsr166xclean, jsr166xjar">
629 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
626 >  <target name="test11-13">
627 >    <antcall>
628 >      <param name="java.runtime.target" value="13"/>
629 >      <param name="build.main.javac" value="${javac11}"/>
630 >      <param name="build.main.javadoc" value="${javadoc13}"/>
631 >      <param name="build.main.javadoc.source" value="11"/>
632 >      <target name="clean"/>
633 >      <target name="test"/>
634 >      <target name="docs"/>
635 >    </antcall>
636    </target>
637  
638 <  <target name="jsr166xdist-docs"
639 <          depends="jsr166xclean, jsr166xdocs">
640 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
638 >  <target name="test11-14">
639 >    <antcall>
640 >      <param name="java.runtime.target" value="14"/>
641 >      <param name="build.main.javac" value="${javac11}"/>
642 >      <param name="build.main.javadoc" value="${javadoc14}"/>
643 >      <param name="build.main.javadoc.source" value="11"/>
644 >      <target name="clean"/>
645 >      <target name="test"/>
646 >      <target name="docs"/>
647 >    </antcall>
648    </target>
649  
650 <  <!-- jsr166y -->
651 <
652 <
653 <  <target name="jsr166ycompile"
654 <          depends="configure-compiler"
655 <          description="Compiles jsr166y sources">
656 <
657 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
658 <
659 <    <javac srcdir="${topsrc.dir}"
1167 <           destdir="${build.jsr166y.classes.dir}"
1168 <           debug="${build.debug}"
1169 <           debuglevel="${build.debuglevel}"
1170 <           deprecation="${build.deprecation}"
1171 <           source="6"
1172 <           target="6"
1173 <           classpath=""
1174 <           bootclasspath="${bootclasspath6}"
1175 <           includeAntRuntime="false"
1176 <           includeJavaRuntime="false"
1177 <           encoding="ASCII"
1178 <           executable="${javac7}"
1179 <           fork="true">
1180 <
1181 <      <include name="jsr166y/**/*.java"/>
1182 <      <compilerarg value="-XDignore.symbol.file=true"/>
1183 <      <compilerarg value="-Xlint:all"/>
1184 <      <compilerarg value="-Werror"/>
1185 <      <compilerarg line="${build.args}"/>
1186 <
1187 <    </javac>
650 >  <target name="test11-15">
651 >    <antcall>
652 >      <param name="java.runtime.target" value="15"/>
653 >      <param name="build.main.javac" value="${javac11}"/>
654 >      <param name="build.main.javadoc" value="${javadoc15}"/>
655 >      <param name="build.main.javadoc.source" value="11"/>
656 >      <target name="clean"/>
657 >      <target name="test"/>
658 >      <target name="docs"/>
659 >    </antcall>
660    </target>
661  
662 <
663 <  <target name="jsr166yjar"
664 <          depends="jsr166ycompile"
665 <          description="Builds library jar from compiled sources">
666 <
667 <    <jar destfile="${jsr166y.jar}" index="true">
668 <      <fileset dir="${build.jsr166y.classes.dir}"/>
669 <      <manifest>
670 <        <attribute name="Built-By" value="${user.name}"/>
671 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1200 <      </manifest>
1201 <    </jar>
1202 <
662 >  <target name="test11-16">
663 >    <antcall>
664 >      <param name="java.runtime.target" value="16"/>
665 >      <param name="build.main.javac" value="${javac11}"/>
666 >      <param name="build.main.javadoc" value="${javadoc16}"/>
667 >      <param name="build.main.javadoc.source" value="11"/>
668 >      <target name="clean"/>
669 >      <target name="test"/>
670 >      <target name="docs"/>
671 >    </antcall>
672    </target>
673  
674 <
675 <  <target name="jsr166ydocs"
676 <          description="Builds javadocs to dist dir">
677 <
678 <    <delete dir="${jsr166ydocs.dir}"/>
679 <    <mkdir dir="${jsr166ydocs.dir}"/>
680 <
681 <    <javadoc destdir="${jsr166ydocs.dir}"
682 <             packagenames="jsr166y.*"
1214 <             link="${java.api.url}"
1215 <             access="${build.javadoc.access}"
1216 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1217 <             bootclasspath="${bootclasspath6}"
1218 <             source="6"
1219 <             executable="${javadoc7}"
1220 <             failonerror = "true">
1221 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1222 <      <arg value="-XDignore.symbol.file=true"/>
1223 <
1224 <    </javadoc>
674 >  <target name="docs16">
675 >    <antcall>
676 >      <param name="java.runtime.target" value="16"/>
677 >      <param name="build.main.javac" value="${javac16}"/>
678 >      <param name="build.main.javadoc" value="${javadoc16}"/>
679 >      <param name="build.main.javadoc.source" value="16"/>
680 >      <target name="clean"/>
681 >      <target name="docs"/>
682 >    </antcall>
683    </target>
684  
685  
686 <  <target name="jsr166ydist"
687 <          depends="jsr166ydist-jar, jsr166ydist-docs"
688 <          description="Puts all distributable products in single hierarchy"/>
689 <
686 >  <target name="configure-compiler">
687 >    <fail message="ant version too old">
688 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
689 >    </fail>
690  
691 <  <target name="jsr166yclean"
1234 <          description="Removes all jsr166y build products">
691 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
692  
693 <    <delete dir="${build.jsr166y.dir}"/>
693 >    <condition property="warnunchecked.arg" value="${unchecked.option}">
694 >      <istrue value="${build.warnunchecked}"/>
695 >    </condition>
696  
697 <  </target>
697 >    <property name="warnunchecked.arg" value=""/>
698  
699  
700 <  <target name="jsr166ydist-jar"
701 <          depends="jsr166yclean, jsr166yjar">
1243 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1244 <  </target>
700 >    <!-- Common options in javac invocations -->
701 >    <property name="build.args" value="${warnunchecked.arg}"/>
702  
1246  <target name="jsr166ydist-docs"
1247          depends="jsr166yclean, jsr166ydocs">
1248    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
703    </target>
704  
705  
706 <  <!-- extra166y -->
707 <
1254 <
1255 <  <target name="extra166ycompile"
1256 <          depends="configure-compiler, jsr166yjar"
1257 <          description="Compiles extra166y sources">
706 >  <target name="compile-test-loops" depends="jar"
707 >          description="Compiles all the perf tests in src/test/loops">
708  
709 <    <mkdir dir="${build.extra166y.classes.dir}"/>
709 >    <mkdir dir="${build.dir}/test/loops"/>
710  
711 <    <javac srcdir="${topsrc.dir}"
712 <           destdir="${build.extra166y.classes.dir}"
711 >    <javac srcdir="${basedir}/src/test/loops"
712 >           destdir="${build.dir}/test/loops"
713             debug="${build.debug}"
714             debuglevel="${build.debuglevel}"
715             deprecation="${build.deprecation}"
1266           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1267           classpath=""
1268           source="6"
1269           target="6"
716             includeAntRuntime="false"
717             includeJavaRuntime="false"
718             encoding="ASCII"
719 <           executable="${javac7}"
1274 <           fork="true">
1275 <
1276 <      <include name="extra166y/**/*.java"/>
1277 <      <compilerarg value="-XDignore.symbol.file=true"/>
1278 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1279 <      <compilerarg value="-Werror"/>
1280 <      <compilerarg line="${build.args}"/>
1281 <
1282 <    </javac>
1283 <  </target>
1284 <
1285 <
1286 <  <target name="extra166yjar"
1287 <          depends="extra166ycompile"
1288 <          description="Builds library jar from compiled sources">
1289 <
1290 <    <jar destfile="${extra166y.jar}" index="true">
1291 <      <fileset dir="${build.extra166y.classes.dir}"/>
1292 <      <manifest>
1293 <        <attribute name="Built-By" value="${user.name}"/>
1294 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1295 <      </manifest>
1296 <    </jar>
1297 <
1298 <  </target>
1299 <
1300 <
1301 <  <target name="extra166ydocs"
1302 <          description="Builds javadocs to build dir">
1303 <
1304 <    <delete dir="${extra166ydocs.dir}"/>
1305 <    <mkdir dir="${extra166ydocs.dir}"/>
1306 <
1307 <    <javadoc destdir="${extra166ydocs.dir}"
1308 <             packagenames="extra166y.*"
1309 <             link="${java.api.url}"
1310 <             access="${build.javadoc.access}"
1311 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1312 <             bootclasspath="${bootclasspath6}"
1313 <             source="6"
1314 <             executable="${javadoc7}">
1315 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1316 <      <arg value="-XDignore.symbol.file=true"/>
1317 <
1318 <    </javadoc>
1319 <  </target>
1320 <
1321 <
1322 <  <target name="extra166ydist"
1323 <          depends="extra166ydist-jar, extra166ydist-docs"
1324 <          description="Puts all distributable products in single hierarchy"/>
1325 <
1326 <
1327 <  <target name="extra166yclean"
1328 <          description="Removes all extra166y build products">
1329 <
1330 <    <delete dir="${build.extra166y.dir}"/>
1331 <
1332 <  </target>
1333 <
1334 <
1335 <  <target name="extra166ydist-jar"
1336 <          depends="extra166yclean, extra166yjar">
1337 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1338 <  </target>
1339 <
1340 <  <target name="extra166ydist-docs"
1341 <          depends="extra166yclean, extra166ydocs">
1342 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1343 <  </target>
1344 <
1345 <  <!-- jsr166e -->
1346 <
1347 <  <property name="build.jsr166e.java.version" value="6"/>
1348 <  <property name="build.jsr166e.javac" value="${javac6}"/>
1349 <
1350 <  <target name="jsr166ecompile"
1351 <          depends="configure-compiler"
1352 <          description="Compiles jsr166e sources">
1353 <
1354 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
1355 <
1356 <    <javac srcdir="${topsrc.dir}"
1357 <           destdir="${build.jsr166e.classes.dir}"
1358 <           debug="${build.debug}"
1359 <           debuglevel="${build.debuglevel}"
1360 <           deprecation="${build.deprecation}"
1361 <           source="${build.jsr166e.java.version}"
1362 <           target="${build.jsr166e.java.version}"
1363 <           classpath=""
1364 <           includeAntRuntime="false"
1365 <           includeJavaRuntime="false"
1366 <           executable="${build.jsr166e.javac}"
719 >           executable="${build.main.javac}"
720             fork="true">
721  
722 <      <include name="jsr166e/**/*.java"/>
722 >      <include name="*.java"/>
723        <compilerarg value="-XDignore.symbol.file=true"/>
724 <      <compilerarg value="-Xlint:all"/>
725 <      <compilerarg value="-Werror"/>
724 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
725 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
726        <compilerarg line="${build.args}"/>
1374
1375    </javac>
1376  </target>
1377
1378  <!-- jsr166e: find doclint errors -->
1379  <target name="jsr166edoclint">
1380
1381    <mkdir dir="${build.jsr166e.classes.dir}"/>
1382
1383    <javac srcdir="${topsrc.dir}"
1384           destdir="${build.jsr166e.classes.dir}"
1385           debug="${build.debug}"
1386           debuglevel="${build.debuglevel}"
1387           deprecation="${build.deprecation}"
1388           source="${build.jsr166e.java.version}"
1389           target="${build.jsr166e.java.version}"
1390           classpath=""
1391           bootclasspath="${bootclasspath6}"
1392           includeAntRuntime="false"
1393           includeJavaRuntime="false"
1394           executable="${javac8}"
1395           fork="true">
1396
1397      <include name="jsr166e/**/*.java"/>
1398      <compilerarg value="-XDignore.symbol.file=true"/>
1399      <compilerarg value="-Xlint:all"/>
1400      <compilerarg value="-Werror"/>
1401      <compilerarg value="-Xdoclint:all/protected"/>
1402
727      </javac>
728    </target>
729  
730  
731 <  <target name="jsr166ejar"
732 <          depends="jsr166ecompile"
733 <          description="Builds library jar from compiled sources">
734 <
735 <    <jar destfile="${jsr166e.jar}" index="true">
736 <      <fileset dir="${build.jsr166e.classes.dir}"/>
737 <      <manifest>
1414 <        <attribute name="Built-By" value="${user.name}"/>
1415 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1416 <      </manifest>
1417 <    </jar>
1418 <
1419 <  </target>
1420 <
1421 <
1422 <  <target name="jsr166edocs"
1423 <          description="Builds javadocs to build dir">
1424 <
1425 <    <delete dir="${jsr166edocs.dir}"/>
1426 <    <mkdir dir="${jsr166edocs.dir}"/>
1427 <
1428 <    <javadoc destdir="${jsr166edocs.dir}"
1429 <             packagenames="jsr166e.*"
1430 <             link="${java.api.url}"
1431 <             access="${build.javadoc.access}"
1432 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1433 <             source="${build.jsr166e.java.version}"
1434 <             executable="${javadoc7}"
1435 <             failonerror = "true">
1436 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1437 <      <arg value="-XDignore.symbol.file=true"/>
1438 <
1439 <    </javadoc>
1440 <  </target>
1441 <
1442 <
1443 <  <target name="jsr166e-tck-one-java-version"
1444 <          depends="jsr166ejar">
1445 <
1446 <    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1447 <
1448 <    <run-tck-tests
1449 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
1450 <      target="${build.jsr166e.java.version}"
1451 <      workdir="${build.jsr166e.dir}"
1452 <      classes="${jsr166e.jar}"/>
1453 <  </target>
1454 <
1455 <  <target name="jsr166e-tck"
1456 <          description="Runs tck tests for jsr166e for multiple java versions">
1457 <
1458 < <!--     <antcall target="clean"/> -->
1459 < <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1460 < <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1461 < <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1462 < <!--     </antcall> -->
1463 <
1464 <    <antcall target="clean"/>
1465 <    <antcall target="jsr166e-tck-one-java-version">
1466 <      <param name="build.jsr166e.java.version" value="7"/>
1467 <      <param name="build.jsr166e.javac" value="${javac7}"/>
1468 <    </antcall>
1469 <
1470 <    <antcall target="clean"/>
1471 <    <antcall target="jsr166e-tck-one-java-version">
1472 <      <param name="build.jsr166e.java.version" value="6"/>
1473 <      <param name="build.jsr166e.javac" value="${javac6}"/>
1474 <    </antcall>
1475 <  </target>
1476 <
1477 <
1478 <  <target name="jsr166e-test"
1479 <          depends="jsr166e-tck"
1480 <          description="Runs all tests for jsr166e">
1481 <  </target>
1482 <
1483 <  <target name="jsr166edist"
1484 <          depends="jsr166edist-jar, jsr166edist-docs"
1485 <          description="Puts all distributable products in single hierarchy"/>
1486 <
1487 <
1488 <  <target name="jsr166eclean"
1489 <          description="Removes all jsr166e build products">
1490 <    <delete dir="${build.jsr166e.dir}"/>
1491 <  </target>
1492 <
1493 <
1494 <  <target name="jsr166edist-jar"
1495 <          depends="jsr166eclean, jsr166ejar">
1496 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1497 <  </target>
1498 <
1499 <  <target name="jsr166edist-docs"
1500 <          depends="jsr166eclean, jsr166edocs">
1501 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1502 <  </target>
1503 <
731 >  <!-- old branches no longer maintained.  build support deleted -->
732 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
733 >  <!-- jsr166 4jdk7 (no longer maintained) -->
734 >  <!-- jsr166x (no longer maintained) -->
735 >  <!-- jsr166y (no longer maintained) -->
736 >  <!-- extra166y (no longer maintained) -->
737 >  <!-- jsr166e (no longer maintained) -->
738  
739   <!-- Find buglets that can be detected by static build tools -->
740  
741 <  <target name="lint">
742 <    <antcall target="dists">
743 <      <param name="build.javadoc.access" value="public"/>
744 <    </antcall>
745 <  </target>
741 > <!--   <target name="lint"> -->
742 > <!--     <antcall target="dists"> -->
743 > <!--       <param name="build.javadoc.access" value="protected"/> -->
744 > <!--     </antcall> -->
745 > <!--   </target> -->
746  
747   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
748 <  <target name="lint-private">
748 >  <target name="doclint-private">
749      <antcall target="dist">
750        <param name="build.javadoc.access" value="private"/>
751      </antcall>
# Line 1519 | Line 753
753  
754  
755   <!-- ==============================================================
756 <  Experimental errorprone support - http://errorprone.info
757 <  You may need to bring your own errorprone jar.
756 >  Experimental errorprone support
757 >  https://errorprone.info
758 >  https://errorprone.info/docs/installation
759 >  https://github.com/google/error-prone/issues/1143
760   =================================================================== -->
761 +  <path id="errorprone.processorpath.path">
762 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
763 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
764 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
765 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
766 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
767 +  </path>
768 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
769 +  <property name="errorprone.jsr166.user.flags" value=""/>
770 +  <property name="errorprone.jsr166.flags"
771 +            value="-Xep:HashtableContains:OFF
772 +                   -Xep:PreferJavaTimeOverload:OFF
773 +                   -Xep:JdkObsolete:OFF
774 +                   -Xep:MissingOverride:OFF
775 +                   -Xep:MissingFail:OFF
776 +                   -Xep:ThreadPriorityCheck:OFF
777 +                   -Xep:MixedArrayDimensions:ERROR
778 +                   -Xep:RemoveUnusedImports:ERROR
779 +                   -Xep:EmptyIf:ERROR
780 +                   -Xep:MultipleTopLevelClasses:ERROR
781 +                   -Xep:ClassName:ERROR
782 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
783 +                   -Xep:RedundantThrows:ERROR
784 +                   -Xep:IdentityBinaryExpression:WARN
785 +                   -Xep:ConstructorInvokesOverridable:WARN
786 +                   -Xep:MethodCanBeStatic:WARN
787 +                   ${errorprone.jsr166.user.flags}"/>
788 +  <!-- -Xep:WildcardImport:ERROR -->
789 +  <property name="errorprone.jsr166.test.flags"
790 +            value="-Xep:StringSplitter:OFF
791 +                   -Xep:BoxedPrimitiveConstructor:OFF
792 +                   -Xep:UnnecessaryParentheses:OFF
793 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
794 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
795    <target name="errorprone"
796            depends="clean, configure-compiler"
797 <          description="Run errorprone over jsr166 source code">
797 >          description="Run errorprone over jsr166 source code (experimental)">
798  
799      <local name="destdir"/>
800      <property name="destdir" value="${build.classes.dir}/java.base"/>
# Line 1543 | Line 813
813             fork="true">
814  
815        <include name="**/*.java"/>
816 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
817 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
818 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
819 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
820 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
1551 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
1552 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1553 <      <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1554 <      <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1555 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
816 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
817 >      <compilerarg value="-J--illegal-access=permit"/>
818 >      <compilerarg value="-XDcompilePolicy=simple"/>
819 >      <compilerarg value="-processorpath"/>
820 >      <compilerarg pathref="errorprone.processorpath.path"/>
821        <compilerarg value="-Xplugin:ErrorProne
822 <                          -Xep:IdentityBinaryExpression:WARN
1558 <                          -Xep:MissingOverride:OFF
1559 <                          -Xep:MixedArrayDimensions:WARN
1560 <                          -Xep:RemoveUnusedImports:ERROR
1561 <                          -Xep:MethodCanBeStatic:WARN"/>
822 >                          ${errorprone.jsr166.flags}"/>
823        <compilerarg value="--patch-module=java.base=${src.dir}"/>
824        <compilerarg value="-Xprefer:source"/>
825        <compilerarg value="-XDignore.symbol.file=true"/>
# Line 1573 | Line 834
834      </jar>
835  
836      <run-tck-tests
837 <      target="${build.main.java.version}"
837 >      target="${java.runtime.target}"
838        workdir="${build.dir}"
839        classes="${product.jar}">
840        <javac-elements>
841 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.api=ALL-UNNAMED"/>
842 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.util=ALL-UNNAMED"/>
843 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.tree=ALL-UNNAMED"/>
844 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.main=ALL-UNNAMED"/>
845 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.code=ALL-UNNAMED"/>
846 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.processing=ALL-UNNAMED"/>
847 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.parser=ALL-UNNAMED"/>
1587 <        <compilerarg value="-J--add-exports=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1588 <        <compilerarg value="-J--add-opens=jdk.compiler/com.sun.tools.javac.comp=ALL-UNNAMED"/>
1589 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.20-SNAPSHOT.jar"/>
1590 <        <compilerarg value="-Xplugin:ErrorProne
1591 <                            -Xep:IdentityBinaryExpression:WARN
1592 <                            -Xep:BoxedPrimitiveConstructor:OFF
1593 <                            -Xep:HashtableContains:OFF
1594 <                            -Xep:ModifyingCollectionWithItself:OFF
1595 <                            -Xep:MissingOverride:OFF
1596 <                            -Xep:MixedArrayDimensions:WARN
1597 <                            -Xep:RemoveUnusedImports:ERROR
1598 <                            -Xep:MethodCanBeStatic:WARN"/>
841 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
842 >        <compilerarg value="-J--illegal-access=permit"/>
843 >        <compilerarg value="-XDcompilePolicy=simple"/>
844 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
845 >        <compilerarg value="-Xplugin:ErrorProne
846 >                            ${errorprone.jsr166.flags}
847 >                            ${errorprone.jsr166.test.flags}"/>
848          <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
849        </javac-elements>
850      </run-tck-tests>
851    </target>
852  
853 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
854 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
855 +  <target name="errorprone-jtreg"
856 +          depends="jar"
857 +          description="Run errorprone over jtreg tests (experimental)">
858 +
859 +    <run-jtreg-tests
860 +       target="${java.runtime.target}"
861 +       workdir="${build.dir}"
862 +       classes="${product.jar}"
863 +       verbose="all">
864 +      <jtreg-elements>
865 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
866 +        <arg value="-javacoption:-processorpath"/>
867 +        <arg value="-javacoption:${errorprone.processorpath}"/>
868 +        <arg value="-javacoption:-Xplugin:ErrorProne
869 +                            ${errorprone.jsr166.flags}
870 +                            ${errorprone.jsr166.test.flags}
871 +                            -Xep:MultipleTopLevelClasses:WARN
872 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
873 +      </jtreg-elements>
874 +    </run-jtreg-tests>
875 +  </target>
876 +
877  
878   <!-- ==============================================================
879    Running guava tests against jsr166 code
# Line 1654 | Line 927
927      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
928           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
929      <junit printsummary="true" showoutput="true" haltonfailure="true"
930 <           jvm="${java9}" fork="true">
931 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
930 >           jvm="${build.main.java}" fork="true">
931 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
932        <formatter type="brief"/>
933        <classpath>
934          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines