ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/jsr166/jsr166/build.xml
(Generate patch)

Comparing jsr166/build.xml (file contents):
Revision 1.236 by jsr166, Mon Mar 20 00:03:57 2017 UTC vs.
Revision 1.320 by jsr166, Tue Sep 15 19:09:50 2020 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines