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.234 by jsr166, Sat Feb 18 18:33:42 2017 UTC vs.
Revision 1.321 by jsr166, Sat Dec 12 18:58:10 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 253 | Line 208
208        <include name="*.java"/>
209        <compilerarg value="-XDignore.symbol.file=true"/>
210        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
211 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
212 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
211 >      <compilerarg value="-Xdoclint:reference/private"/>
212 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
213        <compilerarg line="${build.args}"/>
214        <javac-elements/>
215  
# Line 264 | 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"/>
288 <        </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 -->
318 <    <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  
329    <local name="modules"/>
330    <condition property="modules">
331      <available file="${jdk@{target}.home}/jmods" type="dir"/>
332    </condition>
333
288      <delete dir="@{workdir}/JTwork"   quiet="true"/>
289      <jtreg dir="${jtreg@{target}.src.dir}"
290             jdk="${jdk@{target}.home}"
291             workDir="@{workdir}/JTwork">
292        <patternset refid="jdk@{target}.jtreg.tests"/>
293 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
294 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
295 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
293 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
294 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
295 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
296        <arg value="-agentvm"/>
297        <arg value="-noreport"/>
298 <      <arg value="-verbose:${jtreg.verbose}"/>
298 >      <arg value="-verbose:@{verbose}"/>
299        <arg value="-vmoptions:-esa -ea"/>
300        <arg value="-automatic"/>
301        <arg value="-k:!ignore"/>
302        <arg line="@{jtregflags}"/>
303        <arg line="${jtreg.flags}"/>
304 +      <jtreg-elements/>
305      </jtreg>
306      </sequential>
307    </macrodef>
# Line 357 | Line 312
312    </path>
313  
314    <!-- Support @jls tag, used in jdk8+ javadoc -->
315 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
316    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
317    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
318  
319    <!-- Main targets -->
320  
321 <  <property name="build.main.java.version" value="9"/>
322 <  <property name="build.main.javac" value="${javac9}"/>
321 >  <!-- Default values: may seem strange ... -->
322 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
323 >  <!-- But at build time, target jdk9, for maximal binary portability -->
324 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
325 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
326 >    o override-methods=summary
327 >    o {@systemProperty ...}
328 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
329 >    o 8202628: javadoc generates bad links in TestModules.java
330 >    -->
331 >  <property name="java.runtime.target" value="11"/>
332 >  <property name="build.main.java" value="${java11}"/>
333 >  <property name="build.main.javac" value="${javac11}"/>
334 >  <property name="build.main.javadoc" value="${javadoc12}"/>
335 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
336  
337    <target name="dists"
338 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
338 >          depends="dist"
339            description="Builds all public jars and docs"/>
340  
341    <target name="compile"
342            depends="configure-compiler"
343            description="Compiles src/main sources to build dir">
344  
376    <local name="modules"/>
377    <condition property="modules">
378      <and>
379        <available file="${jdk9.home}/jmods" type="dir"/>
380        <equals arg1="9" arg2="${build.main.java.version}"/>
381      </and>
382    </condition>
383
345      <local name="destdir"/>
346 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
386 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
346 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
347  
348      <mkdir dir="${destdir}"/>
349  
# Line 400 | Line 360
360             fork="true">
361  
362        <include name="**/*.java"/>
363 <      <compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
363 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
364        <compilerarg value="-Xprefer:source"/>
365        <compilerarg value="-XDignore.symbol.file=true"/>
366 <      <compilerarg value="-Xlint:all"/>
367 <      <compilerarg value="-Werror"/>
366 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
367 >      <compilerarg value="-Xlint:all,-removal"/>
368 >      <compilerarg line="--doclint-format html5"/>
369 > <!--  Temporarily disable doclint for private elements, due to -->
370 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
371 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
372 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
373        <compilerarg value="-Xdoclint:all/protected"/>
374 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
375 +      <compilerarg value="-Werror"/>
376        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
377        <compilerarg line="${build.args}"/>
378  
# Line 431 | Line 398
398    <target name="docs"
399            description="Builds javadocs for src/main to dist dir">
400  
401 <    <delete dir="${docs.dir}"/>
401 >    <delete dir="${docs.dir}" quiet="true"/>
402      <mkdir dir="${docs.dir}"/>
403  
404 +    <!-- old school frames via docs/index.html?overview-summary.html -->
405 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
406 +    <local name="use-frames"/>
407 +    <condition property="use-frames">
408 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
409 +    </condition>
410 +
411      <!-- the packagenames="none" hack below prevents scanning the -->
412      <!-- sourcepath for packages -->
413  
# Line 444 | Line 418
418   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
419      <javadoc destdir="${docs.dir}"
420               packagenames="none"
421 <             link="${java9.api.url}"
421 >             link="${java.api.url}"
422               overview="${src.dir}/intro.html"
423               access="${build.javadoc.access}"
424               sourcepath="${src.dir}"
425               classpath=""
426 <             executable="${javadoc9}">
426 >             source="${build.main.javadoc.source}"
427 >             executable="${build.main.javadoc}">
428 > <!-- TODO: JDK-8214571 failonerror = "true" -->
429        <fileset dir="${src.dir}" defaultexcludes="yes">
430 <        <include name="**/*.java"/>
430 >        <include name="java/**/*.java"/>
431        </fileset>
432 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
432 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
433        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
434 +      <arg value="-quiet"/>
435        <arg value="-XDignore.symbol.file=true"/>
436 +      <arg value="-html5"/>
437 +      <arg value="-Xdoclint:all,-missing"/>
438        <arg value="--patch-module=java.base=${src.dir}"/>
439 <      <arg value="-tag"/>
440 <      <arg value="${javadoc.jls.option}"/>
441 < <!-- @apiNote currently unused -->
442 < <!--       <arg value="-tag"/> -->
443 < <!--       <arg value="apiNote:a:API Note:"/> -->
444 <      <arg value="-tag"/>
466 <      <arg value="implSpec:a:Implementation Requirements:"/>
467 <      <arg value="-tag"/>
468 <      <arg value="implNote:a:Implementation Note:"/>
439 >      <arg value="--frames" if:set="use-frames"/>
440 >      <arg value="--override-methods=summary"/>
441 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
442 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
443 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
444 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
445   <!-- tags added in jdk9: currently unused -->
446 < <!--       <arg value="-tag"/> -->
447 < <!--       <arg value="revised:X"/> -->
472 < <!--       <arg value="-tag"/> -->
473 < <!--       <arg value="spec:X"/> -->
446 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
447 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
448      </javadoc>
449    </target>
450  
# Line 480 | Line 454
454            description="Puts all distributable products in single hierarchy"/>
455  
456  
483  <target name="release"
484          depends="dist"
485          description="Puts entire CVS tree, plus distribution productions, in a jar">
486
487    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
488
489    <jar basedir="${basedir}" destfile="${release.jar}">
490      <!-- <exclude name="build/**"/> -->
491      <exclude name="${release.jar}"/>
492      <exclude name="user.properties"/>
493      <exclude name="etc/notes/**"/>
494      <exclude name="src/emulation/**"/>
495      <exclude name="**/SyntaxTest.java"/>
496      <exclude name="**/SuperfluousAbstract.java"/>
497      <manifest>
498        <attribute name="Built-By" value="${user.name}"/>
499        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
500      </manifest>
501    </jar>
502  </target>
503
504
457    <target name="clean"
458            description="Removes all build products">
507
459      <delete dir="${build.dir}"/>
509
460    </target>
461  
462  
463    <target name="dist-clean"
464            description="Removes all build and distribution products">
515
465      <delete dir="${build.dir}"/>
466      <delete dir="${dist.dir}"/>
518
467    </target>
468  
469  
# Line 530 | Line 478
478    </target>
479  
480    <target name="tck"
481 <          depends="jar"
481 >          depends="jar"
482            description="Runs tck tests for src/main directly">
483  
484      <run-tck-tests
485 <      target="${build.main.java.version}"
485 >      target="${java.runtime.target}"
486        workdir="${build.dir}"
487 <      classes="${product.jar}"/>
487 >      classes="${product.jar}">
488 >      <javac-elements>
489 >        <compilerarg value="-Werror"/>
490 >      </javac-elements>
491 >    </run-tck-tests>
492    </target>
493  
494    <target name="tck-parallelism-1"
# Line 561 | Line 513
513    </target>
514  
515    <target name="jtreg"
516 <          depends="jar"
516 >          depends="jar"
517            description="Runs jtreg tests for src/main using the jtreg ant task">
518      <run-jtreg-tests
519 <       target="${build.main.java.version}"
519 >       target="${java.runtime.target}"
520         workdir="${build.dir}"
521         classes="${product.jar}"/>
522    </target>
523  
524    <target name="test"
525            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
526 <          description="Runs tck and jtreg tests for src/main">
526 >          description="Runs tck and jtreg tests for src/main"/>
527 >
528 >  <target name="test-version-permutations"
529 >          depends="test11, test12, test13, test14, test15, test16,
530 >          test11-12, test11-13, test11-14, test11-15, test11-16,
531 >          clean, test, docs"
532 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
533 >
534 >  <target name="test11">
535 >    <antcall>
536 >      <param name="java.runtime.target" value="11"/>
537 >      <param name="build.main.javac" value="${javac11}"/>
538 >      <param name="build.main.javadoc" value="${javadoc12}"/>
539 >      <param name="build.main.javadoc.source" value="11"/>
540 >      <target name="clean"/>
541 >      <target name="test"/>
542 >      <target name="docs"/>
543 >    </antcall>
544    </target>
545  
546 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
546 >  <target name="test12">
547 >    <antcall>
548 >      <param name="java.runtime.target" value="12"/>
549 >      <param name="build.main.javac" value="${javac12}"/>
550 >      <param name="build.main.javadoc" value="${javadoc12}"/>
551 >      <param name="build.main.javadoc.source" value="12"/>
552 >      <target name="clean"/>
553 >      <target name="test"/>
554 >      <target name="docs"/>
555 >    </antcall>
556 >  </target>
557  
558 < <!--     <antcall target="jtreg"> -->
559 < <!--       <param name="build.main.java.version" value="8"/> -->
560 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
561 < <!--     </antcall> -->
558 >  <target name="test13">
559 >    <antcall>
560 >      <param name="java.runtime.target" value="13"/>
561 >      <param name="build.main.javac" value="${javac13}"/>
562 >      <param name="build.main.javadoc" value="${javadoc13}"/>
563 >      <param name="build.main.javadoc.source" value="13"/>
564 >      <target name="clean"/>
565 >      <target name="test"/>
566 >      <target name="docs"/>
567 >    </antcall>
568 >  </target>
569  
570 < <!--   </target> -->
570 >  <target name="test14">
571 >    <antcall>
572 >      <param name="java.runtime.target" value="14"/>
573 >      <param name="build.main.javac" value="${javac14}"/>
574 >      <param name="build.main.javadoc" value="${javadoc14}"/>
575 >      <param name="build.main.javadoc.source" value="14"/>
576 >      <target name="clean"/>
577 >      <target name="test"/>
578 >      <target name="docs"/>
579 >    </antcall>
580 >  </target>
581  
582 < <!--   <target name="test89" -->
583 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
582 >  <target name="test15">
583 >    <antcall>
584 >      <param name="java.runtime.target" value="15"/>
585 >      <param name="build.main.javac" value="${javac15}"/>
586 >      <param name="build.main.javadoc" value="${javadoc15}"/>
587 >      <param name="build.main.javadoc.source" value="15"/>
588 >      <target name="clean"/>
589 >      <target name="test"/>
590 >      <target name="docs"/>
591 >    </antcall>
592 >  </target>
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> -->
594 >  <target name="test16">
595 >    <antcall>
596 >      <param name="java.runtime.target" value="16"/>
597 >      <param name="build.main.javac" value="${javac16}"/>
598 >      <param name="build.main.javadoc" value="${javadoc16}"/>
599 >      <param name="build.main.javadoc.source" value="16"/>
600 >      <target name="clean"/>
601 >      <target name="test"/>
602 >      <target name="docs"/>
603 >    </antcall>
604 >  </target>
605  
606 < <!--     <antcall target="clean"/> -->
607 < <!--     <antcall target="test"> -->
608 < <!--       <param name="build.main.java.version" value="9"/> -->
609 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
610 < <!--     </antcall> -->
606 >  <target name="test11-12">
607 >    <antcall>
608 >      <param name="java.runtime.target" value="12"/>
609 >      <param name="build.main.javac" value="${javac11}"/>
610 >      <param name="build.main.javadoc" value="${javadoc12}"/>
611 >      <param name="build.main.javadoc.source" value="11"/>
612 >      <target name="clean"/>
613 >      <target name="test"/>
614 >      <target name="docs"/>
615 >    </antcall>
616 >  </target>
617  
618 < <!--   </target> -->
618 >  <target name="test11-13">
619 >    <antcall>
620 >      <param name="java.runtime.target" value="13"/>
621 >      <param name="build.main.javac" value="${javac11}"/>
622 >      <param name="build.main.javadoc" value="${javadoc13}"/>
623 >      <param name="build.main.javadoc.source" value="11"/>
624 >      <target name="clean"/>
625 >      <target name="test"/>
626 >      <target name="docs"/>
627 >    </antcall>
628 >  </target>
629 >
630 >  <target name="test11-14">
631 >    <antcall>
632 >      <param name="java.runtime.target" value="14"/>
633 >      <param name="build.main.javac" value="${javac11}"/>
634 >      <param name="build.main.javadoc" value="${javadoc14}"/>
635 >      <param name="build.main.javadoc.source" value="11"/>
636 >      <target name="clean"/>
637 >      <target name="test"/>
638 >      <target name="docs"/>
639 >    </antcall>
640 >  </target>
641 >
642 >  <target name="test11-15">
643 >    <antcall>
644 >      <param name="java.runtime.target" value="15"/>
645 >      <param name="build.main.javac" value="${javac11}"/>
646 >      <param name="build.main.javadoc" value="${javadoc15}"/>
647 >      <param name="build.main.javadoc.source" value="11"/>
648 >      <target name="clean"/>
649 >      <target name="test"/>
650 >      <target name="docs"/>
651 >    </antcall>
652 >  </target>
653  
654 +  <target name="test11-16">
655 +    <antcall>
656 +      <param name="java.runtime.target" value="16"/>
657 +      <param name="build.main.javac" value="${javac11}"/>
658 +      <param name="build.main.javadoc" value="${javadoc16}"/>
659 +      <param name="build.main.javadoc.source" value="11"/>
660 +      <target name="clean"/>
661 +      <target name="test"/>
662 +      <target name="docs"/>
663 +    </antcall>
664 +  </target>
665 +
666 +  <target name="docs16">
667 +    <antcall>
668 +      <param name="java.runtime.target" value="16"/>
669 +      <param name="build.main.javac" value="${javac16}"/>
670 +      <param name="build.main.javadoc" value="${javadoc16}"/>
671 +      <param name="build.main.javadoc.source" value="16"/>
672 +      <target name="clean"/>
673 +      <target name="docs"/>
674 +    </antcall>
675 +  </target>
676  
677  
678    <target name="configure-compiler">
679      <fail message="ant version too old">
680 <      <condition>
608 <        <not> <antversion atleast="1.9.1"/> </not>
609 <      </condition>
680 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
681      </fail>
682  
683      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 624 | Line 695
695    </target>
696  
697  
627
628  <!-- Various demos and test programs -->
629
630
631  <!-- description="Benchmark from Doug Lea's AQS paper" -->
632  <target name="loops" depends="configure-compiler">
633
634    <mkdir dir="${build.loops.dir}"/>
635
636    <javac srcdir="${loops.src.dir}"
637          destdir="${build.loops.dir}"
638            debug="${build.debug}"
639       debuglevel="${build.debuglevel}"
640      deprecation="${build.deprecation}"
641           source="${build.sourcelevel}"
642           target="${build.sourcelevel}"
643         encoding="ASCII"
644             fork="true">
645
646      <compilerarg line="${build.args}"/>
647      <classpath refid="loops.classpath"/>
648      <compilerarg value="-XDignore.symbol.file=true"/>
649
650    </javac>
651
652    <java classname="ALoops" fork="true">
653      <classpath refid="loops.classpath"/>
654    </java>
655
656  </target>
657
658
698    <target name="compile-test-loops" depends="jar"
699 <          description="compile all the perf tests in src/test/loops">
699 >          description="Compiles all the perf tests in src/test/loops">
700  
701      <mkdir dir="${build.dir}/test/loops"/>
702  
# Line 669 | Line 708
708             includeAntRuntime="false"
709             includeJavaRuntime="false"
710             encoding="ASCII"
711 <           executable="${javac9}"
711 >           executable="${build.main.javac}"
712             fork="true">
713  
714        <include name="*.java"/>
715        <compilerarg value="-XDignore.symbol.file=true"/>
716 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
717 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
679 <      <compilerarg line="${build.args}"/>
680 <
681 <    </javac>
682 <
683 <  </target>
684 <
685 <
686 <  <!-- jsr166 4jdk8 -->
687 <
688 <  <target name="4jdk8compile"
689 <          depends="configure-compiler"
690 <          description="Compiles src/jdk8 sources, targeting jdk8">
691 <
692 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
693 <
694 <    <javac srcdir="${4jdk8src.dir}"
695 <           destdir="${build.4jdk8.classes.dir}"
696 <           debug="${build.debug}"
697 <           debuglevel="${build.debuglevel}"
698 <           deprecation="${build.deprecation}"
699 <           source="8"
700 <           target="8"
701 <           classpath=""
702 <           bootclasspath="${bootclasspath8}"
703 <           includeAntRuntime="false"
704 <           includeJavaRuntime="false"
705 <           encoding="ASCII"
706 <           executable="${javac8}"
707 <           fork="true">
708 <
709 <      <include name="**/*.java"/>
710 <      <compilerarg value="-Xprefer:source"/>
711 <      <compilerarg value="-XDignore.symbol.file=true"/>
712 <      <compilerarg value="-Xlint:all"/>
713 <      <compilerarg value="-Werror"/>
716 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
717 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
718        <compilerarg line="${build.args}"/>
715
719      </javac>
720    </target>
721  
719  <target name="4jdk8doclint"
720          depends="configure-compiler"
721          description="Finds doclint warnings">
722
723    <mkdir dir="${build.4jdk8.classes.dir}"/>
722  
723 <    <javac srcdir="${4jdk8src.dir}"
724 <           destdir="${build.4jdk8.classes.dir}"
725 <           debug="${build.debug}"
726 <           debuglevel="${build.debuglevel}"
727 <           deprecation="${build.deprecation}"
728 <           source="8"
729 <           target="8"
732 <           classpath=""
733 <           bootclasspath="${bootclasspath8}"
734 <           includeAntRuntime="false"
735 <           includeJavaRuntime="false"
736 <           encoding="ASCII"
737 <           executable="${javac8}"
738 <           fork="true">
723 >  <!-- old branches no longer maintained.  build support deleted -->
724 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
725 >  <!-- jsr166 4jdk7 (no longer maintained) -->
726 >  <!-- jsr166x (no longer maintained) -->
727 >  <!-- jsr166y (no longer maintained) -->
728 >  <!-- extra166y (no longer maintained) -->
729 >  <!-- jsr166e (no longer maintained) -->
730  
731 <      <include name="**/*.java"/>
741 <      <compilerarg value="-Xprefer:source"/>
742 <      <compilerarg value="-XDignore.symbol.file=true"/>
743 <      <compilerarg value="-Xlint:all"/>
744 <      <compilerarg value="-Xdoclint:all/protected"/>
745 <      <compilerarg line="${build.args}"/>
746 <
747 <    </javac>
748 <  </target>
749 <
750 <
751 <  <target name="4jdk8jar"
752 <          depends="4jdk8compile"
753 <          description="Builds library jar from compiled sources">
754 <
755 <    <jar destfile="${4jdk8product.jar}">
756 <      <fileset dir="${build.4jdk8.classes.dir}"/>
757 <      <manifest>
758 <        <attribute name="Built-By" value="${user.name}"/>
759 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
760 <      </manifest>
761 <    </jar>
762 <
763 <  </target>
764 <
765 <
766 <  <target name="4jdk8-tck"
767 <          depends="4jdk8jar"
768 <          description="Runs tck tests for jsr166-4jdk8 directly">
769 <
770 <    <run-tck-tests
771 <      target="8"
772 <      workdir="${build.4jdk8.dir}"
773 <      classes="${4jdk8product.jar}">
774 <      <javac-elements>
775 <        <!-- JDK9+ test classes -->
776 <        <exclude name="*9Test.java"/>
777 <        <exclude name="*10Test.java"/>
778 <      </javac-elements>
779 <    </run-tck-tests>
780 <  </target>
781 <
782 <
783 <  <target name="4jdk8-jtreg"
784 <          depends="4jdk8jar"
785 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
786 <    <run-jtreg-tests
787 <       target="8"
788 <       workdir="${build.4jdk8.dir}"
789 <       classes="${4jdk8product.jar}"/>
790 <  </target>
791 <
792 <
793 <  <target name="4jdk8-test"
794 <          depends="4jdk8-tck, 4jdk8-jtreg"
795 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
796 <  </target>
797 <
798 <
799 <  <target name="4jdk8docs"
800 <          description="Builds javadocs for src/jdk8 to dist dir">
801 <
802 <    <delete dir="${4jdk8docs.dir}"/>
803 <    <mkdir dir="${4jdk8docs.dir}"/>
804 <
805 <    <javadoc destdir="${4jdk8docs.dir}"
806 <             packagenames="none"
807 <             link="${java8.api.url}"
808 <             overview="${4jdk8src.dir}/intro.html"
809 <             access="${build.javadoc.access}"
810 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
811 <             classpath=""
812 <             executable="${javadoc8}"
813 <             failonerror = "true">
814 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
815 <        <include name="**/*.java"/>
816 <      </fileset>
817 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
818 <      <arg value="-XDignore.symbol.file=true"/>
819 <      <arg value="-tag"/>
820 <      <arg value="${javadoc.jls.option}"/>
821 < <!-- @apiNote currently unused -->
822 < <!--       <arg value="-tag"/> -->
823 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
824 <      <arg value="-tag"/>
825 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
826 <      <arg value="-tag"/>
827 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
828 <    </javadoc>
829 <  </target>
830 <
831 <
832 <  <target name="4jdk8dist"
833 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
834 <          description="Puts all distributable products in single hierarchy"/>
835 <
836 <
837 <  <target name="4jdk8clean"
838 <          description="Removes all 4jdk8 build products">
839 <
840 <    <delete dir="${build.4jdk8.dir}"/>
841 <
842 <  </target>
843 <
844 <
845 <  <target name="4jdk8dist-jar"
846 <          depends="4jdk8clean, 4jdk8jar">
847 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
848 <  </target>
731 > <!-- Find buglets that can be detected by static build tools -->
732  
733 + <!--   <target name="lint"> -->
734 + <!--     <antcall target="dists"> -->
735 + <!--       <param name="build.javadoc.access" value="protected"/> -->
736 + <!--     </antcall> -->
737 + <!--   </target> -->
738  
739 <  <target name="4jdk8dist-docs"
740 <          depends="4jdk8clean, 4jdk8docs">
741 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
739 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
740 >  <target name="doclint-private">
741 >    <antcall target="dist">
742 >      <param name="build.javadoc.access" value="private"/>
743 >    </antcall>
744    </target>
745  
746  
747 + <!-- ==============================================================
748 +  Experimental errorprone support
749 +  https://errorprone.info
750 +  https://errorprone.info/docs/installation
751 +  https://github.com/google/error-prone/issues/1143
752 + =================================================================== -->
753 +  <path id="errorprone.processorpath.path">
754 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
755 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
756 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
757 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
758 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
759 +  </path>
760 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
761 +  <property name="errorprone.jsr166.user.flags" value=""/>
762 +  <property name="errorprone.jsr166.flags"
763 +            value="-Xep:HashtableContains:OFF
764 +                   -Xep:PreferJavaTimeOverload:OFF
765 +                   -Xep:JdkObsolete:OFF
766 +                   -Xep:MissingOverride:OFF
767 +                   -Xep:MissingFail:OFF
768 +                   -Xep:ThreadPriorityCheck:OFF
769 +                   -Xep:MixedArrayDimensions:ERROR
770 +                   -Xep:RemoveUnusedImports:ERROR
771 +                   -Xep:EmptyIf:ERROR
772 +                   -Xep:MultipleTopLevelClasses:ERROR
773 +                   -Xep:ClassName:ERROR
774 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
775 +                   -Xep:RedundantThrows:ERROR
776 +                   -Xep:IdentityBinaryExpression:WARN
777 +                   -Xep:ConstructorInvokesOverridable:WARN
778 +                   -Xep:MethodCanBeStatic:WARN
779 +                   ${errorprone.jsr166.user.flags}"/>
780 +  <!-- -Xep:WildcardImport:ERROR -->
781 +  <property name="errorprone.jsr166.test.flags"
782 +            value="-Xep:StringSplitter:OFF
783 +                   -Xep:BoxedPrimitiveConstructor:OFF
784 +                   -Xep:UnnecessaryParentheses:OFF
785 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
786 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
787 +  <target name="errorprone"
788 +          depends="clean, configure-compiler"
789 +          description="Run errorprone over jsr166 source code (experimental)">
790  
791 <  <!-- jsr166 4jdk7 -->
792 <
793 <  <target name="4jdk7compile"
861 <          depends="configure-compiler"
862 <          description="Compiles src/jdk7 sources, targeting jdk7">
863 <
864 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
865 <
866 <    <javac srcdir="${4jdk7src.dir}"
867 <           destdir="${build.4jdk7.classes.dir}"
868 <           debug="${build.debug}"
869 <           debuglevel="${build.debuglevel}"
870 <           deprecation="${build.deprecation}"
871 <           source="6"
872 <           target="6"
873 <           classpath=""
874 <           bootclasspath="${bootclasspath6}"
875 <           includeAntRuntime="false"
876 <           includeJavaRuntime="false"
877 <           encoding="ASCII"
878 <           executable="${javac7}"
879 <           fork="true">
880 <
881 <      <include name="**/*.java"/>
882 <      <compilerarg value="-Xprefer:source"/>
883 <      <compilerarg value="-XDignore.symbol.file=true"/>
884 <      <compilerarg value="-Xlint:all"/>
885 <      <compilerarg value="-Werror"/>
886 <      <compilerarg line="${build.args}"/>
887 <
888 <    </javac>
889 <  </target>
890 <
891 <  <target name="4jdk7doclint"
892 <          depends="configure-compiler"
893 <          description="Finds doclint warnings">
894 <
895 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
791 >    <local name="destdir"/>
792 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
793 >    <mkdir dir="${destdir}"/>
794  
795 <    <javac srcdir="${4jdk7src.dir}"
796 <           destdir="${build.4jdk7.classes.dir}"
795 >    <javac srcdir="${src.dir}"
796 >           destdir="${destdir}"
797             debug="${build.debug}"
798             debuglevel="${build.debuglevel}"
799             deprecation="${build.deprecation}"
902           source="6"
903           target="6"
800             classpath=""
905           bootclasspath="${bootclasspath6}"
801             includeAntRuntime="false"
802             includeJavaRuntime="false"
803             encoding="ASCII"
804 <           executable="${javac8}"
804 >           executable="${build.main.javac}"
805             fork="true">
806  
807        <include name="**/*.java"/>
808 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
809 +      <compilerarg value="-J--illegal-access=permit"/>
810 +      <compilerarg value="-XDcompilePolicy=simple"/>
811 +      <compilerarg value="-processorpath"/>
812 +      <compilerarg pathref="errorprone.processorpath.path"/>
813 +      <compilerarg value="-Xplugin:ErrorProne
814 +                          ${errorprone.jsr166.flags}"/>
815 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
816        <compilerarg value="-Xprefer:source"/>
817        <compilerarg value="-XDignore.symbol.file=true"/>
818        <compilerarg value="-Xlint:all"/>
819 <      <compilerarg value="-Xdoclint:all/protected"/>
819 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
820 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
821        <compilerarg line="${build.args}"/>
918
822      </javac>
920  </target>
921
823  
824 <  <target name="4jdk7jar"
825 <          depends="4jdk7compile"
925 <          description="Builds library jar from compiled sources">
926 <
927 <    <jar destfile="${4jdk7product.jar}">
928 <      <fileset dir="${build.4jdk7.classes.dir}"/>
929 <      <manifest>
930 <        <attribute name="Built-By" value="${user.name}"/>
931 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
932 <      </manifest>
824 >    <jar destfile="${product.jar}">
825 >      <fileset dir="${destdir}"/>
826      </jar>
827  
935  </target>
936
937
938  <target name="4jdk7-tck"
939          depends="4jdk7jar"
940          description="Runs tck tests for jsr166-4jdk7 directly">
941
828      <run-tck-tests
829 <      target="7"
830 <      workdir="${build.4jdk7.dir}"
831 <      classes="${4jdk7product.jar}">
829 >      target="${java.runtime.target}"
830 >      workdir="${build.dir}"
831 >      classes="${product.jar}">
832        <javac-elements>
833 <        <!-- JDK8+ test classes -->
834 <        <exclude name="*8Test.java"/>
835 <        <exclude name="*9Test.java"/>
836 <        <exclude name="*10Test.java"/>
837 <        <exclude name="DoubleAccumulatorTest.java"/>
838 <        <exclude name="DoubleAdderTest.java"/>
839 <        <exclude name="LongAccumulatorTest.java"/>
840 <        <exclude name="LongAdderTest.java"/>
955 <        <exclude name="CompletableFutureTest.java"/>
956 <        <exclude name="SplittableRandomTest.java"/>
957 <        <exclude name="StampedLockTest.java"/>
958 <        <exclude name="SubmissionPublisherTest.java"/>
833 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
834 >        <compilerarg value="-J--illegal-access=permit"/>
835 >        <compilerarg value="-XDcompilePolicy=simple"/>
836 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
837 >        <compilerarg value="-Xplugin:ErrorProne
838 >                            ${errorprone.jsr166.flags}
839 >                            ${errorprone.jsr166.test.flags}"/>
840 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
841        </javac-elements>
842      </run-tck-tests>
843    </target>
844  
845 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
846 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
847 +  <target name="errorprone-jtreg"
848 +          depends="jar"
849 +          description="Run errorprone over jtreg tests (experimental)">
850  
964  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
965  <target name="4jdk7-tck-junit"
966          depends="4jdk7compile">
967
968    <junit printsummary="true"
969           showoutput="true"
970           errorProperty="junit.failed"
971           failureProperty="junit.failed"
972           includeantruntime="true"
973           jvm="${java7}"
974           fork="true">
975
976      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
977      <jvmarg value="-server"/>
978
979      <classpath>
980        <pathelement location="${junit.jar}"/>
981        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
982      </classpath>
983
984      <formatter type="brief"/>
985
986      <test name="${jsr166.tckTestClass}" haltonfailure="no">
987      </test>
988
989    </junit>
990  </target>
991
992  <target name="4jdk7-jtreg"
993          depends="4jdk7jar"
994          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
851      <run-jtreg-tests
852 <       target="7"
853 <       workdir="${build.4jdk7.dir}"
854 <       classes="${4jdk7product.jar}"/>
855 <  </target>
856 <
857 <
858 <  <target name="4jdk7-test"
859 <          depends="4jdk7-tck, 4jdk7-jtreg"
860 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
861 <  </target>
862 <
863 <
864 <  <target name="4jdk7docs"
865 <          description="Builds javadocs for src/jdk7 to dist dir">
866 <
1011 <    <delete dir="${4jdk7docs.dir}"/>
1012 <    <mkdir dir="${4jdk7docs.dir}"/>
1013 <
1014 <    <javadoc destdir="${4jdk7docs.dir}"
1015 <             packagenames="none"
1016 <             link="${java7.api.url}"
1017 <             overview="${4jdk7src.dir}/intro.html"
1018 <             access="${build.javadoc.access}"
1019 <             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1020 <             classpath=""
1021 <             executable="${javadoc7}"
1022 <             failonerror = "true">
1023 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1024 <        <include name="**/*.java"/>
1025 <      </fileset>
1026 <      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1027 <      <arg value="-XDignore.symbol.file=true"/>
1028 <    </javadoc>
1029 <  </target>
1030 <
1031 <
1032 <  <target name="4jdk7dist"
1033 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1034 <          description="Puts all distributable products in single hierarchy"/>
1035 <
1036 <
1037 <  <target name="4jdk7clean"
1038 <          description="Removes all 4jdk7 build products">
1039 <
1040 <    <delete dir="${build.4jdk7.dir}"/>
1041 <
1042 <  </target>
1043 <
1044 <
1045 <  <target name="4jdk7dist-jar"
1046 <          depends="4jdk7clean, 4jdk7jar">
1047 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1048 <  </target>
1049 <
1050 <
1051 <  <target name="4jdk7dist-docs"
1052 <          depends="4jdk7clean, 4jdk7docs">
1053 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1054 <  </target>
1055 <
1056 <
1057 <  <!-- jsr166x -->
1058 <
1059 <  <target name="jsr166xcompile"
1060 <          depends="configure-compiler"
1061 <          description="Compiles jsr166x sources to build dir">
1062 <
1063 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
1064 <
1065 <    <javac srcdir="${topsrc.dir}"
1066 <           destdir="${build.jsr166x.classes.dir}"
1067 <           debug="${build.debug}"
1068 <           debuglevel="${build.debuglevel}"
1069 <           deprecation="${build.deprecation}"
1070 <           classpath=""
1071 <           bootclasspath="${bootclasspath6}"
1072 <           source="5"
1073 <           target="5"
1074 <           includeAntRuntime="false"
1075 <           includeJavaRuntime="false"
1076 <           encoding="ASCII"
1077 <           executable="${javac7}"
1078 <           fork="true">
1079 <
1080 <      <include name="jsr166x/**/*.java"/>
1081 <      <compilerarg value="-XDignore.symbol.file=true"/>
1082 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1083 <      <compilerarg value="-Werror"/>
1084 <      <compilerarg line="${build.args}"/>
1085 <
1086 <    </javac>
1087 <  </target>
1088 <
1089 <
1090 <  <target name="jsr166xjar"
1091 <          depends="jsr166xcompile"
1092 <          description="Builds library jar from compiled sources">
1093 <
1094 <    <jar destfile="${jsr166x.jar}">
1095 <      <fileset dir="${build.jsr166x.classes.dir}"/>
1096 <      <manifest>
1097 <        <attribute name="Built-By" value="${user.name}"/>
1098 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1099 <      </manifest>
1100 <    </jar>
1101 <
1102 <  </target>
1103 <
1104 <
1105 <  <target name="jsr166xdocs"
1106 <          description="Builds javadocs to dist dir">
1107 <
1108 <    <delete dir="${jsr166xdocs.dir}"/>
1109 <    <mkdir dir="${jsr166xdocs.dir}"/>
1110 <
1111 <    <javadoc destdir="${jsr166xdocs.dir}"
1112 <             packagenames="jsr166x.*"
1113 <             link="${java.api.url}"
1114 <             access="${build.javadoc.access}"
1115 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1116 <             bootclasspath="${bootclasspath6}"
1117 <             source="5"
1118 <             executable="${javadoc7}"
1119 <             failonerror = "true">
1120 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1121 <      <arg value="-XDignore.symbol.file=true"/>
1122 <
1123 <    </javadoc>
1124 <  </target>
1125 <
1126 <
1127 <  <target name="jsr166xdist"
1128 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1129 <          description="Puts all distributable products in single hierarchy"/>
1130 <
1131 <
1132 <  <target name="jsr166xclean"
1133 <          description="Removes all jsr166x build products">
1134 <
1135 <    <delete dir="${build.jsr166x.dir}"/>
1136 <
1137 <  </target>
1138 <
1139 <
1140 <  <target name="jsr166xdist-jar"
1141 <          depends="jsr166xclean, jsr166xjar">
1142 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1143 <  </target>
1144 <
1145 <  <target name="jsr166xdist-docs"
1146 <          depends="jsr166xclean, jsr166xdocs">
1147 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1148 <  </target>
1149 <
1150 <  <!-- jsr166y -->
1151 <
1152 <
1153 <  <target name="jsr166ycompile"
1154 <          depends="configure-compiler"
1155 <          description="Compiles jsr166y sources">
1156 <
1157 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
1158 <
1159 <    <javac srcdir="${topsrc.dir}"
1160 <           destdir="${build.jsr166y.classes.dir}"
1161 <           debug="${build.debug}"
1162 <           debuglevel="${build.debuglevel}"
1163 <           deprecation="${build.deprecation}"
1164 <           source="6"
1165 <           target="6"
1166 <           classpath=""
1167 <           bootclasspath="${bootclasspath6}"
1168 <           includeAntRuntime="false"
1169 <           includeJavaRuntime="false"
1170 <           encoding="ASCII"
1171 <           executable="${javac7}"
1172 <           fork="true">
1173 <
1174 <      <include name="jsr166y/**/*.java"/>
1175 <      <compilerarg value="-XDignore.symbol.file=true"/>
1176 <      <compilerarg value="-Xlint:all"/>
1177 <      <compilerarg value="-Werror"/>
1178 <      <compilerarg line="${build.args}"/>
1179 <
1180 <    </javac>
1181 <  </target>
1182 <
1183 <
1184 <  <target name="jsr166yjar"
1185 <          depends="jsr166ycompile"
1186 <          description="Builds library jar from compiled sources">
1187 <
1188 <    <jar destfile="${jsr166y.jar}" index="true">
1189 <      <fileset dir="${build.jsr166y.classes.dir}"/>
1190 <      <manifest>
1191 <        <attribute name="Built-By" value="${user.name}"/>
1192 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1193 <      </manifest>
1194 <    </jar>
1195 <
1196 <  </target>
1197 <
1198 <
1199 <  <target name="jsr166ydocs"
1200 <          description="Builds javadocs to dist dir">
1201 <
1202 <    <delete dir="${jsr166ydocs.dir}"/>
1203 <    <mkdir dir="${jsr166ydocs.dir}"/>
1204 <
1205 <    <javadoc destdir="${jsr166ydocs.dir}"
1206 <             packagenames="jsr166y.*"
1207 <             link="${java.api.url}"
1208 <             access="${build.javadoc.access}"
1209 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1210 <             bootclasspath="${bootclasspath6}"
1211 <             source="6"
1212 <             executable="${javadoc7}"
1213 <             failonerror = "true">
1214 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1215 <      <arg value="-XDignore.symbol.file=true"/>
1216 <
1217 <    </javadoc>
1218 <  </target>
1219 <
1220 <
1221 <  <target name="jsr166ydist"
1222 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1223 <          description="Puts all distributable products in single hierarchy"/>
1224 <
1225 <
1226 <  <target name="jsr166yclean"
1227 <          description="Removes all jsr166y build products">
1228 <
1229 <    <delete dir="${build.jsr166y.dir}"/>
1230 <
1231 <  </target>
1232 <
1233 <
1234 <  <target name="jsr166ydist-jar"
1235 <          depends="jsr166yclean, jsr166yjar">
1236 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1237 <  </target>
1238 <
1239 <  <target name="jsr166ydist-docs"
1240 <          depends="jsr166yclean, jsr166ydocs">
1241 <    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1242 <  </target>
1243 <
1244 <
1245 <  <!-- extra166y -->
1246 <
1247 <
1248 <  <target name="extra166ycompile"
1249 <          depends="configure-compiler, jsr166yjar"
1250 <          description="Compiles extra166y sources">
1251 <
1252 <    <mkdir dir="${build.extra166y.classes.dir}"/>
1253 <
1254 <    <javac srcdir="${topsrc.dir}"
1255 <           destdir="${build.extra166y.classes.dir}"
1256 <           debug="${build.debug}"
1257 <           debuglevel="${build.debuglevel}"
1258 <           deprecation="${build.deprecation}"
1259 <           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1260 <           classpath=""
1261 <           source="6"
1262 <           target="6"
1263 <           includeAntRuntime="false"
1264 <           includeJavaRuntime="false"
1265 <           encoding="ASCII"
1266 <           executable="${javac7}"
1267 <           fork="true">
1268 <
1269 <      <include name="extra166y/**/*.java"/>
1270 <      <compilerarg value="-XDignore.symbol.file=true"/>
1271 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1272 <      <compilerarg value="-Werror"/>
1273 <      <compilerarg line="${build.args}"/>
1274 <
1275 <    </javac>
1276 <  </target>
1277 <
1278 <
1279 <  <target name="extra166yjar"
1280 <          depends="extra166ycompile"
1281 <          description="Builds library jar from compiled sources">
1282 <
1283 <    <jar destfile="${extra166y.jar}" index="true">
1284 <      <fileset dir="${build.extra166y.classes.dir}"/>
1285 <      <manifest>
1286 <        <attribute name="Built-By" value="${user.name}"/>
1287 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1288 <      </manifest>
1289 <    </jar>
1290 <
1291 <  </target>
1292 <
1293 <
1294 <  <target name="extra166ydocs"
1295 <          description="Builds javadocs to build dir">
1296 <
1297 <    <delete dir="${extra166ydocs.dir}"/>
1298 <    <mkdir dir="${extra166ydocs.dir}"/>
1299 <
1300 <    <javadoc destdir="${extra166ydocs.dir}"
1301 <             packagenames="extra166y.*"
1302 <             link="${java.api.url}"
1303 <             access="${build.javadoc.access}"
1304 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1305 <             bootclasspath="${bootclasspath6}"
1306 <             source="6"
1307 <             executable="${javadoc7}">
1308 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1309 <      <arg value="-XDignore.symbol.file=true"/>
1310 <
1311 <    </javadoc>
1312 <  </target>
1313 <
1314 <
1315 <  <target name="extra166ydist"
1316 <          depends="extra166ydist-jar, extra166ydist-docs"
1317 <          description="Puts all distributable products in single hierarchy"/>
1318 <
1319 <
1320 <  <target name="extra166yclean"
1321 <          description="Removes all extra166y build products">
1322 <
1323 <    <delete dir="${build.extra166y.dir}"/>
1324 <
1325 <  </target>
1326 <
1327 <
1328 <  <target name="extra166ydist-jar"
1329 <          depends="extra166yclean, extra166yjar">
1330 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1331 <  </target>
1332 <
1333 <  <target name="extra166ydist-docs"
1334 <          depends="extra166yclean, extra166ydocs">
1335 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1336 <  </target>
1337 <
1338 <  <!-- jsr166e -->
1339 <
1340 <  <property name="build.jsr166e.java.version" value="6"/>
1341 <  <property name="build.jsr166e.javac" value="${javac6}"/>
1342 <
1343 <  <target name="jsr166ecompile"
1344 <          depends="configure-compiler"
1345 <          description="Compiles jsr166e sources">
1346 <
1347 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
1348 <
1349 <    <javac srcdir="${topsrc.dir}"
1350 <           destdir="${build.jsr166e.classes.dir}"
1351 <           debug="${build.debug}"
1352 <           debuglevel="${build.debuglevel}"
1353 <           deprecation="${build.deprecation}"
1354 <           source="${build.jsr166e.java.version}"
1355 <           target="${build.jsr166e.java.version}"
1356 <           classpath=""
1357 <           includeAntRuntime="false"
1358 <           includeJavaRuntime="false"
1359 <           executable="${build.jsr166e.javac}"
1360 <           fork="true">
1361 <
1362 <      <include name="jsr166e/**/*.java"/>
1363 <      <compilerarg value="-XDignore.symbol.file=true"/>
1364 <      <compilerarg value="-Xlint:all"/>
1365 <      <compilerarg value="-Werror"/>
1366 <      <compilerarg line="${build.args}"/>
1367 <
1368 <    </javac>
1369 <  </target>
1370 <
1371 <  <!-- jsr166e: find doclint errors -->
1372 <  <target name="jsr166edoclint">
1373 <
1374 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
1375 <
1376 <    <javac srcdir="${topsrc.dir}"
1377 <           destdir="${build.jsr166e.classes.dir}"
1378 <           debug="${build.debug}"
1379 <           debuglevel="${build.debuglevel}"
1380 <           deprecation="${build.deprecation}"
1381 <           source="${build.jsr166e.java.version}"
1382 <           target="${build.jsr166e.java.version}"
1383 <           classpath=""
1384 <           bootclasspath="${bootclasspath6}"
1385 <           includeAntRuntime="false"
1386 <           includeJavaRuntime="false"
1387 <           executable="${javac8}"
1388 <           fork="true">
1389 <
1390 <      <include name="jsr166e/**/*.java"/>
1391 <      <compilerarg value="-XDignore.symbol.file=true"/>
1392 <      <compilerarg value="-Xlint:all"/>
1393 <      <compilerarg value="-Werror"/>
1394 <      <compilerarg value="-Xdoclint:all/protected"/>
1395 <
1396 <    </javac>
1397 <  </target>
1398 <
1399 <
1400 <  <target name="jsr166ejar"
1401 <          depends="jsr166ecompile"
1402 <          description="Builds library jar from compiled sources">
1403 <
1404 <    <jar destfile="${jsr166e.jar}" index="true">
1405 <      <fileset dir="${build.jsr166e.classes.dir}"/>
1406 <      <manifest>
1407 <        <attribute name="Built-By" value="${user.name}"/>
1408 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1409 <      </manifest>
1410 <    </jar>
1411 <
1412 <  </target>
1413 <
1414 <
1415 <  <target name="jsr166edocs"
1416 <          description="Builds javadocs to build dir">
1417 <
1418 <    <delete dir="${jsr166edocs.dir}"/>
1419 <    <mkdir dir="${jsr166edocs.dir}"/>
1420 <
1421 <    <javadoc destdir="${jsr166edocs.dir}"
1422 <             packagenames="jsr166e.*"
1423 <             link="${java.api.url}"
1424 <             access="${build.javadoc.access}"
1425 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1426 <             source="${build.jsr166e.java.version}"
1427 <             executable="${javadoc7}"
1428 <             failonerror = "true">
1429 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1430 <      <arg value="-XDignore.symbol.file=true"/>
1431 <
1432 <    </javadoc>
1433 <  </target>
1434 <
1435 <
1436 <  <target name="jsr166e-tck-one-java-version"
1437 <          depends="jsr166ejar">
1438 <
1439 <    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1440 <
1441 <    <run-tck-tests
1442 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
1443 <      target="${build.jsr166e.java.version}"
1444 <      workdir="${build.jsr166e.dir}"
1445 <      classes="${jsr166e.jar}"/>
1446 <  </target>
1447 <
1448 <  <target name="jsr166e-tck"
1449 <          description="Runs tck tests for jsr166e for multiple java versions">
1450 <
1451 < <!--     <antcall target="clean"/> -->
1452 < <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1453 < <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1454 < <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1455 < <!--     </antcall> -->
1456 <
1457 <    <antcall target="clean"/>
1458 <    <antcall target="jsr166e-tck-one-java-version">
1459 <      <param name="build.jsr166e.java.version" value="7"/>
1460 <      <param name="build.jsr166e.javac" value="${javac7}"/>
1461 <    </antcall>
1462 <
1463 <    <antcall target="clean"/>
1464 <    <antcall target="jsr166e-tck-one-java-version">
1465 <      <param name="build.jsr166e.java.version" value="6"/>
1466 <      <param name="build.jsr166e.javac" value="${javac6}"/>
1467 <    </antcall>
1468 <  </target>
1469 <
1470 <
1471 <  <target name="jsr166e-test"
1472 <          depends="jsr166e-tck"
1473 <          description="Runs all tests for jsr166e">
1474 <  </target>
1475 <
1476 <  <target name="jsr166edist"
1477 <          depends="jsr166edist-jar, jsr166edist-docs"
1478 <          description="Puts all distributable products in single hierarchy"/>
1479 <
1480 <
1481 <  <target name="jsr166eclean"
1482 <          description="Removes all jsr166e build products">
1483 <    <delete dir="${build.jsr166e.dir}"/>
1484 <  </target>
1485 <
1486 <
1487 <  <target name="jsr166edist-jar"
1488 <          depends="jsr166eclean, jsr166ejar">
1489 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1490 <  </target>
1491 <
1492 <  <target name="jsr166edist-docs"
1493 <          depends="jsr166eclean, jsr166edocs">
1494 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1495 <  </target>
1496 <
1497 <
1498 < <!-- Find buglets that can be detected by static build tools -->
1499 <
1500 <  <target name="lint">
1501 <    <antcall target="dists">
1502 <      <param name="build.javadoc.access" value="public"/>
1503 <    </antcall>
852 >       target="${java.runtime.target}"
853 >       workdir="${build.dir}"
854 >       classes="${product.jar}"
855 >       verbose="all">
856 >      <jtreg-elements>
857 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
858 >        <arg value="-javacoption:-processorpath"/>
859 >        <arg value="-javacoption:${errorprone.processorpath}"/>
860 >        <arg value="-javacoption:-Xplugin:ErrorProne
861 >                            ${errorprone.jsr166.flags}
862 >                            ${errorprone.jsr166.test.flags}
863 >                            -Xep:MultipleTopLevelClasses:WARN
864 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
865 >      </jtreg-elements>
866 >    </run-jtreg-tests>
867    </target>
868  
1506 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1507  <target name="lint-private">
1508    <antcall target="dist">
1509      <param name="build.javadoc.access" value="private"/>
1510    </antcall>
1511  </target>
869  
870   <!-- ==============================================================
871    Running guava tests against jsr166 code
# Line 1562 | Line 919
919      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
920           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
921      <junit printsummary="true" showoutput="true" haltonfailure="true"
922 <           jvm="${java9}" fork="true">
923 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
922 >           jvm="${build.main.java}" fork="true">
923 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
924        <formatter type="brief"/>
925        <classpath>
926          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines