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.282 by jsr166, Tue Oct 9 01:34:19 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) -->
140 <  <!-- But pin to jdk 10 until fix for -->
141 <  <!-- 8211194: javadoc -link doesn't take module path into consideration -->
142 <  <property name="java.docroot.url"   value="${java10.docroot.url}"/>
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 -->
212  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
213  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
214  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
215  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
216  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
217  <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 224 | 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 247 | Line 183
183  
184      <sequential>
185  
250    <local name="modules"/>
251    <condition property="modules">
252      <available file="${jdk@{compile-target}.home}/lib/modules" type="file"/>
253    </condition>
254
255    <local name="use-doclint"/>
256    <condition property="use-doclint">
257      <not> <equals arg1="@{target}" arg2="7"/> </not>
258    </condition>
259
186      <mkdir dir="@{workdir}/tck-classes"/>
187  
188      <javac srcdir="@{tck.src.dir}"
# Line 276 | 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"/>
281 <      <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 288 | 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"/>
312 <        </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 330 | 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"/>
335  <defjtregtests v="10"/>
336  <defjtregtests v="9"/>
337  <defjtregtests v="8"/>
338  <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 354 | Line 278
278      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
279      <property name="jtreg.verbose" value="nopass,fail,error"/>
280  
357    <local name="modules"/>
358    <condition property="modules">
359      <available file="${jdk@{target}.home}/lib/modules" type="file"/>
360    </condition>
361
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 386 | 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, so we can use override-methods=summary -->
322 <      <!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
323 <      <condition property="build.main.javadoc"
324 <                 value="${javadoc12}"
325 <                 else="${javadoc@{v}}">
326 <        <matches pattern="^(9|10|11)$" string="@{v}"/>
327 <      </condition>
328 <    </sequential>
409 <  </macrodef>
410 <  <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"/>
415          <!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist -->
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="${java11.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"/>
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 514 | Line 447
447            description="Puts all distributable products in single hierarchy"/>
448  
449  
517  <target name="release"
518          depends="dist"
519          description="Puts entire CVS tree, plus distribution productions, in a jar">
520
521    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
522
523    <jar basedir="${basedir}" destfile="${release.jar}">
524      <!-- <exclude name="build/**"/> -->
525      <exclude name="${release.jar}"/>
526      <exclude name="user.properties"/>
527      <exclude name="etc/notes/**"/>
528      <exclude name="src/emulation/**"/>
529      <exclude name="**/SyntaxTest.java"/>
530      <exclude name="**/SuperfluousAbstract.java"/>
531      <manifest>
532        <attribute name="Built-By" value="${user.name}"/>
533        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
534      </manifest>
535    </jar>
536  </target>
537
538
450    <target name="clean"
451            description="Removes all build products">
452      <delete dir="${build.dir}"/>
# Line 560 | 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 595 | 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 607 | 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"/>
639 <      <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 680 | Line 688
688    </target>
689  
690  
683
684  <!-- Various demos and test programs -->
685
686
687  <!-- description="Benchmark from Doug Lea's AQS paper" -->
688  <target name="loops" depends="configure-compiler">
689
690    <mkdir dir="${build.loops.dir}"/>
691
692    <javac srcdir="${loops.src.dir}"
693          destdir="${build.loops.dir}"
694            debug="${build.debug}"
695       debuglevel="${build.debuglevel}"
696      deprecation="${build.deprecation}"
697           source="${build.sourcelevel}"
698           target="${build.sourcelevel}"
699         encoding="ASCII"
700             fork="true">
701
702      <compilerarg line="${build.args}"/>
703      <classpath refid="loops.classpath"/>
704      <compilerarg value="-XDignore.symbol.file=true"/>
705
706    </javac>
707
708    <java classname="ALoops" fork="true">
709      <classpath refid="loops.classpath"/>
710    </java>
711  </target>
712
713
691    <target name="compile-test-loops" depends="jar"
692            description="Compiles all the perf tests in src/test/loops">
693  
# Line 729 | 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}"/>
734 <      <compilerarg line="${build.args}"/>
735 <    </javac>
736 <  </target>
737 <
738 <
739 <  <!-- jsr166 4jdk8 -->
740 <
741 <  <target name="4jdk8compile"
742 <          depends="configure-compiler"
743 <          description="Compiles src/jdk8 sources, targeting jdk8">
744 <
745 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
746 <
747 <    <javac srcdir="${4jdk8src.dir}"
748 <           destdir="${build.4jdk8.classes.dir}"
749 <           debug="${build.debug}"
750 <           debuglevel="${build.debuglevel}"
751 <           deprecation="${build.deprecation}"
752 <           source="8"
753 <           target="8"
754 <           classpath=""
755 <           bootclasspath="${bootclasspath8}"
756 <           includeAntRuntime="false"
757 <           includeJavaRuntime="false"
758 <           encoding="ASCII"
759 <           executable="${javac8}"
760 <           fork="true">
761 <      <include name="**/*.java"/>
762 <      <compilerarg value="-Xprefer:source"/>
763 <      <compilerarg value="-XDignore.symbol.file=true"/>
764 <      <compilerarg value="-Xlint:all"/>
765 <      <compilerarg value="-Werror"/>
766 <      <compilerarg line="${build.args}"/>
767 <    </javac>
768 <  </target>
769 <
770 <  <target name="4jdk8doclint"
771 <          depends="configure-compiler"
772 <          description="Finds doclint warnings">
773 <
774 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
775 <
776 <    <javac srcdir="${4jdk8src.dir}"
777 <           destdir="${build.4jdk8.classes.dir}"
778 <           debug="${build.debug}"
779 <           debuglevel="${build.debuglevel}"
780 <           deprecation="${build.deprecation}"
781 <           source="8"
782 <           target="8"
783 <           classpath=""
784 <           bootclasspath="${bootclasspath8}"
785 <           includeAntRuntime="false"
786 <           includeJavaRuntime="false"
787 <           encoding="ASCII"
788 <           executable="${javac8}"
789 <           fork="true">
790 <      <include name="**/*.java"/>
791 <      <compilerarg value="-Xprefer:source"/>
792 <      <compilerarg value="-XDignore.symbol.file=true"/>
793 <      <compilerarg value="-Xlint:all"/>
794 <      <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"
802 <          description="Builds library jar from compiled sources">
803 <
804 <    <jar destfile="${4jdk8product.jar}">
805 <      <fileset dir="${build.4jdk8.classes.dir}"/>
806 <      <manifest>
807 <        <attribute name="Built-By" value="${user.name}"/>
808 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
809 <      </manifest>
810 <    </jar>
811 <  </target>
812 <
813 <
814 <  <target name="4jdk8-tck"
815 <          depends="4jdk8jar"
816 <          description="Runs tck tests for jsr166-4jdk8 directly">
817 <
818 <    <run-tck-tests
819 <      target="8"
820 <      workdir="${build.4jdk8.dir}"
821 <      classes="${4jdk8product.jar}">
822 <      <javac-elements>
823 <        <!-- JDK9+ test classes -->
824 <        <exclude name="*9Test.java"/>
825 <        <exclude name="*10Test.java"/>
826 <        <compilerarg value="-Werror"/>
827 <      </javac-elements>
828 <    </run-tck-tests>
829 <  </target>
830 <
831 <
832 <  <target name="4jdk8-jtreg"
833 <          depends="4jdk8jar"
834 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
835 <    <run-jtreg-tests
836 <       target="8"
837 <       workdir="${build.4jdk8.dir}"
838 <       classes="${4jdk8product.jar}"/>
839 <  </target>
840 <
841 <
842 <  <target name="4jdk8-test"
843 <          depends="4jdk8-tck, 4jdk8-jtreg"
844 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
845 <
846 <
847 <  <target name="4jdk8docs"
848 <          description="Builds javadocs for src/jdk8 to dist dir">
849 <
850 <    <delete dir="${4jdk8docs.dir}"/>
851 <    <mkdir dir="${4jdk8docs.dir}"/>
852 <
853 <    <javadoc destdir="${4jdk8docs.dir}"
854 <             packagenames="none"
855 <             link="${java8.api.url}"
856 <             overview="${4jdk8src.dir}/intro.html"
857 <             access="${build.javadoc.access}"
858 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
859 <             classpath=""
860 <             source="8"
861 <             executable="${javadoc8}"
862 <             failonerror = "true">
863 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
864 <        <include name="**/*.java"/>
865 <      </fileset>
866 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
867 <      <arg value="-XDignore.symbol.file=true"/>
868 <      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
869 <      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
870 <      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
871 < <!-- @apiNote tag currently unused -->
872 < <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
873 <    </javadoc>
874 <  </target>
875 <
876 <
877 <  <target name="4jdk8dist"
878 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
879 <          description="Puts all distributable products in single hierarchy"/>
880 <
881 <
882 <  <target name="4jdk8clean"
883 <          description="Removes all 4jdk8 build products">
884 <    <delete dir="${build.4jdk8.dir}"/>
885 <  </target>
886 <
887 <
888 <  <target name="4jdk8dist-jar"
889 <          depends="4jdk8clean, 4jdk8jar">
890 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
891 <  </target>
892 <
893 <
894 <  <target name="4jdk8dist-docs"
895 <          depends="4jdk8clean, 4jdk8docs">
896 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
897 <  </target>
898 <
899 <
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) -->
901
902  <target name="4jdk7compile" 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="${javac7}"
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="-Werror"/>
925      <compilerarg line="${build.args}"/>
926    </javac>
927  </target>
928
929  <target name="4jdk7doclint" depends="configure-compiler">
930    <mkdir dir="${build.4jdk7.classes.dir}"/>
931
932    <javac srcdir="${4jdk7src.dir}"
933           destdir="${build.4jdk7.classes.dir}"
934           debug="${build.debug}"
935           debuglevel="${build.debuglevel}"
936           deprecation="${build.deprecation}"
937           source="6"
938           target="6"
939           classpath=""
940           bootclasspath="${bootclasspath6}"
941           includeAntRuntime="false"
942           includeJavaRuntime="false"
943           encoding="ASCII"
944           executable="${javac8}"
945           fork="true">
946
947      <include name="**/*.java"/>
948      <compilerarg value="-Xprefer:source"/>
949      <compilerarg value="-XDignore.symbol.file=true"/>
950      <compilerarg value="-Xlint:all"/>
951      <compilerarg value="-Xdoclint:all/protected"/>
952      <compilerarg line="${build.args}"/>
953    </javac>
954  </target>
955
956  <target name="4jdk7jar" depends="4jdk7compile">
957    <jar destfile="${4jdk7product.jar}">
958      <fileset dir="${build.4jdk7.classes.dir}"/>
959      <manifest>
960        <attribute name="Built-By" value="${user.name}"/>
961        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
962      </manifest>
963    </jar>
964  </target>
965
966  <target name="4jdk7-tck" depends="4jdk7jar">
967    <run-tck-tests
968      target="7"
969      workdir="${build.4jdk7.dir}"
970      classes="${4jdk7product.jar}">
971      <javac-elements>
972        <!-- JDK8+ test classes -->
973        <exclude name="*8Test.java"/>
974        <exclude name="*9Test.java"/>
975        <exclude name="*10Test.java"/>
976        <exclude name="DoubleAccumulatorTest.java"/>
977        <exclude name="DoubleAdderTest.java"/>
978        <exclude name="LongAccumulatorTest.java"/>
979        <exclude name="LongAdderTest.java"/>
980        <exclude name="CompletableFutureTest.java"/>
981        <exclude name="SplittableRandomTest.java"/>
982        <exclude name="StampedLockTest.java"/>
983        <exclude name="SubmissionPublisherTest.java"/>
984        <compilerarg value="-Werror"/>
985      </javac-elements>
986    </run-tck-tests>
987  </target>
988
989  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
990  <target name="4jdk7-tck-junit" depends="4jdk7compile">
991
992    <junit printsummary="true"
993           showoutput="true"
994           errorProperty="junit.failed"
995           failureProperty="junit.failed"
996           includeantruntime="true"
997           jvm="${java7}"
998           fork="true">
999
1000      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
1001      <jvmarg value="-server"/>
1002
1003      <classpath>
1004        <pathelement location="${junit.jar}"/>
1005        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
1006      </classpath>
1007
1008      <formatter type="brief"/>
1009
1010      <test name="${jsr166.tckTestClass}" haltonfailure="no">
1011      </test>
1012    </junit>
1013  </target>
1014
1015  <target name="4jdk7-jtreg" depends="4jdk7jar">
1016    <run-jtreg-tests
1017       target="7"
1018       workdir="${build.4jdk7.dir}"
1019       classes="${4jdk7product.jar}"/>
1020  </target>
1021
1022  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1023
1024  <target name="4jdk7docs">
1025    <delete dir="${4jdk7docs.dir}"/>
1026    <mkdir dir="${4jdk7docs.dir}"/>
1027
1028    <javadoc destdir="${4jdk7docs.dir}"
1029             packagenames="none"
1030             link="${java7.api.url}"
1031             overview="${4jdk7src.dir}/intro.html"
1032             access="${build.javadoc.access}"
1033             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1034             classpath=""
1035             executable="${javadoc7}"
1036             failonerror = "true">
1037      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1038        <include name="**/*.java"/>
1039      </fileset>
1040      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1041      <arg value="-XDignore.symbol.file=true"/>
1042    </javadoc>
1043  </target>
1044
1045  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1046
1047  <target name="4jdk7clean">
1048    <delete dir="${build.4jdk7.dir}"/>
1049  </target>
1050
1051  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1052    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1053  </target>
1054
1055  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1056    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1057  </target>
1058
1059
719    <!-- jsr166x (no longer maintained) -->
1061
1062  <target name="jsr166xcompile" depends="configure-compiler">
1063    <mkdir dir="${build.jsr166x.classes.dir}"/>
1064
1065    <javac srcdir="${topsrc.dir}"
1066           destdir="${build.jsr166x.classes.dir}"
1067           debug="${build.debug}"
1068           debuglevel="${build.debuglevel}"
1069           deprecation="${build.deprecation}"
1070           classpath=""
1071           bootclasspath="${bootclasspath6}"
1072           source="5"
1073           target="5"
1074           includeAntRuntime="false"
1075           includeJavaRuntime="false"
1076           encoding="ASCII"
1077           executable="${javac7}"
1078           fork="true">
1079      <include name="jsr166x/**/*.java"/>
1080      <compilerarg value="-XDignore.symbol.file=true"/>
1081      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1082      <compilerarg value="-Werror"/>
1083      <compilerarg line="${build.args}"/>
1084    </javac>
1085  </target>
1086
1087  <target name="jsr166xjar" depends="jsr166xcompile">
1088    <jar destfile="${jsr166x.jar}">
1089      <fileset dir="${build.jsr166x.classes.dir}"/>
1090      <manifest>
1091        <attribute name="Built-By" value="${user.name}"/>
1092        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1093      </manifest>
1094    </jar>
1095  </target>
1096
1097  <target name="jsr166xdocs">
1098    <delete dir="${jsr166xdocs.dir}"/>
1099    <mkdir dir="${jsr166xdocs.dir}"/>
1100
1101    <javadoc destdir="${jsr166xdocs.dir}"
1102             packagenames="jsr166x.*"
1103             link="${java.api.url}"
1104             access="${build.javadoc.access}"
1105             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1106             bootclasspath="${bootclasspath6}"
1107             source="5"
1108             executable="${javadoc7}"
1109             failonerror = "true">
1110      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1111      <arg value="-XDignore.symbol.file=true"/>
1112    </javadoc>
1113  </target>
1114
1115  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1116
1117  <target name="jsr166xclean">
1118    <delete dir="${build.jsr166x.dir}"/>
1119  </target>
1120
1121  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1122    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1123  </target>
1124
1125  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1126    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1127  </target>
1128
1129
720    <!-- jsr166y (no longer maintained) -->
1131
1132  <target name="jsr166ycompile" depends="configure-compiler">
1133    <mkdir dir="${build.jsr166y.classes.dir}"/>
1134
1135    <javac srcdir="${topsrc.dir}"
1136           destdir="${build.jsr166y.classes.dir}"
1137           debug="${build.debug}"
1138           debuglevel="${build.debuglevel}"
1139           deprecation="${build.deprecation}"
1140           source="6"
1141           target="6"
1142           classpath=""
1143           bootclasspath="${bootclasspath6}"
1144           includeAntRuntime="false"
1145           includeJavaRuntime="false"
1146           encoding="ASCII"
1147           executable="${javac7}"
1148           fork="true">
1149
1150      <include name="jsr166y/**/*.java"/>
1151      <compilerarg value="-XDignore.symbol.file=true"/>
1152      <compilerarg value="-Xlint:all"/>
1153      <compilerarg value="-Werror"/>
1154      <compilerarg line="${build.args}"/>
1155    </javac>
1156  </target>
1157
1158  <target name="jsr166yjar" depends="jsr166ycompile">
1159    <jar destfile="${jsr166y.jar}" index="true">
1160      <fileset dir="${build.jsr166y.classes.dir}"/>
1161      <manifest>
1162        <attribute name="Built-By" value="${user.name}"/>
1163        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1164      </manifest>
1165    </jar>
1166  </target>
1167
1168  <target name="jsr166ydocs">
1169    <delete dir="${jsr166ydocs.dir}"/>
1170    <mkdir dir="${jsr166ydocs.dir}"/>
1171
1172    <javadoc destdir="${jsr166ydocs.dir}"
1173             packagenames="jsr166y.*"
1174             link="${java.api.url}"
1175             access="${build.javadoc.access}"
1176             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1177             bootclasspath="${bootclasspath6}"
1178             source="6"
1179             executable="${javadoc7}"
1180             failonerror = "true">
1181      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1182      <arg value="-XDignore.symbol.file=true"/>
1183    </javadoc>
1184  </target>
1185
1186  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1187
1188  <target name="jsr166yclean">
1189    <delete dir="${build.jsr166y.dir}"/>
1190  </target>
1191
1192  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1193    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1194  </target>
1195
1196  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1197    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1198  </target>
1199
1200
721    <!-- extra166y (no longer maintained) -->
1202
1203  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1204    <mkdir dir="${build.extra166y.classes.dir}"/>
1205
1206    <javac srcdir="${topsrc.dir}"
1207           destdir="${build.extra166y.classes.dir}"
1208           debug="${build.debug}"
1209           debuglevel="${build.debuglevel}"
1210           deprecation="${build.deprecation}"
1211           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1212           classpath=""
1213           source="6"
1214           target="6"
1215           includeAntRuntime="false"
1216           includeJavaRuntime="false"
1217           encoding="ASCII"
1218           executable="${javac7}"
1219           fork="true">
1220
1221      <include name="extra166y/**/*.java"/>
1222      <compilerarg value="-XDignore.symbol.file=true"/>
1223      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1224      <compilerarg value="-Werror"/>
1225      <compilerarg line="${build.args}"/>
1226    </javac>
1227  </target>
1228
1229  <target name="extra166yjar" depends="extra166ycompile">
1230    <jar destfile="${extra166y.jar}" index="true">
1231      <fileset dir="${build.extra166y.classes.dir}"/>
1232      <manifest>
1233        <attribute name="Built-By" value="${user.name}"/>
1234        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1235      </manifest>
1236    </jar>
1237  </target>
1238
1239  <target name="extra166ydocs">
1240    <delete dir="${extra166ydocs.dir}"/>
1241    <mkdir dir="${extra166ydocs.dir}"/>
1242
1243    <javadoc destdir="${extra166ydocs.dir}"
1244             packagenames="extra166y.*"
1245             link="${java.api.url}"
1246             access="${build.javadoc.access}"
1247             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1248             bootclasspath="${bootclasspath6}"
1249             source="6"
1250             executable="${javadoc7}">
1251      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1252      <arg value="-XDignore.symbol.file=true"/>
1253    </javadoc>
1254  </target>
1255
1256  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1257
1258  <target name="extra166yclean">
1259    <delete dir="${build.extra166y.dir}"/>
1260  </target>
1261
1262  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1263    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1264  </target>
1265
1266  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1267    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1268  </target>
1269
1270
722    <!-- jsr166e (no longer maintained) -->
723  
1273  <property name="build.jsr166e.java.version" value="6"/>
1274  <property name="build.jsr166e.javac" value="${javac6}"/>
1275
1276  <target name="jsr166ecompile" depends="configure-compiler">
1277    <mkdir dir="${build.jsr166e.classes.dir}"/>
1278
1279    <javac srcdir="${topsrc.dir}"
1280           destdir="${build.jsr166e.classes.dir}"
1281           debug="${build.debug}"
1282           debuglevel="${build.debuglevel}"
1283           deprecation="${build.deprecation}"
1284           source="${build.jsr166e.java.version}"
1285           target="${build.jsr166e.java.version}"
1286           classpath=""
1287           includeAntRuntime="false"
1288           includeJavaRuntime="false"
1289           executable="${build.jsr166e.javac}"
1290           fork="true">
1291
1292      <include name="jsr166e/**/*.java"/>
1293      <compilerarg value="-XDignore.symbol.file=true"/>
1294      <compilerarg value="-Xlint:all"/>
1295      <compilerarg value="-Werror"/>
1296      <compilerarg line="${build.args}"/>
1297    </javac>
1298  </target>
1299
1300  <target name="jsr166edoclint">
1301    <mkdir dir="${build.jsr166e.classes.dir}"/>
1302
1303    <javac srcdir="${topsrc.dir}"
1304           destdir="${build.jsr166e.classes.dir}"
1305           debug="${build.debug}"
1306           debuglevel="${build.debuglevel}"
1307           deprecation="${build.deprecation}"
1308           source="${build.jsr166e.java.version}"
1309           target="${build.jsr166e.java.version}"
1310           classpath=""
1311           bootclasspath="${bootclasspath6}"
1312           includeAntRuntime="false"
1313           includeJavaRuntime="false"
1314           executable="${javac8}"
1315           fork="true">
1316
1317      <include name="jsr166e/**/*.java"/>
1318      <compilerarg value="-XDignore.symbol.file=true"/>
1319      <compilerarg value="-Xlint:all"/>
1320      <compilerarg value="-Werror"/>
1321      <compilerarg value="-Xdoclint:all/protected"/>
1322    </javac>
1323  </target>
1324
1325  <target name="jsr166ejar" depends="jsr166ecompile">
1326    <jar destfile="${jsr166e.jar}" index="true">
1327      <fileset dir="${build.jsr166e.classes.dir}"/>
1328      <manifest>
1329        <attribute name="Built-By" value="${user.name}"/>
1330        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1331      </manifest>
1332    </jar>
1333  </target>
1334
1335  <target name="jsr166edocs">
1336    <delete dir="${jsr166edocs.dir}"/>
1337    <mkdir dir="${jsr166edocs.dir}"/>
1338
1339    <javadoc destdir="${jsr166edocs.dir}"
1340             packagenames="jsr166e.*"
1341             link="${java.api.url}"
1342             access="${build.javadoc.access}"
1343             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1344             source="${build.jsr166e.java.version}"
1345             executable="${javadoc7}"
1346             failonerror = "true">
1347      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1348      <arg value="-XDignore.symbol.file=true"/>
1349    </javadoc>
1350  </target>
1351
1352  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1353    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1354    <run-tck-tests
1355      tck.src.dir="${test.src.dir}/tck-jsr166e"
1356      target="${build.jsr166e.java.version}"
1357      workdir="${build.jsr166e.dir}"
1358      classes="${jsr166e.jar}"/>
1359  </target>
1360
1361  <target name="jsr166e-tck">
1362
1363 <!--     <antcall target="clean"/> -->
1364 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1365 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1366 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1367 <!--     </antcall> -->
1368
1369    <antcall target="clean"/>
1370    <antcall target="jsr166e-tck-one-java-version">
1371      <param name="build.jsr166e.java.version" value="7"/>
1372      <param name="build.jsr166e.javac" value="${javac7}"/>
1373    </antcall>
1374
1375    <antcall target="clean"/>
1376    <antcall target="jsr166e-tck-one-java-version">
1377      <param name="build.jsr166e.java.version" value="6"/>
1378      <param name="build.jsr166e.javac" value="${javac6}"/>
1379    </antcall>
1380  </target>
1381
1382  <target name="jsr166e-test" depends="jsr166e-tck"/>
1383
1384  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1385
1386  <target name="jsr166eclean">
1387    <delete dir="${build.jsr166e.dir}"/>
1388  </target>
1389
1390  <target name="jsr166edist-jar"
1391          depends="jsr166eclean, jsr166ejar">
1392    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1393  </target>
1394
1395  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1396    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1397  </target>
1398
1399
724   <!-- Find buglets that can be detected by static build tools -->
725  
726   <!--   <target name="lint"> -->
# Line 1414 | 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 1431 | 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 1463 | 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 1480 | 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 1503 | 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