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.74 by dl, Thu Sep 13 11:19:25 2007 UTC vs.
Revision 1.328 by jsr166, Sat Jan 7 16:30:33 2023 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 6 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17 +
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"/>
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.testcases.dir"  location="${build.dir}/testcases"/>
62 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
63 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
64 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
65 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
66 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
67 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
68 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
69 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
70 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
71 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
72 <  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
73 <  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
74 <  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
75 <
76 <  <property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>
77 <  <property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
78 <  <property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
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"/>
99    <property name="test.src.dir"         location="${basedir}/src/test"/>
54  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
100    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
101    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
102 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
103 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
104 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
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"/>
63  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
64  <property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
111  
112 <  <!-- Distribution locations -->
113 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
114 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
69 <  <property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
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="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
119 <  <property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
120 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
121 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
122 <
123 <  <!-- Bootclasspath argument -->
124 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
125 <
126 <  <!-- Test classpath -->
127 <  <path id="test.classpath">
128 <    <pathelement location="${build.testcases.dir}"/>
129 <    <pathelement location="${junit.jar}"/>
130 <  </path>
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 >    <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 >  <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 <  <!-- J1 classpath -->
294 <  <path id="j1.classpath">
295 <    <pathelement location="${build.classes.dir}"/>
296 <    <pathelement location="${build.j1.dir}"/>
96 <    <pathelement location="${junit.jar}"/>
97 <
98 <    <!-- Include dl.u.c for BoundedBuffer comparison -->
99 <    <pathelement location="${concurrent.jar}"/>
100 <  </path>
101 <
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 +  <!-- 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    <target name="compile"
313 <          depends="init, configure-compiler"
314 <          description="Compiles main sources to build folder">
313 >          depends="configure-compiler"
314 >          description="Compiles src/main sources to build dir">
315 >
316 >    <local name="destdir"/>
317 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
318  
319 <    <mkdir dir="${build.classes.dir}"/>
319 >    <mkdir dir="${destdir}"/>
320  
321      <javac srcdir="${src.dir}"
322 <          destdir="${build.classes.dir}"
323 <            debug="${build.debug}"
324 <       debuglevel="${build.debuglevel}"
325 <      deprecation="${build.deprecation}"
326 <           source="${build.sourcelevel}"
327 <             fork="true">
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="-XDignore.symbol.file"/>
335 <
336 < <!--
337 <      <exclude name="java/lang/**"/>
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}"/>
126      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
127 -->
128
343      </javac>
130
344    </target>
345  
133
134
346    <target name="jar"
347            depends="compile"
348 <          description="Builds library jar from compiled sources">
349 <
350 <    <mkdir dir="${build.lib.dir}"/>
140 <
348 >          description="Builds library jar for src/main from compiled sources">
349 >    <local name="subdir"/>
350 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
351      <jar destfile="${product.jar}">
352 <      <fileset dir="${build.classes.dir}"/>
352 >      <fileset dir="${build.classes.dir}${subdir}"/>
353 >      <manifest>
354 >        <attribute name="Built-By" value="${user.name}"/>
355 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
356 >      </manifest>
357      </jar>
144
358    </target>
359  
360  
148
149  <target name="test"
150          depends="init, configure-tests, report-tests"
151          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
152
153
154
361    <target name="docs"
362 <          description="Builds javadocs with custom tags to build folder">
363 <
364 <    <delete dir="${build.javadocs.dir}"/>
365 <    <mkdir dir="${build.javadocs.dir}"/>
366 <
367 <    <javadoc destdir="${build.javadocs.dir}"
368 <                link="http://java.sun.com/javase/6/docs/api/"
369 <            overview="${src.dir}/intro.html"
370 <            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
371 <    >          
372 <
373 <      <packageset dir="${src.dir}"/>
374 <
375 <    </javadoc>
376 <
377 <  </target>
378 <
379 <
380 <
381 <  <target name="doccheck"
382 <          depends="filter-doccheck"
383 <          description="Reports on javadoc style errors">
384 <
385 <    <delete dir="${build.doccheck.dir}"/>
386 <    <mkdir dir="${build.doccheck.dir}"/>
387 <
388 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
389 <         docletpath="${lib.dir}/doccheck.jar"
390 <            destdir="${build.doccheck.dir}">
185 <      <packageset dir="${build.dc-filter.dir}"/>
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>
187
188    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
189
392    </target>
393  
192
193
194  <target name="checkstyle"
195          depends="filter-src"
196          description="Reports on style errors in Java source (verbose, mostly chaff)">
197
198    <taskdef resource="checkstyletask.properties"
199            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
200
201    <mkdir dir="${build.checkstyle.dir}"/>
202
203    <checkstyle config="etc/checkstyle/sun_checks.xml"
204       failOnViolation="false">
205      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
206      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
207    </checkstyle>
208
209    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
210          out="${build.checkstyle.dir}/checkstyle-report.html"
211        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
212
213  </target>
214
215
216
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  
221
222
223  <target name="release"
224          depends="dist"
225          description="Puts entire CVS tree, plus distribution productions, in a jar">
226
227    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
228
229    <jar basedir="${basedir}" destfile="${release.jar}">
230      <!-- <exclude name="build/**"/> -->
231      <exclude name="${release.jar}"/>
232      <exclude name="user.properties"/>
233      <exclude name="etc/notes/**"/>
234      <exclude name="src/emulation/**"/>
235      <exclude name="**/SyntaxTest.java"/>
236      <exclude name="**/SuperfluousAbstract.java"/>
237    </jar>
238
239  </target>
240
241
242
398    <target name="clean"
399            description="Removes all build products">
245
400      <delete dir="${build.dir}"/>
247    <delete dir="${build.classes.dir}"/>
248    <delete dir="${build.lib.dir}"/>
249
401    </target>
402  
252
253
403    <target name="dist-clean"
404            description="Removes all build and distribution products">
405 <
405 >    <delete dir="${build.dir}"/>
406      <delete dir="${dist.dir}"/>
258
259  </target>
260
261
262
263  <target name="dist-docs"
264          description="Builds javadocs without custom tags to dist folder">
265
266    <delete dir="${dist.javadocs.dir}"/>
267    <mkdir dir="${dist.javadocs.dir}"/>
268
269    <javadoc destdir="${dist.javadocs.dir}"
270            link="http://java.sun.com/javase/6/docs/api/"
271            overview="${src.dir}/intro.html"
272
273            sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
274     >
275 <!--
276      <packageset dir="${src.dir}" defaultexcludes="yes">
277      <include name="java/util/concurrent"/>
278      <include name="java/util/concurrent/atomic"/>
279      <include name="java/util/concurrent/locks"/>
280      </packageset>
281 -->
282      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
283      <include name="main/java/util/concurrent/*.java"/>
284      <include name="main/java/util/concurrent/atomic/*.java"/>
285      <include name="main/java/util/concurrent/locks/*.java"/>
286      <include name="main/java/util/*.java"/>
287 <!--
288      <include name="main/java/util/concurrent/*.html"/>
289      <include name="main/java/util/concurrent/atomic/*.html"/>
290      <include name="main/java/util/concurrent/locks/*.html"/>
291      <include name="main/java/util/*.html"/>
292 -->
293 <!--      <include name="jsr166x/*.java"/> -->
294      </fileset>
295    </javadoc>
296
297  </target>
298
299
300
301  <!-- Internal targets -->
302
303
304  <target name="init">
305
306    <!-- Version is kept in a separate file -->
307    <loadfile property="version" srcFile="version.properties"/>
308    <echo>Building JSR-166 version ${version}</echo>
309    <echo>java.home is ${java.home}</echo>
310
407    </target>
408  
313
409    <target name="dist-jar"
410            depends="clean, jar">
316
411      <copy file="${product.jar}" todir="${dist.dir}"/>
318
412    </target>
413  
414 <
415 <  <target name="compile-ant-filter"
416 <          depends="init">
324 <
325 <    <mkdir dir="${build.ant.dir}"/>
326 <
327 <    <javac srcdir="${ant.src.dir}"
328 <          destdir="${build.ant.dir}"
329 <           source="1.4"/>
330 <
331 <  </target>
332 <
333 <
334 <  <target name="filter-src"
335 <          depends="compile-ant-filter">
336 <
337 <    <mkdir dir="${build.filter.src.dir}"/>
338 <
339 <    <copy todir="${build.filter.src.dir}">
340 <      <fileset dir="${src.dir}">
341 <        <include name="**/*.html"/>
342 <      </fileset>
343 <    </copy>
344 <
345 <    <copy todir="${build.filter.src.dir}">
346 <      <fileset dir="${src.dir}">
347 <        <exclude name="**/*.html"/>
348 <        <!-- Files excluded from dist-docs -->
349 <        <exclude name="java/util/Random.*"/>
350 <        <exclude name="sun/misc/Unsafe.*"/>
351 <      </fileset>
352 <      <!--
353 <      <filterchain>
354 <      -->
355 <
356 <        <!--
357 <         # This filter gets rid of angle-bracketed type parameters
358 <         # so that javadoc can run on the result. The following
359 <         # heuristic seems to work:
360 <         #
361 <         # For all lines not starting with space(s)-asterisk-space(s),
362 <         #   replace <something> with a space, where there may be more
363 <         #   than one right angle bracket at the end, and "something"
364 <         #   must not contain parens or pipes. (This may need some
365 <         #   tweaking.)
366 <         -->
367 <
368 <        <!--
369 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
370 <                      classpath="${build.ant.dir}">
371 <          <param name="notmatching" value="^\s+\*\s.*$"/>
372 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
373 <          <param name="replacement" value=" "/>
374 <        </filterreader>
375 <        -->
376 <
377 <      <!--
378 <      </filterchain>
379 <      -->
380 <    </copy>
381 <
382 <  </target>
383 <
384 <
385 <  <target name="filter-doccheck"
386 <          depends="filter-src">
387 <
388 <    <mkdir dir="${build.dc-filter.dir}"/>
389 <
390 <    <copy todir="${build.dc-filter.dir}">
391 <      <fileset dir="${build.filter.src.dir}">
392 <        <include name="**/*.html"/>
393 <      </fileset>
394 <    </copy>
395 <
396 <    <property name="generic.declarations"
397 <             value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
398 <    />
399 <
400 <    <copy todir="${build.dc-filter.dir}">
401 <      <fileset dir="${build.filter.src.dir}">
402 <        <exclude name="**/*.html"/>
403 <      </fileset>
404 <      <filterchain>
405 <        <!--
406 <         # These two filters try to make the source look like
407 <         # something that doccheck can process. The first removes
408 <         # -source 1.4 assertions and the second adds in a bunch
409 <         # of single letter public nested marker interfaces so that
410 <         # the generic type parameters are recognized.
411 <         -->
412 <
413 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
414 <                      classpath="${build.ant.dir}">
415 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
416 <          <param name="pattern"     value="assert"/>
417 <          <param name="replacement" value="//assert"/>
418 <        </filterreader>
419 <
420 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
421 <                      classpath="${build.ant.dir}">
422 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
423 <          <param name="pattern"     value="$"/>
424 <          <param name="replacement" value=" ${generic.declarations}"/>
425 <        </filterreader>
426 <
427 <      </filterchain>
428 <    </copy>
429 <
430 <  </target>
431 <
432 <
433 <  <target name="compile-tests"
434 <          depends="jar">
435 <
436 <    <mkdir dir="${build.testcases.dir}"/>
437 <
438 <    <javac srcdir="${tck.src.dir}"
439 <          destdir="${build.testcases.dir}"
440 <            debug="${build.debug}"
441 <       debuglevel="${build.debuglevel}"
442 <      deprecation="${build.deprecation}"
443 <           source="${build.sourcelevel}"
444 <             fork="true">
445 <
446 <      <compilerarg value="${bootclasspath.args}"/>
447 <      <compilerarg line="${build.args}"/>
448 <
449 <      <classpath refid="test.classpath"/>
450 <
451 <    </javac>
452 <
453 <    <javac srcdir="${test.src.dir}"
454 <          destdir="${build.testcases.dir}"
455 <            debug="${build.debug}"
456 <       debuglevel="${build.debuglevel}"
457 <      deprecation="${build.deprecation}"
458 <           source="${build.sourcelevel}"
459 <             fork="true">
460 <
461 <      <include name="jsr166/test/**"/>
462 <
463 <      <compilerarg value="${bootclasspath.args}"/>
464 <      <compilerarg line="${build.args}"/>
465 <
466 <      <classpath refid="test.classpath"/>
467 <
468 <    </javac>
469 <
470 < <!--
471 <    <javac srcdir="${jtreg.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 <      <compilerarg value="${bootclasspath.args}"/>
480 <      <compilerarg line="${build.args}"/>
481 <
482 <      <classpath refid="test.classpath"/>
483 <
484 <    </javac>
485 < -->
486 <
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="run-tests"
421 <          depends="compile-tests">
422 <
423 <    <!-- May be overridden by user.properties -->
424 <    <property name="testcase" value="*"/>
425 <
426 <    <mkdir dir="${build.reports.dir}"/>
427 <
428 <    <junit printsummary="true"
429 <             showoutput="true"
430 <          errorProperty="junit.failed"
431 <        failureProperty="junit.failed"
432 <                    dir="${build.reports.dir}"
433 <                   fork="true">
434 <
435 <      <jvmarg value="${bootclasspath.args}"/>
436 <      <jvmarg value="-server"/>
437 <      <jvmarg value="-showversion"/>
438 <
439 <      <classpath refid="test.classpath"/>
440 <
441 <      <formatter type="xml"/>
442 <
443 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
444 <        <fileset dir="${tck.src.dir}">
445 <          <include name="**/${testcase}Test.java"/>
446 <        </fileset>
447 <      </batchtest>
448 <
449 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
450 <        <fileset dir="${test.src.dir}">
451 <          <include name="jsr166/test/**/${testcase}Test.java"/>
452 <        </fileset>
453 <      </batchtest>
454 <
455 < <!--
456 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
457 <        <fileset dir="${jtreg.src.dir}">
458 <          <include name="**/${testcase}Test.java"/>
459 <        </fileset>
530 <      </batchtest>
531 < -->
532 <
533 <    </junit>
534 <
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="report-tests"
467 <          depends="run-tests">
468 <
469 <    <!-- Sets junit.report.format to frames if redirection is present,
470 <         otherwise sets it to noframes. -->
471 <    <available property="junit.report.format"
472 <                  value="frames"
473 <              classname="org.apache.xalan.lib.Redirect"
474 <    />
475 <    <property name="junit.report.format" value="noframes"/>
476 <
477 <    <junitreport todir="${build.reports.dir}">
478 <      <fileset dir="${build.reports.dir}">
479 <        <include name="TEST-*.xml"/>
480 <      </fileset>
481 <      <report styledir="${stylesheet.dir}"
482 <                format="${junit.report.format}"
483 <                 todir="${build.reports.dir}"
484 <      />
485 <    </junitreport>
486 <
487 <    <fail message="Test Cases Failed" if="junit.failed"/>
488 <
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="configure-compiler">
496 +    <fail message="ant version too old">
497 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
498 +    </fail>
499  
500      <property name="unchecked.option" value="-Xlint:unchecked"/>
501  
# Line 578 | Line 512
512    </target>
513  
514  
515 <  <target name="configure-tests"
516 <       depends="configure-compiler">
583 <
584 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
585 <    <available property="junit.available"
586 <               classname="junit.framework.Protectable"/>
587 <
588 <    <!-- Xalan -->
589 <    <available property="xalan.available"
590 <               classname="org.apache.xalan.Version"/>
591 <
592 <
593 <    <!-- Ant 1.6beta and later don't need or want this check -->
594 <    <!--
595 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
596 <          unless="junit.available"/>
597 <
598 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
599 <          unless="xalan.available"/>
600 <    -->
601 <
602 <  </target>
603 <
604 <
605 <
606 <  <!-- Anthill targets -->
607 <
608 <  <target name="anthill-build">
609 <
610 <    <!-- Override this in user.properties -->
611 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
612 <
613 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
614 <      <arg value="-Xmx256000000"/>
615 <      <!-- classpath of new JVM -->
616 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
617 <      <!-- location of Ant home directory -->
618 <      <arg value="-Dant.home=${ant.home}"/>
619 <      <!-- the Ant main class -->
620 <      <arg value="org.apache.tools.ant.Main"/>
621 <      <!-- The build file -->
622 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
623 <      <!-- the target to build on the new Ant instance -->
624 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
625 <      <arg value="do-anthill-build"/>
626 <    </exec>
627 <  </target>
628 <
629 <  <target name="do-anthill-build"
630 <          depends="jar, test, docs, dist-docs"/>
631 <
632 <  <target name="anthill-publish">
633 <
634 <    <copy todir="${deployDir}/docs/private">
635 <      <fileset dir="${build.javadocs.dir}"/>
636 <    </copy>
637 <
638 <    <copy todir="${deployDir}/docs/public">
639 <      <fileset dir="${dist.javadocs.dir}"/>
640 <    </copy>
641 <
642 <    <copy tofile="${deployDir}/index.html"
643 <          file="${basedir}/etc/anthill-index.html"/>
644 <
645 <    <copy todir="${deployDir}/notes">
646 <      <fileset dir="${basedir}/etc/notes"/>
647 <    </copy>
648 <
649 <  </target>
650 <
651 <
652 <
653 <  <!-- Various demos and test programs -->
654 <
655 <
656 <  <target name="sample" depends="init, configure-compiler"
657 <          description="Standalone demo program">
658 <
659 <    <mkdir dir="${build.testcases.dir}"/>
660 <
661 <    <javac srcdir="${test.src.dir}"
662 <          destdir="${build.testcases.dir}"
663 <            debug="${build.debug}"
664 <       debuglevel="${build.debuglevel}"
665 <      deprecation="${build.deprecation}"
666 <           source="${build.sourcelevel}"
667 <             fork="true">
668 <
669 <      <include name="jsr166/test/Sample.java"/>
670 <
671 <    </javac>
672 <
673 <    <copy todir="${build.testcases.dir}">
674 <      <fileset dir="${test.src.dir}">
675 <        <include name="**/*.properties"/>
676 <      </fileset>
677 <    </copy>
678 <
679 <
680 <    <java classname="jsr166.test.Sample" fork="true">
681 <      <classpath refid="test.classpath"/>
682 <      <!-- <jvmarg value="-ea"/> -->
683 <      <!-- <jvmarg value="-server"/> -->
684 <      <!-- <arg value="1000"/> -->
685 <    </java>
686 <  </target>
687 <
688 <
689 <  <target name="loops" depends="init, configure-compiler"
690 <          description="Benchmark from Doug Lea's AQS paper">
691 <
692 <    <mkdir dir="${build.loops.dir}"/>
515 >  <target name="compile-test-loops" depends="jar"
516 >          description="Compiles all the perf tests in src/test/loops">
517  
518 <    <javac srcdir="${loops.src.dir}"
695 <          destdir="${build.loops.dir}"
696 <            debug="${build.debug}"
697 <       debuglevel="${build.debuglevel}"
698 <      deprecation="${build.deprecation}"
699 <           source="${build.sourcelevel}"
700 <             fork="true">
518 >    <mkdir dir="${build.dir}/test/loops"/>
519  
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}"/>
703      <classpath refid="loops.classpath"/>
704
536      </javac>
706
707    <java classname="ALoops" fork="true">
708      <classpath refid="loops.classpath"/>
709    </java>
710
711  </target>
712
713
714  <target name="compile-j1" depends="init, configure-compiler, compile">
715
716    <mkdir dir="${build.j1.dir}"/>
717
718    <javac srcdir="${j1.src.dir}"
719          destdir="${build.j1.dir}"
720            debug="${build.debug}"
721       debuglevel="${build.debuglevel}"
722      deprecation="${build.deprecation}"
723           source="${build.sourcelevel}" >
724
725      <include name="**/*.java"/>
726      <exclude name="**/dijkstra/**"/>
727
728      <compilerarg line="${build.args}"/>
729      <classpath refid="j1.classpath"/>
730
731    </javac>
732
733  </target>
734
735
736  <target name="sw" depends="compile-j1"
737          description="Runs the SwingWorker demo">
738
739    <!--
740    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
741      <classpath refid="j1.classpath"/>
742    </java>
743    -->
744
745    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
746
747    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
748      <arg value="${build.j1.dir}/SwingWorker.html"/>
749    </exec>
750
537    </target>
538  
753  <target name="j1" depends="compile-j1"
754          description="Runs a standalone JavaOne program">
755
756    <java classname="${j1.test}" fork="true">
757      <classpath refid="j1.classpath"/>
758      <jvmarg value="-client"/>
759
760      <!-- TestPseudoRandom args -->
761      <arg value="2"/>
762      <arg value="25"/>
763      <arg value="100000"/>
764
765      <!-- WebCrawler args -->
766      <!--
767      <arg value="jsr166.webcrawler.WebCrawler3"/>
768      <arg value="http://www.priorartisans.com"/>
769      <arg value="25"/>
770      -->
771
772    </java>
539  
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 <  <target name="test-j1" depends="compile-j1"
565 <          description="Runs testcases from the JavaOne source directories">
566 <
567 <    <junit printsummary="true"
568 <             showoutput="true"
569 <          errorProperty="junit.failed"
570 <        failureProperty="junit.failed"
571 <                    dir="${build.j1.dir}"
572 <                   fork="true">
573 <
574 <      <!-- <jvmarg value="-server"/> -->
575 <      <classpath refid="j1.classpath"/>
576 <      <formatter type="xml"/>
577 <
578 <      <batchtest todir="${build.j1.dir}">
579 <        <fileset dir="${j1.src.dir}">
580 <          <include name="**/*Test.java"/>
581 <        </fileset>
582 <      </batchtest>
583 <
584 <    </junit>
585 <
586 <    <available property="junit.report.format"
587 <                  value="frames"
588 <              classname="org.apache.xalan.lib.Redirect"/>
589 <    <property name="junit.report.format" value="noframes"/>
590 <
591 <    <junitreport todir="${build.j1.dir}">
592 <      <fileset dir="${build.j1.dir}">
593 <        <include name="TEST-*.xml"/>
594 <      </fileset>
595 <      <report styledir="${stylesheet.dir}"
596 <                format="${junit.report.format}"
597 <                 todir="${build.j1.dir}"
598 <      />
599 <    </junitreport>
600 <
601 <    <fail message="Test Cases Failed" if="junit.failed"/>
602 <
603 <  </target>
604 <
605 <
606 <
607 <  <!-- C++ and JNI definitions and demos -->
608 <
609 <  <target name="configure-cpp">
610 <
824 <    <!-- Define tasks and types -->
825 <
826 <    <path id="cpptasks.path">
827 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
828 <    </path>
829 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
830 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
831 <
832 <    <!-- Set platform property for JNI includes -->
833 <
834 <    <condition property="platform" value="linux">
835 <      <os name="Linux"/>
836 <    </condition>
837 <    <condition property="platform" value="win32">
838 <      <os family="windows"/>
839 <    </condition>
840 <    <condition property="platform" value="solaris">
841 <      <os name="SunOS"/>
842 <    </condition>
843 <
844 <  </target>
845 <
846 <
847 <  <target name="cppdemo" depends="configure-cpp">
848 <
849 <    <mkdir dir="${build.dir}"/>
850 <
851 <    <cc multithreaded="true"
852 <                 name="g++"
853 <               objdir="${build.dir}"
854 <              outfile="${build.dir}/CppDemo">
855 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
856 <      <libset libs="stdc++"/>
857 <    </cc>
858 <
859 <    <exec executable="${build.dir}/CppDemo">
860 <      <arg line="count in word frequency of word in command line count"/>
861 <    </exec>
862 <
863 <  </target>
864 <
865 <
866 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
867 <
868 <    <mkdir dir="${build.testcases.dir}"/>
869 <
870 <    <javac srcdir="${test.src.dir}"
871 <          destdir="${build.testcases.dir}"
872 <            debug="${build.debug}"
873 <       debuglevel="${build.debuglevel}"
874 <      deprecation="${build.deprecation}"
875 <           source="${build.sourcelevel}"
876 <             fork="true">
877 <      <compilerarg value="${bootclasspath.args}"/>
878 <      <compilerarg line="${build.args}"/>
879 <      <classpath refid="test.classpath"/>
880 <      <include name="JniDemo.java"/>
881 <    </javac>
882 <
883 <    <javah destdir="${build.testcases.dir}"
884 <      classpathref="test.classpath">
885 <      <class name="JniDemo"/>
886 <    </javah>
887 <
888 <    <cc multithreaded="true"
889 <                 name="g++"
890 <               objdir="${build.dir}"
891 <              outfile="${build.dir}/JniDemo"
892 <              outtype="shared">
893 <
894 <      <compiler>
895 <        <defineset>
896 <          <define name="__int64" value="long long"/>
897 <        </defineset>
898 <        <includepath location="${java.home}/../include"/>
899 <        <includepath location="${java.home}/../include/${platform}"/>
900 <        <compilerarg value="-mno-cygwin"/>
901 <      </compiler>
902 <
903 <      <linker>
904 <        <linkerarg value="--add-stdcall-alias"/>
905 <      </linker>
906 <
907 <      <includepath location="${build.testcases.dir}"/>
908 <
909 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
910 <
911 <      <libset libs="stdc++"/>
912 <
913 <    </cc>
914 <
915 <    <!-- Necessary if windows, harmless if not -->
916 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
917 <
918 <    <java classname="JniDemo" fork="true">
919 <      <!-- Watch out: path separator hardwired to semicolon here! -->
920 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
921 <      <classpath refid="test.classpath"/>
922 <      <arg line="count in word frequency of word in command line count"/>
923 <    </java>
924 <
925 <  </target>
926 <
927 <
928 <
929 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
930 <
931 <
932 <
933 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
934 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
935 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
936 <  <property name="pretiger.sourcelevel" value="1.4"/>
937 <
938 <  <target name="defang"
939 <       depends="init"
940 <   description="Generates pre-Tiger compatible source">
941 <
942 <    <delete dir="${pretiger.src.dir}"/>
943 <    <mkdir dir="${pretiger.src.dir}"/>
944 <
945 <    <exec executable="perl">
946 <      <arg file="etc/defang.pl"/>
947 <      <!-- <arg value="-v"/> -->
948 <      <arg value="-s"/> <arg file="${src.dir}"/>
949 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
950 <    </exec>
951 <
952 <  </target>
953 <
954 <  <target name="compile-pretiger"
955 <          depends="init, configure-compiler, defang"
956 <          description="Compiles pre-Tiger sources to build folder">
957 <
958 <    <mkdir dir="${build.pretiger.dir}"/>
959 <
960 <    <javac srcdir="${pretiger.src.dir}"
961 <          destdir="${build.pretiger.dir}"
962 <            debug="${build.debug}"
963 <       debuglevel="${build.debuglevel}"
964 <      deprecation="${build.deprecation}"
965 <           source="${pretiger.sourcelevel}"
966 <             fork="true">
967 <
968 <      <compilerarg line="${build.args}"/>
969 <      <exclude name="**/Thread.java"/>
970 <
971 <    </javac>
972 <
973 <  </target>
974 <
975 <  <target name="pretiger" depends="compile-pretiger">
976 <
977 <    <mkdir dir="${build.lib.dir}"/>
978 <
979 <    <jar destfile="${pretiger.jar}">
980 <      <fileset dir="${build.pretiger.dir}">
981 <      </fileset>
982 <    </jar>
983 <
984 <  </target>
985 <
986 <  <!-- jsr166x -->
987 <
988 <
989 <  <target name="jsr166xcompile"
990 <          depends="init, configure-compiler"
991 <          description="Compiles jsr166x sources">
992 <
993 <    <mkdir dir="${build.jsr166x.dir}"/>
994 <
995 <    <javac srcdir="${jsr166xsrc.dir}"
996 <          destdir="${build.jsr166x.dir}"
997 <            debug="${build.debug}"
998 <       debuglevel="${build.debuglevel}"
999 <      deprecation="${build.deprecation}"
1000 <           source="${build.sourcelevel}"
1001 <             fork="true">
1002 <
1003 <      <include name="**/*.java"/>
1004 <      <compilerarg line="${build.args}"/>
1005 <
1006 <    </javac>
1007 <
1008 <  </target>
1009 <
1010 <
1011 <
1012 <  <target name="jsr166xjar"
1013 <          depends="jsr166xcompile"
1014 <          description="Builds library jar from compiled sources">
1015 <
1016 <    <mkdir dir="${build.jsr166xlib.dir}"/>
1017 <
1018 <    <jar destfile="${jsr166xproduct.jar}">
1019 <      <fileset dir="${build.jsr166x.dir}"/>
1020 <    </jar>
1021 <
1022 <  </target>
1023 <
1024 <
1025 <
1026 <  <target name="jsr166xdocs"
1027 <          description="Builds javadocs with custom tags to build folder">
1028 <
1029 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
1030 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
1031 <
1032 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1033 <             link="http://java.sun.com/javase/6/docs/api/"
1034 <
1035 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1036 <
1037 <    >
1038 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1039 <      <include name="jsr166x"/>
1040 <      </packageset>
1041 <
1042 <
1043 <    </javadoc>
1044 <
1045 <  </target>
1046 <
1047 <
1048 <  <target name="jsr166xdist"
1049 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1050 <          description="Puts all distributable products in single hierarchy"/>
1051 <
1052 <
1053 <
1054 <  <target name="jsr166xclean"
1055 <          description="Removes all build products">
1056 <
1057 <    <delete dir="${build.jsr166x.dir}"/>
1058 <    <delete dir="${build.jsr166xlib.dir}"/>
1059 <
1060 <  </target>
1061 <
1062 <
1063 <
1064 <  <target name="jsr166xdist-clean"
1065 <          description="Removes all build and distribution products">
1066 <
1067 <  </target>
1068 <
1069 <
1070 <
1071 <  <target name="jsr166xdist-docs"
1072 <          description="Builds javadocs without custom tags to dist folder">
1073 <
1074 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1075 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1076 <
1077 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1078 <                link="http://java.sun.com/javase/6/docs/api/"
1079 <              source="${build.sourcelevel}">
1080 <
1081 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1082 <      <include name="jsr166x"/>
1083 <      </packageset>
1084 <
1085 <    </javadoc>
1086 <
1087 <  </target>
1088 <
1089 <  <target name="jsr166xdist-jar"
1090 <          depends="jsr166xclean, jsr166xjar">
1091 <
1092 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1093 <
1094 <  </target>
1095 <
1096 <  <!-- jsr166y -->
1097 <
1098 <
1099 <  <target name="jsr166ycompile"
1100 <          depends="init, configure-compiler"
1101 <          description="Compiles jsr166y sources">
1102 <
1103 <    <mkdir dir="${build.jsr166y.dir}"/>
564 > <!-- ==============================================================
565 >  Experimental errorprone support
566 >  https://errorprone.info
567 >  https://errorprone.info/docs/installation
568 >  https://github.com/google/error-prone/issues/1143
569 > =================================================================== -->
570 >  <path id="errorprone.processorpath.path">
571 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
572 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
573 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
574 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
575 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
576 >  </path>
577 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
578 >  <property name="errorprone.jsr166.user.flags" value=""/>
579 >  <property name="errorprone.jsr166.flags"
580 >            value="-Xep:HashtableContains:OFF
581 >                   -Xep:PreferJavaTimeOverload:OFF
582 >                   -Xep:JdkObsolete:OFF
583 >                   -Xep:MissingOverride:OFF
584 >                   -Xep:MissingFail:OFF
585 >                   -Xep:ThreadPriorityCheck:OFF
586 >                   -Xep:MixedArrayDimensions:ERROR
587 >                   -Xep:RemoveUnusedImports:ERROR
588 >                   -Xep:EmptyIf:ERROR
589 >                   -Xep:MultipleTopLevelClasses:ERROR
590 >                   -Xep:ClassName:ERROR
591 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
592 >                   -Xep:RedundantThrows:ERROR
593 >                   -Xep:IdentityBinaryExpression:WARN
594 >                   -Xep:ConstructorInvokesOverridable:WARN
595 >                   -Xep:MethodCanBeStatic:WARN
596 >                   ${errorprone.jsr166.user.flags}"/>
597 >  <!-- -Xep:WildcardImport:ERROR -->
598 >  <property name="errorprone.jsr166.test.flags"
599 >            value="-Xep:StringSplitter:OFF
600 >                   -Xep:BoxedPrimitiveConstructor:OFF
601 >                   -Xep:UnnecessaryParentheses:OFF
602 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
603 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
604 >  <target name="errorprone"
605 >          depends="clean, configure-compiler"
606 >          description="Run errorprone over jsr166 source code (experimental)">
607 >
608 >    <local name="destdir"/>
609 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
610 >    <mkdir dir="${destdir}"/>
611  
612 <    <javac srcdir="${jsr166ysrc.dir}"
613 <          destdir="${build.jsr166y.dir}"
614 <            debug="${build.debug}"
615 <       debuglevel="${build.debuglevel}"
616 <      deprecation="${build.deprecation}"
617 <           source="${build.sourcelevel}"
618 <             fork="true">
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}"/>
1115      <compilerarg value="${bootclasspath.args}"/>
1116
1117 <!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
1118
640      </javac>
641  
642 <  </target>
643 <
1123 <
1124 <
1125 <  <target name="jsr166yjar"
1126 <          depends="jsr166ycompile"
1127 <          description="Builds library jar from compiled sources">
1128 <
1129 <    <mkdir dir="${build.jsr166ylib.dir}"/>
1130 <
1131 <    <jar destfile="${jsr166yproduct.jar}">
1132 <      <fileset dir="${build.jsr166y.dir}"/>
642 >    <jar destfile="${product.jar}">
643 >      <fileset dir="${destdir}"/>
644      </jar>
645  
646 <  </target>
647 <
648 <
649 <
650 <  <target name="jsr166ydocs"
651 <          description="Builds javadocs with custom tags to build folder">
652 <
653 <    <delete dir="${build.jsr166yjavadocs.dir}"/>
654 <    <mkdir dir="${build.jsr166yjavadocs.dir}"/>
655 <
656 <    <javadoc destdir="${build.jsr166yjavadocs.dir}"
657 <                link="http://java.sun.com/javase/6/docs/api/"
658 <            sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
659 <
660 <    >
661 <      <packageset dir="${topsrc.dir}" defaultexcludes="no">
662 <      <include name="jsr166y"/>
663 <      </packageset>
664 <
665 <
666 <    </javadoc>
667 <
668 <  </target>
669 <
670 <
671 <  <target name="jsr166ydist"
672 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
673 <          description="Puts all distributable products in single hierarchy"/>
674 <
675 <
676 <
677 <  <target name="jsr166yclean"
678 <          description="Removes all build products">
679 <
680 <    <delete dir="${build.jsr166y.dir}"/>
681 <    <delete dir="${build.jsr166ylib.dir}"/>
682 <
683 <  </target>
684 <
685 <
686 <
687 <  <target name="jsr166ydist-clean"
688 <          description="Removes all build and distribution products">
689 <
690 <  </target>
691 <
692 <  <target name="jsr166ydist-docs"
693 <          description="Builds javadocs without custom tags to dist folder">
694 <
695 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
696 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
697 <
698 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
699 <                link="http://java.sun.com/javase/6/docs/api/"
700 <              source="${build.sourcelevel}">
701 <      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
702 <      <include name="jsr166y/*.java"/>
703 <      <include name="jsr166y/forkjoin/*.java"/>
704 <            </fileset>
705 <    </javadoc>
706 <
707 <  </target>
708 <
709 <  <target name="jsr166ydist-jar"
710 <          depends="jsr166yclean, jsr166yjar">
711 <
712 <    <copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
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  
754   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines