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.171 by jsr166, Wed Sep 2 04:46:40 2015 UTC vs.
Revision 1.327 by jsr166, Fri Nov 25 20:33:50 2022 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines