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.168 by jsr166, Wed Sep 2 02:14:59 2015 UTC vs.
Revision 1.328 by jsr166, Sat Jan 7 16:30:33 2023 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines