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.30 by tim, Wed May 28 14:19:25 2003 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 examples.
16 >  See user.properties.sample for an explanation of some useful settings.
17 >
18 >  The repository contains all dependencies except for ant and the JDK
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/jdk17
23 >  $HOME/jdk/jdk19
24 >  where each of the above is a JDK or a symlink to same, and
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=... -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 <  <target name="usage" description="Advises user to run with -projecthelp">
40 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
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 -->
24  <property name="build.sourcelevel"    value="1.5"/>
25  <property name="build.docsourcelevel" value="1.4"/>
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  
58    <!-- Build locations -->
59 <  <property name="build.dir"            location="build"/>
60 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
61 <  <property name="build.emulation.dir"  location="${build.dir}/emulation"/>
62 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
63 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
64 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
65 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
66 <  <property name="build.stripped.dir"   location="${build.dir}/stripped"/>
67 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
68 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
69 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
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"/>
63 >
64 >  <!-- JDK locations -->
65 >  <property name="jdks.home"  location="${user.home}/jdk"/>
66 >
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.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 >
79 >  <macrodef name="mirror-dir">
80 >    <attribute name="src"/>
81 >    <attribute name="dst"/>
82 >    <sequential>
83 >    <delete dir="@{dst}"/>
84 >    <mkdir dir="@{dst}"/>
85 >    <copy todir="@{dst}" preservelastmodified="true">
86 >      <fileset dir="@{src}"/>
87 >    </copy>
88 >    </sequential>
89 >  </macrodef>
90 >
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"/>
45  <property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
99    <property name="test.src.dir"         location="${basedir}/src/test"/>
100 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
101 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
100 >  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
101 >  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
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"/>
111  
112 <  <!-- Distribution locations -->
113 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
112 >  <!-- Javadoc locations -->
113 >  <property name="docs.dir"          location="${build.dir}/docs"/>
114 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
115  
116    <!-- Jar locations -->
117 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
118 <  <property name="javac.jar"            location="${lib.dir}/javac.jar"/>
58 <  <property name="collect.jar"          location="${lib.dir}/collect.jar"/>
59 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
60 <  <property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
61 <
62 <
63 <
64 <  <!--
65 <   ! Bootclasspath munging for source compilation.
66 <   -->
67 <
68 <  <path id="javac.bootclasspath.prefix">
69 <    <!-- <pathelement location="${src.dir}"/> -->
70 <    <pathelement location="${javac.jar}"/>
71 <  </path>
72 <
73 <  <path id="javac.bootclasspath">
74 <    <!-- <pathelement location="${src.dir}"/> -->
75 <    <pathelement location="${collect.jar}"/>
76 <    <pathelement location="${rt.jar}"/>
77 <  </path>
78 <
79 <  <!-- Flatten bootclasspath prefix into a platform-appropriate string -->
80 <  <property name="javac.bootclasspath.prefix" refid="javac.bootclasspath.prefix"/>
81 <
82 <  <!-- Turn the flattened bootclasspath prefix into a javac argument -->
83 <  <property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
117 >  <property name="product.jar"      location="${build.dir}/jsr166.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 +  <!-- 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="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 -->
139 +  <!-- See the docs in "jtreg -onlineHelp" -->
140 +  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
141 +           classpath="${lib.dir}/jtreg.jar" />
142 +
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 +    <!--
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"/>
167 +
168 +    <javac srcdir="@{tck.src.dir}"
169 +           destdir="@{workdir}/tck-classes"
170 +           debug="${build.debug}"
171 +           debuglevel="${build.debuglevel}"
172 +           deprecation="${build.deprecation}"
173 +           source="@{compile-target}"
174 +           target="@{compile-target}"
175 +           classpath="${junit.jar}"
176 +           includeAntRuntime="false"
177 +           includeJavaRuntime="false"
178 +           encoding="ASCII"
179 +           executable="${javac@{compile-target}}"
180 +           fork="true">
181 +
182 +      <include name="*.java"/>
183 +      <compilerarg value="-XDignore.symbol.file=true"/>
184 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
185 +      <compilerarg value="-Xdoclint:reference/private"/>
186 +      <compilerarg value="--patch-module=java.base=@{classes}"/>
187 +      <compilerarg line="${build.args}"/>
188 +      <javac-elements/>
189  
190 +    </javac>
191  
192 <  <!--
193 <   ! Bootclasspath munging for testing, so JUnit can test our local
194 <   ! modifications to java.*.
195 <   -->
192 >    <java classname="${jsr166.tckTestClass}"
193 >          failonerror="true"
194 >          jvm="${java@{target}}"
195 >          fork="true">
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 >  <!-- 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 <  <path id="test.classpath">
238 <    <pathelement location="${product.jar}"/>
239 <    <pathelement location="${build.testcases.dir}"/>
240 <    <pathelement location="${junit.jar}"/>
237 >  <defjtregtests v="17"/>
238 >  <defjtregtests v="18"/>
239 >  <defjtregtests v="19"/>
240 >  <defjtregtests v="20"/>
241 >  <defjtregtests v="21"/>
242 >
243 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
244 >  <property name="jtreg.flags" value=""/>
245 >
246 >  <macrodef name="run-jtreg-tests">
247 >    <attribute name="target"/>
248 >    <attribute name="workdir"/>
249 >    <attribute name="classes"/>
250 >    <attribute name="verbose" default="${jtreg.verbose}"/>
251 >    <attribute name="jtregflags" default=""/>
252 >    <element name="jtreg-elements" optional="true"/>
253 >
254 >    <sequential>
255 >
256 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
257 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
258 >
259 >    <!-- 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">
269 >      <patternset refid="jdk@{target}.jtreg.tests"/>
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>
287 >
288 >  <!-- ALoops classpath -->
289 >  <path id="loops.classpath">
290 >    <pathelement location="${build.loops.dir}"/>
291    </path>
292  
293 <  <!-- Flatten test classpath into a platform-appropriate string -->
294 <  <property name="test.classpath" refid="test.classpath"/>
295 <
296 <  <!-- Turn the flattened test classpath into a javac argument -->
102 <  <property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
103 <
104 <
105 <
106 <  <!-- Files excluded from emulation and dist-docs -->
107 <  <patternset id="emulation.excludes">
108 <    <exclude name="java/util/Random.*"/>
109 <    <exclude name="sun/misc/Unsafe.*"/>
110 <  </patternset>
111 <
112 <
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 <  <target name="compile"
301 <          depends="init"
302 <          description="Compiles main sources to build folder">
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"
310 >          description="Builds all public jars and docs"/>
311  
312 <    <mkdir dir="${build.classes.dir}"/>
312 >  <target name="compile"
313 >          depends="configure-compiler"
314 >          description="Compiles src/main sources to build dir">
315  
316 <    <javac srcdir="${src.dir}"
317 <          destdir="${build.classes.dir}"
124 <            debug="${build.debug}"
125 <       debuglevel="${build.debuglevel}"
126 <      deprecation="${build.deprecation}"
127 <           source="${build.sourcelevel}"
128 <             fork="true">
316 >    <local name="destdir"/>
317 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
318  
319 <      <bootclasspath refid="javac.bootclasspath"/>
131 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
319 >    <mkdir dir="${destdir}"/>
320  
321 +    <javac srcdir="${src.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"/>
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}"/>
343      </javac>
134
344    </target>
345  
137
346    <target name="jar"
347 <          depends="check-emulation, init-jar, native-jar, emulation-jar"
348 <          description="Builds library jar from compiled sources"/>
349 <
350 <
351 <  <target name="test"
352 <          depends="init, check-junit, report-tests"
353 <          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
354 <
355 <
356 <  <target name="checkstyle"
357 <          depends="filter-src"
150 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
151 <
152 <    <taskdef resource="checkstyletask.properties"
153 <            classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
154 <
155 <    <checkstyle>
156 <      <formatter type="plain"/>  <!-- also available: type="xml" -->
157 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
158 <    </checkstyle>
159 <
160 <  </target>
161 <
162 <
163 <  <target name="doccheck"
164 <          depends="filter-src"
165 <          description="Reports on javadoc style errors (not working yet)">
166 <
167 <    <delete dir="${build.doccheck.dir}"/>
168 <    <mkdir dir="${build.doccheck.dir}"/>
169 <
170 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
171 <         docletpath="${lib.dir}/doccheck.jar"
172 <            destdir="${build.doccheck.dir}">
173 <      <packageset dir="${build.filter.src.dir}"/>
174 <    </javadoc>
175 <
347 >          depends="compile"
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}${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 <          depends="filter-src"
363 <          description="Builds javadocs with custom tags to build folder">
364 <
365 <    <delete dir="${build.javadocs.dir}"/>
366 <    <mkdir dir="${build.javadocs.dir}"/>
367 <
368 <    <javadoc destdir="${build.javadocs.dir}"
369 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
370 <            overview="${src.dir}/intro.html"
371 <              source="${build.docsourcelevel}">
372 <
373 <      <tag name="revised" description="Last revised:"/>
374 <      <tag name="spec"    description="Specified by:"/>
375 <      <tag name="editor"  description="Last edited by:"/>
376 <      <tag name="fixme"   description="FIX ME:"/>
377 <
378 <      <packageset dir="${build.filter.src.dir}"/>
379 <
362 >          description="Builds javadocs for src/main to dist dir">
363 >    <delete dir="${docs.dir}" quiet="true"/>
364 >    <mkdir dir="${docs.dir}"/>
365 >    <javadoc destdir="${docs.dir}"
366 >             packagenames="none"
367 >             link="${java.api.url}"
368 >             overview="${src.dir}/intro.html"
369 >             access="${build.javadoc.access}"
370 >             sourcepath="${src.dir}"
371 >             classpath=""
372 >             source="${build.main.javadoc.source}"
373 >             executable="${build.main.javadoc}">
374 >      <fileset dir="${src.dir}" defaultexcludes="yes">
375 >        <include name="java/**/*.java"/>
376 >      </fileset>
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="-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>
199
392    </target>
393  
202
203  <!--
204   # javac -s doesn't reliably generate compilable code. It generates
205   # bridge methods (marked as "synthetic") that can have identical
206   # signatures to existing methods except for the return value.
207   -->
208  <target name="strip"
209          depends="init">
210
211    <mkdir dir="${build.stripped.dir}"/>
212
213    <javac srcdir="${src.dir}"
214          destdir="${build.stripped.dir}"
215            debug="${build.debug}"
216       debuglevel="${build.debuglevel}"
217      deprecation="${build.deprecation}"
218           source="${build.sourcelevel}"
219             fork="true">
220
221      <bootclasspath refid="javac.bootclasspath"/>
222      <compilerarg line="${javac.args} ${build.warnings.option} -s"/>
223
224    </javac>
225
226  </target>
227
228
394    <target name="dist"
395 <          depends="init, dist-clean, dist-jar, dist-docs"
395 >          depends="dist-clean, dist-jar, dist-docs"
396            description="Puts all distributable products in single hierarchy"/>
397  
233
398    <target name="clean"
399            description="Removes all build products">
236
400      <delete dir="${build.dir}"/>
238    <delete dir="${build.classes.dir}"/>
239    <delete dir="${build.lib.dir}"/>
240
401    </target>
402  
243
403    <target name="dist-clean"
404            description="Removes all build and distribution products">
405 <
405 >    <delete dir="${build.dir}"/>
406      <delete dir="${dist.dir}"/>
248
249  </target>
250
251
252  <target name="dist-docs"
253          depends="filter-src"
254          description="Builds javadocs without custom tags to dist folder">
255
256    <delete dir="${dist.javadocs.dir}"/>
257    <mkdir dir="${dist.javadocs.dir}"/>
258
259    <javadoc destdir="${dist.javadocs.dir}"
260                link="http://java.sun.com/j2se/1.4.1/docs/api"
261            overview="${src.dir}/intro.html"
262              source="${build.docsourcelevel}">
263
264      <packageset dir="${build.filter.src.dir}"/>
265
266    </javadoc>
267
268  </target>
269
270
271
272  <!-- Internal targets -->
273
274  <target name="set-warnings-if" if="build.warnings">
275
276    <property name="build.warnings.option" value="-warnunchecked"/>
277
278  </target>
279
280
281  <target name="set-warnings-unless" unless="build.warnings">
282
283    <property name="build.warnings.option" value=""/>
284
285  </target>
286
287
288  <target name="init"
289          depends="set-warnings-if, set-warnings-unless">
290
291    <!-- Version is kept in a separate file -->
292    <loadfile property="version" srcFile="version.properties"/>
293    <echo>Building JSR-166 version ${version}</echo>
294
295  </target>
296
297
298  <target name="init-jar">
299
300    <mkdir dir="${build.lib.dir}"/>
301
302  </target>
303
304
305  <target name="native-jar"
306          depends="compile"
307          unless="build.emulation.true">
308
309    <jar destfile="${product.jar}">
310      <fileset dir="${build.classes.dir}"/>
311    </jar>
312
313  </target>
314
315
316  <target name="compile-emulation"
317          depends="init"
318          if="build.emulation.true">
319
320    <mkdir dir="${build.emulation.dir}"/>
321
322    <javac srcdir="${emulation.src.dir}"
323          destdir="${build.emulation.dir}"
324            debug="${build.debug}"
325       debuglevel="${build.debuglevel}"
326      deprecation="${build.deprecation}"
327           source="${build.sourcelevel}"
328             fork="true">
329
330      <bootclasspath refid="javac.bootclasspath"/>
331      <compilerarg line="${javac.args} ${build.warnings.option}"/>
332
333    </javac>
334
407    </target>
408  
337
338  <target name="emulation-jar"
339          depends="compile-emulation"
340          if="build.emulation.true">
341
342
343    <jar destfile="${product.jar}" duplicate="add">
344      <fileset dir="${build.classes.dir}">
345        <patternset refid="emulation.excludes"/>
346      </fileset>
347      <fileset dir="${build.emulation.dir}"/>
348    </jar>
349
350  </target>
351
352
409    <target name="dist-jar"
410            depends="clean, jar">
355
411      <copy file="${product.jar}" todir="${dist.dir}"/>
357
412    </target>
413  
414 <
415 <  <target name="compile-ant-filter"
416 <          depends="init">
363 <
364 <    <mkdir dir="${build.ant.dir}"/>
365 <
366 <    <javac srcdir="${ant.src.dir}"
367 <          destdir="${build.ant.dir}"
368 <           source="1.4"
369 <    />
370 <
414 >  <target name="dist-docs"
415 >          depends="clean, docs">
416 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
417    </target>
418  
419 <
420 <  <target name="filter-src"
421 <          depends="compile-ant-filter">
422 <
423 <    <mkdir dir="${build.filter.src.dir}"/>
424 <
425 <    <copy todir="${build.filter.src.dir}">
426 <      <fileset dir="${src.dir}">
427 <        <patternset refid="emulation.excludes"/>
428 <      </fileset>
429 <      <filterchain>
430 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
431 <                      classpath="${build.ant.dir}">
432 <          <!--
433 <           # These arguments are to get rid of angle-bracketed type
434 <           # parameters so that javadoc can run on the result. The
435 <           # following heuristic that seems to work:
436 <           #
437 <           # For all lines not starting with space(s)-asterisk-space(s),
438 <           #   replace <something> with a space, where there may be more
439 <           #   than one right angle bracket at the end, and "something"
440 <           #   must not contain parens or pipes. (This may need some
441 <           #   tweaking.)
442 <           -->
443 <          <param name="notmatching" value="^\s+\*\s.*$"/>
444 <          <param name="pattern" value="&lt;[^|>()]+?>+"/>
445 <          <param name="replacement" value=" "/>
446 <        </filterreader>
447 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
448 <                      classpath="${build.ant.dir}">
449 <          <!--
450 <           # These arguments are to uncomment lines beginning with
451 <           # "//@" so that javadoc can see imports that are needed
452 <           # to resolve links but that shouldn't be in the compiled
453 <           # code.
454 <           -->
455 <          <param name="matching" value="^//@.*$"/>
456 <          <param name="pattern" value="^//@"/>
457 <          <param name="replacement" value=""/>
458 <        </filterreader>
459 <      </filterchain>
414 <    </copy>
415 <
419 >  <target name="tck"
420 >          depends="jar"
421 >          description="Runs tck tests for src/main directly">
422 >    <run-tck-tests
423 >      target="${java.runtime.target}"
424 >      workdir="${build.dir}"
425 >      classes="${product.jar}">
426 >      <javac-elements>
427 >        <!-- <compilerarg value="-Werror"/> -->
428 >      </javac-elements>
429 >    </run-tck-tests>
430 >  </target>
431 >
432 >  <target name="tck-parallelism-1"
433 >          description="Runs tck with common pool parallelism 1">
434 >    <antcall target="tck">
435 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
436 >    </antcall>
437 >  </target>
438 >
439 >  <target name="tck-parallelism-0"
440 >          description="Runs tck with common pool parallelism 0">
441 >    <antcall target="tck">
442 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
443 >    </antcall>
444 >  </target>
445 >
446 >  <target name="tck-security-manager"
447 >          description="Runs tck with a security manager">
448 >    <antcall target="tck">
449 >      <param name="jsr166.useSecurityManager" value="true"/>
450 >    </antcall>
451 >  </target>
452 >
453 >  <target name="jtreg"
454 >          depends="jar"
455 >          description="Runs jtreg tests for src/main using the jtreg ant task">
456 >    <run-jtreg-tests
457 >       target="${java.runtime.target}"
458 >       workdir="${build.dir}"
459 >       classes="${product.jar}"/>
460    </target>
461  
462 +  <target name="test"
463 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
464 +          description="Runs tck and jtreg tests for src/main"/>
465  
466 <  <target name="compile-tests"
467 <          depends="jar">
468 <
469 <    <mkdir dir="${build.testcases.dir}"/>
470 <
471 <    <javac srcdir="${test.src.dir}"
472 <          destdir="${build.testcases.dir}"
473 <            debug="${build.debug}"
474 <       debuglevel="${build.debuglevel}"
475 <      deprecation="${build.deprecation}"
476 <           source="${build.sourcelevel}"
477 <             fork="true">
478 <
479 <      <bootclasspath refid="javac.bootclasspath"/>
480 <      <compilerarg line="${javac.args} ${build.warnings.option}"/>
481 <      <classpath refid="test.classpath"/>
482 <
483 <    </javac>
484 <
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>
481 >  </target>
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>
492    </target>
493  
494  
495 <  <target name="run-tests"
496 <          depends="compile-tests">
497 <
498 <    <!-- May be overridden by user.properties -->
445 <    <property name="testcase" value="*"/>
446 <
447 <    <mkdir dir="${build.reports.dir}"/>
448 <
449 <    <junit printsummary="true"
450 <             showoutput="true"
451 <          errorProperty="junit.failed"
452 <        failureProperty="junit.failed"
453 <                    dir="${build.reports.dir}"
454 <                   fork="true">
455 <
456 <      <jvmarg value="${test.javac.args}"/>
457 <
458 <      <formatter type="xml"/>
459 <
460 <      <batchtest todir="${build.reports.dir}">
461 <        <fileset dir="${test.src.dir}">
462 <          <include name="**/${testcase}Test.java"/>
463 <        </fileset>
464 <      </batchtest>
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 <    </junit>
467 <
468 <  </target>
500 >    <property name="unchecked.option" value="-Xlint:unchecked"/>
501  
502 +    <condition property="warnunchecked.arg" value="${unchecked.option}">
503 +      <istrue value="${build.warnunchecked}"/>
504 +    </condition>
505  
506 <  <target name="report-tests"
472 <          depends="run-tests">
506 >    <property name="warnunchecked.arg" value=""/>
507  
474    <!-- Sets junit.report.format to frames if Xalan is present,
475         otherwise sets it to noframes. -->
476    <available property="junit.report.format"
477                  value="frames"
478              classname="org.apache.xalan.lib.Redirect"
479    />
480    <property name="junit.report.format" value="noframes"/>
481
482    <junitreport todir="${build.reports.dir}">
483      <fileset dir="${build.reports.dir}">
484        <include name="TEST-*.xml"/>
485      </fileset>
486      <report styledir="${stylesheet.dir}"
487                format="${junit.report.format}"
488                 todir="${build.reports.dir}"
489      />
490    </junitreport>
508  
509 <    <fail message="Test Cases Failed" if="junit.failed"/>
509 >    <!-- Common options in javac invocations -->
510 >    <property name="build.args" value="${warnunchecked.arg}"/>
511  
512    </target>
513  
514  
515 <  <target name="check-junit">
515 >  <target name="compile-test-loops" depends="jar"
516 >          description="Compiles all the perf tests in src/test/loops">
517  
518 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
500 <    <available property="junit.available"
501 <               classname="junit.framework.Protectable"/>
518 >    <mkdir dir="${build.dir}/test/loops"/>
519  
520 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
521 <          unless="junit.available"/>
520 >    <javac srcdir="${basedir}/src/test/loops"
521 >           destdir="${build.dir}/test/loops"
522 >           debug="${build.debug}"
523 >           debuglevel="${build.debuglevel}"
524 >           deprecation="${build.deprecation}"
525 >           includeAntRuntime="false"
526 >           includeJavaRuntime="false"
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,-deprecation"/>
534 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
535 +      <compilerarg line="${build.args}"/>
536 +    </javac>
537    </target>
538  
539  
540 <  <target name="check-emulation">
541 <    <condition property="build.emulation.true">
542 <      <or>
543 <        <isset property="build.emulation"/>
544 <        <os family="windows"/>
545 <      </or>
546 <    </condition>
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 > <!-- Find buglets that can be detected by static build tools -->
549 >
550 > <!--   <target name="lint"> -->
551 > <!--     <antcall target="dists"> -->
552 > <!--       <param name="build.javadoc.access" value="protected"/> -->
553 > <!--     </antcall> -->
554 > <!--   </target> -->
555 >
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  
563  
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 <  <!-- Anthill targets -->
613 <
614 <  <target name="anthill-build"
615 <          depends="jar, test, docs, dist-docs"/>
616 <
617 <  <target name="anthill-publish">
618 <
619 <    <copy todir="${deployDir}/docs/private">
620 <      <fileset dir="${build.javadocs.dir}"/>
621 <    </copy>
622 <
623 <    <copy todir="${deployDir}/docs/public">
624 <      <fileset dir="${dist.javadocs.dir}"/>
625 <    </copy>
612 >    <javac srcdir="${src.dir}"
613 >           destdir="${destdir}"
614 >           debug="${build.debug}"
615 >           debuglevel="${build.debuglevel}"
616 >           deprecation="${build.deprecation}"
617 >           classpath=""
618 >           includeAntRuntime="false"
619 >           includeJavaRuntime="false"
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,reference/private"/>
637 >      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
638 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
639 >      <compilerarg line="${build.args}"/>
640 >    </javac>
641  
642 <    <copy tofile="${deployDir}/index.html"
643 <          file="${basedir}/etc/anthill-index.html"/>
642 >    <jar destfile="${product.jar}">
643 >      <fileset dir="${destdir}"/>
644 >    </jar>
645  
646 <    <copy todir="${deployDir}/notes">
647 <      <fileset dir="${basedir}/etc/notes"/>
648 <    </copy>
646 >    <run-tck-tests
647 >      target="${java.runtime.target}"
648 >      workdir="${build.dir}"
649 >      classes="${product.jar}">
650 >      <javac-elements>
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 >    <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="${guava.dir}/guava-testlib-tests.jar"/>
746 >        <path refid="guava.testlib.classpath"/>
747 >      </classpath>
748  
749 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
750 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
751 +    </junit>
752    </target>
753  
544
754   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines