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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines