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.278 by jsr166, Mon Oct 1 00:10:52 2018 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"
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 +  $HOME/jdk/jdk15
27 +  $HOME/jdk/jdk16
28    where each of the above is a JDK or a symlink to same, and
28  $HOME/jdk/src/jdk8
29  $HOME/jdk/src/jdk9
30  $HOME/jdk/src/jdk10
29    $HOME/jdk/src/jdk11
30    $HOME/jdk/src/jdk12
31 <  where each of the above is a complete JDK source tree
32 <  (e.g. mercurial forest) or a symlink to same.
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 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 55 | Line 58
58  
59  
60    <!-- Compilation options -->
58  <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 67 | Line 69
69    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
70    <property name="build.loops.dir"             location="${build.dir}/loops"/>
71  
70  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
71  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
72  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
73  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
74
75  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
76  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
77  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
78  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
79
80  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
81  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
82  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
83  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
84
85  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
86  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
87  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
88  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
89
72    <!-- JDK locations -->
73    <property name="jdks.home"  location="${user.home}/jdk"/>
74  
# Line 98 | 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"/>
102 <    <available property="have.java.base"
103 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
104 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
105 <      if:set="have.java.base"/>
106 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
107 <      unless:set="have.java.base"/>
108 <    <local name="modules"/>
109 <    <available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/>
110 <    <local name="boot.jar.dir"/>
111 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
112 <    <path id="bootclasspath@{v}" unless:set="modules">
113 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
114 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
115 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
116 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
117 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
118 <    </path>
119 <    <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 132 | Line 96
96      </sequential>
97    </macrodef>
98  
135  <defjdklocations v="6"/>
136  <defjdklocations v="7"/>
137  <defjdklocations v="8"/>
138  <defjdklocations v="9"/>
139  <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"/>
148  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
149  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
150  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
151  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
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="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
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"/>
158  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
159  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
160  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
161  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
162  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
163  <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"/>
168 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
169 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
170 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
171 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
172 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
173 <
174 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
175 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
176 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
177 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
178 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
179 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
180 <  <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"/>
184  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
185  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
186  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
187  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
188  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
189  <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    <!-- 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"/>
198 <  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
199 <  <property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
200 <  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
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) -->
202  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
203  <!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
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 <  <!-- Default jdk doc location (latest stable release seems best) -->
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 -->
210  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
211  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
212  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
213  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
214  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
215  <property name="java10.api.url"     value="${java10.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 222 | 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 245 | Line 183
183  
184      <sequential>
185  
248    <local name="modules"/>
249    <condition property="modules">
250      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
251    </condition>
252
253    <local name="use-doclint"/>
254    <condition property="use-doclint">
255      <not> <equals arg1="@{target}" arg2="7"/> </not>
256    </condition>
257
186      <mkdir dir="@{workdir}/tck-classes"/>
187  
188      <javac srcdir="@{tck.src.dir}"
# Line 274 | Line 202
202        <include name="*.java"/>
203        <compilerarg value="-XDignore.symbol.file=true"/>
204        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
205 <      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
206 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
279 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
205 >      <compilerarg value="-Xdoclint:reference/private"/>
206 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
207        <compilerarg line="${build.args}"/>
208        <javac-elements/>
209  
# Line 286 | 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"/>
310 <        </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>
# Line 328 | Line 254
254      </sequential>
255    </macrodef>
256  
257 +  <defjtregtests v="16"/>
258 +  <defjtregtests v="15"/>
259 +  <defjtregtests v="14"/>
260 +  <defjtregtests v="13"/>
261    <defjtregtests v="12"/>
262    <defjtregtests v="11"/>
333  <defjtregtests v="10"/>
334  <defjtregtests v="9"/>
335  <defjtregtests v="8"/>
336  <defjtregtests v="7"/>
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 -->
268 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
269      <attribute name="target"/>
270      <attribute name="workdir"/>
271      <attribute name="classes"/>
# Line 352 | Line 278
278      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
279      <property name="jtreg.verbose" value="nopass,fail,error"/>
280  
355    <local name="modules"/>
356    <condition property="modules">
357      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
358    </condition>
359
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:@{verbose}"/>
# Line 384 | 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="11"/>
315 <  <!-- Workaround "no nested properties in ant" -->
316 <  <macrodef name="define-build-main-properties">
317 <    <attribute name="v"/>
318 <    <sequential>
319 <      <property name="build.main.java"    value="${java@{v}}"/>
320 <      <property name="build.main.javac"   value="${javac@{v}}"/>
321 <      <!-- Force javadoc version to be at least 10,
322 <           so we can use override-methods=summary -->
323 <      <condition property="build.main.javadoc"
324 <                 value="${javadoc11}"
325 <                 else="${javadoc@{v}}">
326 <        <equals arg1="@{v}" arg2="9"/>
327 <      </condition>
328 <    </sequential>
407 <  </macrodef>
408 <  <define-build-main-properties v="${build.main.java.version}"/>
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"
331 >          depends="dist"
332            description="Builds all public jars and docs"/>
413          <!--
414              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
415          -->
333  
334    <target name="compile"
335            depends="configure-compiler"
# Line 439 | Line 356
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 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
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"/>
369        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
370        <compilerarg line="${build.args}"/>
# Line 468 | 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 481 | Line 411
411   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
412      <javadoc destdir="${docs.dir}"
413               packagenames="none"
414 <             link="${java10.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 <             source="11"
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 ${java10.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="--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:"/>
# Line 513 | Line 447
447            description="Puts all distributable products in single hierarchy"/>
448  
449  
516  <target name="release"
517          depends="dist"
518          description="Puts entire CVS tree, plus distribution productions, in a jar">
519
520    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
521
522    <jar basedir="${basedir}" destfile="${release.jar}">
523      <!-- <exclude name="build/**"/> -->
524      <exclude name="${release.jar}"/>
525      <exclude name="user.properties"/>
526      <exclude name="etc/notes/**"/>
527      <exclude name="src/emulation/**"/>
528      <exclude name="**/SyntaxTest.java"/>
529      <exclude name="**/SuperfluousAbstract.java"/>
530      <manifest>
531        <attribute name="Built-By" value="${user.name}"/>
532        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
533      </manifest>
534    </jar>
535  </target>
536
537
450    <target name="clean"
451            description="Removes all build products">
452      <delete dir="${build.dir}"/>
# Line 559 | 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 594 | 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>
# Line 606 | Line 518
518            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
519            description="Runs tck and jtreg tests for src/main"/>
520  
521 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
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 < <!--     <antcall target="jtreg"> -->
540 < <!--       <param name="build.main.java.version" value="8"/> -->
541 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
542 < <!--     </antcall> -->
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 < <!--   </target> -->
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 <  <target name="test9101112"
564 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
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 <    <antcall target="clean"/>
576 <    <antcall target="test">
577 <      <param name="build.main.java.version" value="9"/>
578 <      <param name="build.main.java" value="${java9}"/>
579 <      <param name="build.main.javac" value="${javac9}"/>
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 <    <antcall target="clean"/>
588 <    <antcall target="test">
589 <      <param name="build.main.java.version" value="10"/>
590 <      <param name="build.main.java" value="${java10}"/>
591 <      <param name="build.main.javac" value="${javac10}"/>
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 <    <antcall target="clean"/>
600 <    <antcall target="test">
601 <      <param name="build.main.java.version" value="11"/>
638 <      <param name="build.main.java" value="${java11}"/>
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 <    <antcall target="clean"/>
612 <    <antcall target="test">
613 <      <param name="build.main.java.version" value="12"/>
614 <      <param name="build.main.java" value="${java12}"/>
615 <      <param name="build.main.javac" value="${javac12}"/>
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 <    <antcall target="docs">
622 <      <param name="build.main.java.version" value="12"/>
623 <      <param name="build.main.java" value="${java12}"/>
624 <      <param name="build.main.javac" value="${javac12}"/>
625 <      <param name="build.main.javadoc" value="${javadoc12}"/>
621 >  </target>
622 >
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 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
636 <    <antcall target="clean"/>
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 +  <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 +  <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="configure-compiler">
# Line 679 | Line 688
688    </target>
689  
690  
682
683  <!-- Various demos and test programs -->
684
685
686  <!-- description="Benchmark from Doug Lea's AQS paper" -->
687  <target name="loops" depends="configure-compiler">
688
689    <mkdir dir="${build.loops.dir}"/>
690
691    <javac srcdir="${loops.src.dir}"
692          destdir="${build.loops.dir}"
693            debug="${build.debug}"
694       debuglevel="${build.debuglevel}"
695      deprecation="${build.deprecation}"
696           source="${build.sourcelevel}"
697           target="${build.sourcelevel}"
698         encoding="ASCII"
699             fork="true">
700
701      <compilerarg line="${build.args}"/>
702      <classpath refid="loops.classpath"/>
703      <compilerarg value="-XDignore.symbol.file=true"/>
704
705    </javac>
706
707    <java classname="ALoops" fork="true">
708      <classpath refid="loops.classpath"/>
709    </java>
710  </target>
711
712
691    <target name="compile-test-loops" depends="jar"
692            description="Compiles all the perf tests in src/test/loops">
693  
# Line 728 | Line 706
706  
707        <include name="*.java"/>
708        <compilerarg value="-XDignore.symbol.file=true"/>
709 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
710 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
733 <      <compilerarg line="${build.args}"/>
734 <    </javac>
735 <  </target>
736 <
737 <
738 <  <!-- jsr166 4jdk8 -->
739 <
740 <  <target name="4jdk8compile"
741 <          depends="configure-compiler"
742 <          description="Compiles src/jdk8 sources, targeting jdk8">
743 <
744 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
745 <
746 <    <javac srcdir="${4jdk8src.dir}"
747 <           destdir="${build.4jdk8.classes.dir}"
748 <           debug="${build.debug}"
749 <           debuglevel="${build.debuglevel}"
750 <           deprecation="${build.deprecation}"
751 <           source="8"
752 <           target="8"
753 <           classpath=""
754 <           bootclasspath="${bootclasspath8}"
755 <           includeAntRuntime="false"
756 <           includeJavaRuntime="false"
757 <           encoding="ASCII"
758 <           executable="${javac8}"
759 <           fork="true">
760 <      <include name="**/*.java"/>
761 <      <compilerarg value="-Xprefer:source"/>
762 <      <compilerarg value="-XDignore.symbol.file=true"/>
763 <      <compilerarg value="-Xlint:all"/>
764 <      <compilerarg value="-Werror"/>
765 <      <compilerarg line="${build.args}"/>
766 <    </javac>
767 <  </target>
768 <
769 <  <target name="4jdk8doclint"
770 <          depends="configure-compiler"
771 <          description="Finds doclint warnings">
772 <
773 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
774 <
775 <    <javac srcdir="${4jdk8src.dir}"
776 <           destdir="${build.4jdk8.classes.dir}"
777 <           debug="${build.debug}"
778 <           debuglevel="${build.debuglevel}"
779 <           deprecation="${build.deprecation}"
780 <           source="8"
781 <           target="8"
782 <           classpath=""
783 <           bootclasspath="${bootclasspath8}"
784 <           includeAntRuntime="false"
785 <           includeJavaRuntime="false"
786 <           encoding="ASCII"
787 <           executable="${javac8}"
788 <           fork="true">
789 <      <include name="**/*.java"/>
790 <      <compilerarg value="-Xprefer:source"/>
791 <      <compilerarg value="-XDignore.symbol.file=true"/>
792 <      <compilerarg value="-Xlint:all"/>
793 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
709 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
710 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
711        <compilerarg line="${build.args}"/>
712      </javac>
713    </target>
714  
715  
716 <  <target name="4jdk8jar"
717 <          depends="4jdk8compile"
801 <          description="Builds library jar from compiled sources">
802 <
803 <    <jar destfile="${4jdk8product.jar}">
804 <      <fileset dir="${build.4jdk8.classes.dir}"/>
805 <      <manifest>
806 <        <attribute name="Built-By" value="${user.name}"/>
807 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
808 <      </manifest>
809 <    </jar>
810 <  </target>
811 <
812 <
813 <  <target name="4jdk8-tck"
814 <          depends="4jdk8jar"
815 <          description="Runs tck tests for jsr166-4jdk8 directly">
816 <
817 <    <run-tck-tests
818 <      target="8"
819 <      workdir="${build.4jdk8.dir}"
820 <      classes="${4jdk8product.jar}">
821 <      <javac-elements>
822 <        <!-- JDK9+ test classes -->
823 <        <exclude name="*9Test.java"/>
824 <        <exclude name="*10Test.java"/>
825 <        <compilerarg value="-Werror"/>
826 <      </javac-elements>
827 <    </run-tck-tests>
828 <  </target>
829 <
830 <
831 <  <target name="4jdk8-jtreg"
832 <          depends="4jdk8jar"
833 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
834 <    <run-jtreg-tests
835 <       target="8"
836 <       workdir="${build.4jdk8.dir}"
837 <       classes="${4jdk8product.jar}"/>
838 <  </target>
839 <
840 <
841 <  <target name="4jdk8-test"
842 <          depends="4jdk8-tck, 4jdk8-jtreg"
843 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
844 <
845 <
846 <  <target name="4jdk8docs"
847 <          description="Builds javadocs for src/jdk8 to dist dir">
848 <
849 <    <delete dir="${4jdk8docs.dir}"/>
850 <    <mkdir dir="${4jdk8docs.dir}"/>
851 <
852 <    <javadoc destdir="${4jdk8docs.dir}"
853 <             packagenames="none"
854 <             link="${java8.api.url}"
855 <             overview="${4jdk8src.dir}/intro.html"
856 <             access="${build.javadoc.access}"
857 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
858 <             classpath=""
859 <             source="8"
860 <             executable="${javadoc8}"
861 <             failonerror = "true">
862 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
863 <        <include name="**/*.java"/>
864 <      </fileset>
865 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
866 <      <arg value="-XDignore.symbol.file=true"/>
867 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
868 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
869 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
870 < <!-- @apiNote tag currently unused -->
871 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
872 <    </javadoc>
873 <  </target>
874 <
875 <
876 <  <target name="4jdk8dist"
877 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
878 <          description="Puts all distributable products in single hierarchy"/>
879 <
880 <
881 <  <target name="4jdk8clean"
882 <          description="Removes all 4jdk8 build products">
883 <    <delete dir="${build.4jdk8.dir}"/>
884 <  </target>
885 <
886 <
887 <  <target name="4jdk8dist-jar"
888 <          depends="4jdk8clean, 4jdk8jar">
889 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
890 <  </target>
891 <
892 <
893 <  <target name="4jdk8dist-docs"
894 <          depends="4jdk8clean, 4jdk8docs">
895 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
896 <  </target>
897 <
898 <
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) -->
900
901  <target name="4jdk7compile" depends="configure-compiler">
902    <mkdir dir="${build.4jdk7.classes.dir}"/>
903
904    <javac srcdir="${4jdk7src.dir}"
905           destdir="${build.4jdk7.classes.dir}"
906           debug="${build.debug}"
907           debuglevel="${build.debuglevel}"
908           deprecation="${build.deprecation}"
909           source="6"
910           target="6"
911           classpath=""
912           bootclasspath="${bootclasspath6}"
913           includeAntRuntime="false"
914           includeJavaRuntime="false"
915           encoding="ASCII"
916           executable="${javac7}"
917           fork="true">
918
919      <include name="**/*.java"/>
920      <compilerarg value="-Xprefer:source"/>
921      <compilerarg value="-XDignore.symbol.file=true"/>
922      <compilerarg value="-Xlint:all"/>
923      <compilerarg value="-Werror"/>
924      <compilerarg line="${build.args}"/>
925    </javac>
926  </target>
927
928  <target name="4jdk7doclint" depends="configure-compiler">
929    <mkdir dir="${build.4jdk7.classes.dir}"/>
930
931    <javac srcdir="${4jdk7src.dir}"
932           destdir="${build.4jdk7.classes.dir}"
933           debug="${build.debug}"
934           debuglevel="${build.debuglevel}"
935           deprecation="${build.deprecation}"
936           source="6"
937           target="6"
938           classpath=""
939           bootclasspath="${bootclasspath6}"
940           includeAntRuntime="false"
941           includeJavaRuntime="false"
942           encoding="ASCII"
943           executable="${javac8}"
944           fork="true">
945
946      <include name="**/*.java"/>
947      <compilerarg value="-Xprefer:source"/>
948      <compilerarg value="-XDignore.symbol.file=true"/>
949      <compilerarg value="-Xlint:all"/>
950      <compilerarg value="-Xdoclint:all/protected"/>
951      <compilerarg line="${build.args}"/>
952    </javac>
953  </target>
954
955  <target name="4jdk7jar" depends="4jdk7compile">
956    <jar destfile="${4jdk7product.jar}">
957      <fileset dir="${build.4jdk7.classes.dir}"/>
958      <manifest>
959        <attribute name="Built-By" value="${user.name}"/>
960        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
961      </manifest>
962    </jar>
963  </target>
964
965  <target name="4jdk7-tck" depends="4jdk7jar">
966    <run-tck-tests
967      target="7"
968      workdir="${build.4jdk7.dir}"
969      classes="${4jdk7product.jar}">
970      <javac-elements>
971        <!-- JDK8+ test classes -->
972        <exclude name="*8Test.java"/>
973        <exclude name="*9Test.java"/>
974        <exclude name="*10Test.java"/>
975        <exclude name="DoubleAccumulatorTest.java"/>
976        <exclude name="DoubleAdderTest.java"/>
977        <exclude name="LongAccumulatorTest.java"/>
978        <exclude name="LongAdderTest.java"/>
979        <exclude name="CompletableFutureTest.java"/>
980        <exclude name="SplittableRandomTest.java"/>
981        <exclude name="StampedLockTest.java"/>
982        <exclude name="SubmissionPublisherTest.java"/>
983        <compilerarg value="-Werror"/>
984      </javac-elements>
985    </run-tck-tests>
986  </target>
987
988  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
989  <target name="4jdk7-tck-junit" depends="4jdk7compile">
990
991    <junit printsummary="true"
992           showoutput="true"
993           errorProperty="junit.failed"
994           failureProperty="junit.failed"
995           includeantruntime="true"
996           jvm="${java7}"
997           fork="true">
998
999      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
1000      <jvmarg value="-server"/>
1001
1002      <classpath>
1003        <pathelement location="${junit.jar}"/>
1004        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
1005      </classpath>
1006
1007      <formatter type="brief"/>
1008
1009      <test name="${jsr166.tckTestClass}" haltonfailure="no">
1010      </test>
1011    </junit>
1012  </target>
1013
1014  <target name="4jdk7-jtreg" depends="4jdk7jar">
1015    <run-jtreg-tests
1016       target="7"
1017       workdir="${build.4jdk7.dir}"
1018       classes="${4jdk7product.jar}"/>
1019  </target>
1020
1021  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1022
1023  <target name="4jdk7docs">
1024    <delete dir="${4jdk7docs.dir}"/>
1025    <mkdir dir="${4jdk7docs.dir}"/>
1026
1027    <javadoc destdir="${4jdk7docs.dir}"
1028             packagenames="none"
1029             link="${java7.api.url}"
1030             overview="${4jdk7src.dir}/intro.html"
1031             access="${build.javadoc.access}"
1032             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1033             classpath=""
1034             executable="${javadoc7}"
1035             failonerror = "true">
1036      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1037        <include name="**/*.java"/>
1038      </fileset>
1039      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1040      <arg value="-XDignore.symbol.file=true"/>
1041    </javadoc>
1042  </target>
1043
1044  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1045
1046  <target name="4jdk7clean">
1047    <delete dir="${build.4jdk7.dir}"/>
1048  </target>
1049
1050  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1051    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1052  </target>
1053
1054  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1055    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1056  </target>
1057
1058
719    <!-- jsr166x (no longer maintained) -->
1060
1061  <target name="jsr166xcompile" depends="configure-compiler">
1062    <mkdir dir="${build.jsr166x.classes.dir}"/>
1063
1064    <javac srcdir="${topsrc.dir}"
1065           destdir="${build.jsr166x.classes.dir}"
1066           debug="${build.debug}"
1067           debuglevel="${build.debuglevel}"
1068           deprecation="${build.deprecation}"
1069           classpath=""
1070           bootclasspath="${bootclasspath6}"
1071           source="5"
1072           target="5"
1073           includeAntRuntime="false"
1074           includeJavaRuntime="false"
1075           encoding="ASCII"
1076           executable="${javac7}"
1077           fork="true">
1078      <include name="jsr166x/**/*.java"/>
1079      <compilerarg value="-XDignore.symbol.file=true"/>
1080      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1081      <compilerarg value="-Werror"/>
1082      <compilerarg line="${build.args}"/>
1083    </javac>
1084  </target>
1085
1086  <target name="jsr166xjar" depends="jsr166xcompile">
1087    <jar destfile="${jsr166x.jar}">
1088      <fileset dir="${build.jsr166x.classes.dir}"/>
1089      <manifest>
1090        <attribute name="Built-By" value="${user.name}"/>
1091        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1092      </manifest>
1093    </jar>
1094  </target>
1095
1096  <target name="jsr166xdocs">
1097    <delete dir="${jsr166xdocs.dir}"/>
1098    <mkdir dir="${jsr166xdocs.dir}"/>
1099
1100    <javadoc destdir="${jsr166xdocs.dir}"
1101             packagenames="jsr166x.*"
1102             link="${java.api.url}"
1103             access="${build.javadoc.access}"
1104             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1105             bootclasspath="${bootclasspath6}"
1106             source="5"
1107             executable="${javadoc7}"
1108             failonerror = "true">
1109      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1110      <arg value="-XDignore.symbol.file=true"/>
1111    </javadoc>
1112  </target>
1113
1114  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1115
1116  <target name="jsr166xclean">
1117    <delete dir="${build.jsr166x.dir}"/>
1118  </target>
1119
1120  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1121    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1122  </target>
1123
1124  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1125    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1126  </target>
1127
1128
720    <!-- jsr166y (no longer maintained) -->
1130
1131  <target name="jsr166ycompile" depends="configure-compiler">
1132    <mkdir dir="${build.jsr166y.classes.dir}"/>
1133
1134    <javac srcdir="${topsrc.dir}"
1135           destdir="${build.jsr166y.classes.dir}"
1136           debug="${build.debug}"
1137           debuglevel="${build.debuglevel}"
1138           deprecation="${build.deprecation}"
1139           source="6"
1140           target="6"
1141           classpath=""
1142           bootclasspath="${bootclasspath6}"
1143           includeAntRuntime="false"
1144           includeJavaRuntime="false"
1145           encoding="ASCII"
1146           executable="${javac7}"
1147           fork="true">
1148
1149      <include name="jsr166y/**/*.java"/>
1150      <compilerarg value="-XDignore.symbol.file=true"/>
1151      <compilerarg value="-Xlint:all"/>
1152      <compilerarg value="-Werror"/>
1153      <compilerarg line="${build.args}"/>
1154    </javac>
1155  </target>
1156
1157  <target name="jsr166yjar" depends="jsr166ycompile">
1158    <jar destfile="${jsr166y.jar}" index="true">
1159      <fileset dir="${build.jsr166y.classes.dir}"/>
1160      <manifest>
1161        <attribute name="Built-By" value="${user.name}"/>
1162        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1163      </manifest>
1164    </jar>
1165  </target>
1166
1167  <target name="jsr166ydocs">
1168    <delete dir="${jsr166ydocs.dir}"/>
1169    <mkdir dir="${jsr166ydocs.dir}"/>
1170
1171    <javadoc destdir="${jsr166ydocs.dir}"
1172             packagenames="jsr166y.*"
1173             link="${java.api.url}"
1174             access="${build.javadoc.access}"
1175             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1176             bootclasspath="${bootclasspath6}"
1177             source="6"
1178             executable="${javadoc7}"
1179             failonerror = "true">
1180      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1181      <arg value="-XDignore.symbol.file=true"/>
1182    </javadoc>
1183  </target>
1184
1185  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1186
1187  <target name="jsr166yclean">
1188    <delete dir="${build.jsr166y.dir}"/>
1189  </target>
1190
1191  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1192    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1193  </target>
1194
1195  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1196    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1197  </target>
1198
1199
721    <!-- extra166y (no longer maintained) -->
1201
1202  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1203    <mkdir dir="${build.extra166y.classes.dir}"/>
1204
1205    <javac srcdir="${topsrc.dir}"
1206           destdir="${build.extra166y.classes.dir}"
1207           debug="${build.debug}"
1208           debuglevel="${build.debuglevel}"
1209           deprecation="${build.deprecation}"
1210           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1211           classpath=""
1212           source="6"
1213           target="6"
1214           includeAntRuntime="false"
1215           includeJavaRuntime="false"
1216           encoding="ASCII"
1217           executable="${javac7}"
1218           fork="true">
1219
1220      <include name="extra166y/**/*.java"/>
1221      <compilerarg value="-XDignore.symbol.file=true"/>
1222      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1223      <compilerarg value="-Werror"/>
1224      <compilerarg line="${build.args}"/>
1225    </javac>
1226  </target>
1227
1228  <target name="extra166yjar" depends="extra166ycompile">
1229    <jar destfile="${extra166y.jar}" index="true">
1230      <fileset dir="${build.extra166y.classes.dir}"/>
1231      <manifest>
1232        <attribute name="Built-By" value="${user.name}"/>
1233        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1234      </manifest>
1235    </jar>
1236  </target>
1237
1238  <target name="extra166ydocs">
1239    <delete dir="${extra166ydocs.dir}"/>
1240    <mkdir dir="${extra166ydocs.dir}"/>
1241
1242    <javadoc destdir="${extra166ydocs.dir}"
1243             packagenames="extra166y.*"
1244             link="${java.api.url}"
1245             access="${build.javadoc.access}"
1246             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1247             bootclasspath="${bootclasspath6}"
1248             source="6"
1249             executable="${javadoc7}">
1250      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1251      <arg value="-XDignore.symbol.file=true"/>
1252    </javadoc>
1253  </target>
1254
1255  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1256
1257  <target name="extra166yclean">
1258    <delete dir="${build.extra166y.dir}"/>
1259  </target>
1260
1261  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1262    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1263  </target>
1264
1265  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1266    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1267  </target>
1268
1269
722    <!-- jsr166e (no longer maintained) -->
723  
1272  <property name="build.jsr166e.java.version" value="6"/>
1273  <property name="build.jsr166e.javac" value="${javac6}"/>
1274
1275  <target name="jsr166ecompile" depends="configure-compiler">
1276    <mkdir dir="${build.jsr166e.classes.dir}"/>
1277
1278    <javac srcdir="${topsrc.dir}"
1279           destdir="${build.jsr166e.classes.dir}"
1280           debug="${build.debug}"
1281           debuglevel="${build.debuglevel}"
1282           deprecation="${build.deprecation}"
1283           source="${build.jsr166e.java.version}"
1284           target="${build.jsr166e.java.version}"
1285           classpath=""
1286           includeAntRuntime="false"
1287           includeJavaRuntime="false"
1288           executable="${build.jsr166e.javac}"
1289           fork="true">
1290
1291      <include name="jsr166e/**/*.java"/>
1292      <compilerarg value="-XDignore.symbol.file=true"/>
1293      <compilerarg value="-Xlint:all"/>
1294      <compilerarg value="-Werror"/>
1295      <compilerarg line="${build.args}"/>
1296    </javac>
1297  </target>
1298
1299  <target name="jsr166edoclint">
1300    <mkdir dir="${build.jsr166e.classes.dir}"/>
1301
1302    <javac srcdir="${topsrc.dir}"
1303           destdir="${build.jsr166e.classes.dir}"
1304           debug="${build.debug}"
1305           debuglevel="${build.debuglevel}"
1306           deprecation="${build.deprecation}"
1307           source="${build.jsr166e.java.version}"
1308           target="${build.jsr166e.java.version}"
1309           classpath=""
1310           bootclasspath="${bootclasspath6}"
1311           includeAntRuntime="false"
1312           includeJavaRuntime="false"
1313           executable="${javac8}"
1314           fork="true">
1315
1316      <include name="jsr166e/**/*.java"/>
1317      <compilerarg value="-XDignore.symbol.file=true"/>
1318      <compilerarg value="-Xlint:all"/>
1319      <compilerarg value="-Werror"/>
1320      <compilerarg value="-Xdoclint:all/protected"/>
1321    </javac>
1322  </target>
1323
1324  <target name="jsr166ejar" depends="jsr166ecompile">
1325    <jar destfile="${jsr166e.jar}" index="true">
1326      <fileset dir="${build.jsr166e.classes.dir}"/>
1327      <manifest>
1328        <attribute name="Built-By" value="${user.name}"/>
1329        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1330      </manifest>
1331    </jar>
1332  </target>
1333
1334  <target name="jsr166edocs">
1335    <delete dir="${jsr166edocs.dir}"/>
1336    <mkdir dir="${jsr166edocs.dir}"/>
1337
1338    <javadoc destdir="${jsr166edocs.dir}"
1339             packagenames="jsr166e.*"
1340             link="${java.api.url}"
1341             access="${build.javadoc.access}"
1342             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1343             source="${build.jsr166e.java.version}"
1344             executable="${javadoc7}"
1345             failonerror = "true">
1346      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1347      <arg value="-XDignore.symbol.file=true"/>
1348    </javadoc>
1349  </target>
1350
1351  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1352    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1353    <run-tck-tests
1354      tck.src.dir="${test.src.dir}/tck-jsr166e"
1355      target="${build.jsr166e.java.version}"
1356      workdir="${build.jsr166e.dir}"
1357      classes="${jsr166e.jar}"/>
1358  </target>
1359
1360  <target name="jsr166e-tck">
1361
1362 <!--     <antcall target="clean"/> -->
1363 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1364 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1365 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1366 <!--     </antcall> -->
1367
1368    <antcall target="clean"/>
1369    <antcall target="jsr166e-tck-one-java-version">
1370      <param name="build.jsr166e.java.version" value="7"/>
1371      <param name="build.jsr166e.javac" value="${javac7}"/>
1372    </antcall>
1373
1374    <antcall target="clean"/>
1375    <antcall target="jsr166e-tck-one-java-version">
1376      <param name="build.jsr166e.java.version" value="6"/>
1377      <param name="build.jsr166e.javac" value="${javac6}"/>
1378    </antcall>
1379  </target>
1380
1381  <target name="jsr166e-test" depends="jsr166e-tck"/>
1382
1383  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1384
1385  <target name="jsr166eclean">
1386    <delete dir="${build.jsr166e.dir}"/>
1387  </target>
1388
1389  <target name="jsr166edist-jar"
1390          depends="jsr166eclean, jsr166ejar">
1391    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1392  </target>
1393
1394  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1395    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1396  </target>
1397
1398
724   <!-- Find buglets that can be detected by static build tools -->
725  
726   <!--   <target name="lint"> -->
# Line 1413 | Line 738
738  
739  
740   <!-- ==============================================================
741 <  Experimental errorprone support - https://errorprone.info
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 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
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
# Line 1430 | Line 767
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"
# Line 1462 | Line 801
801        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
802        <compilerarg value="-J--illegal-access=permit"/>
803        <compilerarg value="-XDcompilePolicy=simple"/>
804 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
804 >      <compilerarg value="-processorpath"/>
805 >      <compilerarg pathref="errorprone.processorpath.path"/>
806        <compilerarg value="-Xplugin:ErrorProne
807                            ${errorprone.jsr166.flags}"/>
808        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1479 | 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          <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
827          <compilerarg value="-J--illegal-access=permit"/>
828          <compilerarg value="-XDcompilePolicy=simple"/>
829 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
829 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
830          <compilerarg value="-Xplugin:ErrorProne
831                              ${errorprone.jsr166.flags}
832                              ${errorprone.jsr166.test.flags}"/>
# Line 1502 | Line 842
842            description="Run errorprone over jtreg tests (experimental)">
843  
844      <run-jtreg-tests
845 <       target="${build.main.java.version}"
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.jar}"/>
852 >        <arg value="-javacoption:${errorprone.processorpath}"/>
853          <arg value="-javacoption:-Xplugin:ErrorProne
854                              ${errorprone.jsr166.flags}
855                              ${errorprone.jsr166.test.flags}

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines