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.324 by jsr166, Wed Sep 29 01:13:44 2021 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 >  $HOME/jdk/jdk18
30    where each of the above is a JDK or a symlink to same, and
31 <  $HOME/jdk/src/jdk6
32 <  $HOME/jdk/src/jdk7
33 <  $HOME/jdk/src/jdk8
34 <  $HOME/jdk/src/jdk9
35 <  where each of the above is a complete JDK source tree
36 <  (e.g. mercurial forest) or a symlink to same.
31 >  $HOME/jdk/src/jdk11
32 >  $HOME/jdk/src/jdk12
33 >  $HOME/jdk/src/jdk13
34 >  $HOME/jdk/src/jdk14
35 >  $HOME/jdk/src/jdk15
36 >  $HOME/jdk/src/jdk16
37 >  $HOME/jdk/src/jdk17
38 >  $HOME/jdk/src/jdk18
39 >  where each of the above is a JDK source tree or a symlink to same.
40  
41    Alternatively, define ant variables thus:
42    ant -Djdk$N.home=... -Djdk$N.src.home=...
43 <  for $N in 6 7 8 9 ...
43 >  for $N in 11 .. 18 ...
44  
45 <  As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
46 <  target is currently broken.
45 >  As of 2016-03, the sources in src/main are for jdk9+ only.
46 >  As of 2019-08, the sources in src/main are for jdk11+ only.
47 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
48   ------------------------------------------------------------------------------
49    </description>
50  
# Line 53 | Line 62
62  
63  
64    <!-- Compilation options -->
56  <property name="build.sourcelevel"    value="6"/>
65    <property name="build.debug"          value="true"/>
66    <property name="build.debuglevel"     value="source,lines,vars"/>
67    <property name="build.deprecation"    value="false"/>
# Line 65 | Line 73
73    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
74    <property name="build.loops.dir"             location="${build.dir}/loops"/>
75  
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
76    <!-- JDK locations -->
77    <property name="jdks.home"  location="${user.home}/jdk"/>
78  
# Line 96 | Line 84
84      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
85      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
86      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
87 <    <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"/>
87 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
88      </sequential>
89    </macrodef>
90  
# Line 130 | Line 100
100      </sequential>
101    </macrodef>
102  
103 <  <defjdklocations v="6"/>
104 <  <defjdklocations v="7"/>
105 <  <defjdklocations v="8"/>
106 <  <defjdklocations v="9"/>
103 >  <defjdklocations v="11"/>
104 >  <defjdklocations v="12"/>
105 >  <defjdklocations v="13"/>
106 >  <defjdklocations v="14"/>
107 >  <defjdklocations v="15"/>
108 >  <defjdklocations v="16"/>
109 >  <defjdklocations v="17"/>
110 >  <defjdklocations v="18"/>
111  
112    <!-- Source locations -->
113    <property name="src.dir"              location="${basedir}/src/main"/>
114    <property name="test.src.dir"         location="${basedir}/src/test"/>
115    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
116    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
117 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
118 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
119 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
120 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
117 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
118 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
119 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
120 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
121 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
122 >  <property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
123 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
124 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
125 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
126    <property name="lib.dir"              location="${basedir}/lib"/>
127    <property name="dist.dir"             location="${basedir}/dist"/>
128    <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"/>
129  
130    <!-- Javadoc locations -->
131    <property name="docs.dir"          location="${build.dir}/docs"/>
132 <  <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"/>
132 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
133  
134    <!-- Jar locations -->
135    <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"/>
136    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
137  
138    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
139 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
140 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
141 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
142 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
143 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
144 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
145 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
146 <  <!-- Default jdk doc location (latest stable release seems best) -->
147 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
139 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
140 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
141 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
142 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
143 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
144 >  <!-- The location of jdk early access docs (RIP) -->
145 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
146 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
147 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
148 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
149 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
150 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
151 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
152 >  <property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
153 >  <property name="java16.docroot.url" value="https://docs.oracle.com/en/java/javase/16/docs"/>
154 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
155 >  <property name="java18.docroot.url" value="https://download.java.net/java/early_access/jdk18/docs"/>
156 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
157 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
158  
159    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
160 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
161 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
162 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
163 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
164 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
160 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
161 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
162 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
163 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
164 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
165 >  <property name="java16.api.url"     value="${java16.docroot.url}/api/"/>
166 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
167 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
168    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
169  
170    <!-- Define the "jtreg" task -->
# Line 205 | Line 172
172    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
173             classpath="${lib.dir}/jtreg.jar" />
174  
175 <  <!-- Tck options; see JSR166TestCase.java
175 >  <!-- Tck configuration options; see JSR166TestCase.java
176     To profile a single tck test class:
177     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
178     To stress test a single tck test class:
# Line 228 | Line 195
195  
196      <sequential>
197  
231    <local name="modules"/>
232    <condition property="modules">
233      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
234    </condition>
235
198      <mkdir dir="@{workdir}/tck-classes"/>
199  
200      <javac srcdir="@{tck.src.dir}"
# Line 252 | Line 214
214        <include name="*.java"/>
215        <compilerarg value="-XDignore.symbol.file=true"/>
216        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
217 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
218 <      <compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
217 >      <compilerarg value="-Xdoclint:reference/private"/>
218 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
219        <compilerarg line="${build.args}"/>
220        <javac-elements/>
221  
# Line 263 | Line 225
225            failonerror="true"
226            jvm="${java@{target}}"
227            fork="true">
228 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
229 <        <jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
230 <        <jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
231 <        <jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
232 <        <jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
233 <        <jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
234 <        <jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
235 <        <jvmarg line="@{jvmflags}"/>
236 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
237 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
238 <
239 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
240 <        <syspropertyset id="system-properties-used-by-tck">
241 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
242 <          <propertyref prefix="jsr166."/>
243 <          <propertyref name="test.timeout.factor"/>
244 <        </syspropertyset>
245 <
246 <        <classpath>
247 <          <pathelement location="${junit.jar}"/>
248 <          <pathelement location="@{workdir}/tck-classes"/>
287 <        </classpath>
228 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
229 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
230 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
231 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
232 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
233 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
234 >        <jvmarg line="@{jvmflags}"/>
235 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
236 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
237 >
238 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
239 >        <syspropertyset id="system-properties-used-by-tck">
240 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
241 >          <propertyref prefix="jsr166."/>
242 >          <propertyref name="test.timeout.factor"/>
243 >        </syspropertyset>
244 >
245 >        <classpath>
246 >          <pathelement location="${junit.jar}"/>
247 >          <pathelement location="@{workdir}/tck-classes"/>
248 >        </classpath>
249      </java>
250  
251      </sequential>
252    </macrodef>
253  
254    <!-- Define jtreg test sets for different jdk versions -->
255 <  <fileset dir="${jtreg9.src.dir}">
256 <    <patternset id="jdk9.jtreg.tests">
257 <      <include name="**/*.java"/>
258 <    </patternset>
259 <  </fileset>
260 <
261 <  <fileset dir="${jtreg8.src.dir}">
262 <    <patternset id="jdk8.jtreg.tests">
263 <      <include name="**/*.java"/>
264 <    </patternset>
265 <  </fileset>
255 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
256 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
257 >  <property name="jtreg.test.pattern" value="**/*.java"/>
258 >  <macrodef name="defjtregtests">
259 >    <attribute name="v"/>
260 >    <sequential>
261 >      <fileset dir="${jtreg@{v}.src.dir}">
262 >        <patternset id="jdk@{v}.jtreg.tests">
263 >          <include name="${jtreg.test.pattern}"/>
264 >        </patternset>
265 >      </fileset>
266 >    </sequential>
267 >  </macrodef>
268  
269 <  <fileset dir="${jtreg7.src.dir}">
270 <    <patternset id="jdk7.jtreg.tests">
271 <      <include name="**/*.java"/>
272 <    </patternset>
273 <  </fileset>
269 >  <defjtregtests v="18"/>
270 >  <defjtregtests v="17"/>
271 >  <defjtregtests v="16"/>
272 >  <defjtregtests v="15"/>
273 >  <defjtregtests v="14"/>
274 >  <defjtregtests v="13"/>
275 >  <defjtregtests v="12"/>
276 >  <defjtregtests v="11"/>
277  
278    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
279    <property name="jtreg.flags" value=""/>
280  
281    <macrodef name="run-jtreg-tests">
282 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
317 <    <attribute name="source" default="7"/>
282 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
283      <attribute name="target"/>
284      <attribute name="workdir"/>
285      <attribute name="classes"/>
286 +    <attribute name="verbose" default="${jtreg.verbose}"/>
287      <attribute name="jtregflags" default=""/>
288 +    <element name="jtreg-elements" optional="true"/>
289  
290      <sequential>
291  
292      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
293      <property name="jtreg.verbose" value="nopass,fail,error"/>
294  
295 <    <local name="modules"/>
296 <    <condition property="modules">
297 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
298 <    </condition>
295 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
296 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
297 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
298 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
299 >    <property name="jtreg.concurrency" value="3"/>
300  
301 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
301 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
302      <jtreg dir="${jtreg@{target}.src.dir}"
303             jdk="${jdk@{target}.home}"
304             workDir="@{workdir}/JTwork">
305        <patternset refid="jdk@{target}.jtreg.tests"/>
306 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
307 <      <arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
308 <      <arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
306 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
307 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
308 >      <arg value="-vmoption:-Xmx256m"/>
309 >      <arg value="-concurrency:${jtreg.concurrency}"/>
310 >      <arg value="-vmoptions:-esa -ea"/>
311 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
312        <arg value="-agentvm"/>
313        <arg value="-noreport"/>
314 <      <arg value="-verbose:${jtreg.verbose}"/>
344 <      <arg value="-vmoptions:-esa -ea"/>
314 >      <arg value="-verbose:@{verbose}"/>
315        <arg value="-automatic"/>
316        <arg value="-k:!ignore"/>
317        <arg line="@{jtregflags}"/>
318        <arg line="${jtreg.flags}"/>
319 +      <jtreg-elements/>
320      </jtreg>
321      </sequential>
322    </macrodef>
# Line 356 | Line 327
327    </path>
328  
329    <!-- Support @jls tag, used in jdk8+ javadoc -->
330 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
331    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
332    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
333  
334    <!-- Main targets -->
335  
336 <  <property name="build.main.java.version" value="9"/>
337 <  <property name="build.main.javac" value="${javac9}"/>
336 >  <!-- Default values: may seem strange ... -->
337 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
338 >  <!-- But at build time, target jdk9, for maximal binary portability -->
339 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
340 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
341 >    o override-methods=summary
342 >    o {@systemProperty ...}
343 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
344 >    o 8202628: javadoc generates bad links in TestModules.java
345 >    -->
346 >  <property name="java.runtime.target" value="11"/>
347 >  <property name="build.main.java" value="${java11}"/>
348 >  <property name="build.main.javac" value="${javac11}"/>
349 >  <property name="build.main.javadoc" value="${javadoc12}"/>
350 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
351  
352    <target name="dists"
353 <          depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
353 >          depends="dist"
354            description="Builds all public jars and docs"/>
355  
356    <target name="compile"
357            depends="configure-compiler"
358            description="Compiles src/main sources to build dir">
359  
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
360      <local name="destdir"/>
361 <    <property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
385 <    <property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
361 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
362  
363      <mkdir dir="${destdir}"/>
364  
# Line 399 | Line 375
375             fork="true">
376  
377        <include name="**/*.java"/>
378 <      <compilerarg value="-Xmodule:java.base" if:set="modules"/>
378 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
379        <compilerarg value="-Xprefer:source"/>
380        <compilerarg value="-XDignore.symbol.file=true"/>
381 <      <compilerarg value="-Xlint:all"/>
382 <      <compilerarg value="-Werror"/>
381 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
382 >      <compilerarg value="-Xlint:all,-removal"/>
383 >      <compilerarg line="--doclint-format html5"/>
384 > <!--  Temporarily disable doclint for private elements, due to -->
385 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
386 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
387 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
388        <compilerarg value="-Xdoclint:all/protected"/>
389 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
390 +      <compilerarg value="-Werror"/>
391        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
392        <compilerarg line="${build.args}"/>
393  
# Line 430 | Line 413
413    <target name="docs"
414            description="Builds javadocs for src/main to dist dir">
415  
416 <    <delete dir="${docs.dir}"/>
416 >    <delete dir="${docs.dir}" quiet="true"/>
417      <mkdir dir="${docs.dir}"/>
418  
419 +    <!-- old school frames via docs/index.html?overview-summary.html -->
420 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
421 +    <local name="use-frames"/>
422 +    <condition property="use-frames">
423 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
424 +    </condition>
425 +
426      <!-- the packagenames="none" hack below prevents scanning the -->
427      <!-- sourcepath for packages -->
428  
# Line 443 | Line 433
433   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
434      <javadoc destdir="${docs.dir}"
435               packagenames="none"
436 <             link="${java9.api.url}"
436 >             link="${java.api.url}"
437               overview="${src.dir}/intro.html"
438               access="${build.javadoc.access}"
439               sourcepath="${src.dir}"
440               classpath=""
441 <             executable="${javadoc9}">
441 >             source="${build.main.javadoc.source}"
442 >             executable="${build.main.javadoc}">
443 > <!-- TODO: JDK-8214571 failonerror = "true" -->
444        <fileset dir="${src.dir}" defaultexcludes="yes">
445 <        <include name="**/*.java"/>
445 >        <include name="java/**/*.java"/>
446        </fileset>
447 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
447 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
448        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
449 +      <arg value="-quiet"/>
450        <arg value="-XDignore.symbol.file=true"/>
451 <      <arg value="-Xmodule:java.base"/>
452 <      <arg value="-tag"/>
453 <      <arg value="${javadoc.jls.option}"/>
454 < <!-- @apiNote currently unused -->
455 < <!--       <arg value="-tag"/> -->
456 < <!--       <arg value="apiNote:a:API Note:"/> -->
457 <      <arg value="-tag"/>
458 <      <arg value="implSpec:a:Implementation Requirements:"/>
459 <      <arg value="-tag"/>
467 <      <arg value="implNote:a:Implementation Note:"/>
451 >      <arg value="-html5"/>
452 >      <arg value="-Xdoclint:all,-missing"/>
453 >      <arg value="--patch-module=java.base=${src.dir}"/>
454 >      <arg value="--frames" if:set="use-frames"/>
455 >      <arg value="--override-methods=summary"/>
456 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
457 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
458 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
459 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
460   <!-- tags added in jdk9: currently unused -->
461 < <!--       <arg value="-tag"/> -->
462 < <!--       <arg value="revised:X"/> -->
471 < <!--       <arg value="-tag"/> -->
472 < <!--       <arg value="spec:X"/> -->
461 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
462 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
463      </javadoc>
464    </target>
465  
# Line 479 | Line 469
469            description="Puts all distributable products in single hierarchy"/>
470  
471  
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
472    <target name="clean"
473            description="Removes all build products">
506
474      <delete dir="${build.dir}"/>
508
475    </target>
476  
477  
478    <target name="dist-clean"
479            description="Removes all build and distribution products">
514
480      <delete dir="${build.dir}"/>
481      <delete dir="${dist.dir}"/>
517
482    </target>
483  
484  
# Line 529 | Line 493
493    </target>
494  
495    <target name="tck"
496 <          depends="jar"
496 >          depends="jar"
497            description="Runs tck tests for src/main directly">
498  
499      <run-tck-tests
500 <      target="${build.main.java.version}"
500 >      target="${java.runtime.target}"
501        workdir="${build.dir}"
502 <      classes="${product.jar}"/>
502 >      classes="${product.jar}">
503 >      <javac-elements>
504 >        <compilerarg value="-Werror"/>
505 >      </javac-elements>
506 >    </run-tck-tests>
507    </target>
508  
509    <target name="tck-parallelism-1"
# Line 560 | Line 528
528    </target>
529  
530    <target name="jtreg"
531 <          depends="jar"
531 >          depends="jar"
532            description="Runs jtreg tests for src/main using the jtreg ant task">
533      <run-jtreg-tests
534 <       target="${build.main.java.version}"
534 >       target="${java.runtime.target}"
535         workdir="${build.dir}"
536         classes="${product.jar}"/>
537    </target>
538  
539    <target name="test"
540            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
541 <          description="Runs tck and jtreg tests for src/main">
541 >          description="Runs tck and jtreg tests for src/main"/>
542 >
543 >  <target name="test-version-permutations"
544 >          depends="test11, test12, test13, test14, test15, test16,
545 >          test11-12, test11-13, test11-14, test11-15, test11-16,
546 >          clean, test, docs"
547 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
548 >
549 >  <target name="test11">
550 >    <antcall>
551 >      <param name="java.runtime.target" value="11"/>
552 >      <param name="build.main.javac" value="${javac11}"/>
553 >      <param name="build.main.javadoc" value="${javadoc12}"/>
554 >      <param name="build.main.javadoc.source" value="11"/>
555 >      <target name="clean"/>
556 >      <target name="test"/>
557 >      <target name="docs"/>
558 >    </antcall>
559    </target>
560  
561 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
561 >  <target name="test12">
562 >    <antcall>
563 >      <param name="java.runtime.target" value="12"/>
564 >      <param name="build.main.javac" value="${javac12}"/>
565 >      <param name="build.main.javadoc" value="${javadoc12}"/>
566 >      <param name="build.main.javadoc.source" value="12"/>
567 >      <target name="clean"/>
568 >      <target name="test"/>
569 >      <target name="docs"/>
570 >    </antcall>
571 >  </target>
572  
573 < <!--     <antcall target="jtreg"> -->
574 < <!--       <param name="build.main.java.version" value="8"/> -->
575 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
576 < <!--     </antcall> -->
573 >  <target name="test13">
574 >    <antcall>
575 >      <param name="java.runtime.target" value="13"/>
576 >      <param name="build.main.javac" value="${javac13}"/>
577 >      <param name="build.main.javadoc" value="${javadoc13}"/>
578 >      <param name="build.main.javadoc.source" value="13"/>
579 >      <target name="clean"/>
580 >      <target name="test"/>
581 >      <target name="docs"/>
582 >    </antcall>
583 >  </target>
584  
585 < <!--   </target> -->
585 >  <target name="test14">
586 >    <antcall>
587 >      <param name="java.runtime.target" value="14"/>
588 >      <param name="build.main.javac" value="${javac14}"/>
589 >      <param name="build.main.javadoc" value="${javadoc14}"/>
590 >      <param name="build.main.javadoc.source" value="14"/>
591 >      <target name="clean"/>
592 >      <target name="test"/>
593 >      <target name="docs"/>
594 >    </antcall>
595 >  </target>
596  
597 < <!--   <target name="test89" -->
598 < <!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
597 >  <target name="test15">
598 >    <antcall>
599 >      <param name="java.runtime.target" value="15"/>
600 >      <param name="build.main.javac" value="${javac15}"/>
601 >      <param name="build.main.javadoc" value="${javadoc15}"/>
602 >      <param name="build.main.javadoc.source" value="15"/>
603 >      <target name="clean"/>
604 >      <target name="test"/>
605 >      <target name="docs"/>
606 >    </antcall>
607 >  </target>
608  
609 < <!--     <antcall target="clean"/> -->
610 < <!--     <antcall target="test"> -->
611 < <!--       <param name="build.main.java.version" value="8"/> -->
612 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
613 < <!--     </antcall> -->
609 >  <target name="test16">
610 >    <antcall>
611 >      <param name="java.runtime.target" value="16"/>
612 >      <param name="build.main.javac" value="${javac16}"/>
613 >      <param name="build.main.javadoc" value="${javadoc16}"/>
614 >      <param name="build.main.javadoc.source" value="16"/>
615 >      <target name="clean"/>
616 >      <target name="test"/>
617 >      <target name="docs"/>
618 >    </antcall>
619 >  </target>
620  
621 < <!--     <antcall target="clean"/> -->
622 < <!--     <antcall target="test"> -->
623 < <!--       <param name="build.main.java.version" value="9"/> -->
624 < <!--       <param name="build.main.javac" value="${javac9}"/> -->
625 < <!--     </antcall> -->
621 >  <target name="test11-12">
622 >    <antcall>
623 >      <param name="java.runtime.target" value="12"/>
624 >      <param name="build.main.javac" value="${javac11}"/>
625 >      <param name="build.main.javadoc" value="${javadoc12}"/>
626 >      <param name="build.main.javadoc.source" value="11"/>
627 >      <target name="clean"/>
628 >      <target name="test"/>
629 >      <target name="docs"/>
630 >    </antcall>
631 >  </target>
632  
633 < <!--   </target> -->
633 >  <target name="test11-13">
634 >    <antcall>
635 >      <param name="java.runtime.target" value="13"/>
636 >      <param name="build.main.javac" value="${javac11}"/>
637 >      <param name="build.main.javadoc" value="${javadoc13}"/>
638 >      <param name="build.main.javadoc.source" value="11"/>
639 >      <target name="clean"/>
640 >      <target name="test"/>
641 >      <target name="docs"/>
642 >    </antcall>
643 >  </target>
644 >
645 >  <target name="test11-14">
646 >    <antcall>
647 >      <param name="java.runtime.target" value="14"/>
648 >      <param name="build.main.javac" value="${javac11}"/>
649 >      <param name="build.main.javadoc" value="${javadoc14}"/>
650 >      <param name="build.main.javadoc.source" value="11"/>
651 >      <target name="clean"/>
652 >      <target name="test"/>
653 >      <target name="docs"/>
654 >    </antcall>
655 >  </target>
656  
657 +  <target name="test11-15">
658 +    <antcall>
659 +      <param name="java.runtime.target" value="15"/>
660 +      <param name="build.main.javac" value="${javac11}"/>
661 +      <param name="build.main.javadoc" value="${javadoc15}"/>
662 +      <param name="build.main.javadoc.source" value="11"/>
663 +      <target name="clean"/>
664 +      <target name="test"/>
665 +      <target name="docs"/>
666 +    </antcall>
667 +  </target>
668 +
669 +  <target name="test11-16">
670 +    <antcall>
671 +      <param name="java.runtime.target" value="16"/>
672 +      <param name="build.main.javac" value="${javac11}"/>
673 +      <param name="build.main.javadoc" value="${javadoc16}"/>
674 +      <param name="build.main.javadoc.source" value="11"/>
675 +      <target name="clean"/>
676 +      <target name="test"/>
677 +      <target name="docs"/>
678 +    </antcall>
679 +  </target>
680 +
681 +  <target name="docs16">
682 +    <antcall>
683 +      <param name="java.runtime.target" value="16"/>
684 +      <param name="build.main.javac" value="${javac16}"/>
685 +      <param name="build.main.javadoc" value="${javadoc16}"/>
686 +      <param name="build.main.javadoc.source" value="16"/>
687 +      <target name="clean"/>
688 +      <target name="docs"/>
689 +    </antcall>
690 +  </target>
691  
692  
693    <target name="configure-compiler">
694      <fail message="ant version too old">
695 <      <condition>
607 <        <not> <antversion atleast="1.9.1"/> </not>
608 <      </condition>
695 >      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
696      </fail>
697  
698      <property name="unchecked.option" value="-Xlint:unchecked"/>
# Line 623 | Line 710
710    </target>
711  
712  
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
713    <target name="compile-test-loops" depends="jar"
714 <          description="compile all the perf tests in src/test/loops">
714 >          description="Compiles all the perf tests in src/test/loops">
715  
716      <mkdir dir="${build.dir}/test/loops"/>
717  
# Line 668 | Line 723
723             includeAntRuntime="false"
724             includeJavaRuntime="false"
725             encoding="ASCII"
726 <           executable="${javac9}"
726 >           executable="${build.main.javac}"
727             fork="true">
728  
729        <include name="*.java"/>
730        <compilerarg value="-XDignore.symbol.file=true"/>
731 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
732 <      <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"/>
731 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
732 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
733        <compilerarg line="${build.args}"/>
714
734      </javac>
735    </target>
736  
718  <target name="4jdk8doclint"
719          depends="configure-compiler"
720          description="Finds doclint warnings">
721
722    <mkdir dir="${build.4jdk8.classes.dir}"/>
737  
738 <    <javac srcdir="${4jdk8src.dir}"
739 <           destdir="${build.4jdk8.classes.dir}"
740 <           debug="${build.debug}"
741 <           debuglevel="${build.debuglevel}"
742 <           deprecation="${build.deprecation}"
743 <           source="8"
744 <           target="8"
731 <           classpath=""
732 <           bootclasspath="${bootclasspath8}"
733 <           includeAntRuntime="false"
734 <           includeJavaRuntime="false"
735 <           encoding="ASCII"
736 <           executable="${javac8}"
737 <           fork="true">
738 <
739 <      <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}"/>
738 >  <!-- old branches no longer maintained.  build support deleted -->
739 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
740 >  <!-- jsr166 4jdk7 (no longer maintained) -->
741 >  <!-- jsr166x (no longer maintained) -->
742 >  <!-- jsr166y (no longer maintained) -->
743 >  <!-- extra166y (no longer maintained) -->
744 >  <!-- jsr166e (no longer maintained) -->
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>
746 > <!-- Find buglets that can be detected by static build tools -->
747  
748 + <!--   <target name="lint"> -->
749 + <!--     <antcall target="dists"> -->
750 + <!--       <param name="build.javadoc.access" value="protected"/> -->
751 + <!--     </antcall> -->
752 + <!--   </target> -->
753  
754 <  <target name="4jdk8dist-docs"
755 <          depends="4jdk8clean, 4jdk8docs">
756 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
754 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
755 >  <target name="doclint-private">
756 >    <antcall target="dist">
757 >      <param name="build.javadoc.access" value="private"/>
758 >    </antcall>
759    </target>
760  
761  
762 + <!-- ==============================================================
763 +  Experimental errorprone support
764 +  https://errorprone.info
765 +  https://errorprone.info/docs/installation
766 +  https://github.com/google/error-prone/issues/1143
767 + =================================================================== -->
768 +  <path id="errorprone.processorpath.path">
769 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
770 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
771 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
772 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
773 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
774 +  </path>
775 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
776 +  <property name="errorprone.jsr166.user.flags" value=""/>
777 +  <property name="errorprone.jsr166.flags"
778 +            value="-Xep:HashtableContains:OFF
779 +                   -Xep:PreferJavaTimeOverload:OFF
780 +                   -Xep:JdkObsolete:OFF
781 +                   -Xep:MissingOverride:OFF
782 +                   -Xep:MissingFail:OFF
783 +                   -Xep:ThreadPriorityCheck:OFF
784 +                   -Xep:MixedArrayDimensions:ERROR
785 +                   -Xep:RemoveUnusedImports:ERROR
786 +                   -Xep:EmptyIf:ERROR
787 +                   -Xep:MultipleTopLevelClasses:ERROR
788 +                   -Xep:ClassName:ERROR
789 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
790 +                   -Xep:RedundantThrows:ERROR
791 +                   -Xep:IdentityBinaryExpression:WARN
792 +                   -Xep:ConstructorInvokesOverridable:WARN
793 +                   -Xep:MethodCanBeStatic:WARN
794 +                   ${errorprone.jsr166.user.flags}"/>
795 +  <!-- -Xep:WildcardImport:ERROR -->
796 +  <property name="errorprone.jsr166.test.flags"
797 +            value="-Xep:StringSplitter:OFF
798 +                   -Xep:BoxedPrimitiveConstructor:OFF
799 +                   -Xep:UnnecessaryParentheses:OFF
800 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
801 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
802 +  <target name="errorprone"
803 +          depends="clean, configure-compiler"
804 +          description="Run errorprone over jsr166 source code (experimental)">
805  
806 <  <!-- jsr166 4jdk7 -->
807 <
808 <  <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}"/>
806 >    <local name="destdir"/>
807 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
808 >    <mkdir dir="${destdir}"/>
809  
810 <    <javac srcdir="${4jdk7src.dir}"
811 <           destdir="${build.4jdk7.classes.dir}"
810 >    <javac srcdir="${src.dir}"
811 >           destdir="${destdir}"
812             debug="${build.debug}"
813             debuglevel="${build.debuglevel}"
814             deprecation="${build.deprecation}"
901           source="6"
902           target="6"
815             classpath=""
904           bootclasspath="${bootclasspath6}"
816             includeAntRuntime="false"
817             includeJavaRuntime="false"
818             encoding="ASCII"
819 <           executable="${javac8}"
819 >           executable="${build.main.javac}"
820             fork="true">
821  
822        <include name="**/*.java"/>
823 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
824 +      <compilerarg value="-J--illegal-access=permit"/>
825 +      <compilerarg value="-XDcompilePolicy=simple"/>
826 +      <compilerarg value="-processorpath"/>
827 +      <compilerarg pathref="errorprone.processorpath.path"/>
828 +      <compilerarg value="-Xplugin:ErrorProne
829 +                          ${errorprone.jsr166.flags}"/>
830 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
831        <compilerarg value="-Xprefer:source"/>
832        <compilerarg value="-XDignore.symbol.file=true"/>
833        <compilerarg value="-Xlint:all"/>
834 <      <compilerarg value="-Xdoclint:all/protected"/>
834 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
835 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
836        <compilerarg line="${build.args}"/>
917
837      </javac>
919  </target>
920
921
922  <target name="4jdk7jar"
923          depends="4jdk7compile"
924          description="Builds library jar from compiled sources">
838  
839 <    <jar destfile="${4jdk7product.jar}">
840 <      <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>
839 >    <jar destfile="${product.jar}">
840 >      <fileset dir="${destdir}"/>
841      </jar>
842  
934  </target>
935
936
937  <target name="4jdk7-tck"
938          depends="4jdk7jar"
939          description="Runs tck tests for jsr166-4jdk7 directly">
940
843      <run-tck-tests
844 <      target="7"
845 <      workdir="${build.4jdk7.dir}"
846 <      classes="${4jdk7product.jar}">
844 >      target="${java.runtime.target}"
845 >      workdir="${build.dir}"
846 >      classes="${product.jar}">
847        <javac-elements>
848 <        <!-- JDK8+ test classes -->
849 <        <exclude name="*8Test.java"/>
850 <        <exclude name="*9Test.java"/>
851 <        <exclude name="*10Test.java"/>
852 <        <exclude name="DoubleAccumulatorTest.java"/>
853 <        <exclude name="DoubleAdderTest.java"/>
854 <        <exclude name="LongAccumulatorTest.java"/>
855 <        <exclude name="LongAdderTest.java"/>
954 <        <exclude name="CompletableFutureTest.java"/>
955 <        <exclude name="SplittableRandomTest.java"/>
956 <        <exclude name="StampedLockTest.java"/>
957 <        <exclude name="SubmissionPublisherTest.java"/>
848 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
849 >        <compilerarg value="-J--illegal-access=permit"/>
850 >        <compilerarg value="-XDcompilePolicy=simple"/>
851 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
852 >        <compilerarg value="-Xplugin:ErrorProne
853 >                            ${errorprone.jsr166.flags}
854 >                            ${errorprone.jsr166.test.flags}"/>
855 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
856        </javac-elements>
857      </run-tck-tests>
858    </target>
859  
860 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
861 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
862 +  <target name="errorprone-jtreg"
863 +          depends="jar"
864 +          description="Run errorprone over jtreg tests (experimental)">
865  
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">
866      <run-jtreg-tests
867 <       target="7"
868 <       workdir="${build.4jdk7.dir}"
869 <       classes="${4jdk7product.jar}"/>
870 <  </target>
871 <
872 <
873 <  <target name="4jdk7-test"
874 <          depends="4jdk7-tck, 4jdk7-jtreg"
875 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
876 <  </target>
877 <
878 <
879 <  <target name="4jdk7docs"
880 <          description="Builds javadocs for src/jdk7 to dist dir">
881 <
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>
867 >       target="${java.runtime.target}"
868 >       workdir="${build.dir}"
869 >       classes="${product.jar}"
870 >       verbose="all">
871 >      <jtreg-elements>
872 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
873 >        <arg value="-javacoption:-processorpath"/>
874 >        <arg value="-javacoption:${errorprone.processorpath}"/>
875 >        <arg value="-javacoption:-Xplugin:ErrorProne
876 >                            ${errorprone.jsr166.flags}
877 >                            ${errorprone.jsr166.test.flags}
878 >                            -Xep:MultipleTopLevelClasses:WARN
879 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
880 >      </jtreg-elements>
881 >    </run-jtreg-tests>
882    </target>
883  
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>
884  
885   <!-- ==============================================================
886    Running guava tests against jsr166 code
# Line 1561 | Line 934
934      <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
935           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
936      <junit printsummary="true" showoutput="true" haltonfailure="true"
937 <           jvm="${java9}" fork="true">
938 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
937 >           jvm="${build.main.java}" fork="true">
938 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
939        <formatter type="brief"/>
940        <classpath>
941          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines