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.172 by jsr166, Wed Sep 2 05:00:20 2015 UTC vs.
Revision 1.326 by jsr166, Fri Nov 25 19:33:39 2022 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines