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.250 by jsr166, Thu Sep 14 14:23:02 2017 UTC vs.
Revision 1.327 by jsr166, Fri Nov 25 20:33:50 2022 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:
22 <  $HOME/jdk/jdk8
23 <  $HOME/jdk/jdk9
23 <  $HOME/jdk/jdk10
22 >  $HOME/jdk/jdk17
23 >  $HOME/jdk/jdk19
24    where each of the above is a JDK or a symlink to same, and
25 <  $HOME/jdk/src/jdk8
26 <  $HOME/jdk/src/jdk9
27 <  $HOME/jdk/src/jdk10
28 <  where each of the above is a complete JDK source tree
29 <  (e.g. mercurial forest) or a symlink to same.
25 >  $HOME/jdk/src/jdk17
26 >  where each of the above is a JDK source tree or a symlink to same.
27  
28    Alternatively, define ant variables thus:
29    ant -Djdk$N.home=... -Djdk$N.src.home=...
30 <  for $N in 8 9 10 ...
30 >  for $N in 17 .. 19 ...
31  
32    As of 2016-03, the sources in src/main are for jdk9+ only.
33 +  As of 2019-08, the sources in src/main are for jdk11+ only.
34 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
35 +  As of 2022-02, the sources in src/main are for jdk17+ only.
36   ------------------------------------------------------------------------------
37    </description>
38  
# Line 50 | Line 50
50  
51  
52    <!-- Compilation options -->
53  <property name="build.sourcelevel"    value="6"/>
53    <property name="build.debug"          value="true"/>
54    <property name="build.debuglevel"     value="source,lines,vars"/>
55    <property name="build.deprecation"    value="false"/>
# Line 62 | Line 61
61    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62    <property name="build.loops.dir"             location="${build.dir}/loops"/>
63  
65  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
66  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
67  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
68  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
69
70  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
71  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
72  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
73  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
74
75  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
76  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
77  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
78  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
79
80  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
81  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
82  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
83  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
84
64    <!-- JDK locations -->
65    <property name="jdks.home"  location="${user.home}/jdk"/>
66  
# Line 93 | Line 72
72      <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
73      <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
74      <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
75 <    <local name="have.java.base"/>
97 <    <available property="have.java.base"
98 <      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
99 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
100 <      if:set="have.java.base"/>
101 <    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
102 <      unless:set="have.java.base"/>
103 <    <local name="modules"/>
104 <    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
105 <    <local name="boot.jar.dir"/>
106 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
107 <    <path id="bootclasspath@{v}" unless:set="modules">
108 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
109 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
110 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
111 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
112 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
113 <    </path>
114 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
75 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
76      </sequential>
77    </macrodef>
78  
# Line 127 | Line 88
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="6"/>
92 <  <defjdklocations v="7"/>
93 <  <defjdklocations v="8"/>
94 <  <defjdklocations v="9"/>
134 <  <defjdklocations v="10"/>
91 >  <defjdklocations v="17"/>
92 >  <defjdklocations v="18"/>
93 >  <defjdklocations v="19"/>
94 >  <defjdklocations v="20"/>
95  
96    <!-- Source locations -->
97    <property name="src.dir"              location="${basedir}/src/main"/>
98    <property name="test.src.dir"         location="${basedir}/src/test"/>
99    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
100    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
101 <  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
102 <  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
103 <  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
104 <  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
105 <  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
101 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
102 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
103 >  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
104 >  <property name="jtreg20.src.dir"      location="${test.src.dir}/jtreg"/>
105 >  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
106    <property name="lib.dir"              location="${basedir}/lib"/>
107    <property name="dist.dir"             location="${basedir}/dist"/>
108    <property name="topsrc.dir"           location="${basedir}/src"/>
149  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
150  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
151  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
152  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
153  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
154  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
109  
110    <!-- Javadoc locations -->
111    <property name="docs.dir"          location="${build.dir}/docs"/>
112 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
159 <  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
160 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
161 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
162 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
163 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
164 <
165 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
166 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
167 <  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
168 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
169 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
170 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
171 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
112 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
113  
114    <!-- Jar locations -->
115    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
175  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
176  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
177  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
178  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
179  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
180  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
116    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
117  
118    <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
119 <  <property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
120 <  <property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
121 <  <property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
122 <  <property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
123 <  <!-- The expected canonical location does not yet exist as of 2016-04 -->
124 <  <!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
125 <  <property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191 <  <!-- Default jdk doc location (latest stable release seems best) -->
192 <  <property name="java.docroot.url"       value="${java8.docroot.url}"/>
119 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
120 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
121 >  <property name="java18.docroot.url" value="https://docs.oracle.com/en/java/javase/18/docs"/>
122 >  <property name="java19.docroot.url" value="https://docs.oracle.com/en/java/javase/19/docs"/>
123 >  <property name="java20.docroot.url" value="https://download.java.net/java/early_access/jdk20/docs"/>
124 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
125 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
126  
127    <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
128 <  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
129 <  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
130 <  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
131 <  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
199 <  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
128 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
129 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
130 >  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
131 >  <property name="java20.api.url"     value="${java20.docroot.url}/api/"/>
132    <property name="java.api.url"       value="${java.docroot.url}/api/"/>
133  
134    <!-- Define the "jtreg" task -->
# Line 204 | Line 136
136    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
137             classpath="${lib.dir}/jtreg.jar" />
138  
139 <  <!-- Tck options; see JSR166TestCase.java
139 >  <!-- Tck configuration options; see JSR166TestCase.java
140     To profile a single tck test class:
141     ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
142     To stress test a single tck test class:
# Line 227 | Line 159
159  
160      <sequential>
161  
230    <local name="modules"/>
231    <condition property="modules">
232      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233    </condition>
234
235    <local name="use-doclint"/>
236    <condition property="use-doclint">
237      <not> <equals arg1="@{target}" arg2="7"/> </not>
238    </condition>
239
162      <mkdir dir="@{workdir}/tck-classes"/>
163  
164      <javac srcdir="@{tck.src.dir}"
# Line 256 | Line 178
178        <include name="*.java"/>
179        <compilerarg value="-XDignore.symbol.file=true"/>
180        <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
181 <      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
182 <      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261 <      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
181 >      <compilerarg value="-Xdoclint:reference/private"/>
182 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
183        <compilerarg line="${build.args}"/>
184        <javac-elements/>
185  
# Line 268 | Line 189
189            failonerror="true"
190            jvm="${java@{target}}"
191            fork="true">
192 <        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
193 <        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
194 <        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
195 <        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
196 <        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
197 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
198 <        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
199 <        <jvmarg line="@{jvmflags}"/>
200 <        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
201 <        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
202 <
203 <        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
204 <        <syspropertyset id="system-properties-used-by-tck">
205 <          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
206 <          <propertyref prefix="jsr166."/>
207 <          <propertyref name="test.timeout.factor"/>
208 <        </syspropertyset>
209 <
210 <        <classpath>
211 <          <pathelement location="${junit.jar}"/>
212 <          <pathelement location="@{workdir}/tck-classes"/>
292 <        </classpath>
192 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
193 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
194 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
195 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
196 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
197 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
198 >        <jvmarg line="@{jvmflags}"/>
199 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
200 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
201 >
202 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
203 >        <syspropertyset id="system-properties-used-by-tck">
204 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
205 >          <propertyref prefix="jsr166."/>
206 >          <propertyref name="test.timeout.factor"/>
207 >        </syspropertyset>
208 >
209 >        <classpath>
210 >          <pathelement location="${junit.jar}"/>
211 >          <pathelement location="@{workdir}/tck-classes"/>
212 >        </classpath>
213      </java>
214  
215      </sequential>
216    </macrodef>
217  
218    <!-- Define jtreg test sets for different jdk versions -->
219 <  <fileset dir="${jtreg10.src.dir}">
220 <    <patternset id="jdk10.jtreg.tests">
221 <      <include name="**/*.java"/>
222 <    </patternset>
223 <  </fileset>
224 <
225 <  <fileset dir="${jtreg9.src.dir}">
226 <    <patternset id="jdk9.jtreg.tests">
227 <      <include name="**/*.java"/>
228 <    </patternset>
229 <  </fileset>
230 <
231 <  <fileset dir="${jtreg8.src.dir}">
312 <    <patternset id="jdk8.jtreg.tests">
313 <      <include name="**/*.java"/>
314 <    </patternset>
315 <  </fileset>
219 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
220 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
221 >  <property name="jtreg.test.pattern" value="**/*.java"/>
222 >  <macrodef name="defjtregtests">
223 >    <attribute name="v"/>
224 >    <sequential>
225 >      <fileset dir="${jtreg@{v}.src.dir}">
226 >        <patternset id="jdk@{v}.jtreg.tests">
227 >          <include name="${jtreg.test.pattern}"/>
228 >        </patternset>
229 >      </fileset>
230 >    </sequential>
231 >  </macrodef>
232  
233 <  <fileset dir="${jtreg7.src.dir}">
234 <    <patternset id="jdk7.jtreg.tests">
235 <      <include name="**/*.java"/>
236 <    </patternset>
321 <  </fileset>
233 >  <defjtregtests v="17"/>
234 >  <defjtregtests v="18"/>
235 >  <defjtregtests v="19"/>
236 >  <defjtregtests v="20"/>
237  
238    <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
239    <property name="jtreg.flags" value=""/>
240  
241    <macrodef name="run-jtreg-tests">
327    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
242      <attribute name="target"/>
243      <attribute name="workdir"/>
244      <attribute name="classes"/>
245 +    <attribute name="verbose" default="${jtreg.verbose}"/>
246      <attribute name="jtregflags" default=""/>
247 +    <element name="jtreg-elements" optional="true"/>
248  
249      <sequential>
250  
251      <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
252      <property name="jtreg.verbose" value="nopass,fail,error"/>
253  
254 <    <local name="modules"/>
255 <    <condition property="modules">
256 <      <available file="${jdk@{target}.home}/jmods" type="dir"/>
257 <    </condition>
254 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
255 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
256 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
257 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
258 >    <property name="jtreg.concurrency" value="3"/>
259  
260 <    <delete dir="@{workdir}/JTwork"   quiet="true"/>
260 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
261      <jtreg dir="${jtreg@{target}.src.dir}"
262             jdk="${jdk@{target}.home}"
263             workDir="@{workdir}/JTwork">
264        <patternset refid="jdk@{target}.jtreg.tests"/>
265 <      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266 <      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
267 <      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
265 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
266 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
267 >      <arg value="-vmoption:-Xmx256m"/>
268 >      <arg value="-concurrency:${jtreg.concurrency}"/>
269 >      <arg value="-vmoptions:-esa -ea"/>
270 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
271        <arg value="-agentvm"/>
272        <arg value="-noreport"/>
273 <      <arg value="-verbose:${jtreg.verbose}"/>
354 <      <arg value="-vmoptions:-esa -ea"/>
273 >      <arg value="-verbose:@{verbose}"/>
274        <arg value="-automatic"/>
275        <arg value="-k:!ignore"/>
276        <arg line="@{jtregflags}"/>
277        <arg line="${jtreg.flags}"/>
278 +      <jtreg-elements/>
279      </jtreg>
280      </sequential>
281    </macrodef>
# Line 366 | Line 286
286    </path>
287  
288    <!-- Support @jls tag, used in jdk8+ javadoc -->
289 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
290    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
291    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
292  
293    <!-- Main targets -->
294  
295 <  <property name="build.main.java.version" value="9"/>
296 <  <!-- Workaround "no nested properties in ant" -->
297 <  <macrodef name="define-build-main-properties">
298 <    <attribute name="v"/>
299 <    <sequential>
300 <      <property name="build.main.java"    value="${java@{v}}"/>
301 <      <property name="build.main.javac"   value="${javac@{v}}"/>
381 <      <property name="build.main.javadoc" value="${javadoc@{v}}"/>
382 <    </sequential>
383 <  </macrodef>
384 <  <define-build-main-properties v="${build.main.java.version}"/>
295 >  <!-- Default values: may seem strange ... -->
296 >  <!-- At runtime, target latest, but build for current LTS -->
297 >  <property name="java.runtime.target" value="19"/>
298 >  <property name="build.main.java" value="${java17}"/>
299 >  <property name="build.main.javac" value="${javac17}"/>
300 >  <property name="build.main.javadoc" value="${javadoc19}"/>
301 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
302  
303    <target name="dists"
304 <          depends="dist, 4jdk8dist"
304 >          depends="dist"
305            description="Builds all public jars and docs"/>
389          <!--
390              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
391          -->
306  
307    <target name="compile"
308            depends="configure-compiler"
# Line 416 | Line 330
330        <compilerarg value="-Xprefer:source"/>
331        <compilerarg value="-XDignore.symbol.file=true"/>
332        <compilerarg value="-Xlint:all"/>
333 <      <compilerarg line="--doclint-format html5"/>
334 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
333 >      <compilerarg value="-Xdoclint:all/protected"/>
334 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
335        <compilerarg value="-Werror"/>
336        <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
337        <compilerarg line="${build.args}"/>
424
338      </javac>
339    </target>
340  
428
341    <target name="jar"
342            depends="compile"
343            description="Builds library jar for src/main from compiled sources">
# Line 443 | Line 355
355  
356    <target name="docs"
357            description="Builds javadocs for src/main to dist dir">
358 <
447 <    <delete dir="${docs.dir}"/>
358 >    <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
449
450    <!-- the packagenames="none" hack below prevents scanning the -->
451    <!-- sourcepath for packages -->
452
453 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
454 <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
455 <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
456 <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
457 <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
360      <javadoc destdir="${docs.dir}"
361               packagenames="none"
362 <             link="${java9.api.url}"
362 >             link="${java.api.url}"
363               overview="${src.dir}/intro.html"
364               access="${build.javadoc.access}"
365               sourcepath="${src.dir}"
366               classpath=""
367 <             source="9"
367 >             source="${build.main.javadoc.source}"
368               executable="${build.main.javadoc}">
369        <fileset dir="${src.dir}" defaultexcludes="yes">
370 <        <include name="**/*.java"/>
370 >        <include name="java/**/*.java"/>
371        </fileset>
372 <      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
372 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
373        <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
374 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
375 +      <arg value="-quiet"/>
376        <arg value="-XDignore.symbol.file=true"/>
377        <arg value="-html5"/>
378 +      <arg value="-Xdoclint:all,-missing"/>
379        <arg value="--patch-module=java.base=${src.dir}"/>
380 <      <arg value="-tag"/>
381 <      <arg value="${javadoc.jls.option}"/>
382 < <!-- @apiNote currently unused -->
383 < <!--       <arg value="-tag"/> -->
384 < <!--       <arg value="apiNote:a:API Note:"/> -->
385 <      <arg value="-tag"/>
481 <      <arg value="implSpec:a:Implementation Requirements:"/>
482 <      <arg value="-tag"/>
483 <      <arg value="implNote:a:Implementation Note:"/>
484 < <!-- tags added in jdk9: currently unused -->
485 < <!--       <arg value="-tag"/> -->
486 < <!--       <arg value="revised:X"/> -->
487 < <!--       <arg value="-tag"/> -->
488 < <!--       <arg value="spec:X"/> -->
380 >      <arg value="--frames" if:set="use-frames"/>
381 >      <arg value="--override-methods=summary"/>
382 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
383 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
384 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
385 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
386      </javadoc>
387    </target>
388  
492
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
497
498  <target name="release"
499          depends="dist"
500          description="Puts entire CVS tree, plus distribution productions, in a jar">
501
502    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
503
504    <jar basedir="${basedir}" destfile="${release.jar}">
505      <!-- <exclude name="build/**"/> -->
506      <exclude name="${release.jar}"/>
507      <exclude name="user.properties"/>
508      <exclude name="etc/notes/**"/>
509      <exclude name="src/emulation/**"/>
510      <exclude name="**/SyntaxTest.java"/>
511      <exclude name="**/SuperfluousAbstract.java"/>
512      <manifest>
513        <attribute name="Built-By" value="${user.name}"/>
514        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
515      </manifest>
516    </jar>
517  </target>
518
519
393    <target name="clean"
394            description="Removes all build products">
395      <delete dir="${build.dir}"/>
396    </target>
397  
525
398    <target name="dist-clean"
399            description="Removes all build and distribution products">
400      <delete dir="${build.dir}"/>
401      <delete dir="${dist.dir}"/>
402    </target>
403  
532
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 541 | Line 412
412    </target>
413  
414    <target name="tck"
415 <          depends="jar"
415 >          depends="jar"
416            description="Runs tck tests for src/main directly">
546
417      <run-tck-tests
418 <      target="${build.main.java.version}"
418 >      target="${java.runtime.target}"
419        workdir="${build.dir}"
420        classes="${product.jar}">
421        <javac-elements>
422 <        <compilerarg value="-Werror"/>
422 >        <!-- <compilerarg value="-Werror"/> -->
423        </javac-elements>
424      </run-tck-tests>
425    </target>
# Line 576 | Line 446
446    </target>
447  
448    <target name="jtreg"
449 <          depends="jar"
449 >          depends="jar"
450            description="Runs jtreg tests for src/main using the jtreg ant task">
451      <run-jtreg-tests
452 <       target="${build.main.java.version}"
452 >       target="${java.runtime.target}"
453         workdir="${build.dir}"
454         classes="${product.jar}"/>
455    </target>
# Line 588 | Line 458
458            depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
459            description="Runs tck and jtreg tests for src/main"/>
460  
461 < <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
461 >  <target name="test-version-permutations"
462 >          depends="test17, test19, clean, test, docs"
463 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
464  
593 <!--     <antcall target="jtreg"> -->
594 <!--       <param name="build.main.java.version" value="8"/> -->
595 <!--       <param name="build.main.javac" value="${javac8}"/> -->
596 <!--     </antcall> -->
597
598 <!--   </target> -->
599
600  <target name="test910"
601          description="Runs tck and jtreg tests for src/main for multiple java versions">
465  
466 <    <antcall target="clean"/>
467 <    <antcall target="test">
468 <      <param name="build.main.java.version" value="9"/>
466 >  <target name="test17">
467 >    <antcall>
468 >      <param name="java.runtime.target" value="17"/>
469 >      <param name="build.main.javac" value="${javac17}"/>
470 >      <param name="build.main.javadoc" value="${javadoc17}"/>
471 >      <param name="build.main.javadoc.source" value="17"/>
472 >      <target name="clean"/>
473 >      <target name="test"/>
474 >      <target name="docs"/>
475      </antcall>
476 <
477 <    <antcall target="clean"/>
478 <    <antcall target="test">
479 <      <param name="build.main.java.version" value="10"/>
476 >  </target>
477 >  <target name="test19">
478 >    <antcall>
479 >      <param name="java.runtime.target" value="19"/>
480 >      <param name="build.main.javac" value="${javac19}"/>
481 >      <param name="build.main.javadoc" value="${javadoc19}"/>
482 >      <param name="build.main.javadoc.source" value="19"/>
483 >      <target name="clean"/>
484 >      <target name="test"/>
485 >      <target name="docs"/>
486      </antcall>
612
487    </target>
488  
489  
616
490    <target name="configure-compiler">
491      <fail message="ant version too old">
492        <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
# Line 634 | Line 507
507    </target>
508  
509  
637
638  <!-- Various demos and test programs -->
639
640
641  <!-- description="Benchmark from Doug Lea's AQS paper" -->
642  <target name="loops" depends="configure-compiler">
643
644    <mkdir dir="${build.loops.dir}"/>
645
646    <javac srcdir="${loops.src.dir}"
647          destdir="${build.loops.dir}"
648            debug="${build.debug}"
649       debuglevel="${build.debuglevel}"
650      deprecation="${build.deprecation}"
651           source="${build.sourcelevel}"
652           target="${build.sourcelevel}"
653         encoding="ASCII"
654             fork="true">
655
656      <compilerarg line="${build.args}"/>
657      <classpath refid="loops.classpath"/>
658      <compilerarg value="-XDignore.symbol.file=true"/>
659
660    </javac>
661
662    <java classname="ALoops" fork="true">
663      <classpath refid="loops.classpath"/>
664    </java>
665  </target>
666
667
510    <target name="compile-test-loops" depends="jar"
511            description="Compiles all the perf tests in src/test/loops">
512  
# Line 683 | Line 525
525  
526        <include name="*.java"/>
527        <compilerarg value="-XDignore.symbol.file=true"/>
528 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
529 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
688 <      <compilerarg line="${build.args}"/>
689 <    </javac>
690 <  </target>
691 <
692 <
693 <  <!-- jsr166 4jdk8 -->
694 <
695 <  <target name="4jdk8compile"
696 <          depends="configure-compiler"
697 <          description="Compiles src/jdk8 sources, targeting jdk8">
698 <
699 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
700 <
701 <    <javac srcdir="${4jdk8src.dir}"
702 <           destdir="${build.4jdk8.classes.dir}"
703 <           debug="${build.debug}"
704 <           debuglevel="${build.debuglevel}"
705 <           deprecation="${build.deprecation}"
706 <           source="8"
707 <           target="8"
708 <           classpath=""
709 <           bootclasspath="${bootclasspath8}"
710 <           includeAntRuntime="false"
711 <           includeJavaRuntime="false"
712 <           encoding="ASCII"
713 <           executable="${javac8}"
714 <           fork="true">
715 <      <include name="**/*.java"/>
716 <      <compilerarg value="-Xprefer:source"/>
717 <      <compilerarg value="-XDignore.symbol.file=true"/>
718 <      <compilerarg value="-Xlint:all"/>
719 <      <compilerarg value="-Werror"/>
720 <      <compilerarg line="${build.args}"/>
721 <    </javac>
722 <  </target>
723 <
724 <  <target name="4jdk8doclint"
725 <          depends="configure-compiler"
726 <          description="Finds doclint warnings">
727 <
728 <    <mkdir dir="${build.4jdk8.classes.dir}"/>
729 <
730 <    <javac srcdir="${4jdk8src.dir}"
731 <           destdir="${build.4jdk8.classes.dir}"
732 <           debug="${build.debug}"
733 <           debuglevel="${build.debuglevel}"
734 <           deprecation="${build.deprecation}"
735 <           source="8"
736 <           target="8"
737 <           classpath=""
738 <           bootclasspath="${bootclasspath8}"
739 <           includeAntRuntime="false"
740 <           includeJavaRuntime="false"
741 <           encoding="ASCII"
742 <           executable="${javac8}"
743 <           fork="true">
744 <      <include name="**/*.java"/>
745 <      <compilerarg value="-Xprefer:source"/>
746 <      <compilerarg value="-XDignore.symbol.file=true"/>
747 <      <compilerarg value="-Xlint:all"/>
748 <      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
528 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
529 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
530        <compilerarg line="${build.args}"/>
531      </javac>
532    </target>
533  
534  
535 <  <target name="4jdk8jar"
536 <          depends="4jdk8compile"
756 <          description="Builds library jar from compiled sources">
757 <
758 <    <jar destfile="${4jdk8product.jar}">
759 <      <fileset dir="${build.4jdk8.classes.dir}"/>
760 <      <manifest>
761 <        <attribute name="Built-By" value="${user.name}"/>
762 <        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
763 <      </manifest>
764 <    </jar>
765 <  </target>
766 <
767 <
768 <  <target name="4jdk8-tck"
769 <          depends="4jdk8jar"
770 <          description="Runs tck tests for jsr166-4jdk8 directly">
771 <
772 <    <run-tck-tests
773 <      target="8"
774 <      workdir="${build.4jdk8.dir}"
775 <      classes="${4jdk8product.jar}">
776 <      <javac-elements>
777 <        <!-- JDK9+ test classes -->
778 <        <exclude name="*9Test.java"/>
779 <        <exclude name="*10Test.java"/>
780 <        <compilerarg value="-Werror"/>
781 <      </javac-elements>
782 <    </run-tck-tests>
783 <  </target>
784 <
785 <
786 <  <target name="4jdk8-jtreg"
787 <          depends="4jdk8jar"
788 <          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
789 <    <run-jtreg-tests
790 <       target="8"
791 <       workdir="${build.4jdk8.dir}"
792 <       classes="${4jdk8product.jar}"/>
793 <  </target>
794 <
795 <
796 <  <target name="4jdk8-test"
797 <          depends="4jdk8-tck, 4jdk8-jtreg"
798 <          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
799 <
800 <
801 <  <target name="4jdk8docs"
802 <          description="Builds javadocs for src/jdk8 to dist dir">
803 <
804 <    <delete dir="${4jdk8docs.dir}"/>
805 <    <mkdir dir="${4jdk8docs.dir}"/>
806 <
807 <    <javadoc destdir="${4jdk8docs.dir}"
808 <             packagenames="none"
809 <             link="${java8.api.url}"
810 <             overview="${4jdk8src.dir}/intro.html"
811 <             access="${build.javadoc.access}"
812 <             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
813 <             classpath=""
814 <             source="8"
815 <             executable="${javadoc8}"
816 <             failonerror = "true">
817 <      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
818 <        <include name="**/*.java"/>
819 <      </fileset>
820 <      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
821 <      <arg value="-XDignore.symbol.file=true"/>
822 <      <arg value="-tag"/>
823 <      <arg value="${javadoc.jls.option}"/>
824 < <!-- @apiNote currently unused -->
825 < <!--       <arg value="-tag"/> -->
826 < <!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
827 <      <arg value="-tag"/>
828 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
829 <      <arg value="-tag"/>
830 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
831 <    </javadoc>
832 <  </target>
833 <
834 <
835 <  <target name="4jdk8dist"
836 <          depends="4jdk8dist-jar, 4jdk8dist-docs"
837 <          description="Puts all distributable products in single hierarchy"/>
838 <
839 <
840 <  <target name="4jdk8clean"
841 <          description="Removes all 4jdk8 build products">
842 <    <delete dir="${build.4jdk8.dir}"/>
843 <  </target>
844 <
845 <
846 <  <target name="4jdk8dist-jar"
847 <          depends="4jdk8clean, 4jdk8jar">
848 <    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
849 <  </target>
850 <
851 <
852 <  <target name="4jdk8dist-docs"
853 <          depends="4jdk8clean, 4jdk8docs">
854 <    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
855 <  </target>
856 <
857 <
535 >  <!-- old branches no longer maintained.  build support deleted -->
536 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
537    <!-- jsr166 4jdk7 (no longer maintained) -->
859
860  <target name="4jdk7compile" depends="configure-compiler">
861    <mkdir dir="${build.4jdk7.classes.dir}"/>
862
863    <javac srcdir="${4jdk7src.dir}"
864           destdir="${build.4jdk7.classes.dir}"
865           debug="${build.debug}"
866           debuglevel="${build.debuglevel}"
867           deprecation="${build.deprecation}"
868           source="6"
869           target="6"
870           classpath=""
871           bootclasspath="${bootclasspath6}"
872           includeAntRuntime="false"
873           includeJavaRuntime="false"
874           encoding="ASCII"
875           executable="${javac7}"
876           fork="true">
877
878      <include name="**/*.java"/>
879      <compilerarg value="-Xprefer:source"/>
880      <compilerarg value="-XDignore.symbol.file=true"/>
881      <compilerarg value="-Xlint:all"/>
882      <compilerarg value="-Werror"/>
883      <compilerarg line="${build.args}"/>
884    </javac>
885  </target>
886
887  <target name="4jdk7doclint" depends="configure-compiler">
888    <mkdir dir="${build.4jdk7.classes.dir}"/>
889
890    <javac srcdir="${4jdk7src.dir}"
891           destdir="${build.4jdk7.classes.dir}"
892           debug="${build.debug}"
893           debuglevel="${build.debuglevel}"
894           deprecation="${build.deprecation}"
895           source="6"
896           target="6"
897           classpath=""
898           bootclasspath="${bootclasspath6}"
899           includeAntRuntime="false"
900           includeJavaRuntime="false"
901           encoding="ASCII"
902           executable="${javac8}"
903           fork="true">
904
905      <include name="**/*.java"/>
906      <compilerarg value="-Xprefer:source"/>
907      <compilerarg value="-XDignore.symbol.file=true"/>
908      <compilerarg value="-Xlint:all"/>
909      <compilerarg value="-Xdoclint:all/protected"/>
910      <compilerarg line="${build.args}"/>
911    </javac>
912  </target>
913
914  <target name="4jdk7jar" depends="4jdk7compile">
915    <jar destfile="${4jdk7product.jar}">
916      <fileset dir="${build.4jdk7.classes.dir}"/>
917      <manifest>
918        <attribute name="Built-By" value="${user.name}"/>
919        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
920      </manifest>
921    </jar>
922  </target>
923
924  <target name="4jdk7-tck" depends="4jdk7jar">
925    <run-tck-tests
926      target="7"
927      workdir="${build.4jdk7.dir}"
928      classes="${4jdk7product.jar}">
929      <javac-elements>
930        <!-- JDK8+ test classes -->
931        <exclude name="*8Test.java"/>
932        <exclude name="*9Test.java"/>
933        <exclude name="*10Test.java"/>
934        <exclude name="DoubleAccumulatorTest.java"/>
935        <exclude name="DoubleAdderTest.java"/>
936        <exclude name="LongAccumulatorTest.java"/>
937        <exclude name="LongAdderTest.java"/>
938        <exclude name="CompletableFutureTest.java"/>
939        <exclude name="SplittableRandomTest.java"/>
940        <exclude name="StampedLockTest.java"/>
941        <exclude name="SubmissionPublisherTest.java"/>
942        <compilerarg value="-Werror"/>
943      </javac-elements>
944    </run-tck-tests>
945  </target>
946
947  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
948  <target name="4jdk7-tck-junit" depends="4jdk7compile">
949
950    <junit printsummary="true"
951           showoutput="true"
952           errorProperty="junit.failed"
953           failureProperty="junit.failed"
954           includeantruntime="true"
955           jvm="${java7}"
956           fork="true">
957
958      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
959      <jvmarg value="-server"/>
960
961      <classpath>
962        <pathelement location="${junit.jar}"/>
963        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
964      </classpath>
965
966      <formatter type="brief"/>
967
968      <test name="${jsr166.tckTestClass}" haltonfailure="no">
969      </test>
970    </junit>
971  </target>
972
973  <target name="4jdk7-jtreg" depends="4jdk7jar">
974    <run-jtreg-tests
975       target="7"
976       workdir="${build.4jdk7.dir}"
977       classes="${4jdk7product.jar}"/>
978  </target>
979
980  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
981
982  <target name="4jdk7docs">
983    <delete dir="${4jdk7docs.dir}"/>
984    <mkdir dir="${4jdk7docs.dir}"/>
985
986    <javadoc destdir="${4jdk7docs.dir}"
987             packagenames="none"
988             link="${java7.api.url}"
989             overview="${4jdk7src.dir}/intro.html"
990             access="${build.javadoc.access}"
991             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
992             classpath=""
993             executable="${javadoc7}"
994             failonerror = "true">
995      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
996        <include name="**/*.java"/>
997      </fileset>
998      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
999      <arg value="-XDignore.symbol.file=true"/>
1000    </javadoc>
1001  </target>
1002
1003  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1004
1005  <target name="4jdk7clean">
1006    <delete dir="${build.4jdk7.dir}"/>
1007  </target>
1008
1009  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1010    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1011  </target>
1012
1013  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1014    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1015  </target>
1016
1017
538    <!-- jsr166x (no longer maintained) -->
1019
1020  <target name="jsr166xcompile" depends="configure-compiler">
1021    <mkdir dir="${build.jsr166x.classes.dir}"/>
1022
1023    <javac srcdir="${topsrc.dir}"
1024           destdir="${build.jsr166x.classes.dir}"
1025           debug="${build.debug}"
1026           debuglevel="${build.debuglevel}"
1027           deprecation="${build.deprecation}"
1028           classpath=""
1029           bootclasspath="${bootclasspath6}"
1030           source="5"
1031           target="5"
1032           includeAntRuntime="false"
1033           includeJavaRuntime="false"
1034           encoding="ASCII"
1035           executable="${javac7}"
1036           fork="true">
1037      <include name="jsr166x/**/*.java"/>
1038      <compilerarg value="-XDignore.symbol.file=true"/>
1039      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1040      <compilerarg value="-Werror"/>
1041      <compilerarg line="${build.args}"/>
1042    </javac>
1043  </target>
1044
1045  <target name="jsr166xjar" depends="jsr166xcompile">
1046    <jar destfile="${jsr166x.jar}">
1047      <fileset dir="${build.jsr166x.classes.dir}"/>
1048      <manifest>
1049        <attribute name="Built-By" value="${user.name}"/>
1050        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1051      </manifest>
1052    </jar>
1053  </target>
1054
1055  <target name="jsr166xdocs">
1056    <delete dir="${jsr166xdocs.dir}"/>
1057    <mkdir dir="${jsr166xdocs.dir}"/>
1058
1059    <javadoc destdir="${jsr166xdocs.dir}"
1060             packagenames="jsr166x.*"
1061             link="${java.api.url}"
1062             access="${build.javadoc.access}"
1063             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1064             bootclasspath="${bootclasspath6}"
1065             source="5"
1066             executable="${javadoc7}"
1067             failonerror = "true">
1068      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1069      <arg value="-XDignore.symbol.file=true"/>
1070    </javadoc>
1071  </target>
1072
1073  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1074
1075  <target name="jsr166xclean">
1076    <delete dir="${build.jsr166x.dir}"/>
1077  </target>
1078
1079  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1080    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1081  </target>
1082
1083  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1084    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1085  </target>
1086
1087
539    <!-- jsr166y (no longer maintained) -->
1089
1090  <target name="jsr166ycompile" depends="configure-compiler">
1091    <mkdir dir="${build.jsr166y.classes.dir}"/>
1092
1093    <javac srcdir="${topsrc.dir}"
1094           destdir="${build.jsr166y.classes.dir}"
1095           debug="${build.debug}"
1096           debuglevel="${build.debuglevel}"
1097           deprecation="${build.deprecation}"
1098           source="6"
1099           target="6"
1100           classpath=""
1101           bootclasspath="${bootclasspath6}"
1102           includeAntRuntime="false"
1103           includeJavaRuntime="false"
1104           encoding="ASCII"
1105           executable="${javac7}"
1106           fork="true">
1107
1108      <include name="jsr166y/**/*.java"/>
1109      <compilerarg value="-XDignore.symbol.file=true"/>
1110      <compilerarg value="-Xlint:all"/>
1111      <compilerarg value="-Werror"/>
1112      <compilerarg line="${build.args}"/>
1113    </javac>
1114  </target>
1115
1116  <target name="jsr166yjar" depends="jsr166ycompile">
1117    <jar destfile="${jsr166y.jar}" index="true">
1118      <fileset dir="${build.jsr166y.classes.dir}"/>
1119      <manifest>
1120        <attribute name="Built-By" value="${user.name}"/>
1121        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1122      </manifest>
1123    </jar>
1124  </target>
1125
1126  <target name="jsr166ydocs">
1127    <delete dir="${jsr166ydocs.dir}"/>
1128    <mkdir dir="${jsr166ydocs.dir}"/>
1129
1130    <javadoc destdir="${jsr166ydocs.dir}"
1131             packagenames="jsr166y.*"
1132             link="${java.api.url}"
1133             access="${build.javadoc.access}"
1134             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1135             bootclasspath="${bootclasspath6}"
1136             source="6"
1137             executable="${javadoc7}"
1138             failonerror = "true">
1139      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1140      <arg value="-XDignore.symbol.file=true"/>
1141    </javadoc>
1142  </target>
1143
1144  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1145
1146  <target name="jsr166yclean">
1147    <delete dir="${build.jsr166y.dir}"/>
1148  </target>
1149
1150  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1151    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1152  </target>
1153
1154  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1155    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1156  </target>
1157
1158
540    <!-- extra166y (no longer maintained) -->
1160
1161  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1162    <mkdir dir="${build.extra166y.classes.dir}"/>
1163
1164    <javac srcdir="${topsrc.dir}"
1165           destdir="${build.extra166y.classes.dir}"
1166           debug="${build.debug}"
1167           debuglevel="${build.debuglevel}"
1168           deprecation="${build.deprecation}"
1169           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1170           classpath=""
1171           source="6"
1172           target="6"
1173           includeAntRuntime="false"
1174           includeJavaRuntime="false"
1175           encoding="ASCII"
1176           executable="${javac7}"
1177           fork="true">
1178
1179      <include name="extra166y/**/*.java"/>
1180      <compilerarg value="-XDignore.symbol.file=true"/>
1181      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1182      <compilerarg value="-Werror"/>
1183      <compilerarg line="${build.args}"/>
1184    </javac>
1185  </target>
1186
1187  <target name="extra166yjar" depends="extra166ycompile">
1188    <jar destfile="${extra166y.jar}" index="true">
1189      <fileset dir="${build.extra166y.classes.dir}"/>
1190      <manifest>
1191        <attribute name="Built-By" value="${user.name}"/>
1192        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1193      </manifest>
1194    </jar>
1195  </target>
1196
1197  <target name="extra166ydocs">
1198    <delete dir="${extra166ydocs.dir}"/>
1199    <mkdir dir="${extra166ydocs.dir}"/>
1200
1201    <javadoc destdir="${extra166ydocs.dir}"
1202             packagenames="extra166y.*"
1203             link="${java.api.url}"
1204             access="${build.javadoc.access}"
1205             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1206             bootclasspath="${bootclasspath6}"
1207             source="6"
1208             executable="${javadoc7}">
1209      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1210      <arg value="-XDignore.symbol.file=true"/>
1211    </javadoc>
1212  </target>
1213
1214  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1215
1216  <target name="extra166yclean">
1217    <delete dir="${build.extra166y.dir}"/>
1218  </target>
1219
1220  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1221    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1222  </target>
1223
1224  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1225    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1226  </target>
1227
1228
541    <!-- jsr166e (no longer maintained) -->
542  
1231  <property name="build.jsr166e.java.version" value="6"/>
1232  <property name="build.jsr166e.javac" value="${javac6}"/>
1233
1234  <target name="jsr166ecompile" depends="configure-compiler">
1235    <mkdir dir="${build.jsr166e.classes.dir}"/>
1236
1237    <javac srcdir="${topsrc.dir}"
1238           destdir="${build.jsr166e.classes.dir}"
1239           debug="${build.debug}"
1240           debuglevel="${build.debuglevel}"
1241           deprecation="${build.deprecation}"
1242           source="${build.jsr166e.java.version}"
1243           target="${build.jsr166e.java.version}"
1244           classpath=""
1245           includeAntRuntime="false"
1246           includeJavaRuntime="false"
1247           executable="${build.jsr166e.javac}"
1248           fork="true">
1249
1250      <include name="jsr166e/**/*.java"/>
1251      <compilerarg value="-XDignore.symbol.file=true"/>
1252      <compilerarg value="-Xlint:all"/>
1253      <compilerarg value="-Werror"/>
1254      <compilerarg line="${build.args}"/>
1255    </javac>
1256  </target>
1257
1258  <target name="jsr166edoclint">
1259    <mkdir dir="${build.jsr166e.classes.dir}"/>
1260
1261    <javac srcdir="${topsrc.dir}"
1262           destdir="${build.jsr166e.classes.dir}"
1263           debug="${build.debug}"
1264           debuglevel="${build.debuglevel}"
1265           deprecation="${build.deprecation}"
1266           source="${build.jsr166e.java.version}"
1267           target="${build.jsr166e.java.version}"
1268           classpath=""
1269           bootclasspath="${bootclasspath6}"
1270           includeAntRuntime="false"
1271           includeJavaRuntime="false"
1272           executable="${javac8}"
1273           fork="true">
1274
1275      <include name="jsr166e/**/*.java"/>
1276      <compilerarg value="-XDignore.symbol.file=true"/>
1277      <compilerarg value="-Xlint:all"/>
1278      <compilerarg value="-Werror"/>
1279      <compilerarg value="-Xdoclint:all/protected"/>
1280    </javac>
1281  </target>
1282
1283  <target name="jsr166ejar" depends="jsr166ecompile">
1284    <jar destfile="${jsr166e.jar}" index="true">
1285      <fileset dir="${build.jsr166e.classes.dir}"/>
1286      <manifest>
1287        <attribute name="Built-By" value="${user.name}"/>
1288        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1289      </manifest>
1290    </jar>
1291  </target>
1292
1293  <target name="jsr166edocs">
1294    <delete dir="${jsr166edocs.dir}"/>
1295    <mkdir dir="${jsr166edocs.dir}"/>
1296
1297    <javadoc destdir="${jsr166edocs.dir}"
1298             packagenames="jsr166e.*"
1299             link="${java.api.url}"
1300             access="${build.javadoc.access}"
1301             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1302             source="${build.jsr166e.java.version}"
1303             executable="${javadoc7}"
1304             failonerror = "true">
1305      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1306      <arg value="-XDignore.symbol.file=true"/>
1307    </javadoc>
1308  </target>
1309
1310  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1311    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1312    <run-tck-tests
1313      tck.src.dir="${test.src.dir}/tck-jsr166e"
1314      target="${build.jsr166e.java.version}"
1315      workdir="${build.jsr166e.dir}"
1316      classes="${jsr166e.jar}"/>
1317  </target>
1318
1319  <target name="jsr166e-tck">
1320
1321 <!--     <antcall target="clean"/> -->
1322 <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1323 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1324 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1325 <!--     </antcall> -->
1326
1327    <antcall target="clean"/>
1328    <antcall target="jsr166e-tck-one-java-version">
1329      <param name="build.jsr166e.java.version" value="7"/>
1330      <param name="build.jsr166e.javac" value="${javac7}"/>
1331    </antcall>
1332
1333    <antcall target="clean"/>
1334    <antcall target="jsr166e-tck-one-java-version">
1335      <param name="build.jsr166e.java.version" value="6"/>
1336      <param name="build.jsr166e.javac" value="${javac6}"/>
1337    </antcall>
1338  </target>
1339
1340  <target name="jsr166e-test" depends="jsr166e-tck"/>
1341
1342  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1343
1344  <target name="jsr166eclean">
1345    <delete dir="${build.jsr166e.dir}"/>
1346  </target>
1347
1348  <target name="jsr166edist-jar"
1349          depends="jsr166eclean, jsr166ejar">
1350    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1351  </target>
1352
1353  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1354    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1355  </target>
1356
1357
543   <!-- Find buglets that can be detected by static build tools -->
544  
545 <  <target name="lint">
546 <    <antcall target="dists">
547 <      <param name="build.javadoc.access" value="public"/>
548 <    </antcall>
549 <  </target>
545 > <!--   <target name="lint"> -->
546 > <!--     <antcall target="dists"> -->
547 > <!--       <param name="build.javadoc.access" value="protected"/> -->
548 > <!--     </antcall> -->
549 > <!--   </target> -->
550  
551   <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
552 <  <target name="lint-private">
552 >  <target name="doclint-private">
553      <antcall target="dist">
554        <param name="build.javadoc.access" value="private"/>
555      </antcall>
# Line 1372 | Line 557
557  
558  
559   <!-- ==============================================================
560 <  Experimental errorprone support - http://errorprone.info
560 >  Experimental errorprone support
561 >  https://errorprone.info
562 >  https://errorprone.info/docs/installation
563 >  https://github.com/google/error-prone/issues/1143
564   =================================================================== -->
565 +  <path id="errorprone.processorpath.path">
566 +    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
567 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
568 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
569 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
570 +    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
571 +  </path>
572 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
573 +  <property name="errorprone.jsr166.user.flags" value=""/>
574 +  <property name="errorprone.jsr166.flags"
575 +            value="-Xep:HashtableContains:OFF
576 +                   -Xep:PreferJavaTimeOverload:OFF
577 +                   -Xep:JdkObsolete:OFF
578 +                   -Xep:MissingOverride:OFF
579 +                   -Xep:MissingFail:OFF
580 +                   -Xep:ThreadPriorityCheck:OFF
581 +                   -Xep:MixedArrayDimensions:ERROR
582 +                   -Xep:RemoveUnusedImports:ERROR
583 +                   -Xep:EmptyIf:ERROR
584 +                   -Xep:MultipleTopLevelClasses:ERROR
585 +                   -Xep:ClassName:ERROR
586 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
587 +                   -Xep:RedundantThrows:ERROR
588 +                   -Xep:IdentityBinaryExpression:WARN
589 +                   -Xep:ConstructorInvokesOverridable:WARN
590 +                   -Xep:MethodCanBeStatic:WARN
591 +                   ${errorprone.jsr166.user.flags}"/>
592 +  <!-- -Xep:WildcardImport:ERROR -->
593 +  <property name="errorprone.jsr166.test.flags"
594 +            value="-Xep:StringSplitter:OFF
595 +                   -Xep:BoxedPrimitiveConstructor:OFF
596 +                   -Xep:UnnecessaryParentheses:OFF
597 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
598 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
599    <target name="errorprone"
600            depends="clean, configure-compiler"
601            description="Run errorprone over jsr166 source code (experimental)">
# Line 1395 | Line 617
617             fork="true">
618  
619        <include name="**/*.java"/>
620 <      <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
620 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
621 >      <compilerarg value="-J--illegal-access=permit"/>
622 >      <compilerarg value="-XDcompilePolicy=simple"/>
623 >      <compilerarg value="-processorpath"/>
624 >      <compilerarg pathref="errorprone.processorpath.path"/>
625        <compilerarg value="-Xplugin:ErrorProne
626 <                          -Xep:IdentityBinaryExpression:WARN
1401 <                          -Xep:MissingOverride:OFF
1402 <                          -Xep:MixedArrayDimensions:WARN
1403 <                          -Xep:RemoveUnusedImports:ERROR
1404 <                          -Xep:ClassName:ERROR
1405 <                          -Xep:MultipleTopLevelClasses:ERROR
1406 <                          -Xep:EmptyIf:ERROR
1407 <                          -Xep:LongLiteralLowerCaseSuffix:ERROR
1408 <                          -Xep:RedundantThrows:ERROR
1409 <                          -Xep:MethodCanBeStatic:WARN"/>
626 >                          ${errorprone.jsr166.flags}"/>
627        <compilerarg value="--patch-module=java.base=${src.dir}"/>
628        <compilerarg value="-Xprefer:source"/>
629        <compilerarg value="-XDignore.symbol.file=true"/>
630        <compilerarg value="-Xlint:all"/>
631        <compilerarg value="-Xdoclint:all/protected,reference/private"/>
632 <      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
632 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
633 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
634        <compilerarg line="${build.args}"/>
635      </javac>
636  
# Line 1421 | Line 639
639      </jar>
640  
641      <run-tck-tests
642 <      target="${build.main.java.version}"
642 >      target="${java.runtime.target}"
643        workdir="${build.dir}"
644        classes="${product.jar}">
645        <javac-elements>
646 <        <compilerarg line="-processorpath ${lib.dir}/error_prone_ant-2.0.21.jar"/>
646 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
647 >        <compilerarg value="-J--illegal-access=permit"/>
648 >        <compilerarg value="-XDcompilePolicy=simple"/>
649 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
650          <compilerarg value="-Xplugin:ErrorProne
651 <                            -Xep:IdentityBinaryExpression:WARN
652 <                            -Xep:BoxedPrimitiveConstructor:OFF
653 <                            -Xep:HashtableContains:OFF
654 <                            -Xep:ModifyingCollectionWithItself:OFF
1434 <                            -Xep:MissingOverride:OFF
1435 <                            -Xep:MixedArrayDimensions:WARN
1436 <                            -Xep:RemoveUnusedImports:ERROR
1437 <                            -Xep:ClassName:ERROR
1438 <                            -Xep:MultipleTopLevelClasses:ERROR
1439 <                            -Xep:EmptyIf:ERROR
1440 <                            -Xep:LongLiteralLowerCaseSuffix:ERROR
1441 <                            -Xep:RedundantThrows:ERROR
1442 <                            -Xep:MethodCanBeStatic:WARN"/>
1443 <        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
651 >                            ${errorprone.jsr166.flags}
652 >                            ${errorprone.jsr166.test.flags}"/>
653 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
654 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
655        </javac-elements>
656      </run-tck-tests>
657    </target>
658  
659 +  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
660 +  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
661 +  <target name="errorprone-jtreg"
662 +          depends="jar"
663 +          description="Run errorprone over jtreg tests (experimental)">
664 +
665 +    <run-jtreg-tests
666 +       target="${java.runtime.target}"
667 +       workdir="${build.dir}"
668 +       classes="${product.jar}"
669 +       verbose="all">
670 +      <jtreg-elements>
671 +        <arg value="-javacoption:-XDcompilePolicy=simple"/>
672 +        <arg value="-javacoption:-processorpath"/>
673 +        <arg value="-javacoption:${errorprone.processorpath}"/>
674 +        <arg value="-javacoption:-Xplugin:ErrorProne
675 +                            ${errorprone.jsr166.flags}
676 +                            ${errorprone.jsr166.test.flags}
677 +                            -Xep:MultipleTopLevelClasses:WARN
678 +                            -Xep:NonAtomicVolatileUpdate:OFF"/>
679 +      </jtreg-elements>
680 +    </run-jtreg-tests>
681 +  </target>
682 +
683  
684   <!-- ==============================================================
685    Running guava tests against jsr166 code
# Line 1499 | Line 734
734           dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
735      <junit printsummary="true" showoutput="true" haltonfailure="true"
736             jvm="${build.main.java}" fork="true">
737 <      <jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
737 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
738        <formatter type="brief"/>
739        <classpath>
740          <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines