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.272 by jsr166, Sun Jun 3 16:16:47 2018 UTC vs.
Revision 1.305 by jsr166, Sun Oct 6 17:51:03 2019 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if"
2 >  xmlns:if="ant:if"
3    xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
# Line 19 | 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/jdk8
23  $HOME/jdk/jdk9
24  $HOME/jdk/jdk10
22    $HOME/jdk/jdk11
23 +  $HOME/jdk/jdk12
24 +  $HOME/jdk/jdk13
25 +  $HOME/jdk/jdk14
26    where each of the above is a JDK or a symlink to same, and
27  $HOME/jdk/src/jdk8
28  $HOME/jdk/src/jdk9
29  $HOME/jdk/src/jdk10
27    $HOME/jdk/src/jdk11
28 <  where each of the above is a complete JDK source tree
29 <  (e.g. mercurial forest) or a symlink to same.
28 >  $HOME/jdk/src/jdk12
29 >  $HOME/jdk/src/jdk13
30 >  $HOME/jdk/src/jdk14
31 >  where each of the above is a JDK source tree or a symlink to same.
32  
33    Alternatively, define ant variables thus:
34    ant -Djdk$N.home=... -Djdk$N.src.home=...
35 <  for $N in 8 9 10 ...
35 >  for $N in 11 .. 14 ...
36  
37    As of 2016-03, the sources in src/main are for jdk9+ only.
38 +  As of 2019-08, the sources in src/main are for jdk11+ only.
39 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
40   ------------------------------------------------------------------------------
41    </description>
42  
# Line 53 | Line 54
54  
55  
56    <!-- Compilation options -->
56  <property name="build.sourcelevel"    value="6"/>
57    <property name="build.debug"          value="true"/>
58    <property name="build.debuglevel"     value="source,lines,vars"/>
59    <property name="build.deprecation"    value="false"/>
# Line 65 | Line 65
65    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66    <property name="build.loops.dir"             location="${build.dir}/loops"/>
67  
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
68    <!-- JDK locations -->
69    <property name="jdks.home"  location="${user.home}/jdk"/>
70  
# Line 96 | Line 76
76      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
77      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
78      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
79 <    <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"/>
79 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
80      </sequential>
81    </macrodef>
82  
# Line 130 | Line 92
92      </sequential>
93    </macrodef>
94  
133  <defjdklocations v="6"/>
134  <defjdklocations v="7"/>
135  <defjdklocations v="8"/>
136  <defjdklocations v="9"/>
137  <defjdklocations v="10"/>
95    <defjdklocations v="11"/>
96 +  <defjdklocations v="12"/>
97 +  <defjdklocations v="13"/>
98 +  <defjdklocations v="14"/>
99  
100    <!-- Source locations -->
101    <property name="src.dir"              location="${basedir}/src/main"/>
102    <property name="test.src.dir"         location="${basedir}/src/test"/>
103    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
104    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
145  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
146  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
147  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
148  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
105    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
106 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
106 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
107 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
108 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
109 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
110    <property name="lib.dir"              location="${basedir}/lib"/>
111    <property name="dist.dir"             location="${basedir}/dist"/>
112    <property name="topsrc.dir"           location="${basedir}/src"/>
154  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
155  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
156  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
157  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
158  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
159  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
113  
114    <!-- Javadoc locations -->
115    <property name="docs.dir"          location="${build.dir}/docs"/>
116 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
164 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
165 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
166 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
167 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
168 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
169 <
170 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
171 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
172 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
173 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
174 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
175 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
176 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
116 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
117  
118    <!-- Jar locations -->
119    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
180  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
181  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
182  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
183  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
184  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
185  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
120    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
121  
122    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
123    <!-- Switched to https: in 2017-10 - JDK-8190312 -->
124 <  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
125 <  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
126 <  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
127 <  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
194 <  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
195 <  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
124 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
125 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
126 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
127 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
128    <!-- The location of jdk early access docs (RIP) -->
129 <  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
130 <  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
131 <  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
132 <  <!-- Default jdk doc location (latest stable release seems best) -->
133 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
129 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
130 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
131 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
132 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
133 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
134 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
135 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
136 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
137 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
138  
139    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
204  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
205  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
206  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
207  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
208  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
209  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
140    <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
141 +  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
142 +  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
143 +  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
144    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
145  
146    <!-- Define the "jtreg" task -->
# Line 215 | Line 148
148    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
149             classpath="${lib.dir}/jtreg.jar" />
150  
151 <  <!-- Tck options; see JSR166TestCase.java
151 >  <!-- Tck configuration options; see JSR166TestCase.java
152     To profile a single tck test class:
153     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
154     To stress test a single tck test class:
# Line 238 | Line 171
171  
172      <sequential>
173  
241    <local name="modules"/>
242    <condition property="modules">
243      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
244    </condition>
245
246    <local name="use-doclint"/>
247    <condition property="use-doclint">
248      <not> <equals arg1="@{target}" arg2="7"/> </not>
249    </condition>
250
174      <mkdir dir="@{workdir}/tck-classes"/>
175  
176      <javac srcdir="@{tck.src.dir}"
# Line 267 | Line 190
190        <include name="*.java"/>
191        <compilerarg value="-XDignore.symbol.file=true"/>
192        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
193 <      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
194 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
272 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
193 >      <compilerarg value="-Xdoclint:reference/private"/>
194 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
195        <compilerarg line="${build.args}"/>
196        <javac-elements/>
197  
# Line 279 | Line 201
201            failonerror="true"
202            jvm="${java@{target}}"
203            fork="true">
204 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
205 <        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
206 <        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
207 <        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
208 <        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
209 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
210 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
211 <        <jvmarg line="@{jvmflags}"/>
212 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
213 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
214 <
215 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
216 <        <syspropertyset id="system-properties-used-by-tck">
217 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
218 <          <propertyref prefix="jsr166."/>
219 <          <propertyref name="test.timeout.factor"/>
220 <        </syspropertyset>
221 <
222 <        <classpath>
223 <          <pathelement location="${junit.jar}"/>
224 <          <pathelement location="@{workdir}/tck-classes"/>
303 <        </classpath>
204 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
205 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
206 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
207 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
208 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
209 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
210 >        <jvmarg line="@{jvmflags}"/>
211 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
212 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
213 >
214 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
215 >        <syspropertyset id="system-properties-used-by-tck">
216 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
217 >          <propertyref prefix="jsr166."/>
218 >          <propertyref name="test.timeout.factor"/>
219 >        </syspropertyset>
220 >
221 >        <classpath>
222 >          <pathelement location="${junit.jar}"/>
223 >          <pathelement location="@{workdir}/tck-classes"/>
224 >        </classpath>
225      </java>
226  
227      </sequential>
# Line 321 | Line 242
242      </sequential>
243    </macrodef>
244  
245 +  <defjtregtests v="14"/>
246 +  <defjtregtests v="13"/>
247 +  <defjtregtests v="12"/>
248    <defjtregtests v="11"/>
325  <defjtregtests v="10"/>
326  <defjtregtests v="9"/>
327  <defjtregtests v="8"/>
328  <defjtregtests v="7"/>
249  
250    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
251    <property name="jtreg.flags" value=""/>
252  
253    <macrodef name="run-jtreg-tests">
254 <    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
254 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
255      <attribute name="target"/>
256      <attribute name="workdir"/>
257      <attribute name="classes"/>
# Line 344 | Line 264
264      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
265      <property name="jtreg.verbose" value="nopass,fail,error"/>
266  
347    <local name="modules"/>
348    <condition property="modules">
349      <available file="${jdk@{target}.home}/jmods" type="dir"/>
350    </condition>
351
267      <delete dir="@{workdir}/JTwork"   quiet="true"/>
268      <jtreg dir="${jtreg@{target}.src.dir}"
269             jdk="${jdk@{target}.home}"
270             workDir="@{workdir}/JTwork">
271        <patternset refid="jdk@{target}.jtreg.tests"/>
272 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
273 <      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
359 <      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
272 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
273 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
274        <arg value="-agentvm"/>
275        <arg value="-noreport"/>
276        <arg value="-verbose:@{verbose}"/>
# Line 376 | Line 290
290    </path>
291  
292    <!-- Support @jls tag, used in jdk8+ javadoc -->
293 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
294    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
295    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
296  
297    <!-- Main targets -->
298  
299 <  <property name="build.main.java.version" value="9"/>
300 <  <!-- Workaround "no nested properties in ant" -->
301 <  <macrodef name="define-build-main-properties">
302 <    <attribute name="v"/>
303 <    <sequential>
304 <      <property name="build.main.java"    value="${java@{v}}"/>
305 <      <property name="build.main.javac"   value="${javac@{v}}"/>
306 <      <!-- Force javadoc version to be at least 10,
307 <           so we can use override-methods=summary -->
308 <      <condition property="build.main.javadoc"
309 <                 value="${javadoc11}"
310 <                 else="${javadoc@{v}}">
311 <        <equals arg1="@{v}" arg2="9"/>
312 <      </condition>
313 <    </sequential>
399 <  </macrodef>
400 <  <define-build-main-properties v="${build.main.java.version}"/>
299 >  <!-- Default values: may seem strange ... -->
300 >  <!-- At runtime, target latest LTS, i.e. jdk11 -->
301 >  <!-- But at build time, target jdk9, for maximal binary portability -->
302 >  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
303 >  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
304 >    o override-methods=summary
305 >    o {@systemProperty ...}
306 >    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
307 >    o 8202628: javadoc generates bad links in TestModules.java
308 >    -->
309 >  <property name="java.runtime.target" value="11"/>
310 >  <property name="build.main.java" value="${java11}"/>
311 >  <property name="build.main.javac" value="${javac11}"/>
312 >  <property name="build.main.javadoc" value="${javadoc12}"/>
313 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
314  
315    <target name="dists"
316 <          depends="dist, 4jdk8dist"
316 >          depends="dist"
317            description="Builds all public jars and docs"/>
405          <!--
406              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
407          -->
318  
319    <target name="compile"
320            depends="configure-compiler"
# Line 431 | Line 341
341        <compilerarg value="--patch-module=java.base=${src.dir}"/>
342        <compilerarg value="-Xprefer:source"/>
343        <compilerarg value="-XDignore.symbol.file=true"/>
344 <      <compilerarg value="-Xlint:all"/>
344 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
345 >      <compilerarg value="-Xlint:all,-removal"/>
346        <compilerarg line="--doclint-format html5"/>
347        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
348 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
349        <compilerarg value="-Werror"/>
350        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>
# Line 463 | Line 375
375      <delete dir="${docs.dir}"/>
376      <mkdir dir="${docs.dir}"/>
377  
378 +    <!-- old school frames via docs/index.html?overview-summary.html -->
379 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
380 +    <local name="use-frames"/>
381 +    <condition property="use-frames">
382 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
383 +    </condition>
384 +
385      <!-- the packagenames="none" hack below prevents scanning the -->
386      <!-- sourcepath for packages -->
387  
# Line 473 | Line 392
392   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
393      <javadoc destdir="${docs.dir}"
394               packagenames="none"
395 <             link="${java9.api.url}"
395 >             link="${java.api.url}"
396               overview="${src.dir}/intro.html"
397               access="${build.javadoc.access}"
398               sourcepath="${src.dir}"
399               classpath=""
400 <             source="9"
400 >             source="${build.main.javadoc.source}"
401               executable="${build.main.javadoc}">
402 + <!-- TODO: JDK-8214571 failonerror = "true" -->
403        <fileset dir="${src.dir}" defaultexcludes="yes">
404          <include name="**/*.java"/>
405        </fileset>
406 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
406 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
407        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
408        <arg value="-XDignore.symbol.file=true"/>
409        <arg value="-html5"/>
410        <arg value="--patch-module=java.base=${src.dir}"/>
411 +      <arg value="--frames" if:set="use-frames"/>
412        <arg value="--override-methods=summary"/>
413        <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
414        <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
415        <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
416 < <!-- @apiNote tag currently unused -->
496 < <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
416 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
417   <!-- tags added in jdk9: currently unused -->
418   <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
419   <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
# Line 506 | Line 426
426            description="Puts all distributable products in single hierarchy"/>
427  
428  
509  <target name="release"
510          depends="dist"
511          description="Puts entire CVS tree, plus distribution productions, in a jar">
512
513    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
514
515    <jar basedir="${basedir}" destfile="${release.jar}">
516      <!-- <exclude name="build/**"/> -->
517      <exclude name="${release.jar}"/>
518      <exclude name="user.properties"/>
519      <exclude name="etc/notes/**"/>
520      <exclude name="src/emulation/**"/>
521      <exclude name="**/SyntaxTest.java"/>
522      <exclude name="**/SuperfluousAbstract.java"/>
523      <manifest>
524        <attribute name="Built-By" value="${user.name}"/>
525        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
526      </manifest>
527    </jar>
528  </target>
529
530
429    <target name="clean"
430            description="Removes all build products">
431      <delete dir="${build.dir}"/>
# Line 552 | Line 450
450    </target>
451  
452    <target name="tck"
453 <          depends="jar"
453 >          depends="jar"
454            description="Runs tck tests for src/main directly">
455  
456      <run-tck-tests
457 <      target="${build.main.java.version}"
457 >      target="${java.runtime.target}"
458        workdir="${build.dir}"
459        classes="${product.jar}">
460        <javac-elements>
# Line 587 | Line 485
485    </target>
486  
487    <target name="jtreg"
488 <          depends="jar"
488 >          depends="jar"
489            description="Runs jtreg tests for src/main using the jtreg ant task">
490      <run-jtreg-tests
491 <       target="${build.main.java.version}"
491 >       target="${java.runtime.target}"
492         workdir="${build.dir}"
493         classes="${product.jar}"/>
494    </target>
# Line 599 | Line 497
497            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
498            description="Runs tck and jtreg tests for src/main"/>
499  
500 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
501 <
502 < <!--     <antcall target="jtreg"> -->
605 < <!--       <param name="build.main.java.version" value="8"/> -->
606 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
607 < <!--     </antcall> -->
608 <
609 < <!--   </target> -->
500 >  <target name="test-version-permutations"
501 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
502 >  </target>
503  
504 <  <target name="test91011"
505 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
504 >  <target name="test11">
505 >    <antcall target="clean"/>
506 >    <antcall>
507 >      <param name="java.runtime.target" value="11"/>
508 >      <param name="build.main.javac" value="${javac11}"/>
509 >      <param name="build.main.javadoc" value="${javadoc12}"/>
510 >      <param name="build.main.javadoc.source" value="11"/>
511 >      <target name="test"/>
512 >      <target name="docs"/>
513 >    </antcall>
514 >  </target>
515  
516 +  <target name="test12">
517      <antcall target="clean"/>
518 <    <antcall target="test">
519 <      <param name="build.main.java.version" value="9"/>
518 >    <antcall>
519 >      <param name="java.runtime.target" value="12"/>
520 >      <param name="build.main.javac" value="${javac12}"/>
521 >      <param name="build.main.javadoc" value="${javadoc12}"/>
522 >      <param name="build.main.javadoc.source" value="12"/>
523 >      <target name="test"/>
524 >      <target name="docs"/>
525      </antcall>
526 +  </target>
527  
528 +  <target name="test13">
529      <antcall target="clean"/>
530 <    <antcall target="test">
531 <      <param name="build.main.java.version" value="10"/>
530 >    <antcall>
531 >      <param name="java.runtime.target" value="13"/>
532 >      <param name="build.main.javac" value="${javac13}"/>
533 >      <param name="build.main.javadoc" value="${javadoc13}"/>
534 >      <param name="build.main.javadoc.source" value="13"/>
535 >      <target name="test"/>
536 >      <target name="docs"/>
537      </antcall>
538 +  </target>
539  
540 +  <target name="test14">
541      <antcall target="clean"/>
542 <    <antcall target="test">
543 <      <param name="build.main.java.version" value="11"/>
542 >    <antcall>
543 >      <param name="java.runtime.target" value="14"/>
544 >      <param name="build.main.javac" value="${javac14}"/>
545 >      <param name="build.main.javadoc" value="${javadoc14}"/>
546 >      <param name="build.main.javadoc.source" value="14"/>
547 >      <target name="test"/>
548 >      <target name="docs"/>
549      </antcall>
550 +  </target>
551  
552 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
552 >  <target name="test11-12">
553      <antcall target="clean"/>
554 +    <antcall>
555 +      <param name="java.runtime.target" value="12"/>
556 +      <param name="build.main.javac" value="${javac11}"/>
557 +      <param name="build.main.javadoc" value="${javadoc12}"/>
558 +      <param name="build.main.javadoc.source" value="11"/>
559 +      <target name="test"/>
560 +      <target name="docs"/>
561 +    </antcall>
562 +  </target>
563  
564 +  <target name="test11-13">
565 +    <antcall target="clean"/>
566 +    <antcall>
567 +      <param name="java.runtime.target" value="13"/>
568 +      <param name="build.main.javac" value="${javac11}"/>
569 +      <param name="build.main.javadoc" value="${javadoc13}"/>
570 +      <param name="build.main.javadoc.source" value="11"/>
571 +      <target name="test"/>
572 +      <target name="docs"/>
573 +    </antcall>
574    </target>
575  
576 +  <target name="test11-14">
577 +    <antcall target="clean"/>
578 +    <antcall>
579 +      <param name="java.runtime.target" value="14"/>
580 +      <param name="build.main.javac" value="${javac11}"/>
581 +      <param name="build.main.javadoc" value="${javadoc14}"/>
582 +      <param name="build.main.javadoc.source" value="11"/>
583 +      <target name="test"/>
584 +      <target name="docs"/>
585 +    </antcall>
586 +  </target>
587  
588  
589    <target name="configure-compiler">
# Line 653 | Line 606
606    </target>
607  
608  
656
657  <!-- Various demos and test programs -->
658
659
660  <!-- description="Benchmark from Doug Lea's AQS paper" -->
661  <target name="loops" depends="configure-compiler">
662
663    <mkdir dir="${build.loops.dir}"/>
664
665    <javac srcdir="${loops.src.dir}"
666          destdir="${build.loops.dir}"
667            debug="${build.debug}"
668       debuglevel="${build.debuglevel}"
669      deprecation="${build.deprecation}"
670           source="${build.sourcelevel}"
671           target="${build.sourcelevel}"
672         encoding="ASCII"
673             fork="true">
674
675      <compilerarg line="${build.args}"/>
676      <classpath refid="loops.classpath"/>
677      <compilerarg value="-XDignore.symbol.file=true"/>
678
679    </javac>
680
681    <java classname="ALoops" fork="true">
682      <classpath refid="loops.classpath"/>
683    </java>
684  </target>
685
686
609    <target name="compile-test-loops" depends="jar"
610            description="Compiles all the perf tests in src/test/loops">
611  
# Line 702 | Line 624
624  
625        <include name="*.java"/>
626        <compilerarg value="-XDignore.symbol.file=true"/>
627 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
628 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
707 <      <compilerarg line="${build.args}"/>
708 <    </javac>
709 <  </target>
710 <
711 <
712 <  <!-- jsr166 4jdk8 -->
713 <
714 <  <target name="4jdk8compile"
715 <          depends="configure-compiler"
716 <          description="Compiles src/jdk8 sources, targeting jdk8">
717 <
718 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
719 <
720 <    <javac srcdir="${4jdk8src.dir}"
721 <           destdir="${build.4jdk8.classes.dir}"
722 <           debug="${build.debug}"
723 <           debuglevel="${build.debuglevel}"
724 <           deprecation="${build.deprecation}"
725 <           source="8"
726 <           target="8"
727 <           classpath=""
728 <           bootclasspath="${bootclasspath8}"
729 <           includeAntRuntime="false"
730 <           includeJavaRuntime="false"
731 <           encoding="ASCII"
732 <           executable="${javac8}"
733 <           fork="true">
734 <      <include name="**/*.java"/>
735 <      <compilerarg value="-Xprefer:source"/>
736 <      <compilerarg value="-XDignore.symbol.file=true"/>
737 <      <compilerarg value="-Xlint:all"/>
738 <      <compilerarg value="-Werror"/>
739 <      <compilerarg line="${build.args}"/>
740 <    </javac>
741 <  </target>
742 <
743 <  <target name="4jdk8doclint"
744 <          depends="configure-compiler"
745 <          description="Finds doclint warnings">
746 <
747 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
748 <
749 <    <javac srcdir="${4jdk8src.dir}"
750 <           destdir="${build.4jdk8.classes.dir}"
751 <           debug="${build.debug}"
752 <           debuglevel="${build.debuglevel}"
753 <           deprecation="${build.deprecation}"
754 <           source="8"
755 <           target="8"
756 <           classpath=""
757 <           bootclasspath="${bootclasspath8}"
758 <           includeAntRuntime="false"
759 <           includeJavaRuntime="false"
760 <           encoding="ASCII"
761 <           executable="${javac8}"
762 <           fork="true">
763 <      <include name="**/*.java"/>
764 <      <compilerarg value="-Xprefer:source"/>
765 <      <compilerarg value="-XDignore.symbol.file=true"/>
766 <      <compilerarg value="-Xlint:all"/>
767 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
627 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
628 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
629        <compilerarg line="${build.args}"/>
630      </javac>
631    </target>
632  
633  
634 <  <target name="4jdk8jar"
635 <          depends="4jdk8compile"
775 <          description="Builds library jar from compiled sources">
776 <
777 <    <jar destfile="${4jdk8product.jar}">
778 <      <fileset dir="${build.4jdk8.classes.dir}"/>
779 <      <manifest>
780 <        <attribute name="Built-By" value="${user.name}"/>
781 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
782 <      </manifest>
783 <    </jar>
784 <  </target>
785 <
786 <
787 <  <target name="4jdk8-tck"
788 <          depends="4jdk8jar"
789 <          description="Runs tck tests for jsr166-4jdk8 directly">
790 <
791 <    <run-tck-tests
792 <      target="8"
793 <      workdir="${build.4jdk8.dir}"
794 <      classes="${4jdk8product.jar}">
795 <      <javac-elements>
796 <        <!-- JDK9+ test classes -->
797 <        <exclude name="*9Test.java"/>
798 <        <exclude name="*10Test.java"/>
799 <        <compilerarg value="-Werror"/>
800 <      </javac-elements>
801 <    </run-tck-tests>
802 <  </target>
803 <
804 <
805 <  <target name="4jdk8-jtreg"
806 <          depends="4jdk8jar"
807 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
808 <    <run-jtreg-tests
809 <       target="8"
810 <       workdir="${build.4jdk8.dir}"
811 <       classes="${4jdk8product.jar}"/>
812 <  </target>
813 <
814 <
815 <  <target name="4jdk8-test"
816 <          depends="4jdk8-tck, 4jdk8-jtreg"
817 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
818 <
819 <
820 <  <target name="4jdk8docs"
821 <          description="Builds javadocs for src/jdk8 to dist dir">
822 <
823 <    <delete dir="${4jdk8docs.dir}"/>
824 <    <mkdir dir="${4jdk8docs.dir}"/>
825 <
826 <    <javadoc destdir="${4jdk8docs.dir}"
827 <             packagenames="none"
828 <             link="${java8.api.url}"
829 <             overview="${4jdk8src.dir}/intro.html"
830 <             access="${build.javadoc.access}"
831 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
832 <             classpath=""
833 <             source="8"
834 <             executable="${javadoc8}"
835 <             failonerror = "true">
836 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
837 <        <include name="**/*.java"/>
838 <      </fileset>
839 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
840 <      <arg value="-XDignore.symbol.file=true"/>
841 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
842 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
843 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
844 < <!-- @apiNote tag currently unused -->
845 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
846 <    </javadoc>
847 <  </target>
848 <
849 <
850 <  <target name="4jdk8dist"
851 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
852 <          description="Puts all distributable products in single hierarchy"/>
853 <
854 <
855 <  <target name="4jdk8clean"
856 <          description="Removes all 4jdk8 build products">
857 <    <delete dir="${build.4jdk8.dir}"/>
858 <  </target>
859 <
860 <
861 <  <target name="4jdk8dist-jar"
862 <          depends="4jdk8clean, 4jdk8jar">
863 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
864 <  </target>
865 <
866 <
867 <  <target name="4jdk8dist-docs"
868 <          depends="4jdk8clean, 4jdk8docs">
869 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
870 <  </target>
871 <
872 <
634 >  <!-- old branches no longer maintained.  build support deleted -->
635 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
636    <!-- jsr166 4jdk7 (no longer maintained) -->
874
875  <target name="4jdk7compile" depends="configure-compiler">
876    <mkdir dir="${build.4jdk7.classes.dir}"/>
877
878    <javac srcdir="${4jdk7src.dir}"
879           destdir="${build.4jdk7.classes.dir}"
880           debug="${build.debug}"
881           debuglevel="${build.debuglevel}"
882           deprecation="${build.deprecation}"
883           source="6"
884           target="6"
885           classpath=""
886           bootclasspath="${bootclasspath6}"
887           includeAntRuntime="false"
888           includeJavaRuntime="false"
889           encoding="ASCII"
890           executable="${javac7}"
891           fork="true">
892
893      <include name="**/*.java"/>
894      <compilerarg value="-Xprefer:source"/>
895      <compilerarg value="-XDignore.symbol.file=true"/>
896      <compilerarg value="-Xlint:all"/>
897      <compilerarg value="-Werror"/>
898      <compilerarg line="${build.args}"/>
899    </javac>
900  </target>
901
902  <target name="4jdk7doclint" depends="configure-compiler">
903    <mkdir dir="${build.4jdk7.classes.dir}"/>
904
905    <javac srcdir="${4jdk7src.dir}"
906           destdir="${build.4jdk7.classes.dir}"
907           debug="${build.debug}"
908           debuglevel="${build.debuglevel}"
909           deprecation="${build.deprecation}"
910           source="6"
911           target="6"
912           classpath=""
913           bootclasspath="${bootclasspath6}"
914           includeAntRuntime="false"
915           includeJavaRuntime="false"
916           encoding="ASCII"
917           executable="${javac8}"
918           fork="true">
919
920      <include name="**/*.java"/>
921      <compilerarg value="-Xprefer:source"/>
922      <compilerarg value="-XDignore.symbol.file=true"/>
923      <compilerarg value="-Xlint:all"/>
924      <compilerarg value="-Xdoclint:all/protected"/>
925      <compilerarg line="${build.args}"/>
926    </javac>
927  </target>
928
929  <target name="4jdk7jar" depends="4jdk7compile">
930    <jar destfile="${4jdk7product.jar}">
931      <fileset dir="${build.4jdk7.classes.dir}"/>
932      <manifest>
933        <attribute name="Built-By" value="${user.name}"/>
934        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
935      </manifest>
936    </jar>
937  </target>
938
939  <target name="4jdk7-tck" depends="4jdk7jar">
940    <run-tck-tests
941      target="7"
942      workdir="${build.4jdk7.dir}"
943      classes="${4jdk7product.jar}">
944      <javac-elements>
945        <!-- JDK8+ test classes -->
946        <exclude name="*8Test.java"/>
947        <exclude name="*9Test.java"/>
948        <exclude name="*10Test.java"/>
949        <exclude name="DoubleAccumulatorTest.java"/>
950        <exclude name="DoubleAdderTest.java"/>
951        <exclude name="LongAccumulatorTest.java"/>
952        <exclude name="LongAdderTest.java"/>
953        <exclude name="CompletableFutureTest.java"/>
954        <exclude name="SplittableRandomTest.java"/>
955        <exclude name="StampedLockTest.java"/>
956        <exclude name="SubmissionPublisherTest.java"/>
957        <compilerarg value="-Werror"/>
958      </javac-elements>
959    </run-tck-tests>
960  </target>
961
962  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
963  <target name="4jdk7-tck-junit" depends="4jdk7compile">
964
965    <junit printsummary="true"
966           showoutput="true"
967           errorProperty="junit.failed"
968           failureProperty="junit.failed"
969           includeantruntime="true"
970           jvm="${java7}"
971           fork="true">
972
973      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
974      <jvmarg value="-server"/>
975
976      <classpath>
977        <pathelement location="${junit.jar}"/>
978        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
979      </classpath>
980
981      <formatter type="brief"/>
982
983      <test name="${jsr166.tckTestClass}" haltonfailure="no">
984      </test>
985    </junit>
986  </target>
987
988  <target name="4jdk7-jtreg" depends="4jdk7jar">
989    <run-jtreg-tests
990       target="7"
991       workdir="${build.4jdk7.dir}"
992       classes="${4jdk7product.jar}"/>
993  </target>
994
995  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
996
997  <target name="4jdk7docs">
998    <delete dir="${4jdk7docs.dir}"/>
999    <mkdir dir="${4jdk7docs.dir}"/>
1000
1001    <javadoc destdir="${4jdk7docs.dir}"
1002             packagenames="none"
1003             link="${java7.api.url}"
1004             overview="${4jdk7src.dir}/intro.html"
1005             access="${build.javadoc.access}"
1006             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1007             classpath=""
1008             executable="${javadoc7}"
1009             failonerror = "true">
1010      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1011        <include name="**/*.java"/>
1012      </fileset>
1013      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1014      <arg value="-XDignore.symbol.file=true"/>
1015    </javadoc>
1016  </target>
1017
1018  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1019
1020  <target name="4jdk7clean">
1021    <delete dir="${build.4jdk7.dir}"/>
1022  </target>
1023
1024  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1025    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1026  </target>
1027
1028  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1029    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1030  </target>
1031
1032
637    <!-- jsr166x (no longer maintained) -->
1034
1035  <target name="jsr166xcompile" depends="configure-compiler">
1036    <mkdir dir="${build.jsr166x.classes.dir}"/>
1037
1038    <javac srcdir="${topsrc.dir}"
1039           destdir="${build.jsr166x.classes.dir}"
1040           debug="${build.debug}"
1041           debuglevel="${build.debuglevel}"
1042           deprecation="${build.deprecation}"
1043           classpath=""
1044           bootclasspath="${bootclasspath6}"
1045           source="5"
1046           target="5"
1047           includeAntRuntime="false"
1048           includeJavaRuntime="false"
1049           encoding="ASCII"
1050           executable="${javac7}"
1051           fork="true">
1052      <include name="jsr166x/**/*.java"/>
1053      <compilerarg value="-XDignore.symbol.file=true"/>
1054      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1055      <compilerarg value="-Werror"/>
1056      <compilerarg line="${build.args}"/>
1057    </javac>
1058  </target>
1059
1060  <target name="jsr166xjar" depends="jsr166xcompile">
1061    <jar destfile="${jsr166x.jar}">
1062      <fileset dir="${build.jsr166x.classes.dir}"/>
1063      <manifest>
1064        <attribute name="Built-By" value="${user.name}"/>
1065        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1066      </manifest>
1067    </jar>
1068  </target>
1069
1070  <target name="jsr166xdocs">
1071    <delete dir="${jsr166xdocs.dir}"/>
1072    <mkdir dir="${jsr166xdocs.dir}"/>
1073
1074    <javadoc destdir="${jsr166xdocs.dir}"
1075             packagenames="jsr166x.*"
1076             link="${java.api.url}"
1077             access="${build.javadoc.access}"
1078             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1079             bootclasspath="${bootclasspath6}"
1080             source="5"
1081             executable="${javadoc7}"
1082             failonerror = "true">
1083      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1084      <arg value="-XDignore.symbol.file=true"/>
1085    </javadoc>
1086  </target>
1087
1088  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1089
1090  <target name="jsr166xclean">
1091    <delete dir="${build.jsr166x.dir}"/>
1092  </target>
1093
1094  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1095    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1096  </target>
1097
1098  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1099    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1100  </target>
1101
1102
638    <!-- jsr166y (no longer maintained) -->
1104
1105  <target name="jsr166ycompile" depends="configure-compiler">
1106    <mkdir dir="${build.jsr166y.classes.dir}"/>
1107
1108    <javac srcdir="${topsrc.dir}"
1109           destdir="${build.jsr166y.classes.dir}"
1110           debug="${build.debug}"
1111           debuglevel="${build.debuglevel}"
1112           deprecation="${build.deprecation}"
1113           source="6"
1114           target="6"
1115           classpath=""
1116           bootclasspath="${bootclasspath6}"
1117           includeAntRuntime="false"
1118           includeJavaRuntime="false"
1119           encoding="ASCII"
1120           executable="${javac7}"
1121           fork="true">
1122
1123      <include name="jsr166y/**/*.java"/>
1124      <compilerarg value="-XDignore.symbol.file=true"/>
1125      <compilerarg value="-Xlint:all"/>
1126      <compilerarg value="-Werror"/>
1127      <compilerarg line="${build.args}"/>
1128    </javac>
1129  </target>
1130
1131  <target name="jsr166yjar" depends="jsr166ycompile">
1132    <jar destfile="${jsr166y.jar}" index="true">
1133      <fileset dir="${build.jsr166y.classes.dir}"/>
1134      <manifest>
1135        <attribute name="Built-By" value="${user.name}"/>
1136        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1137      </manifest>
1138    </jar>
1139  </target>
1140
1141  <target name="jsr166ydocs">
1142    <delete dir="${jsr166ydocs.dir}"/>
1143    <mkdir dir="${jsr166ydocs.dir}"/>
1144
1145    <javadoc destdir="${jsr166ydocs.dir}"
1146             packagenames="jsr166y.*"
1147             link="${java.api.url}"
1148             access="${build.javadoc.access}"
1149             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1150             bootclasspath="${bootclasspath6}"
1151             source="6"
1152             executable="${javadoc7}"
1153             failonerror = "true">
1154      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1155      <arg value="-XDignore.symbol.file=true"/>
1156    </javadoc>
1157  </target>
1158
1159  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1160
1161  <target name="jsr166yclean">
1162    <delete dir="${build.jsr166y.dir}"/>
1163  </target>
1164
1165  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1166    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1167  </target>
1168
1169  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1170    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1171  </target>
1172
1173
639    <!-- extra166y (no longer maintained) -->
1175
1176  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1177    <mkdir dir="${build.extra166y.classes.dir}"/>
1178
1179    <javac srcdir="${topsrc.dir}"
1180           destdir="${build.extra166y.classes.dir}"
1181           debug="${build.debug}"
1182           debuglevel="${build.debuglevel}"
1183           deprecation="${build.deprecation}"
1184           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1185           classpath=""
1186           source="6"
1187           target="6"
1188           includeAntRuntime="false"
1189           includeJavaRuntime="false"
1190           encoding="ASCII"
1191           executable="${javac7}"
1192           fork="true">
1193
1194      <include name="extra166y/**/*.java"/>
1195      <compilerarg value="-XDignore.symbol.file=true"/>
1196      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1197      <compilerarg value="-Werror"/>
1198      <compilerarg line="${build.args}"/>
1199    </javac>
1200  </target>
1201
1202  <target name="extra166yjar" depends="extra166ycompile">
1203    <jar destfile="${extra166y.jar}" index="true">
1204      <fileset dir="${build.extra166y.classes.dir}"/>
1205      <manifest>
1206        <attribute name="Built-By" value="${user.name}"/>
1207        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1208      </manifest>
1209    </jar>
1210  </target>
1211
1212  <target name="extra166ydocs">
1213    <delete dir="${extra166ydocs.dir}"/>
1214    <mkdir dir="${extra166ydocs.dir}"/>
1215
1216    <javadoc destdir="${extra166ydocs.dir}"
1217             packagenames="extra166y.*"
1218             link="${java.api.url}"
1219             access="${build.javadoc.access}"
1220             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1221             bootclasspath="${bootclasspath6}"
1222             source="6"
1223             executable="${javadoc7}">
1224      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1225      <arg value="-XDignore.symbol.file=true"/>
1226    </javadoc>
1227  </target>
1228
1229  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1230
1231  <target name="extra166yclean">
1232    <delete dir="${build.extra166y.dir}"/>
1233  </target>
1234
1235  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1236    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1237  </target>
1238
1239  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1240    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1241  </target>
1242
1243
640    <!-- jsr166e (no longer maintained) -->
641  
1246  <property name="build.jsr166e.java.version" value="6"/>
1247  <property name="build.jsr166e.javac" value="${javac6}"/>
1248
1249  <target name="jsr166ecompile" depends="configure-compiler">
1250    <mkdir dir="${build.jsr166e.classes.dir}"/>
1251
1252    <javac srcdir="${topsrc.dir}"
1253           destdir="${build.jsr166e.classes.dir}"
1254           debug="${build.debug}"
1255           debuglevel="${build.debuglevel}"
1256           deprecation="${build.deprecation}"
1257           source="${build.jsr166e.java.version}"
1258           target="${build.jsr166e.java.version}"
1259           classpath=""
1260           includeAntRuntime="false"
1261           includeJavaRuntime="false"
1262           executable="${build.jsr166e.javac}"
1263           fork="true">
1264
1265      <include name="jsr166e/**/*.java"/>
1266      <compilerarg value="-XDignore.symbol.file=true"/>
1267      <compilerarg value="-Xlint:all"/>
1268      <compilerarg value="-Werror"/>
1269      <compilerarg line="${build.args}"/>
1270    </javac>
1271  </target>
1272
1273  <target name="jsr166edoclint">
1274    <mkdir dir="${build.jsr166e.classes.dir}"/>
1275
1276    <javac srcdir="${topsrc.dir}"
1277           destdir="${build.jsr166e.classes.dir}"
1278           debug="${build.debug}"
1279           debuglevel="${build.debuglevel}"
1280           deprecation="${build.deprecation}"
1281           source="${build.jsr166e.java.version}"
1282           target="${build.jsr166e.java.version}"
1283           classpath=""
1284           bootclasspath="${bootclasspath6}"
1285           includeAntRuntime="false"
1286           includeJavaRuntime="false"
1287           executable="${javac8}"
1288           fork="true">
1289
1290      <include name="jsr166e/**/*.java"/>
1291      <compilerarg value="-XDignore.symbol.file=true"/>
1292      <compilerarg value="-Xlint:all"/>
1293      <compilerarg value="-Werror"/>
1294      <compilerarg value="-Xdoclint:all/protected"/>
1295    </javac>
1296  </target>
1297
1298  <target name="jsr166ejar" depends="jsr166ecompile">
1299    <jar destfile="${jsr166e.jar}" index="true">
1300      <fileset dir="${build.jsr166e.classes.dir}"/>
1301      <manifest>
1302        <attribute name="Built-By" value="${user.name}"/>
1303        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1304      </manifest>
1305    </jar>
1306  </target>
1307
1308  <target name="jsr166edocs">
1309    <delete dir="${jsr166edocs.dir}"/>
1310    <mkdir dir="${jsr166edocs.dir}"/>
1311
1312    <javadoc destdir="${jsr166edocs.dir}"
1313             packagenames="jsr166e.*"
1314             link="${java.api.url}"
1315             access="${build.javadoc.access}"
1316             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1317             source="${build.jsr166e.java.version}"
1318             executable="${javadoc7}"
1319             failonerror = "true">
1320      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1321      <arg value="-XDignore.symbol.file=true"/>
1322    </javadoc>
1323  </target>
1324
1325  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1326    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1327    <run-tck-tests
1328      tck.src.dir="${test.src.dir}/tck-jsr166e"
1329      target="${build.jsr166e.java.version}"
1330      workdir="${build.jsr166e.dir}"
1331      classes="${jsr166e.jar}"/>
1332  </target>
1333
1334  <target name="jsr166e-tck">
1335
1336 <!--     <antcall target="clean"/> -->
1337 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1338 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1339 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1340 <!--     </antcall> -->
1341
1342    <antcall target="clean"/>
1343    <antcall target="jsr166e-tck-one-java-version">
1344      <param name="build.jsr166e.java.version" value="7"/>
1345      <param name="build.jsr166e.javac" value="${javac7}"/>
1346    </antcall>
1347
1348    <antcall target="clean"/>
1349    <antcall target="jsr166e-tck-one-java-version">
1350      <param name="build.jsr166e.java.version" value="6"/>
1351      <param name="build.jsr166e.javac" value="${javac6}"/>
1352    </antcall>
1353  </target>
1354
1355  <target name="jsr166e-test" depends="jsr166e-tck"/>
1356
1357  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1358
1359  <target name="jsr166eclean">
1360    <delete dir="${build.jsr166e.dir}"/>
1361  </target>
1362
1363  <target name="jsr166edist-jar"
1364          depends="jsr166eclean, jsr166ejar">
1365    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1366  </target>
1367
1368  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1369    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1370  </target>
1371
1372
642   <!-- Find buglets that can be detected by static build tools -->
643  
644   <!--   <target name="lint"> -->
# Line 1387 | Line 656
656  
657  
658   <!-- ==============================================================
659 <  Experimental errorprone support - http://errorprone.info
659 >  Experimental errorprone support
660 >  https://errorprone.info
661 >  https://errorprone.info/docs/installation
662 >  https://github.com/google/error-prone/issues/1143
663   =================================================================== -->
664 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
664 >  <path id="errorprone.processorpath.path">
665 >    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
666 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
667 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
668 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
669 >  </path>
670 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
671    <property name="errorprone.jsr166.user.flags" value=""/>
672    <property name="errorprone.jsr166.flags"
673              value="-Xep:HashtableContains:OFF
674                     -Xep:JdkObsolete:OFF
675                     -Xep:MissingOverride:OFF
676                     -Xep:MissingFail:OFF
677 +                   -Xep:ThreadPriorityCheck:OFF
678                     -Xep:MixedArrayDimensions:ERROR
679                     -Xep:RemoveUnusedImports:ERROR
680                     -Xep:EmptyIf:ERROR
# Line 1404 | Line 683
683                     -Xep:LongLiteralLowerCaseSuffix:ERROR
684                     -Xep:RedundantThrows:ERROR
685                     -Xep:IdentityBinaryExpression:WARN
686 +                   -Xep:ConstructorInvokesOverridable:WARN
687                     -Xep:MethodCanBeStatic:WARN
688                     ${errorprone.jsr166.user.flags}"/>
689    <!-- -Xep:WildcardImport:ERROR -->
# Line 1436 | Line 716
716        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
717        <compilerarg value="-J--illegal-access=permit"/>
718        <compilerarg value="-XDcompilePolicy=simple"/>
719 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
719 >      <compilerarg value="-processorpath"/>
720 >      <compilerarg pathref="errorprone.processorpath.path"/>
721        <compilerarg value="-Xplugin:ErrorProne
722                            ${errorprone.jsr166.flags}"/>
723        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1453 | Line 734
734      </jar>
735  
736      <run-tck-tests
737 <      target="${build.main.java.version}"
737 >      target="${java.runtime.target}"
738        workdir="${build.dir}"
739        classes="${product.jar}">
740        <javac-elements>
741          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
742          <compilerarg value="-J--illegal-access=permit"/>
743          <compilerarg value="-XDcompilePolicy=simple"/>
744 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
744 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
745          <compilerarg value="-Xplugin:ErrorProne
746                              ${errorprone.jsr166.flags}
747                              ${errorprone.jsr166.test.flags}"/>
# Line 1476 | Line 757
757            description="Run errorprone over jtreg tests (experimental)">
758  
759      <run-jtreg-tests
760 <       target="${build.main.java.version}"
760 >       target="${java.runtime.target}"
761         workdir="${build.dir}"
762         classes="${product.jar}"
763         verbose="all">
764        <jtreg-elements>
765          <arg value="-javacoption:-XDcompilePolicy=simple"/>
766          <arg value="-javacoption:-processorpath"/>
767 <        <arg value="-javacoption:${errorprone.jar}"/>
767 >        <arg value="-javacoption:${errorprone.processorpath}"/>
768          <arg value="-javacoption:-Xplugin:ErrorProne
769                              ${errorprone.jsr166.flags}
770                              ${errorprone.jsr166.test.flags}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines