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.231 by jsr166, Sun Jan 29 20:19:00 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/jdk6
23 <  $HOME/jdk/jdk7
24 <  $HOME/jdk/jdk8
25 <  $HOME/jdk/jdk9
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/jdk6
31 <  $HOME/jdk/src/jdk7
32 <  $HOME/jdk/src/jdk8
33 <  $HOME/jdk/src/jdk9
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 6 7 8 9 ...
41 >  for $N in 11 .. 17 ...
42  
43 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
44 <  target is currently broken.
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 53 | Line 60
60  
61  
62    <!-- Compilation options -->
56  <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 65 | Line 71
71    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
72    <property name="build.loops.dir"             location="${build.dir}/loops"/>
73  
68  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
69  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
70  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72
73  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77
78  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
81  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
82
83  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
84  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
85  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
86  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
87
74    <!-- JDK locations -->
75    <property name="jdks.home"  location="${user.home}/jdk"/>
76  
# Line 96 | 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"/>
100 <    <available property="have.java.base"
101 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103 <      if:set="have.java.base"/>
104 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105 <      unless:set="have.java.base"/>
106 <    <local name="modules"/>
107 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108 <    <local name="boot.jar.dir"/>
109 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
110 <    <path id="bootclasspath@{v}" unless:set="modules">
111 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
112 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
113 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
114 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
115 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
116 <    </path>
117 <    <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 130 | Line 98
98      </sequential>
99    </macrodef>
100  
101 <  <defjdklocations v="6"/>
102 <  <defjdklocations v="7"/>
103 <  <defjdklocations v="8"/>
104 <  <defjdklocations v="9"/>
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="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"/>
150  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
151  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
152  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
153  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
154  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
155  <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"/>
160 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
161 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
162 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
163 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
164 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
165 <
166 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
167 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
168 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
169 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
170 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
171 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
172 <  <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"/>
176  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
177  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
178  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
179  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
180  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
181  <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 205 | 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 228 | Line 189
189  
190      <sequential>
191  
231    <local name="modules"/>
232    <condition property="modules">
233      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
234    </condition>
235
192      <mkdir dir="@{workdir}/tck-classes"/>
193  
194      <javac srcdir="@{tck.src.dir}"
# Line 252 | 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 line="--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 263 | Line 219
219            failonerror="true"
220            jvm="${java@{target}}"
221            fork="true">
222 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
223 <        <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
224 <        <jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
225 <        <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
226 <        <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
227 <        <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
228 <        <jvmarg line="--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"/>
287 <        </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 -->
317 <    <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  
328    <local name="modules"/>
329    <condition property="modules">
330      <available file="${jdk@{target}.home}/jmods" type="dir"/>
331    </condition>
332
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 356 | 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  
375    <local name="modules"/>
376    <condition property="modules">
377      <and>
378        <available file="${jdk9.home}/jmods" type="dir"/>
379        <equals arg1="9" arg2="${build.main.java.version}"/>
380      </and>
381    </condition>
382
345      <local name="destdir"/>
346 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
385 <    <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 399 | Line 360
360             fork="true">
361  
362        <include name="**/*.java"/>
363 <      <compilerarg value="-Xmodule:java.base" 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 430 | 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 443 | 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="-Xmodule:java.base"/>
437 <      <arg value="-tag"/>
438 <      <arg value="${javadoc.jls.option}"/>
439 < <!-- @apiNote currently unused -->
440 < <!--       <arg value="-tag"/> -->
441 < <!--       <arg value="apiNote:a:API Note:"/> -->
442 <      <arg value="-tag"/>
443 <      <arg value="implSpec:a:Implementation Requirements:"/>
444 <      <arg value="-tag"/>
467 <      <arg value="implNote:a:Implementation Note:"/>
436 >      <arg value="-html5"/>
437 >      <arg value="-Xdoclint:all,-missing"/>
438 >      <arg value="--patch-module=java.base=${src.dir}"/>
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"/> -->
471 < <!--       <arg value="-tag"/> -->
472 < <!--       <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 479 | Line 454
454            description="Puts all distributable products in single hierarchy"/>
455  
456  
482  <target name="release"
483          depends="dist"
484          description="Puts entire CVS tree, plus distribution productions, in a jar">
485
486    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
487
488    <jar basedir="${basedir}" destfile="${release.jar}">
489      <!-- <exclude name="build/**"/> -->
490      <exclude name="${release.jar}"/>
491      <exclude name="user.properties"/>
492      <exclude name="etc/notes/**"/>
493      <exclude name="src/emulation/**"/>
494      <exclude name="**/SyntaxTest.java"/>
495      <exclude name="**/SuperfluousAbstract.java"/>
496      <manifest>
497        <attribute name="Built-By" value="${user.name}"/>
498        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
499      </manifest>
500    </jar>
501  </target>
502
503
457    <target name="clean"
458            description="Removes all build products">
506
459      <delete dir="${build.dir}"/>
508
460    </target>
461  
462  
463    <target name="dist-clean"
464            description="Removes all build and distribution products">
514
465      <delete dir="${build.dir}"/>
466      <delete dir="${dist.dir}"/>
517
467    </target>
468  
469  
# Line 529 | 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 560 | 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>
607 <        <not> <antversion atleast="1.9.1"/> </not>
608 <      </condition>
680 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
681      </fail>
682  
683      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 623 | Line 695
695    </target>
696  
697  
626
627  <!-- Various demos and test programs -->
628
629
630  <!-- description="Benchmark from Doug Lea's AQS paper" -->
631  <target name="loops" depends="configure-compiler">
632
633    <mkdir dir="${build.loops.dir}"/>
634
635    <javac srcdir="${loops.src.dir}"
636          destdir="${build.loops.dir}"
637            debug="${build.debug}"
638       debuglevel="${build.debuglevel}"
639      deprecation="${build.deprecation}"
640           source="${build.sourcelevel}"
641           target="${build.sourcelevel}"
642         encoding="ASCII"
643             fork="true">
644
645      <compilerarg line="${build.args}"/>
646      <classpath refid="loops.classpath"/>
647      <compilerarg value="-XDignore.symbol.file=true"/>
648
649    </javac>
650
651    <java classname="ALoops" fork="true">
652      <classpath refid="loops.classpath"/>
653    </java>
654
655  </target>
656
657
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 668 | 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}"/>
678 <      <compilerarg line="${build.args}"/>
679 <
680 <    </javac>
681 <
682 <  </target>
683 <
684 <
685 <  <!-- jsr166 4jdk8 -->
686 <
687 <  <target name="4jdk8compile"
688 <          depends="configure-compiler"
689 <          description="Compiles src/jdk8 sources, targeting jdk8">
690 <
691 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
692 <
693 <    <javac srcdir="${4jdk8src.dir}"
694 <           destdir="${build.4jdk8.classes.dir}"
695 <           debug="${build.debug}"
696 <           debuglevel="${build.debuglevel}"
697 <           deprecation="${build.deprecation}"
698 <           source="8"
699 <           target="8"
700 <           classpath=""
701 <           bootclasspath="${bootclasspath8}"
702 <           includeAntRuntime="false"
703 <           includeJavaRuntime="false"
704 <           encoding="ASCII"
705 <           executable="${javac8}"
706 <           fork="true">
707 <
708 <      <include name="**/*.java"/>
709 <      <compilerarg value="-Xprefer:source"/>
710 <      <compilerarg value="-XDignore.symbol.file=true"/>
711 <      <compilerarg value="-Xlint:all"/>
712 <      <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}"/>
714
719      </javac>
720    </target>
721  
718  <target name="4jdk8doclint"
719          depends="configure-compiler"
720          description="Finds doclint warnings">
721
722    <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"
731 <           classpath=""
732 <           bootclasspath="${bootclasspath8}"
733 <           includeAntRuntime="false"
734 <           includeJavaRuntime="false"
735 <           encoding="ASCII"
736 <           executable="${javac8}"
737 <           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"/>
740 <      <compilerarg value="-Xprefer:source"/>
741 <      <compilerarg value="-XDignore.symbol.file=true"/>
742 <      <compilerarg value="-Xlint:all"/>
743 <      <compilerarg value="-Xdoclint:all/protected"/>
744 <      <compilerarg line="${build.args}"/>
745 <
746 <    </javac>
747 <  </target>
748 <
749 <
750 <  <target name="4jdk8jar"
751 <          depends="4jdk8compile"
752 <          description="Builds library jar from compiled sources">
753 <
754 <    <jar destfile="${4jdk8product.jar}">
755 <      <fileset dir="${build.4jdk8.classes.dir}"/>
756 <      <manifest>
757 <        <attribute name="Built-By" value="${user.name}"/>
758 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
759 <      </manifest>
760 <    </jar>
761 <
762 <  </target>
763 <
764 <
765 <  <target name="4jdk8-tck"
766 <          depends="4jdk8jar"
767 <          description="Runs tck tests for jsr166-4jdk8 directly">
768 <
769 <    <run-tck-tests
770 <      target="8"
771 <      workdir="${build.4jdk8.dir}"
772 <      classes="${4jdk8product.jar}">
773 <      <javac-elements>
774 <        <!-- JDK9+ test classes -->
775 <        <exclude name="*9Test.java"/>
776 <        <exclude name="*10Test.java"/>
777 <      </javac-elements>
778 <    </run-tck-tests>
779 <  </target>
780 <
781 <
782 <  <target name="4jdk8-jtreg"
783 <          depends="4jdk8jar"
784 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
785 <    <run-jtreg-tests
786 <       target="8"
787 <       workdir="${build.4jdk8.dir}"
788 <       classes="${4jdk8product.jar}"/>
789 <  </target>
790 <
791 <
792 <  <target name="4jdk8-test"
793 <          depends="4jdk8-tck, 4jdk8-jtreg"
794 <          description="Runs tck and jtreg tests for jsr166-4jdk8">
795 <  </target>
796 <
797 <
798 <  <target name="4jdk8docs"
799 <          description="Builds javadocs for src/jdk8 to dist dir">
800 <
801 <    <delete dir="${4jdk8docs.dir}"/>
802 <    <mkdir dir="${4jdk8docs.dir}"/>
803 <
804 <    <javadoc destdir="${4jdk8docs.dir}"
805 <             packagenames="none"
806 <             link="${java8.api.url}"
807 <             overview="${4jdk8src.dir}/intro.html"
808 <             access="${build.javadoc.access}"
809 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
810 <             classpath=""
811 <             executable="${javadoc8}"
812 <             failonerror = "true">
813 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
814 <        <include name="**/*.java"/>
815 <      </fileset>
816 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
817 <      <arg value="-XDignore.symbol.file=true"/>
818 <      <arg value="-tag"/>
819 <      <arg value="${javadoc.jls.option}"/>
820 < <!-- @apiNote currently unused -->
821 < <!--       <arg value="-tag"/> -->
822 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
823 <      <arg value="-tag"/>
824 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
825 <      <arg value="-tag"/>
826 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
827 <    </javadoc>
828 <  </target>
829 <
830 <
831 <  <target name="4jdk8dist"
832 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
833 <          description="Puts all distributable products in single hierarchy"/>
834 <
835 <
836 <  <target name="4jdk8clean"
837 <          description="Removes all 4jdk8 build products">
838 <
839 <    <delete dir="${build.4jdk8.dir}"/>
840 <
841 <  </target>
842 <
843 <
844 <  <target name="4jdk8dist-jar"
845 <          depends="4jdk8clean, 4jdk8jar">
846 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
847 <  </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"
860 <          depends="configure-compiler"
861 <          description="Compiles src/jdk7 sources, targeting jdk7">
862 <
863 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
864 <
865 <    <javac srcdir="${4jdk7src.dir}"
866 <           destdir="${build.4jdk7.classes.dir}"
867 <           debug="${build.debug}"
868 <           debuglevel="${build.debuglevel}"
869 <           deprecation="${build.deprecation}"
870 <           source="6"
871 <           target="6"
872 <           classpath=""
873 <           bootclasspath="${bootclasspath6}"
874 <           includeAntRuntime="false"
875 <           includeJavaRuntime="false"
876 <           encoding="ASCII"
877 <           executable="${javac7}"
878 <           fork="true">
879 <
880 <      <include name="**/*.java"/>
881 <      <compilerarg value="-Xprefer:source"/>
882 <      <compilerarg value="-XDignore.symbol.file=true"/>
883 <      <compilerarg value="-Xlint:all"/>
884 <      <compilerarg value="-Werror"/>
885 <      <compilerarg line="${build.args}"/>
886 <
887 <    </javac>
888 <  </target>
889 <
890 <  <target name="4jdk7doclint"
891 <          depends="configure-compiler"
892 <          description="Finds doclint warnings">
893 <
894 <    <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}"
901           source="6"
902           target="6"
800             classpath=""
904           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}"/>
917
822      </javac>
919  </target>
920
823  
824 <  <target name="4jdk7jar"
825 <          depends="4jdk7compile"
924 <          description="Builds library jar from compiled sources">
925 <
926 <    <jar destfile="${4jdk7product.jar}">
927 <      <fileset dir="${build.4jdk7.classes.dir}"/>
928 <      <manifest>
929 <        <attribute name="Built-By" value="${user.name}"/>
930 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
931 <      </manifest>
824 >    <jar destfile="${product.jar}">
825 >      <fileset dir="${destdir}"/>
826      </jar>
827  
934  </target>
935
936
937  <target name="4jdk7-tck"
938          depends="4jdk7jar"
939          description="Runs tck tests for jsr166-4jdk7 directly">
940
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"/>
954 <        <exclude name="CompletableFutureTest.java"/>
955 <        <exclude name="SplittableRandomTest.java"/>
956 <        <exclude name="StampedLockTest.java"/>
957 <        <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  
963  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
964  <target name="4jdk7-tck-junit"
965          depends="4jdk7compile">
966
967    <junit printsummary="true"
968           showoutput="true"
969           errorProperty="junit.failed"
970           failureProperty="junit.failed"
971           includeantruntime="true"
972           jvm="${java7}"
973           fork="true">
974
975      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
976      <jvmarg value="-server"/>
977
978      <classpath>
979        <pathelement location="${junit.jar}"/>
980        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
981      </classpath>
982
983      <formatter type="brief"/>
984
985      <test name="${jsr166.tckTestClass}" haltonfailure="no">
986      </test>
987
988    </junit>
989  </target>
990
991  <target name="4jdk7-jtreg"
992          depends="4jdk7jar"
993          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 <
1010 <    <delete dir="${4jdk7docs.dir}"/>
1011 <    <mkdir dir="${4jdk7docs.dir}"/>
1012 <
1013 <    <javadoc destdir="${4jdk7docs.dir}"
1014 <             packagenames="none"
1015 <             link="${java7.api.url}"
1016 <             overview="${4jdk7src.dir}/intro.html"
1017 <             access="${build.javadoc.access}"
1018 <             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1019 <             classpath=""
1020 <             executable="${javadoc7}"
1021 <             failonerror = "true">
1022 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1023 <        <include name="**/*.java"/>
1024 <      </fileset>
1025 <      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1026 <      <arg value="-XDignore.symbol.file=true"/>
1027 <    </javadoc>
1028 <  </target>
1029 <
1030 <
1031 <  <target name="4jdk7dist"
1032 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
1033 <          description="Puts all distributable products in single hierarchy"/>
1034 <
1035 <
1036 <  <target name="4jdk7clean"
1037 <          description="Removes all 4jdk7 build products">
1038 <
1039 <    <delete dir="${build.4jdk7.dir}"/>
1040 <
1041 <  </target>
1042 <
1043 <
1044 <  <target name="4jdk7dist-jar"
1045 <          depends="4jdk7clean, 4jdk7jar">
1046 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1047 <  </target>
1048 <
1049 <
1050 <  <target name="4jdk7dist-docs"
1051 <          depends="4jdk7clean, 4jdk7docs">
1052 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1053 <  </target>
1054 <
1055 <
1056 <  <!-- jsr166x -->
1057 <
1058 <  <target name="jsr166xcompile"
1059 <          depends="configure-compiler"
1060 <          description="Compiles jsr166x sources to build dir">
1061 <
1062 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
1063 <
1064 <    <javac srcdir="${topsrc.dir}"
1065 <           destdir="${build.jsr166x.classes.dir}"
1066 <           debug="${build.debug}"
1067 <           debuglevel="${build.debuglevel}"
1068 <           deprecation="${build.deprecation}"
1069 <           classpath=""
1070 <           bootclasspath="${bootclasspath6}"
1071 <           source="5"
1072 <           target="5"
1073 <           includeAntRuntime="false"
1074 <           includeJavaRuntime="false"
1075 <           encoding="ASCII"
1076 <           executable="${javac7}"
1077 <           fork="true">
1078 <
1079 <      <include name="jsr166x/**/*.java"/>
1080 <      <compilerarg value="-XDignore.symbol.file=true"/>
1081 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1082 <      <compilerarg value="-Werror"/>
1083 <      <compilerarg line="${build.args}"/>
1084 <
1085 <    </javac>
1086 <  </target>
1087 <
1088 <
1089 <  <target name="jsr166xjar"
1090 <          depends="jsr166xcompile"
1091 <          description="Builds library jar from compiled sources">
1092 <
1093 <    <jar destfile="${jsr166x.jar}">
1094 <      <fileset dir="${build.jsr166x.classes.dir}"/>
1095 <      <manifest>
1096 <        <attribute name="Built-By" value="${user.name}"/>
1097 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1098 <      </manifest>
1099 <    </jar>
1100 <
1101 <  </target>
1102 <
1103 <
1104 <  <target name="jsr166xdocs"
1105 <          description="Builds javadocs to dist dir">
1106 <
1107 <    <delete dir="${jsr166xdocs.dir}"/>
1108 <    <mkdir dir="${jsr166xdocs.dir}"/>
1109 <
1110 <    <javadoc destdir="${jsr166xdocs.dir}"
1111 <             packagenames="jsr166x.*"
1112 <             link="${java.api.url}"
1113 <             access="${build.javadoc.access}"
1114 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1115 <             bootclasspath="${bootclasspath6}"
1116 <             source="5"
1117 <             executable="${javadoc7}"
1118 <             failonerror = "true">
1119 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1120 <      <arg value="-XDignore.symbol.file=true"/>
1121 <
1122 <    </javadoc>
1123 <  </target>
1124 <
1125 <
1126 <  <target name="jsr166xdist"
1127 <          depends="jsr166xdist-jar, jsr166xdist-docs"
1128 <          description="Puts all distributable products in single hierarchy"/>
1129 <
1130 <
1131 <  <target name="jsr166xclean"
1132 <          description="Removes all jsr166x build products">
1133 <
1134 <    <delete dir="${build.jsr166x.dir}"/>
1135 <
1136 <  </target>
1137 <
1138 <
1139 <  <target name="jsr166xdist-jar"
1140 <          depends="jsr166xclean, jsr166xjar">
1141 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1142 <  </target>
1143 <
1144 <  <target name="jsr166xdist-docs"
1145 <          depends="jsr166xclean, jsr166xdocs">
1146 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1147 <  </target>
1148 <
1149 <  <!-- jsr166y -->
1150 <
1151 <
1152 <  <target name="jsr166ycompile"
1153 <          depends="configure-compiler"
1154 <          description="Compiles jsr166y sources">
1155 <
1156 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
1157 <
1158 <    <javac srcdir="${topsrc.dir}"
1159 <           destdir="${build.jsr166y.classes.dir}"
1160 <           debug="${build.debug}"
1161 <           debuglevel="${build.debuglevel}"
1162 <           deprecation="${build.deprecation}"
1163 <           source="6"
1164 <           target="6"
1165 <           classpath=""
1166 <           bootclasspath="${bootclasspath6}"
1167 <           includeAntRuntime="false"
1168 <           includeJavaRuntime="false"
1169 <           encoding="ASCII"
1170 <           executable="${javac7}"
1171 <           fork="true">
1172 <
1173 <      <include name="jsr166y/**/*.java"/>
1174 <      <compilerarg value="-XDignore.symbol.file=true"/>
1175 <      <compilerarg value="-Xlint:all"/>
1176 <      <compilerarg value="-Werror"/>
1177 <      <compilerarg line="${build.args}"/>
1178 <
1179 <    </javac>
1180 <  </target>
1181 <
1182 <
1183 <  <target name="jsr166yjar"
1184 <          depends="jsr166ycompile"
1185 <          description="Builds library jar from compiled sources">
1186 <
1187 <    <jar destfile="${jsr166y.jar}" index="true">
1188 <      <fileset dir="${build.jsr166y.classes.dir}"/>
1189 <      <manifest>
1190 <        <attribute name="Built-By" value="${user.name}"/>
1191 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1192 <      </manifest>
1193 <    </jar>
1194 <
1195 <  </target>
1196 <
1197 <
1198 <  <target name="jsr166ydocs"
1199 <          description="Builds javadocs to dist dir">
1200 <
1201 <    <delete dir="${jsr166ydocs.dir}"/>
1202 <    <mkdir dir="${jsr166ydocs.dir}"/>
1203 <
1204 <    <javadoc destdir="${jsr166ydocs.dir}"
1205 <             packagenames="jsr166y.*"
1206 <             link="${java.api.url}"
1207 <             access="${build.javadoc.access}"
1208 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1209 <             bootclasspath="${bootclasspath6}"
1210 <             source="6"
1211 <             executable="${javadoc7}"
1212 <             failonerror = "true">
1213 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1214 <      <arg value="-XDignore.symbol.file=true"/>
1215 <
1216 <    </javadoc>
1217 <  </target>
1218 <
1219 <
1220 <  <target name="jsr166ydist"
1221 <          depends="jsr166ydist-jar, jsr166ydist-docs"
1222 <          description="Puts all distributable products in single hierarchy"/>
1223 <
1224 <
1225 <  <target name="jsr166yclean"
1226 <          description="Removes all jsr166y build products">
1227 <
1228 <    <delete dir="${build.jsr166y.dir}"/>
1229 <
1230 <  </target>
1231 <
1232 <
1233 <  <target name="jsr166ydist-jar"
1234 <          depends="jsr166yclean, jsr166yjar">
1235 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1236 <  </target>
1237 <
1238 <  <target name="jsr166ydist-docs"
1239 <          depends="jsr166yclean, jsr166ydocs">
1240 <    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1241 <  </target>
1242 <
1243 <
1244 <  <!-- extra166y -->
1245 <
1246 <
1247 <  <target name="extra166ycompile"
1248 <          depends="configure-compiler, jsr166yjar"
1249 <          description="Compiles extra166y sources">
1250 <
1251 <    <mkdir dir="${build.extra166y.classes.dir}"/>
1252 <
1253 <    <javac srcdir="${topsrc.dir}"
1254 <           destdir="${build.extra166y.classes.dir}"
1255 <           debug="${build.debug}"
1256 <           debuglevel="${build.debuglevel}"
1257 <           deprecation="${build.deprecation}"
1258 <           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1259 <           classpath=""
1260 <           source="6"
1261 <           target="6"
1262 <           includeAntRuntime="false"
1263 <           includeJavaRuntime="false"
1264 <           encoding="ASCII"
1265 <           executable="${javac7}"
1266 <           fork="true">
1267 <
1268 <      <include name="extra166y/**/*.java"/>
1269 <      <compilerarg value="-XDignore.symbol.file=true"/>
1270 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1271 <      <compilerarg value="-Werror"/>
1272 <      <compilerarg line="${build.args}"/>
1273 <
1274 <    </javac>
1275 <  </target>
1276 <
1277 <
1278 <  <target name="extra166yjar"
1279 <          depends="extra166ycompile"
1280 <          description="Builds library jar from compiled sources">
1281 <
1282 <    <jar destfile="${extra166y.jar}" index="true">
1283 <      <fileset dir="${build.extra166y.classes.dir}"/>
1284 <      <manifest>
1285 <        <attribute name="Built-By" value="${user.name}"/>
1286 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1287 <      </manifest>
1288 <    </jar>
1289 <
1290 <  </target>
1291 <
1292 <
1293 <  <target name="extra166ydocs"
1294 <          description="Builds javadocs to build dir">
1295 <
1296 <    <delete dir="${extra166ydocs.dir}"/>
1297 <    <mkdir dir="${extra166ydocs.dir}"/>
1298 <
1299 <    <javadoc destdir="${extra166ydocs.dir}"
1300 <             packagenames="extra166y.*"
1301 <             link="${java.api.url}"
1302 <             access="${build.javadoc.access}"
1303 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1304 <             bootclasspath="${bootclasspath6}"
1305 <             source="6"
1306 <             executable="${javadoc7}">
1307 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1308 <      <arg value="-XDignore.symbol.file=true"/>
1309 <
1310 <    </javadoc>
1311 <  </target>
1312 <
1313 <
1314 <  <target name="extra166ydist"
1315 <          depends="extra166ydist-jar, extra166ydist-docs"
1316 <          description="Puts all distributable products in single hierarchy"/>
1317 <
1318 <
1319 <  <target name="extra166yclean"
1320 <          description="Removes all extra166y build products">
1321 <
1322 <    <delete dir="${build.extra166y.dir}"/>
1323 <
1324 <  </target>
1325 <
1326 <
1327 <  <target name="extra166ydist-jar"
1328 <          depends="extra166yclean, extra166yjar">
1329 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1330 <  </target>
1331 <
1332 <  <target name="extra166ydist-docs"
1333 <          depends="extra166yclean, extra166ydocs">
1334 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1335 <  </target>
1336 <
1337 <  <!-- jsr166e -->
1338 <
1339 <  <property name="build.jsr166e.java.version" value="6"/>
1340 <  <property name="build.jsr166e.javac" value="${javac6}"/>
1341 <
1342 <  <target name="jsr166ecompile"
1343 <          depends="configure-compiler"
1344 <          description="Compiles jsr166e sources">
1345 <
1346 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
1347 <
1348 <    <javac srcdir="${topsrc.dir}"
1349 <           destdir="${build.jsr166e.classes.dir}"
1350 <           debug="${build.debug}"
1351 <           debuglevel="${build.debuglevel}"
1352 <           deprecation="${build.deprecation}"
1353 <           source="${build.jsr166e.java.version}"
1354 <           target="${build.jsr166e.java.version}"
1355 <           classpath=""
1356 <           includeAntRuntime="false"
1357 <           includeJavaRuntime="false"
1358 <           executable="${build.jsr166e.javac}"
1359 <           fork="true">
1360 <
1361 <      <include name="jsr166e/**/*.java"/>
1362 <      <compilerarg value="-XDignore.symbol.file=true"/>
1363 <      <compilerarg value="-Xlint:all"/>
1364 <      <compilerarg value="-Werror"/>
1365 <      <compilerarg line="${build.args}"/>
1366 <
1367 <    </javac>
1368 <  </target>
1369 <
1370 <  <!-- jsr166e: find doclint errors -->
1371 <  <target name="jsr166edoclint">
1372 <
1373 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
1374 <
1375 <    <javac srcdir="${topsrc.dir}"
1376 <           destdir="${build.jsr166e.classes.dir}"
1377 <           debug="${build.debug}"
1378 <           debuglevel="${build.debuglevel}"
1379 <           deprecation="${build.deprecation}"
1380 <           source="${build.jsr166e.java.version}"
1381 <           target="${build.jsr166e.java.version}"
1382 <           classpath=""
1383 <           bootclasspath="${bootclasspath6}"
1384 <           includeAntRuntime="false"
1385 <           includeJavaRuntime="false"
1386 <           executable="${javac8}"
1387 <           fork="true">
1388 <
1389 <      <include name="jsr166e/**/*.java"/>
1390 <      <compilerarg value="-XDignore.symbol.file=true"/>
1391 <      <compilerarg value="-Xlint:all"/>
1392 <      <compilerarg value="-Werror"/>
1393 <      <compilerarg value="-Xdoclint:all/protected"/>
1394 <
1395 <    </javac>
1396 <  </target>
1397 <
1398 <
1399 <  <target name="jsr166ejar"
1400 <          depends="jsr166ecompile"
1401 <          description="Builds library jar from compiled sources">
1402 <
1403 <    <jar destfile="${jsr166e.jar}" index="true">
1404 <      <fileset dir="${build.jsr166e.classes.dir}"/>
1405 <      <manifest>
1406 <        <attribute name="Built-By" value="${user.name}"/>
1407 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1408 <      </manifest>
1409 <    </jar>
1410 <
1411 <  </target>
1412 <
1413 <
1414 <  <target name="jsr166edocs"
1415 <          description="Builds javadocs to build dir">
1416 <
1417 <    <delete dir="${jsr166edocs.dir}"/>
1418 <    <mkdir dir="${jsr166edocs.dir}"/>
1419 <
1420 <    <javadoc destdir="${jsr166edocs.dir}"
1421 <             packagenames="jsr166e.*"
1422 <             link="${java.api.url}"
1423 <             access="${build.javadoc.access}"
1424 <             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1425 <             source="${build.jsr166e.java.version}"
1426 <             executable="${javadoc7}"
1427 <             failonerror = "true">
1428 <      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1429 <      <arg value="-XDignore.symbol.file=true"/>
1430 <
1431 <    </javadoc>
1432 <  </target>
1433 <
1434 <
1435 <  <target name="jsr166e-tck-one-java-version"
1436 <          depends="jsr166ejar">
1437 <
1438 <    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1439 <
1440 <    <run-tck-tests
1441 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
1442 <      target="${build.jsr166e.java.version}"
1443 <      workdir="${build.jsr166e.dir}"
1444 <      classes="${jsr166e.jar}"/>
1445 <  </target>
1446 <
1447 <  <target name="jsr166e-tck"
1448 <          description="Runs tck tests for jsr166e for multiple java versions">
1449 <
1450 < <!--     <antcall target="clean"/> -->
1451 < <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1452 < <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1453 < <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1454 < <!--     </antcall> -->
1455 <
1456 <    <antcall target="clean"/>
1457 <    <antcall target="jsr166e-tck-one-java-version">
1458 <      <param name="build.jsr166e.java.version" value="7"/>
1459 <      <param name="build.jsr166e.javac" value="${javac7}"/>
1460 <    </antcall>
1461 <
1462 <    <antcall target="clean"/>
1463 <    <antcall target="jsr166e-tck-one-java-version">
1464 <      <param name="build.jsr166e.java.version" value="6"/>
1465 <      <param name="build.jsr166e.javac" value="${javac6}"/>
1466 <    </antcall>
1467 <  </target>
1468 <
1469 <
1470 <  <target name="jsr166e-test"
1471 <          depends="jsr166e-tck"
1472 <          description="Runs all tests for jsr166e">
1473 <  </target>
1474 <
1475 <  <target name="jsr166edist"
1476 <          depends="jsr166edist-jar, jsr166edist-docs"
1477 <          description="Puts all distributable products in single hierarchy"/>
1478 <
1479 <
1480 <  <target name="jsr166eclean"
1481 <          description="Removes all jsr166e build products">
1482 <    <delete dir="${build.jsr166e.dir}"/>
1483 <  </target>
1484 <
1485 <
1486 <  <target name="jsr166edist-jar"
1487 <          depends="jsr166eclean, jsr166ejar">
1488 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1489 <  </target>
1490 <
1491 <  <target name="jsr166edist-docs"
1492 <          depends="jsr166eclean, jsr166edocs">
1493 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1494 <  </target>
1495 <
1496 <
1497 < <!-- Find buglets that can be detected by static build tools -->
1498 <
1499 <  <target name="lint">
1500 <    <antcall target="dists">
1501 <      <param name="build.javadoc.access" value="public"/>
1502 <    </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  
1505 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1506  <target name="lint-private">
1507    <antcall target="dist">
1508      <param name="build.javadoc.access" value="private"/>
1509    </antcall>
1510  </target>
869  
870   <!-- ==============================================================
871    Running guava tests against jsr166 code
# Line 1561 | 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