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.229 by jsr166, Tue Dec 20 04:18:46 2016 UTC vs.
Revision 1.322 by jsr166, Sat Dec 12 22:13:53 2020 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines