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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines