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.263 by jsr166, Tue Jan 23 06:09:53 2018 UTC vs.
Revision 1.310 by jsr166, Tue Dec 17 02:09:40 2019 UTC

# Line 1 | Line 1
1   <project name="jsr166" default="usage"
2 <  xmlns:if="ant:if" xmlns:unless="ant:unless"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4    xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
# Line 18 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
21  $HOME/jdk/jdk8
22  $HOME/jdk/jdk9
23  $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
26  $HOME/jdk/src/jdk8
27  $HOME/jdk/src/jdk9
28  $HOME/jdk/src/jdk10
28    $HOME/jdk/src/jdk11
29 <  where each of the above is a complete JDK source tree
30 <  (e.g. mercurial forest) or a symlink to same.
29 >  $HOME/jdk/src/jdk12
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 52 | Line 56
56  
57  
58    <!-- Compilation options -->
55  <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 64 | Line 67
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <property name="build.loops.dir"             location="${build.dir}/loops"/>
69  
67  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
69  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
70  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
71
72  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
73  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
74  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
75  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
76
77  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
78  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
79  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
80  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
81
82  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
83  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
84  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
85  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
86
70    <!-- JDK locations -->
71    <property name="jdks.home"  location="${user.home}/jdk"/>
72  
# Line 95 | 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"/>
99 <    <available property="have.java.base"
100 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
101 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
102 <      if:set="have.java.base"/>
103 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
104 <      unless:set="have.java.base"/>
105 <    <local name="modules"/>
106 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
107 <    <local name="boot.jar.dir"/>
108 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
109 <    <path id="bootclasspath@{v}" unless:set="modules">
110 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
111 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
112 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
113 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
114 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
115 <    </path>
116 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
81 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
82      </sequential>
83    </macrodef>
84  
# Line 129 | Line 94
94      </sequential>
95    </macrodef>
96  
132  <defjdklocations v="6"/>
133  <defjdklocations v="7"/>
134  <defjdklocations v="8"/>
135  <defjdklocations v="9"/>
136  <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"/>
144  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
145  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
146  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
147  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
108    <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
109 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
109 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
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"/>
153  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
154  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
155  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
156  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
157  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
158  <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"/>
163 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
164 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
165 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
166 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
167 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
168 <
169 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
170 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
171 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
172 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
173 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
174 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
175 <  <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"/>
179  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
180  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
181  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
182  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
183  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
184  <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"/>
132 <  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
133 <  <!-- The location of jdk9 early access docs (RIP) -->
134 <  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
135 <  <!-- Default jdk doc location (latest stable release seems best) -->
136 <  <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="java.docroot.url"   value="${java9.docroot.url}"/>
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) -->
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 >  <!-- <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://download.java.net/java/early_access/jdk14/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 -->
202  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
203  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
204  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
205  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
206  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
207  <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 213 | 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 236 | Line 177
177  
178      <sequential>
179  
239    <local name="modules"/>
240    <condition property="modules">
241      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
242    </condition>
243
244    <local name="use-doclint"/>
245    <condition property="use-doclint">
246      <not> <equals arg1="@{target}" arg2="7"/> </not>
247    </condition>
248
180      <mkdir dir="@{workdir}/tck-classes"/>
181  
182      <javac srcdir="@{tck.src.dir}"
# Line 265 | 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"/>
270 <      <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 277 | 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"/>
301 <        </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>
234    </macrodef>
235  
236    <!-- Define jtreg test sets for different jdk versions -->
237 <  <fileset dir="${jtreg11.src.dir}">
238 <    <patternset id="jdk11.jtreg.tests">
239 <      <include name="**/*.java"/>
240 <    </patternset>
241 <  </fileset>
242 <
243 <  <fileset dir="${jtreg10.src.dir}">
244 <    <patternset id="jdk10.jtreg.tests">
245 <      <include name="**/*.java"/>
246 <    </patternset>
247 <  </fileset>
248 <
249 <  <fileset dir="${jtreg9.src.dir}">
321 <    <patternset id="jdk9.jtreg.tests">
322 <      <include name="**/*.java"/>
323 <    </patternset>
324 <  </fileset>
325 <
326 <  <fileset dir="${jtreg8.src.dir}">
327 <    <patternset id="jdk8.jtreg.tests">
328 <      <include name="**/*.java"/>
329 <    </patternset>
330 <  </fileset>
237 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
238 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
239 >  <property name="jtreg.test.pattern" value="**/*.java"/>
240 >  <macrodef name="defjtregtests">
241 >    <attribute name="v"/>
242 >    <sequential>
243 >      <fileset dir="${jtreg@{v}.src.dir}">
244 >        <patternset id="jdk@{v}.jtreg.tests">
245 >          <include name="${jtreg.test.pattern}"/>
246 >        </patternset>
247 >      </fileset>
248 >    </sequential>
249 >  </macrodef>
250  
251 <  <fileset dir="${jtreg7.src.dir}">
252 <    <patternset id="jdk7.jtreg.tests">
253 <      <include name="**/*.java"/>
254 <    </patternset>
255 <  </fileset>
251 >  <defjtregtests v="15"/>
252 >  <defjtregtests v="14"/>
253 >  <defjtregtests v="13"/>
254 >  <defjtregtests v="12"/>
255 >  <defjtregtests v="11"/>
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 352 | Line 271
271      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
272      <property name="jtreg.verbose" value="nopass,fail,error"/>
273  
355    <local name="modules"/>
356    <condition property="modules">
357      <available file="${jdk@{target}.home}/jmods" type="dir"/>
358    </condition>
359
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 384 | 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="9"/>
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 <      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
315 <    </sequential>
316 <  </macrodef>
317 <  <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"/>
407          <!--
408              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
409          -->
326  
327    <target name="compile"
328            depends="configure-compiler"
# Line 433 | 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"/>
356 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
357        <compilerarg value="-Werror"/>
358        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
359        <compilerarg line="${build.args}"/>
# Line 462 | Line 380
380    <target name="docs"
381            description="Builds javadocs for src/main to dist dir">
382  
383 <    <delete dir="${docs.dir}"/>
383 >    <delete dir="${docs.dir}" quiet="true"/>
384      <mkdir dir="${docs.dir}"/>
385  
386 +    <!-- old school frames via docs/index.html?overview-summary.html -->
387 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
388 +    <local name="use-frames"/>
389 +    <condition property="use-frames">
390 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
391 +    </condition>
392 +
393      <!-- the packagenames="none" hack below prevents scanning the -->
394      <!-- sourcepath for packages -->
395  
# Line 475 | Line 400
400   <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
401      <javadoc destdir="${docs.dir}"
402               packagenames="none"
403 <             link="${java9.api.url}"
403 >             link="${java.api.url}"
404               overview="${src.dir}/intro.html"
405               access="${build.javadoc.access}"
406               sourcepath="${src.dir}"
407               classpath=""
408 <             source="9"
408 >             source="${build.main.javadoc.source}"
409               executable="${build.main.javadoc}">
410 + <!-- TODO: JDK-8214571 failonerror = "true" -->
411        <fileset dir="${src.dir}" defaultexcludes="yes">
412          <include name="**/*.java"/>
413        </fileset>
414 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
414 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
415        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
416 +      <arg value="-quiet"/>
417        <arg value="-XDignore.symbol.file=true"/>
418        <arg value="-html5"/>
419        <arg value="--patch-module=java.base=${src.dir}"/>
420 <      <arg value="-tag"/>
421 <      <arg value="${javadoc.jls.option}"/>
422 < <!-- @apiNote currently unused -->
423 < <!--       <arg value="-tag"/> -->
424 < <!--       <arg value="apiNote:a:API Note:"/> -->
425 <      <arg value="-tag"/>
499 <      <arg value="implSpec:a:Implementation Requirements:"/>
500 <      <arg value="-tag"/>
501 <      <arg value="implNote:a:Implementation Note:"/>
420 >      <arg value="--frames" if:set="use-frames"/>
421 >      <arg value="--override-methods=summary"/>
422 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
423 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
424 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
425 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
426   <!-- tags added in jdk9: currently unused -->
427 < <!--       <arg value="-tag"/> -->
428 < <!--       <arg value="revised:X"/> -->
505 < <!--       <arg value="-tag"/> -->
506 < <!--       <arg value="spec:X"/> -->
427 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
428 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
429      </javadoc>
430    </target>
431  
# Line 513 | Line 435
435            description="Puts all distributable products in single hierarchy"/>
436  
437  
516  <target name="release"
517          depends="dist"
518          description="Puts entire CVS tree, plus distribution productions, in a jar">
519
520    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
521
522    <jar basedir="${basedir}" destfile="${release.jar}">
523      <!-- <exclude name="build/**"/> -->
524      <exclude name="${release.jar}"/>
525      <exclude name="user.properties"/>
526      <exclude name="etc/notes/**"/>
527      <exclude name="src/emulation/**"/>
528      <exclude name="**/SyntaxTest.java"/>
529      <exclude name="**/SuperfluousAbstract.java"/>
530      <manifest>
531        <attribute name="Built-By" value="${user.name}"/>
532        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
533      </manifest>
534    </jar>
535  </target>
536
537
438    <target name="clean"
439            description="Removes all build products">
440      <delete dir="${build.dir}"/>
# Line 559 | Line 459
459    </target>
460  
461    <target name="tck"
462 <          depends="jar"
462 >          depends="jar"
463            description="Runs tck tests for src/main directly">
464  
465      <run-tck-tests
466 <      target="${build.main.java.version}"
466 >      target="${java.runtime.target}"
467        workdir="${build.dir}"
468        classes="${product.jar}">
469        <javac-elements>
# Line 594 | Line 494
494    </target>
495  
496    <target name="jtreg"
497 <          depends="jar"
497 >          depends="jar"
498            description="Runs jtreg tests for src/main using the jtreg ant task">
499      <run-jtreg-tests
500 <       target="${build.main.java.version}"
500 >       target="${java.runtime.target}"
501         workdir="${build.dir}"
502         classes="${product.jar}"/>
503    </target>
# Line 606 | Line 506
506            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
507            description="Runs tck and jtreg tests for src/main"/>
508  
509 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
509 >  <target name="test-version-permutations"
510 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs">
511 >  </target>
512  
513 < <!--     <antcall target="jtreg"> -->
514 < <!--       <param name="build.main.java.version" value="8"/> -->
515 < <!--       <param name="build.main.javac" value="${javac8}"/> -->
516 < <!--     </antcall> -->
513 >  <target name="test11">
514 >    <antcall>
515 >      <param name="java.runtime.target" value="11"/>
516 >      <param name="build.main.javac" value="${javac11}"/>
517 >      <param name="build.main.javadoc" value="${javadoc12}"/>
518 >      <param name="build.main.javadoc.source" value="11"/>
519 >      <target name="clean"/>
520 >      <target name="test"/>
521 >      <target name="docs"/>
522 >    </antcall>
523 >  </target>
524  
525 < <!--   </target> -->
525 >  <target name="test12">
526 >    <antcall>
527 >      <param name="java.runtime.target" value="12"/>
528 >      <param name="build.main.javac" value="${javac12}"/>
529 >      <param name="build.main.javadoc" value="${javadoc12}"/>
530 >      <param name="build.main.javadoc.source" value="12"/>
531 >      <target name="clean"/>
532 >      <target name="test"/>
533 >      <target name="docs"/>
534 >    </antcall>
535 >  </target>
536  
537 <  <target name="test91011"
538 <          description="Runs tck and jtreg tests for src/main for multiple java versions">
537 >  <target name="test13">
538 >    <antcall>
539 >      <param name="java.runtime.target" value="13"/>
540 >      <param name="build.main.javac" value="${javac13}"/>
541 >      <param name="build.main.javadoc" value="${javadoc13}"/>
542 >      <param name="build.main.javadoc.source" value="13"/>
543 >      <target name="clean"/>
544 >      <target name="test"/>
545 >      <target name="docs"/>
546 >    </antcall>
547 >  </target>
548  
549 <    <antcall target="clean"/>
550 <    <antcall target="test">
551 <      <param name="build.main.java.version" value="9"/>
549 >  <target name="test14">
550 >    <antcall>
551 >      <param name="java.runtime.target" value="14"/>
552 >      <param name="build.main.javac" value="${javac14}"/>
553 >      <param name="build.main.javadoc" value="${javadoc14}"/>
554 >      <param name="build.main.javadoc.source" value="14"/>
555 >      <target name="clean"/>
556 >      <target name="test"/>
557 >      <target name="docs"/>
558      </antcall>
559 +  </target>
560  
561 <    <antcall target="clean"/>
562 <    <antcall target="test">
563 <      <param name="build.main.java.version" value="10"/>
561 >  <target name="test15">
562 >    <antcall>
563 >      <param name="java.runtime.target" value="15"/>
564 >      <param name="build.main.javac" value="${javac15}"/>
565 >      <param name="build.main.javadoc" value="${javadoc15}"/>
566 >      <param name="build.main.javadoc.source" value="15"/>
567 >      <target name="clean"/>
568 >      <target name="test"/>
569 >      <target name="docs"/>
570      </antcall>
571 +  </target>
572  
573 <    <antcall target="clean"/>
574 <    <antcall target="test">
575 <      <param name="build.main.java.version" value="11"/>
573 >  <target name="test11-12">
574 >    <antcall>
575 >      <param name="java.runtime.target" value="12"/>
576 >      <param name="build.main.javac" value="${javac11}"/>
577 >      <param name="build.main.javadoc" value="${javadoc12}"/>
578 >      <param name="build.main.javadoc.source" value="11"/>
579 >      <target name="clean"/>
580 >      <target name="test"/>
581 >      <target name="docs"/>
582      </antcall>
583 +  </target>
584  
585 <    <!-- Clean up to avoid obscure wrong class file version bugs -->
586 <    <antcall target="clean"/>
585 >  <target name="test11-13">
586 >    <antcall>
587 >      <param name="java.runtime.target" value="13"/>
588 >      <param name="build.main.javac" value="${javac11}"/>
589 >      <param name="build.main.javadoc" value="${javadoc13}"/>
590 >      <param name="build.main.javadoc.source" value="11"/>
591 >      <target name="clean"/>
592 >      <target name="test"/>
593 >      <target name="docs"/>
594 >    </antcall>
595 >  </target>
596  
597 +  <target name="test11-14">
598 +    <antcall>
599 +      <param name="java.runtime.target" value="14"/>
600 +      <param name="build.main.javac" value="${javac11}"/>
601 +      <param name="build.main.javadoc" value="${javadoc14}"/>
602 +      <param name="build.main.javadoc.source" value="11"/>
603 +      <target name="clean"/>
604 +      <target name="test"/>
605 +      <target name="docs"/>
606 +    </antcall>
607    </target>
608  
609 +  <target name="test11-15">
610 +    <antcall>
611 +      <param name="java.runtime.target" value="15"/>
612 +      <param name="build.main.javac" value="${javac11}"/>
613 +      <param name="build.main.javadoc" value="${javadoc15}"/>
614 +      <param name="build.main.javadoc.source" value="11"/>
615 +      <target name="clean"/>
616 +      <target name="test"/>
617 +      <target name="docs"/>
618 +    </antcall>
619 +  </target>
620  
621  
622    <target name="configure-compiler">
# Line 660 | Line 639
639    </target>
640  
641  
663
664  <!-- Various demos and test programs -->
665
666
667  <!-- description="Benchmark from Doug Lea's AQS paper" -->
668  <target name="loops" depends="configure-compiler">
669
670    <mkdir dir="${build.loops.dir}"/>
671
672    <javac srcdir="${loops.src.dir}"
673          destdir="${build.loops.dir}"
674            debug="${build.debug}"
675       debuglevel="${build.debuglevel}"
676      deprecation="${build.deprecation}"
677           source="${build.sourcelevel}"
678           target="${build.sourcelevel}"
679         encoding="ASCII"
680             fork="true">
681
682      <compilerarg line="${build.args}"/>
683      <classpath refid="loops.classpath"/>
684      <compilerarg value="-XDignore.symbol.file=true"/>
685
686    </javac>
687
688    <java classname="ALoops" fork="true">
689      <classpath refid="loops.classpath"/>
690    </java>
691  </target>
692
693
642    <target name="compile-test-loops" depends="jar"
643            description="Compiles all the perf tests in src/test/loops">
644  
# Line 709 | Line 657
657  
658        <include name="*.java"/>
659        <compilerarg value="-XDignore.symbol.file=true"/>
660 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
661 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
714 <      <compilerarg line="${build.args}"/>
715 <    </javac>
716 <  </target>
717 <
718 <
719 <  <!-- jsr166 4jdk8 -->
720 <
721 <  <target name="4jdk8compile"
722 <          depends="configure-compiler"
723 <          description="Compiles src/jdk8 sources, targeting jdk8">
724 <
725 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
726 <
727 <    <javac srcdir="${4jdk8src.dir}"
728 <           destdir="${build.4jdk8.classes.dir}"
729 <           debug="${build.debug}"
730 <           debuglevel="${build.debuglevel}"
731 <           deprecation="${build.deprecation}"
732 <           source="8"
733 <           target="8"
734 <           classpath=""
735 <           bootclasspath="${bootclasspath8}"
736 <           includeAntRuntime="false"
737 <           includeJavaRuntime="false"
738 <           encoding="ASCII"
739 <           executable="${javac8}"
740 <           fork="true">
741 <      <include name="**/*.java"/>
742 <      <compilerarg value="-Xprefer:source"/>
743 <      <compilerarg value="-XDignore.symbol.file=true"/>
744 <      <compilerarg value="-Xlint:all"/>
745 <      <compilerarg value="-Werror"/>
746 <      <compilerarg line="${build.args}"/>
747 <    </javac>
748 <  </target>
749 <
750 <  <target name="4jdk8doclint"
751 <          depends="configure-compiler"
752 <          description="Finds doclint warnings">
753 <
754 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
755 <
756 <    <javac srcdir="${4jdk8src.dir}"
757 <           destdir="${build.4jdk8.classes.dir}"
758 <           debug="${build.debug}"
759 <           debuglevel="${build.debuglevel}"
760 <           deprecation="${build.deprecation}"
761 <           source="8"
762 <           target="8"
763 <           classpath=""
764 <           bootclasspath="${bootclasspath8}"
765 <           includeAntRuntime="false"
766 <           includeJavaRuntime="false"
767 <           encoding="ASCII"
768 <           executable="${javac8}"
769 <           fork="true">
770 <      <include name="**/*.java"/>
771 <      <compilerarg value="-Xprefer:source"/>
772 <      <compilerarg value="-XDignore.symbol.file=true"/>
773 <      <compilerarg value="-Xlint:all"/>
774 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
660 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
661 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
662        <compilerarg line="${build.args}"/>
663      </javac>
664    </target>
665  
666  
667 <  <target name="4jdk8jar"
668 <          depends="4jdk8compile"
782 <          description="Builds library jar from compiled sources">
783 <
784 <    <jar destfile="${4jdk8product.jar}">
785 <      <fileset dir="${build.4jdk8.classes.dir}"/>
786 <      <manifest>
787 <        <attribute name="Built-By" value="${user.name}"/>
788 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
789 <      </manifest>
790 <    </jar>
791 <  </target>
792 <
793 <
794 <  <target name="4jdk8-tck"
795 <          depends="4jdk8jar"
796 <          description="Runs tck tests for jsr166-4jdk8 directly">
797 <
798 <    <run-tck-tests
799 <      target="8"
800 <      workdir="${build.4jdk8.dir}"
801 <      classes="${4jdk8product.jar}">
802 <      <javac-elements>
803 <        <!-- JDK9+ test classes -->
804 <        <exclude name="*9Test.java"/>
805 <        <exclude name="*10Test.java"/>
806 <        <compilerarg value="-Werror"/>
807 <      </javac-elements>
808 <    </run-tck-tests>
809 <  </target>
810 <
811 <
812 <  <target name="4jdk8-jtreg"
813 <          depends="4jdk8jar"
814 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
815 <    <run-jtreg-tests
816 <       target="8"
817 <       workdir="${build.4jdk8.dir}"
818 <       classes="${4jdk8product.jar}"/>
819 <  </target>
820 <
821 <
822 <  <target name="4jdk8-test"
823 <          depends="4jdk8-tck, 4jdk8-jtreg"
824 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
825 <
826 <
827 <  <target name="4jdk8docs"
828 <          description="Builds javadocs for src/jdk8 to dist dir">
829 <
830 <    <delete dir="${4jdk8docs.dir}"/>
831 <    <mkdir dir="${4jdk8docs.dir}"/>
832 <
833 <    <javadoc destdir="${4jdk8docs.dir}"
834 <             packagenames="none"
835 <             link="${java8.api.url}"
836 <             overview="${4jdk8src.dir}/intro.html"
837 <             access="${build.javadoc.access}"
838 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
839 <             classpath=""
840 <             source="8"
841 <             executable="${javadoc8}"
842 <             failonerror = "true">
843 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
844 <        <include name="**/*.java"/>
845 <      </fileset>
846 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
847 <      <arg value="-XDignore.symbol.file=true"/>
848 <      <arg value="-tag"/>
849 <      <arg value="${javadoc.jls.option}"/>
850 < <!-- @apiNote currently unused -->
851 < <!--       <arg value="-tag"/> -->
852 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
853 <      <arg value="-tag"/>
854 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
855 <      <arg value="-tag"/>
856 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
857 <    </javadoc>
858 <  </target>
859 <
860 <
861 <  <target name="4jdk8dist"
862 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
863 <          description="Puts all distributable products in single hierarchy"/>
864 <
865 <
866 <  <target name="4jdk8clean"
867 <          description="Removes all 4jdk8 build products">
868 <    <delete dir="${build.4jdk8.dir}"/>
869 <  </target>
870 <
871 <
872 <  <target name="4jdk8dist-jar"
873 <          depends="4jdk8clean, 4jdk8jar">
874 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
875 <  </target>
876 <
877 <
878 <  <target name="4jdk8dist-docs"
879 <          depends="4jdk8clean, 4jdk8docs">
880 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
881 <  </target>
882 <
883 <
667 >  <!-- old branches no longer maintained.  build support deleted -->
668 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
669    <!-- jsr166 4jdk7 (no longer maintained) -->
885
886  <target name="4jdk7compile" depends="configure-compiler">
887    <mkdir dir="${build.4jdk7.classes.dir}"/>
888
889    <javac srcdir="${4jdk7src.dir}"
890           destdir="${build.4jdk7.classes.dir}"
891           debug="${build.debug}"
892           debuglevel="${build.debuglevel}"
893           deprecation="${build.deprecation}"
894           source="6"
895           target="6"
896           classpath=""
897           bootclasspath="${bootclasspath6}"
898           includeAntRuntime="false"
899           includeJavaRuntime="false"
900           encoding="ASCII"
901           executable="${javac7}"
902           fork="true">
903
904      <include name="**/*.java"/>
905      <compilerarg value="-Xprefer:source"/>
906      <compilerarg value="-XDignore.symbol.file=true"/>
907      <compilerarg value="-Xlint:all"/>
908      <compilerarg value="-Werror"/>
909      <compilerarg line="${build.args}"/>
910    </javac>
911  </target>
912
913  <target name="4jdk7doclint" depends="configure-compiler">
914    <mkdir dir="${build.4jdk7.classes.dir}"/>
915
916    <javac srcdir="${4jdk7src.dir}"
917           destdir="${build.4jdk7.classes.dir}"
918           debug="${build.debug}"
919           debuglevel="${build.debuglevel}"
920           deprecation="${build.deprecation}"
921           source="6"
922           target="6"
923           classpath=""
924           bootclasspath="${bootclasspath6}"
925           includeAntRuntime="false"
926           includeJavaRuntime="false"
927           encoding="ASCII"
928           executable="${javac8}"
929           fork="true">
930
931      <include name="**/*.java"/>
932      <compilerarg value="-Xprefer:source"/>
933      <compilerarg value="-XDignore.symbol.file=true"/>
934      <compilerarg value="-Xlint:all"/>
935      <compilerarg value="-Xdoclint:all/protected"/>
936      <compilerarg line="${build.args}"/>
937    </javac>
938  </target>
939
940  <target name="4jdk7jar" depends="4jdk7compile">
941    <jar destfile="${4jdk7product.jar}">
942      <fileset dir="${build.4jdk7.classes.dir}"/>
943      <manifest>
944        <attribute name="Built-By" value="${user.name}"/>
945        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
946      </manifest>
947    </jar>
948  </target>
949
950  <target name="4jdk7-tck" depends="4jdk7jar">
951    <run-tck-tests
952      target="7"
953      workdir="${build.4jdk7.dir}"
954      classes="${4jdk7product.jar}">
955      <javac-elements>
956        <!-- JDK8+ test classes -->
957        <exclude name="*8Test.java"/>
958        <exclude name="*9Test.java"/>
959        <exclude name="*10Test.java"/>
960        <exclude name="DoubleAccumulatorTest.java"/>
961        <exclude name="DoubleAdderTest.java"/>
962        <exclude name="LongAccumulatorTest.java"/>
963        <exclude name="LongAdderTest.java"/>
964        <exclude name="CompletableFutureTest.java"/>
965        <exclude name="SplittableRandomTest.java"/>
966        <exclude name="StampedLockTest.java"/>
967        <exclude name="SubmissionPublisherTest.java"/>
968        <compilerarg value="-Werror"/>
969      </javac-elements>
970    </run-tck-tests>
971  </target>
972
973  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
974  <target name="4jdk7-tck-junit" depends="4jdk7compile">
975
976    <junit printsummary="true"
977           showoutput="true"
978           errorProperty="junit.failed"
979           failureProperty="junit.failed"
980           includeantruntime="true"
981           jvm="${java7}"
982           fork="true">
983
984      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
985      <jvmarg value="-server"/>
986
987      <classpath>
988        <pathelement location="${junit.jar}"/>
989        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
990      </classpath>
991
992      <formatter type="brief"/>
993
994      <test name="${jsr166.tckTestClass}" haltonfailure="no">
995      </test>
996    </junit>
997  </target>
998
999  <target name="4jdk7-jtreg" depends="4jdk7jar">
1000    <run-jtreg-tests
1001       target="7"
1002       workdir="${build.4jdk7.dir}"
1003       classes="${4jdk7product.jar}"/>
1004  </target>
1005
1006  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1007
1008  <target name="4jdk7docs">
1009    <delete dir="${4jdk7docs.dir}"/>
1010    <mkdir dir="${4jdk7docs.dir}"/>
1011
1012    <javadoc destdir="${4jdk7docs.dir}"
1013             packagenames="none"
1014             link="${java7.api.url}"
1015             overview="${4jdk7src.dir}/intro.html"
1016             access="${build.javadoc.access}"
1017             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1018             classpath=""
1019             executable="${javadoc7}"
1020             failonerror = "true">
1021      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1022        <include name="**/*.java"/>
1023      </fileset>
1024      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1025      <arg value="-XDignore.symbol.file=true"/>
1026    </javadoc>
1027  </target>
1028
1029  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1030
1031  <target name="4jdk7clean">
1032    <delete dir="${build.4jdk7.dir}"/>
1033  </target>
1034
1035  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1036    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1037  </target>
1038
1039  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1040    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1041  </target>
1042
1043
670    <!-- jsr166x (no longer maintained) -->
1045
1046  <target name="jsr166xcompile" depends="configure-compiler">
1047    <mkdir dir="${build.jsr166x.classes.dir}"/>
1048
1049    <javac srcdir="${topsrc.dir}"
1050           destdir="${build.jsr166x.classes.dir}"
1051           debug="${build.debug}"
1052           debuglevel="${build.debuglevel}"
1053           deprecation="${build.deprecation}"
1054           classpath=""
1055           bootclasspath="${bootclasspath6}"
1056           source="5"
1057           target="5"
1058           includeAntRuntime="false"
1059           includeJavaRuntime="false"
1060           encoding="ASCII"
1061           executable="${javac7}"
1062           fork="true">
1063      <include name="jsr166x/**/*.java"/>
1064      <compilerarg value="-XDignore.symbol.file=true"/>
1065      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1066      <compilerarg value="-Werror"/>
1067      <compilerarg line="${build.args}"/>
1068    </javac>
1069  </target>
1070
1071  <target name="jsr166xjar" depends="jsr166xcompile">
1072    <jar destfile="${jsr166x.jar}">
1073      <fileset dir="${build.jsr166x.classes.dir}"/>
1074      <manifest>
1075        <attribute name="Built-By" value="${user.name}"/>
1076        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1077      </manifest>
1078    </jar>
1079  </target>
1080
1081  <target name="jsr166xdocs">
1082    <delete dir="${jsr166xdocs.dir}"/>
1083    <mkdir dir="${jsr166xdocs.dir}"/>
1084
1085    <javadoc destdir="${jsr166xdocs.dir}"
1086             packagenames="jsr166x.*"
1087             link="${java.api.url}"
1088             access="${build.javadoc.access}"
1089             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1090             bootclasspath="${bootclasspath6}"
1091             source="5"
1092             executable="${javadoc7}"
1093             failonerror = "true">
1094      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1095      <arg value="-XDignore.symbol.file=true"/>
1096    </javadoc>
1097  </target>
1098
1099  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1100
1101  <target name="jsr166xclean">
1102    <delete dir="${build.jsr166x.dir}"/>
1103  </target>
1104
1105  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1106    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1107  </target>
1108
1109  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1110    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1111  </target>
1112
1113
671    <!-- jsr166y (no longer maintained) -->
1115
1116  <target name="jsr166ycompile" depends="configure-compiler">
1117    <mkdir dir="${build.jsr166y.classes.dir}"/>
1118
1119    <javac srcdir="${topsrc.dir}"
1120           destdir="${build.jsr166y.classes.dir}"
1121           debug="${build.debug}"
1122           debuglevel="${build.debuglevel}"
1123           deprecation="${build.deprecation}"
1124           source="6"
1125           target="6"
1126           classpath=""
1127           bootclasspath="${bootclasspath6}"
1128           includeAntRuntime="false"
1129           includeJavaRuntime="false"
1130           encoding="ASCII"
1131           executable="${javac7}"
1132           fork="true">
1133
1134      <include name="jsr166y/**/*.java"/>
1135      <compilerarg value="-XDignore.symbol.file=true"/>
1136      <compilerarg value="-Xlint:all"/>
1137      <compilerarg value="-Werror"/>
1138      <compilerarg line="${build.args}"/>
1139    </javac>
1140  </target>
1141
1142  <target name="jsr166yjar" depends="jsr166ycompile">
1143    <jar destfile="${jsr166y.jar}" index="true">
1144      <fileset dir="${build.jsr166y.classes.dir}"/>
1145      <manifest>
1146        <attribute name="Built-By" value="${user.name}"/>
1147        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1148      </manifest>
1149    </jar>
1150  </target>
1151
1152  <target name="jsr166ydocs">
1153    <delete dir="${jsr166ydocs.dir}"/>
1154    <mkdir dir="${jsr166ydocs.dir}"/>
1155
1156    <javadoc destdir="${jsr166ydocs.dir}"
1157             packagenames="jsr166y.*"
1158             link="${java.api.url}"
1159             access="${build.javadoc.access}"
1160             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1161             bootclasspath="${bootclasspath6}"
1162             source="6"
1163             executable="${javadoc7}"
1164             failonerror = "true">
1165      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1166      <arg value="-XDignore.symbol.file=true"/>
1167    </javadoc>
1168  </target>
1169
1170  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1171
1172  <target name="jsr166yclean">
1173    <delete dir="${build.jsr166y.dir}"/>
1174  </target>
1175
1176  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1177    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1178  </target>
1179
1180  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1181    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1182  </target>
1183
1184
672    <!-- extra166y (no longer maintained) -->
1186
1187  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1188    <mkdir dir="${build.extra166y.classes.dir}"/>
1189
1190    <javac srcdir="${topsrc.dir}"
1191           destdir="${build.extra166y.classes.dir}"
1192           debug="${build.debug}"
1193           debuglevel="${build.debuglevel}"
1194           deprecation="${build.deprecation}"
1195           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1196           classpath=""
1197           source="6"
1198           target="6"
1199           includeAntRuntime="false"
1200           includeJavaRuntime="false"
1201           encoding="ASCII"
1202           executable="${javac7}"
1203           fork="true">
1204
1205      <include name="extra166y/**/*.java"/>
1206      <compilerarg value="-XDignore.symbol.file=true"/>
1207      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1208      <compilerarg value="-Werror"/>
1209      <compilerarg line="${build.args}"/>
1210    </javac>
1211  </target>
1212
1213  <target name="extra166yjar" depends="extra166ycompile">
1214    <jar destfile="${extra166y.jar}" index="true">
1215      <fileset dir="${build.extra166y.classes.dir}"/>
1216      <manifest>
1217        <attribute name="Built-By" value="${user.name}"/>
1218        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1219      </manifest>
1220    </jar>
1221  </target>
1222
1223  <target name="extra166ydocs">
1224    <delete dir="${extra166ydocs.dir}"/>
1225    <mkdir dir="${extra166ydocs.dir}"/>
1226
1227    <javadoc destdir="${extra166ydocs.dir}"
1228             packagenames="extra166y.*"
1229             link="${java.api.url}"
1230             access="${build.javadoc.access}"
1231             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1232             bootclasspath="${bootclasspath6}"
1233             source="6"
1234             executable="${javadoc7}">
1235      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1236      <arg value="-XDignore.symbol.file=true"/>
1237    </javadoc>
1238  </target>
1239
1240  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1241
1242  <target name="extra166yclean">
1243    <delete dir="${build.extra166y.dir}"/>
1244  </target>
1245
1246  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1247    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1248  </target>
1249
1250  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1251    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1252  </target>
1253
1254
673    <!-- jsr166e (no longer maintained) -->
674  
1257  <property name="build.jsr166e.java.version" value="6"/>
1258  <property name="build.jsr166e.javac" value="${javac6}"/>
1259
1260  <target name="jsr166ecompile" depends="configure-compiler">
1261    <mkdir dir="${build.jsr166e.classes.dir}"/>
1262
1263    <javac srcdir="${topsrc.dir}"
1264           destdir="${build.jsr166e.classes.dir}"
1265           debug="${build.debug}"
1266           debuglevel="${build.debuglevel}"
1267           deprecation="${build.deprecation}"
1268           source="${build.jsr166e.java.version}"
1269           target="${build.jsr166e.java.version}"
1270           classpath=""
1271           includeAntRuntime="false"
1272           includeJavaRuntime="false"
1273           executable="${build.jsr166e.javac}"
1274           fork="true">
1275
1276      <include name="jsr166e/**/*.java"/>
1277      <compilerarg value="-XDignore.symbol.file=true"/>
1278      <compilerarg value="-Xlint:all"/>
1279      <compilerarg value="-Werror"/>
1280      <compilerarg line="${build.args}"/>
1281    </javac>
1282  </target>
1283
1284  <target name="jsr166edoclint">
1285    <mkdir dir="${build.jsr166e.classes.dir}"/>
1286
1287    <javac srcdir="${topsrc.dir}"
1288           destdir="${build.jsr166e.classes.dir}"
1289           debug="${build.debug}"
1290           debuglevel="${build.debuglevel}"
1291           deprecation="${build.deprecation}"
1292           source="${build.jsr166e.java.version}"
1293           target="${build.jsr166e.java.version}"
1294           classpath=""
1295           bootclasspath="${bootclasspath6}"
1296           includeAntRuntime="false"
1297           includeJavaRuntime="false"
1298           executable="${javac8}"
1299           fork="true">
1300
1301      <include name="jsr166e/**/*.java"/>
1302      <compilerarg value="-XDignore.symbol.file=true"/>
1303      <compilerarg value="-Xlint:all"/>
1304      <compilerarg value="-Werror"/>
1305      <compilerarg value="-Xdoclint:all/protected"/>
1306    </javac>
1307  </target>
1308
1309  <target name="jsr166ejar" depends="jsr166ecompile">
1310    <jar destfile="${jsr166e.jar}" index="true">
1311      <fileset dir="${build.jsr166e.classes.dir}"/>
1312      <manifest>
1313        <attribute name="Built-By" value="${user.name}"/>
1314        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1315      </manifest>
1316    </jar>
1317  </target>
1318
1319  <target name="jsr166edocs">
1320    <delete dir="${jsr166edocs.dir}"/>
1321    <mkdir dir="${jsr166edocs.dir}"/>
1322
1323    <javadoc destdir="${jsr166edocs.dir}"
1324             packagenames="jsr166e.*"
1325             link="${java.api.url}"
1326             access="${build.javadoc.access}"
1327             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1328             source="${build.jsr166e.java.version}"
1329             executable="${javadoc7}"
1330             failonerror = "true">
1331      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1332      <arg value="-XDignore.symbol.file=true"/>
1333    </javadoc>
1334  </target>
1335
1336  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1337    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1338    <run-tck-tests
1339      tck.src.dir="${test.src.dir}/tck-jsr166e"
1340      target="${build.jsr166e.java.version}"
1341      workdir="${build.jsr166e.dir}"
1342      classes="${jsr166e.jar}"/>
1343  </target>
1344
1345  <target name="jsr166e-tck">
1346
1347 <!--     <antcall target="clean"/> -->
1348 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1349 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1350 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1351 <!--     </antcall> -->
1352
1353    <antcall target="clean"/>
1354    <antcall target="jsr166e-tck-one-java-version">
1355      <param name="build.jsr166e.java.version" value="7"/>
1356      <param name="build.jsr166e.javac" value="${javac7}"/>
1357    </antcall>
1358
1359    <antcall target="clean"/>
1360    <antcall target="jsr166e-tck-one-java-version">
1361      <param name="build.jsr166e.java.version" value="6"/>
1362      <param name="build.jsr166e.javac" value="${javac6}"/>
1363    </antcall>
1364  </target>
1365
1366  <target name="jsr166e-test" depends="jsr166e-tck"/>
1367
1368  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1369
1370  <target name="jsr166eclean">
1371    <delete dir="${build.jsr166e.dir}"/>
1372  </target>
1373
1374  <target name="jsr166edist-jar"
1375          depends="jsr166eclean, jsr166ejar">
1376    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1377  </target>
1378
1379  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1380    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1381  </target>
1382
1383
675   <!-- Find buglets that can be detected by static build tools -->
676  
677 <  <target name="lint">
678 <    <antcall target="dists">
679 <      <param name="build.javadoc.access" value="public"/>
680 <    </antcall>
681 <  </target>
677 > <!--   <target name="lint"> -->
678 > <!--     <antcall target="dists"> -->
679 > <!--       <param name="build.javadoc.access" value="protected"/> -->
680 > <!--     </antcall> -->
681 > <!--   </target> -->
682  
683   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
684 <  <target name="lint-private">
684 >  <target name="doclint-private">
685      <antcall target="dist">
686        <param name="build.javadoc.access" value="private"/>
687      </antcall>
# Line 1398 | Line 689
689  
690  
691   <!-- ==============================================================
692 <  Experimental errorprone support - http://errorprone.info
692 >  Experimental errorprone support
693 >  https://errorprone.info
694 >  https://errorprone.info/docs/installation
695 >  https://github.com/google/error-prone/issues/1143
696   =================================================================== -->
697 <  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
697 >  <path id="errorprone.processorpath.path">
698 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
699 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
700 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
701 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
702 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
703 >  </path>
704 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
705 >  <property name="errorprone.jsr166.user.flags" value=""/>
706    <property name="errorprone.jsr166.flags"
707              value="-Xep:HashtableContains:OFF
708                     -Xep:JdkObsolete:OFF
709                     -Xep:MissingOverride:OFF
710                     -Xep:MissingFail:OFF
711 +                   -Xep:ThreadPriorityCheck:OFF
712                     -Xep:MixedArrayDimensions:ERROR
713                     -Xep:RemoveUnusedImports:ERROR
714                     -Xep:EmptyIf:ERROR
# Line 1414 | Line 717
717                     -Xep:LongLiteralLowerCaseSuffix:ERROR
718                     -Xep:RedundantThrows:ERROR
719                     -Xep:IdentityBinaryExpression:WARN
720 <                   -Xep:MethodCanBeStatic:WARN"/>
720 >                   -Xep:ConstructorInvokesOverridable:WARN
721 >                   -Xep:MethodCanBeStatic:WARN
722 >                   ${errorprone.jsr166.user.flags}"/>
723    <!-- -Xep:WildcardImport:ERROR -->
724    <property name="errorprone.jsr166.test.flags"
725              value="-Xep:StringSplitter:OFF
# Line 1442 | Line 747
747             fork="true">
748  
749        <include name="**/*.java"/>
750 <      <compilerarg line="-processorpath ${errorprone.jar}"/>
750 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
751 >      <compilerarg value="-J--illegal-access=permit"/>
752 >      <compilerarg value="-XDcompilePolicy=simple"/>
753 >      <compilerarg value="-processorpath"/>
754 >      <compilerarg pathref="errorprone.processorpath.path"/>
755        <compilerarg value="-Xplugin:ErrorProne
756                            ${errorprone.jsr166.flags}"/>
757        <compilerarg value="--patch-module=java.base=${src.dir}"/>
# Line 1459 | Line 768
768      </jar>
769  
770      <run-tck-tests
771 <      target="${build.main.java.version}"
771 >      target="${java.runtime.target}"
772        workdir="${build.dir}"
773        classes="${product.jar}">
774        <javac-elements>
775 <        <compilerarg line="-processorpath ${errorprone.jar}"/>
775 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
776 >        <compilerarg value="-J--illegal-access=permit"/>
777 >        <compilerarg value="-XDcompilePolicy=simple"/>
778 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
779          <compilerarg value="-Xplugin:ErrorProne
780                              ${errorprone.jsr166.flags}
781                              ${errorprone.jsr166.test.flags}"/>
# Line 1479 | Line 791
791            description="Run errorprone over jtreg tests (experimental)">
792  
793      <run-jtreg-tests
794 <       target="${build.main.java.version}"
794 >       target="${java.runtime.target}"
795         workdir="${build.dir}"
796         classes="${product.jar}"
797         verbose="all">
798        <jtreg-elements>
799 <        <arg value="-javacoption:-XDcompilePolicy=byfile"/>
799 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
800          <arg value="-javacoption:-processorpath"/>
801 <        <arg value="-javacoption:${errorprone.jar}"/>
801 >        <arg value="-javacoption:${errorprone.processorpath}"/>
802          <arg value="-javacoption:-Xplugin:ErrorProne
803                              ${errorprone.jsr166.flags}
804                              ${errorprone.jsr166.test.flags}
805 +                            -Xep:MultipleTopLevelClasses:WARN
806                              -Xep:NonAtomicVolatileUpdate:OFF"/>
807        </jtreg-elements>
808      </run-jtreg-tests>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines