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.161 by jsr166, Sat Jan 17 23:12:49 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 213 | Line 169
169             source="@{compile-target}"
170             target="@{compile-target}"
171             classpath="${junit.jar}"
216           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
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"/>
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 +  <!-- 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 +  <defjtregtests v="17"/>
234 +  <defjtregtests v="18"/>
235 +  <defjtregtests v="19"/>
236 +  <defjtregtests v="20"/>
237 +
238 +  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
239 +  <property name="jtreg.flags" value=""/>
240 +
241    <macrodef name="run-jtreg-tests">
255    <!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
256    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
257    <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>
263    <delete dir="@{workdir}/JTwork"   quiet="true"/>
264    <delete dir="@{workdir}/JTreport" quiet="true"/>
265    <mkdir dir="@{workdir}/JTwork/scratch"/>
266    <mkdir dir="@{workdir}/JTreport"/>
267    <jtreg dir="@{jtreg.src.dir}"
268           jdk="${jdk@{target}.home}"
269           workDir="@{workdir}/JTwork"
270           reportDir="@{workdir}/JTreport">
250  
251 <      <arg value="-Xbootclasspath/p:@{classes}"/>
252 <      <arg value="-agentvm"/>
253 <      <arg value="-v:nopass,fail"/>
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">
264 >      <patternset refid="jdk@{target}.jtreg.tests"/>
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 286 | 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"/>
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}"/>
325
338      </javac>
339    </target>
340  
329
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 <
343 <    <delete dir="${docs.dir}"/>
358 >    <delete dir="${docs.dir}" quiet="true"/>
359      <mkdir dir="${docs.dir}"/>
345
346    <!-- the packagenames="none" hack below prevents scanning the -->
347    <!-- sourcepath for packages -->
348
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  
374
389    <target name="dist"
390            depends="dist-clean, dist-jar, dist-docs"
391            description="Puts all distributable products in single hierarchy"/>
392  
379
380  <target name="release"
381          depends="dist"
382          description="Puts entire CVS tree, plus distribution productions, in a jar">
383
384    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
385
386    <jar basedir="${basedir}" destfile="${release.jar}">
387      <!-- <exclude name="build/**"/> -->
388      <exclude name="${release.jar}"/>
389      <exclude name="user.properties"/>
390      <exclude name="etc/notes/**"/>
391      <exclude name="src/emulation/**"/>
392      <exclude name="**/SyntaxTest.java"/>
393      <exclude name="**/SuperfluousAbstract.java"/>
394    </jar>
395  </target>
396
397
393    <target name="clean"
394            description="Removes all build products">
400
395      <delete dir="${build.dir}"/>
402
396    </target>
397  
405
398    <target name="dist-clean"
399            description="Removes all build and distribution products">
408
400      <delete dir="${build.dir}"/>
401      <delete dir="${dist.dir}"/>
411
402    </target>
403  
414
404    <target name="dist-jar"
405            depends="clean, jar">
406      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 422 | Line 411
411      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
412    </target>
413  
414 <
415 <  <target name="test-tck"
416 <          depends="jar"
428 <          description="Runs tck tests for main directly">
429 <
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="test-jtreg"
442 <          depends="jar"
443 <          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">
462 <  </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="test89"
462 <          description="Runs tck and jtreg tests for main for multiple java versions">
463 <
464 <    <antcall target="clean"/>
465 <    <antcall target="test">
466 <      <param name="build.main.java.version" value="8"/>
467 <      <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>
476 <
477 <    <antcall target="clean"/>
478 <    <antcall target="test">
479 <      <param name="build.main.java.version" value="9"/>
480 <      <param name="build.main.javac" value="${javac9}"/>
476 >  </target>
477 >  <target name="test19">
478 >    <antcall>
479 >      <param name="java.runtime.target" value="19"/>
480 >      <param name="build.main.javac" value="${javac19}"/>
481 >      <param name="build.main.javadoc" value="${javadoc19}"/>
482 >      <param name="build.main.javadoc.source" value="19"/>
483 >      <target name="clean"/>
484 >      <target name="test"/>
485 >      <target name="docs"/>
486      </antcall>
478
487    </target>
488  
489  
482
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 497 | Line 507
507    </target>
508  
509  
510 +  <target name="compile-test-loops" depends="jar"
511 +          description="Compiles all the perf tests in src/test/loops">
512  
513 <  <!-- Various demos and test programs -->
513 >    <mkdir dir="${build.dir}/test/loops"/>
514  
515 <
516 <  <target name="loops" depends="configure-compiler"
505 <          description="Benchmark from Doug Lea's AQS paper">
506 <
507 <    <mkdir dir="${build.loops.dir}"/>
508 <
509 <    <javac srcdir="${loops.src.dir}"
510 <          destdir="${build.loops.dir}"
511 <            debug="${build.debug}"
512 <       debuglevel="${build.debuglevel}"
513 <      deprecation="${build.deprecation}"
514 <           source="${build.sourcelevel}"
515 <             fork="true">
516 <
517 <      <compilerarg line="${build.args}"/>
518 <      <classpath refid="loops.classpath"/>
519 <      <compilerarg value="-XDignore.symbol.file=true"/>
520 <
521 <    </javac>
522 <
523 <    <java classname="ALoops" fork="true">
524 <      <classpath refid="loops.classpath"/>
525 <    </java>
526 <
527 <  </target>
528 <
529 <
530 <  <!-- jsr166 4jdk7 -->
531 <
532 <  <target name="4jdk7compile"
533 <          depends="configure-compiler"
534 <          description="Compiles src/jdk7 sources, targeting jdk7">
535 <
536 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
537 <
538 <    <javac srcdir="${4jdk7src.dir}"
539 <           destdir="${build.4jdk7.classes.dir}"
515 >    <javac srcdir="${basedir}/src/test/loops"
516 >           destdir="${build.dir}/test/loops"
517             debug="${build.debug}"
518             debuglevel="${build.debuglevel}"
519             deprecation="${build.deprecation}"
543           source="6"
544           classpath=""
545           bootclasspath="${bootclasspath6}"
520             includeAntRuntime="false"
521             includeJavaRuntime="false"
522 <           executable="${javac7}"
522 >           encoding="ASCII"
523 >           executable="${build.main.javac}"
524             fork="true">
525  
526 <      <include name="**/*.java"/>
552 <      <compilerarg value="-Xprefer:source"/>
526 >      <include name="*.java"/>
527        <compilerarg value="-XDignore.symbol.file=true"/>
528 <      <compilerarg value="-Xlint:all"/>
528 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
529 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
530        <compilerarg line="${build.args}"/>
556
531      </javac>
532    </target>
533  
560  <target name="4jdk7doclint"
561          depends="configure-compiler"
562          description="Finds doclint warnings">
534  
535 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
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 > <!-- Find buglets that can be detected by static build tools -->
544 >
545 > <!--   <target name="lint"> -->
546 > <!--     <antcall target="dists"> -->
547 > <!--       <param name="build.javadoc.access" value="protected"/> -->
548 > <!--     </antcall> -->
549 > <!--   </target> -->
550  
551 <    <javac srcdir="${4jdk7src.dir}"
552 <           destdir="${build.4jdk7.classes.dir}"
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 >
558 >
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="${src.dir}"
608 >           destdir="${destdir}"
609             debug="${build.debug}"
610             debuglevel="${build.debuglevel}"
611             deprecation="${build.deprecation}"
571           source="6"
612             classpath=""
573           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}"/>
585
635      </javac>
587  </target>
588
636  
637 <  <target name="4jdk7jar"
638 <          depends="4jdk7compile"
592 <          description="Builds library jar from compiled sources">
593 <
594 <    <jar destfile="${4jdk7product.jar}">
595 <      <fileset dir="${build.4jdk7.classes.dir}"/>
637 >    <jar destfile="${product.jar}">
638 >      <fileset dir="${destdir}"/>
639      </jar>
640  
598  </target>
599
600
601  <target name="4jdk7-test-tck"
602          depends="4jdk7jar"
603          description="Runs tck tests for jsr166-4jdk7 directly">
604
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"/>
619 <        <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 <
647 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
648 <      </test>
649 <
744 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
745 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
746      </junit>
747    </target>
748  
653  <target name="4jdk7-test-jtreg"
654          depends="4jdk7jar"
655          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
656    <run-jtreg-tests
657       target="7"
658       workdir="${build.4jdk7.dir}"
659       classes="${4jdk7product.jar}"
660       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
661  </target>
662
663
664  <target name="4jdk7-test"
665          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
666          description="Runs tck and jtreg tests for jsr166-4jdk7">
667  </target>
668
669
670  <target name="4jdk7docs"
671          description="Builds javadocs for src/jdk7 to dist dir">
672
673    <delete dir="${4jdk7docs.dir}"/>
674    <mkdir dir="${4jdk7docs.dir}"/>
675
676    <javadoc destdir="${4jdk7docs.dir}"
677             packagenames="none"
678             link="${java7.api.url}"
679             overview="${4jdk7src.dir}/intro.html"
680             access="${build.javadoc.access}"
681             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
682             classpath=""
683             executable="${javadoc7}">
684      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
685        <include name="**/*.java"/>
686      </fileset>
687      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
688      <arg value="-XDignore.symbol.file=true"/>
689    </javadoc>
690  </target>
691
692
693  <target name="4jdk7dist"
694          depends="4jdk7dist-jar, 4jdk7dist-docs"
695          description="Puts all distributable products in single hierarchy"/>
696
697
698  <target name="4jdk7clean"
699          description="Removes all 4jdk7 build products">
700
701    <delete dir="${build.4jdk7.dir}"/>
702
703  </target>
704
705
706  <target name="4jdk7dist-jar"
707          depends="4jdk7clean, 4jdk7jar">
708    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
709  </target>
710
711
712  <target name="4jdk7dist-docs"
713          depends="4jdk7clean, 4jdk7docs">
714    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
715  </target>
716
717
718  <!-- jsr166x -->
719
720  <target name="jsr166xcompile"
721          depends="configure-compiler"
722          description="Compiles jsr166x sources to build dir">
723
724    <mkdir dir="${build.jsr166x.classes.dir}"/>
725
726    <javac srcdir="${topsrc.dir}"
727           destdir="${build.jsr166x.classes.dir}"
728           debug="${build.debug}"
729           debuglevel="${build.debuglevel}"
730           deprecation="${build.deprecation}"
731           classpath=""
732           bootclasspath="${bootclasspath6}"
733           source="5"
734           includeAntRuntime="false"
735           includeJavaRuntime="false"
736           executable="${javac7}"
737           fork="true">
738
739      <include name="jsr166x/**/*.java"/>
740      <compilerarg value="-XDignore.symbol.file=true"/>
741      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
742      <compilerarg line="${build.args}"/>
743
744    </javac>
745  </target>
746
747
748  <target name="jsr166xjar"
749          depends="jsr166xcompile"
750          description="Builds library jar from compiled sources">
751
752    <jar destfile="${jsr166x.jar}">
753      <fileset dir="${build.jsr166x.classes.dir}"/>
754    </jar>
755
756  </target>
757
758
759  <target name="jsr166xdocs"
760          description="Builds javadocs to dist dir">
761
762    <delete dir="${jsr166xdocs.dir}"/>
763    <mkdir dir="${jsr166xdocs.dir}"/>
764
765    <javadoc destdir="${jsr166xdocs.dir}"
766             packagenames="jsr166x.*"
767             link="${java.api.url}"
768             access="${build.javadoc.access}"
769             sourcepath="${topsrc.dir}:${jdk6src.dir}"
770             bootclasspath="${bootclasspath6}"
771             source="5"
772             executable="${javadoc7}">
773      <arg line="-Xdocrootparent ${java.docroot.url}"/>
774      <arg value="-XDignore.symbol.file=true"/>
775
776    </javadoc>
777  </target>
778
779
780  <target name="jsr166xdist"
781          depends="jsr166xdist-jar, jsr166xdist-docs"
782          description="Puts all distributable products in single hierarchy"/>
783
784
785  <target name="jsr166xclean"
786          description="Removes all jsr166x build products">
787
788    <delete dir="${build.jsr166x.dir}"/>
789
790  </target>
791
792
793  <target name="jsr166xdist-jar"
794          depends="jsr166xclean, jsr166xjar">
795    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
796  </target>
797
798  <target name="jsr166xdist-docs"
799          depends="jsr166xclean, jsr166xdocs">
800    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
801  </target>
802
803  <!-- jsr166y -->
804
805
806  <target name="jsr166ycompile"
807          depends="configure-compiler"
808          description="Compiles jsr166y sources">
809
810    <mkdir dir="${build.jsr166y.classes.dir}"/>
811
812    <javac srcdir="${topsrc.dir}"
813           destdir="${build.jsr166y.classes.dir}"
814           debug="${build.debug}"
815           debuglevel="${build.debuglevel}"
816           deprecation="${build.deprecation}"
817           source="6"
818           classpath=""
819           bootclasspath="${bootclasspath6}"
820           includeAntRuntime="false"
821           includeJavaRuntime="false"
822           executable="${javac7}"
823           fork="true">
824
825      <include name="jsr166y/**/*.java"/>
826      <compilerarg value="-XDignore.symbol.file=true"/>
827      <compilerarg value="-Xlint:all"/>
828      <compilerarg line="${build.args}"/>
829
830    </javac>
831  </target>
832
833
834  <target name="jsr166yjar"
835          depends="jsr166ycompile"
836          description="Builds library jar from compiled sources">
837
838    <jar destfile="${jsr166y.jar}" index="true">
839      <fileset dir="${build.jsr166y.classes.dir}"/>
840    </jar>
841
842  </target>
843
844
845  <target name="jsr166ydocs"
846          description="Builds javadocs to dist dir">
847
848    <delete dir="${jsr166ydocs.dir}"/>
849    <mkdir dir="${jsr166ydocs.dir}"/>
850
851    <javadoc destdir="${jsr166ydocs.dir}"
852             packagenames="jsr166y.*"
853             link="${java.api.url}"
854             access="${build.javadoc.access}"
855             sourcepath="${topsrc.dir}:${jdk6src.dir}"
856             bootclasspath="${bootclasspath6}"
857             source="6"
858             executable="${javadoc7}">
859      <arg line="-Xdocrootparent ${java.docroot.url}"/>
860      <arg value="-XDignore.symbol.file=true"/>
861
862    </javadoc>
863  </target>
864
865
866  <target name="jsr166ydist"
867          depends="jsr166ydist-jar, jsr166ydist-docs"
868          description="Puts all distributable products in single hierarchy"/>
869
870
871  <target name="jsr166yclean"
872          description="Removes all jsr166y build products">
873
874    <delete dir="${build.jsr166y.dir}"/>
875
876  </target>
877
878
879  <target name="jsr166ydist-jar"
880          depends="jsr166yclean, jsr166yjar">
881    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
882  </target>
883
884  <target name="jsr166ydist-docs"
885          depends="jsr166yclean, jsr166ydocs">
886    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
887  </target>
888
889
890  <!-- extra166y -->
891
892
893  <target name="extra166ycompile"
894          depends="configure-compiler, jsr166yjar"
895          description="Compiles extra166y sources">
896
897    <mkdir dir="${build.extra166y.classes.dir}"/>
898
899    <javac srcdir="${topsrc.dir}"
900           destdir="${build.extra166y.classes.dir}"
901           debug="${build.debug}"
902           debuglevel="${build.debuglevel}"
903           deprecation="${build.deprecation}"
904           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
905           classpath=""
906           source="6"
907           includeAntRuntime="false"
908           includeJavaRuntime="false"
909           executable="${javac7}"
910           fork="true">
911
912      <include name="extra166y/**/*.java"/>
913      <compilerarg value="-XDignore.symbol.file=true"/>
914      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
915      <compilerarg line="${build.args}"/>
916
917    </javac>
918  </target>
919
920
921  <target name="extra166yjar"
922          depends="extra166ycompile"
923          description="Builds library jar from compiled sources">
924
925    <jar destfile="${extra166y.jar}" index="true">
926      <fileset dir="${build.extra166y.classes.dir}"/>
927    </jar>
928
929  </target>
930
931
932  <target name="extra166ydocs"
933          description="Builds javadocs to build dir">
934
935    <delete dir="${extra166ydocs.dir}"/>
936    <mkdir dir="${extra166ydocs.dir}"/>
937
938    <javadoc destdir="${extra166ydocs.dir}"
939             packagenames="extra166y.*"
940             link="${java.api.url}"
941             access="${build.javadoc.access}"
942             sourcepath="${topsrc.dir}:${jdk6src.dir}"
943             bootclasspath="${bootclasspath6}"
944             source="6"
945             executable="${javadoc7}">
946      <arg line="-Xdocrootparent ${java.docroot.url}"/>
947      <arg value="-XDignore.symbol.file=true"/>
948
949    </javadoc>
950  </target>
951
952
953  <target name="extra166ydist"
954          depends="extra166ydist-jar, extra166ydist-docs"
955          description="Puts all distributable products in single hierarchy"/>
956
957
958  <target name="extra166yclean"
959          description="Removes all extra166y build products">
960
961    <delete dir="${build.extra166y.dir}"/>
962
963  </target>
964
965
966  <target name="extra166ydist-jar"
967          depends="extra166yclean, extra166yjar">
968    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
969  </target>
970
971  <target name="extra166ydist-docs"
972          depends="extra166yclean, extra166ydocs">
973    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
974  </target>
975
976  <!-- jsr166e -->
977
978  <property name="build.jsr166e.java.version" value="6"/>
979  <property name="build.jsr166e.javac" value="${javac6}"/>
980
981  <target name="jsr166ecompile"
982          depends="configure-compiler"
983          description="Compiles jsr166e sources">
984
985    <mkdir dir="${build.jsr166e.classes.dir}"/>
986
987    <javac srcdir="${topsrc.dir}"
988           destdir="${build.jsr166e.classes.dir}"
989           debug="${build.debug}"
990           debuglevel="${build.debuglevel}"
991           deprecation="${build.deprecation}"
992           source="${build.jsr166e.java.version}"
993           classpath=""
994           includeAntRuntime="false"
995           includeJavaRuntime="false"
996           executable="${build.jsr166e.javac}"
997           fork="true">
998
999      <include name="jsr166e/**/*.java"/>
1000      <compilerarg value="-XDignore.symbol.file=true"/>
1001      <compilerarg value="-Xlint:all"/>
1002      <compilerarg line="${build.args}"/>
1003
1004    </javac>
1005  </target>
1006
1007  <!-- jsr166e: find doclint errors -->
1008  <target name="jsr166edoclint">
1009
1010    <mkdir dir="${build.jsr166e.classes.dir}"/>
1011
1012    <javac srcdir="${topsrc.dir}"
1013           destdir="${build.jsr166e.classes.dir}"
1014           debug="${build.debug}"
1015           debuglevel="${build.debuglevel}"
1016           deprecation="${build.deprecation}"
1017           source="${build.jsr166e.java.version}"
1018           classpath=""
1019           bootclasspath="${bootclasspath7}"
1020           includeAntRuntime="false"
1021           includeJavaRuntime="false"
1022           executable="${javac8}"
1023           fork="true">
1024
1025      <include name="jsr166e/**/*.java"/>
1026      <compilerarg value="-XDignore.symbol.file=true"/>
1027      <compilerarg value="-Xlint:all"/>
1028      <compilerarg value="-Xdoclint:all/protected"/>
1029
1030    </javac>
1031  </target>
1032
1033
1034  <target name="jsr166ejar"
1035          depends="jsr166ecompile"
1036          description="Builds library jar from compiled sources">
1037
1038    <jar destfile="${jsr166e.jar}" index="true">
1039      <fileset dir="${build.jsr166e.classes.dir}"/>
1040    </jar>
1041
1042  </target>
1043
1044
1045  <target name="jsr166edocs"
1046          description="Builds javadocs to build dir">
1047
1048    <delete dir="${jsr166edocs.dir}"/>
1049    <mkdir dir="${jsr166edocs.dir}"/>
1050
1051    <javadoc destdir="${jsr166edocs.dir}"
1052             packagenames="jsr166e.*"
1053             link="${java.api.url}"
1054             access="${build.javadoc.access}"
1055             sourcepath="${topsrc.dir}:${jdk6src.dir}"
1056             source="${build.jsr166e.java.version}"
1057             executable="${javadoc7}">
1058      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1059      <arg value="-XDignore.symbol.file=true"/>
1060
1061    </javadoc>
1062  </target>
1063
1064
1065  <target name="jsr166e-test-tck-one-java-version"
1066          depends="jsr166ejar">
1067
1068    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1069
1070    <run-tck-tests
1071      tck.src.dir="${test.src.dir}/tck-jsr166e"
1072      target="${build.jsr166e.java.version}"
1073      workdir="${build.jsr166e.dir}"
1074      classes="${jsr166e.jar}"/>
1075  </target>
1076
1077  <target name="jsr166e-test-tck"
1078          description="Runs tck tests for jsr166e for multiple java versions">
1079
1080 <!--     <antcall target="clean"/> -->
1081 <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1082 <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1083 <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1084 <!--     </antcall> -->
1085
1086    <antcall target="clean"/>
1087    <antcall target="jsr166e-test-tck-one-java-version">
1088      <param name="build.jsr166e.java.version" value="7"/>
1089      <param name="build.jsr166e.javac" value="${javac7}"/>
1090    </antcall>
1091
1092    <antcall target="clean"/>
1093    <antcall target="jsr166e-test-tck-one-java-version">
1094      <param name="build.jsr166e.java.version" value="6"/>
1095      <param name="build.jsr166e.javac" value="${javac6}"/>
1096    </antcall>
1097  </target>
1098
1099
1100  <target name="jsr166e-test"
1101          depends="jsr166e-test-tck"
1102          description="Runs all tests for jsr166e">
1103  </target>
1104
1105  <target name="jsr166edist"
1106          depends="jsr166edist-jar, jsr166edist-docs"
1107          description="Puts all distributable products in single hierarchy"/>
1108
1109
1110  <target name="jsr166eclean"
1111          description="Removes all jsr166e build products">
1112    <delete dir="${build.jsr166e.dir}"/>
1113  </target>
1114
1115
1116  <target name="jsr166edist-jar"
1117          depends="jsr166eclean, jsr166ejar">
1118    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1119  </target>
1120
1121  <target name="jsr166edist-docs"
1122          depends="jsr166eclean, jsr166edocs">
1123    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1124  </target>
1125
1126
1127 <!-- Find buglets that can be detected by static build tools -->
1128
1129  <target name="lint">
1130    <antcall target="dists">
1131      <param name="build.javadoc.access" value="public"/>
1132    </antcall>
1133  </target>
1134
1135 <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1136  <target name="lint-private">
1137    <antcall target="dist">
1138      <param name="build.javadoc.access" value="private"/>
1139    </antcall>
1140  </target>
1141
1142
749   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines