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.72 by dl, Fri May 20 16:29:57 2005 UTC vs.
Revision 1.305 by jsr166, Sun Oct 6 17:51:03 2019 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/jdk11
23 +  $HOME/jdk/jdk12
24 +  $HOME/jdk/jdk13
25 +  $HOME/jdk/jdk14
26 +  where each of the above is a JDK or a symlink to same, and
27 +  $HOME/jdk/src/jdk11
28 +  $HOME/jdk/src/jdk12
29 +  $HOME/jdk/src/jdk13
30 +  $HOME/jdk/src/jdk14
31 +  where each of the above is a JDK source tree or a symlink to same.
32 +
33 +  Alternatively, define ant variables thus:
34 +  ant -Djdk$N.home=... -Djdk$N.src.home=...
35 +  for $N in 11 .. 14 ...
36 +
37 +  As of 2016-03, the sources in src/main are for jdk9+ only.
38 +  As of 2019-08, the sources in src/main are for jdk11+ only.
39 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
40   ------------------------------------------------------------------------------
41    </description>
42  
43 <  <target name="usage" description="Advises user to run with -projecthelp">
44 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
43 >  <!-- Run 'ant -projecthelp' (default target) -->
44 >  <target name="usage">
45 >    <java classname="org.apache.tools.ant.Main">
46 >      <arg value="-projecthelp" />
47 >    </java>
48    </target>
49  
50 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
51  
52    <!-- User-specific settings -->
53    <property file="user.properties"/>
54  
55  
56    <!-- Compilation options -->
24  <property name="build.sourcelevel"    value="1.5"/>
57    <property name="build.debug"          value="true"/>
58    <property name="build.debuglevel"     value="source,lines,vars"/>
59    <property name="build.deprecation"    value="false"/>
60 +  <property name="build.javadoc.access" value="protected"/>
61  
62    <!-- Build locations -->
63 <  <property name="build.dir"            location="build"/>
64 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
65 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
66 <  <property name="build.j1.dir"         location="${build.dir}/j1"/>
67 <  <property name="build.loops.dir"      location="${build.dir}/loops"/>
68 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
69 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
70 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
71 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
72 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
73 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
74 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
75 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
76 <  <property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
77 <  <property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
78 <  <property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
63 >  <property name="build.dir"                   location="build"/>
64 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
65 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
66 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
67 >
68 >  <!-- JDK locations -->
69 >  <property name="jdks.home"  location="${user.home}/jdk"/>
70 >
71 >  <macrodef name="defjdklocations">
72 >    <attribute name="v"/>
73 >    <sequential>
74 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
75 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
76 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
77 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
78 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
79 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
80 >    </sequential>
81 >  </macrodef>
82 >
83 >  <macrodef name="mirror-dir">
84 >    <attribute name="src"/>
85 >    <attribute name="dst"/>
86 >    <sequential>
87 >    <delete dir="@{dst}"/>
88 >    <mkdir dir="@{dst}"/>
89 >    <copy todir="@{dst}" preservelastmodified="true">
90 >      <fileset dir="@{src}"/>
91 >    </copy>
92 >    </sequential>
93 >  </macrodef>
94 >
95 >  <defjdklocations v="11"/>
96 >  <defjdklocations v="12"/>
97 >  <defjdklocations v="13"/>
98 >  <defjdklocations v="14"/>
99  
100    <!-- Source locations -->
101    <property name="src.dir"              location="${basedir}/src/main"/>
102    <property name="test.src.dir"         location="${basedir}/src/test"/>
50  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
103    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
104    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
105 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
106 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
107 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
105 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
106 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
107 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
108 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
109 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
110    <property name="lib.dir"              location="${basedir}/lib"/>
111    <property name="dist.dir"             location="${basedir}/dist"/>
112    <property name="topsrc.dir"           location="${basedir}/src"/>
59  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
113  
114 <  <!-- Distribution locations -->
115 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
116 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
114 >  <!-- Javadoc locations -->
115 >  <property name="docs.dir"          location="${build.dir}/docs"/>
116 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
117  
118    <!-- Jar locations -->
119 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
120 <  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
121 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
122 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
123 <
124 <  <!-- Bootclasspath argument -->
125 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
126 <
127 <  <!-- Test classpath -->
128 <  <path id="test.classpath">
129 <    <pathelement location="${build.testcases.dir}"/>
130 <    <pathelement location="${junit.jar}"/>
131 <  </path>
119 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
120 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
121 >
122 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
123 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
124 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
125 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
126 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
127 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
128 >  <!-- The location of jdk early access docs (RIP) -->
129 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
130 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
131 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
132 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
133 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
134 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
135 >  <property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/>
136 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
137 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
138 >
139 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
140 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
141 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
142 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
143 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
144 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
145 >
146 >  <!-- Define the "jtreg" task -->
147 >  <!-- See the docs in "jtreg -onlineHelp" -->
148 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
149 >           classpath="${lib.dir}/jtreg.jar" />
150 >
151 >  <!-- Tck configuration options; see JSR166TestCase.java
152 >   To profile a single tck test class:
153 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
154 >   To stress test a single tck test class:
155 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
156 >   To stress test a single tck test method:
157 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
158 >  -->
159 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
160 >  <macrodef name="run-tck-tests">
161 >    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
162 >    <attribute name="target"/>
163 >    <attribute name="compile-target" default="@{target}"/>
164 >    <attribute name="workdir"/>
165 >    <attribute name="classes"/>
166 >    <!--
167 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
168 >    -->
169 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
170 >    <element name="javac-elements" optional="true"/>
171 >
172 >    <sequential>
173 >
174 >    <mkdir dir="@{workdir}/tck-classes"/>
175 >
176 >    <javac srcdir="@{tck.src.dir}"
177 >           destdir="@{workdir}/tck-classes"
178 >           debug="${build.debug}"
179 >           debuglevel="${build.debuglevel}"
180 >           deprecation="${build.deprecation}"
181 >           source="@{compile-target}"
182 >           target="@{compile-target}"
183 >           classpath="${junit.jar}"
184 >           includeAntRuntime="false"
185 >           includeJavaRuntime="false"
186 >           encoding="ASCII"
187 >           executable="${javac@{compile-target}}"
188 >           fork="true">
189 >
190 >      <include name="*.java"/>
191 >      <compilerarg value="-XDignore.symbol.file=true"/>
192 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
193 >      <compilerarg value="-Xdoclint:reference/private"/>
194 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
195 >      <compilerarg line="${build.args}"/>
196 >      <javac-elements/>
197 >
198 >    </javac>
199 >
200 >    <java classname="${jsr166.tckTestClass}"
201 >          failonerror="true"
202 >          jvm="${java@{target}}"
203 >          fork="true">
204 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
205 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
206 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
207 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
208 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
209 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
210 >        <jvmarg line="@{jvmflags}"/>
211 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
212 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
213 >
214 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
215 >        <syspropertyset id="system-properties-used-by-tck">
216 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
217 >          <propertyref prefix="jsr166."/>
218 >          <propertyref name="test.timeout.factor"/>
219 >        </syspropertyset>
220 >
221 >        <classpath>
222 >          <pathelement location="${junit.jar}"/>
223 >          <pathelement location="@{workdir}/tck-classes"/>
224 >        </classpath>
225 >    </java>
226 >
227 >    </sequential>
228 >  </macrodef>
229 >
230 >  <!-- Define jtreg test sets for different jdk versions -->
231 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
232 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
233 >  <property name="jtreg.test.pattern" value="**/*.java"/>
234 >  <macrodef name="defjtregtests">
235 >    <attribute name="v"/>
236 >    <sequential>
237 >      <fileset dir="${jtreg@{v}.src.dir}">
238 >        <patternset id="jdk@{v}.jtreg.tests">
239 >          <include name="${jtreg.test.pattern}"/>
240 >        </patternset>
241 >      </fileset>
242 >    </sequential>
243 >  </macrodef>
244 >
245 >  <defjtregtests v="14"/>
246 >  <defjtregtests v="13"/>
247 >  <defjtregtests v="12"/>
248 >  <defjtregtests v="11"/>
249 >
250 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
251 >  <property name="jtreg.flags" value=""/>
252 >
253 >  <macrodef name="run-jtreg-tests">
254 >    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
255 >    <attribute name="target"/>
256 >    <attribute name="workdir"/>
257 >    <attribute name="classes"/>
258 >    <attribute name="verbose" default="${jtreg.verbose}"/>
259 >    <attribute name="jtregflags" default=""/>
260 >    <element name="jtreg-elements" optional="true"/>
261 >
262 >    <sequential>
263 >
264 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
265 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
266 >
267 >    <delete dir="@{workdir}/JTwork"   quiet="true"/>
268 >    <jtreg dir="${jtreg@{target}.src.dir}"
269 >           jdk="${jdk@{target}.home}"
270 >           workDir="@{workdir}/JTwork">
271 >      <patternset refid="jdk@{target}.jtreg.tests"/>
272 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
273 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
274 >      <arg value="-agentvm"/>
275 >      <arg value="-noreport"/>
276 >      <arg value="-verbose:@{verbose}"/>
277 >      <arg value="-vmoptions:-esa -ea"/>
278 >      <arg value="-automatic"/>
279 >      <arg value="-k:!ignore"/>
280 >      <arg line="@{jtregflags}"/>
281 >      <arg line="${jtreg.flags}"/>
282 >      <jtreg-elements/>
283 >    </jtreg>
284 >    </sequential>
285 >  </macrodef>
286  
287    <!-- ALoops classpath -->
288    <path id="loops.classpath">
289      <pathelement location="${build.loops.dir}"/>
290    </path>
291  
292 <  <!-- J1 classpath -->
293 <  <path id="j1.classpath">
294 <    <pathelement location="${build.classes.dir}"/>
295 <    <pathelement location="${build.j1.dir}"/>
89 <    <pathelement location="${junit.jar}"/>
90 <
91 <    <!-- Include dl.u.c for BoundedBuffer comparison -->
92 <    <pathelement location="${concurrent.jar}"/>
93 <  </path>
94 <
292 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
293 >  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
294 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
295 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
296  
297    <!-- Main targets -->
298  
299 +  <!-- Default values: may seem strange ... -->
300 +  <!-- At runtime, target latest LTS, i.e. jdk11 -->
301 +  <!-- But at build time, target jdk9, for maximal binary portability -->
302 +  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
303 +  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
304 +    o override-methods=summary
305 +    o {@systemProperty ...}
306 +    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
307 +    o 8202628: javadoc generates bad links in TestModules.java
308 +    -->
309 +  <property name="java.runtime.target" value="11"/>
310 +  <property name="build.main.java" value="${java11}"/>
311 +  <property name="build.main.javac" value="${javac11}"/>
312 +  <property name="build.main.javadoc" value="${javadoc12}"/>
313 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
314 +
315 +  <target name="dists"
316 +          depends="dist"
317 +          description="Builds all public jars and docs"/>
318  
319    <target name="compile"
320 <          depends="init, configure-compiler"
321 <          description="Compiles main sources to build folder">
320 >          depends="configure-compiler"
321 >          description="Compiles src/main sources to build dir">
322 >
323 >    <local name="destdir"/>
324 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
325  
326 <    <mkdir dir="${build.classes.dir}"/>
326 >    <mkdir dir="${destdir}"/>
327  
328      <javac srcdir="${src.dir}"
329 <          destdir="${build.classes.dir}"
330 <            debug="${build.debug}"
331 <       debuglevel="${build.debuglevel}"
332 <      deprecation="${build.deprecation}"
333 <           source="${build.sourcelevel}"
334 <             fork="true">
329 >           destdir="${destdir}"
330 >           debug="${build.debug}"
331 >           debuglevel="${build.debuglevel}"
332 >           deprecation="${build.deprecation}"
333 >           classpath=""
334 >           includeAntRuntime="false"
335 >           includeJavaRuntime="false"
336 >           encoding="ASCII"
337 >           executable="${build.main.javac}"
338 >           fork="true">
339  
340        <include name="**/*.java"/>
341 < <!--
342 <      <exclude name="java/lang/**"/>
343 < -->
341 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
342 >      <compilerarg value="-Xprefer:source"/>
343 >      <compilerarg value="-XDignore.symbol.file=true"/>
344 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
345 >      <compilerarg value="-Xlint:all,-removal"/>
346 >      <compilerarg line="--doclint-format html5"/>
347 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
348 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
349 >      <compilerarg value="-Werror"/>
350 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
351        <compilerarg line="${build.args}"/>
352  
353      </javac>
120
354    </target>
355  
356  
124
357    <target name="jar"
358            depends="compile"
359 <          description="Builds library jar from compiled sources">
360 <
361 <    <mkdir dir="${build.lib.dir}"/>
130 <
359 >          description="Builds library jar for src/main from compiled sources">
360 >    <local name="subdir"/>
361 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
362      <jar destfile="${product.jar}">
363 <      <fileset dir="${build.classes.dir}"/>
363 >      <fileset dir="${build.classes.dir}${subdir}"/>
364 >      <manifest>
365 >        <attribute name="Built-By" value="${user.name}"/>
366 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
367 >      </manifest>
368      </jar>
134
369    </target>
370  
371  
138
139  <target name="test"
140          depends="init, configure-tests, report-tests"
141          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
142
143
144
372    <target name="docs"
373 <          description="Builds javadocs with custom tags to build folder">
147 <
148 <    <delete dir="${build.javadocs.dir}"/>
149 <    <mkdir dir="${build.javadocs.dir}"/>
150 <
151 <    <javadoc destdir="${build.javadocs.dir}"
152 <                link="http://java.sun.com/j2se/1.5.0/docs/api"
153 <            overview="${src.dir}/intro.html"
154 <            sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
155 <    >          
373 >          description="Builds javadocs for src/main to dist dir">
374  
375 <      <packageset dir="${src.dir}"/>
376 <
159 <    </javadoc>
160 <
161 <  </target>
375 >    <delete dir="${docs.dir}"/>
376 >    <mkdir dir="${docs.dir}"/>
377  
378 +    <!-- old school frames via docs/index.html?overview-summary.html -->
379 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
380 +    <local name="use-frames"/>
381 +    <condition property="use-frames">
382 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
383 +    </condition>
384  
385 +    <!-- the packagenames="none" hack below prevents scanning the -->
386 +    <!-- sourcepath for packages -->
387  
388 <  <target name="doccheck"
389 <          depends="filter-doccheck"
390 <          description="Reports on javadoc style errors">
391 <
392 <    <delete dir="${build.doccheck.dir}"/>
393 <    <mkdir dir="${build.doccheck.dir}"/>
394 <
395 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
396 <         docletpath="${lib.dir}/doccheck.jar"
397 <            destdir="${build.doccheck.dir}">
398 <      <packageset dir="${build.dc-filter.dir}"/>
388 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
389 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
390 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
391 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
392 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
393 >    <javadoc destdir="${docs.dir}"
394 >             packagenames="none"
395 >             link="${java.api.url}"
396 >             overview="${src.dir}/intro.html"
397 >             access="${build.javadoc.access}"
398 >             sourcepath="${src.dir}"
399 >             classpath=""
400 >             source="${build.main.javadoc.source}"
401 >             executable="${build.main.javadoc}">
402 > <!-- TODO: JDK-8214571 failonerror = "true" -->
403 >      <fileset dir="${src.dir}" defaultexcludes="yes">
404 >        <include name="**/*.java"/>
405 >      </fileset>
406 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
407 >      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
408 >      <arg value="-XDignore.symbol.file=true"/>
409 >      <arg value="-html5"/>
410 >      <arg value="--patch-module=java.base=${src.dir}"/>
411 >      <arg value="--frames" if:set="use-frames"/>
412 >      <arg value="--override-methods=summary"/>
413 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
414 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
415 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
416 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
417 > <!-- tags added in jdk9: currently unused -->
418 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
419 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
420      </javadoc>
177
178    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
179
180  </target>
181
182
183
184  <target name="checkstyle"
185          depends="filter-src"
186          description="Reports on style errors in Java source (verbose, mostly chaff)">
187
188    <taskdef resource="checkstyletask.properties"
189            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
190
191    <mkdir dir="${build.checkstyle.dir}"/>
192
193    <checkstyle config="etc/checkstyle/sun_checks.xml"
194       failOnViolation="false">
195      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
196      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
197    </checkstyle>
198
199    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
200          out="${build.checkstyle.dir}/checkstyle-report.html"
201        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
202
421    </target>
422  
423  
206
424    <target name="dist"
425 <          depends="init, dist-clean, dist-jar, dist-docs"
425 >          depends="dist-clean, dist-jar, dist-docs"
426            description="Puts all distributable products in single hierarchy"/>
427  
428  
212
213  <target name="release"
214          depends="dist"
215          description="Puts entire CVS tree, plus distribution productions, in a jar">
216
217    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
218
219    <jar basedir="${basedir}" destfile="${release.jar}">
220      <!-- <exclude name="build/**"/> -->
221      <exclude name="${release.jar}"/>
222      <exclude name="user.properties"/>
223      <exclude name="etc/notes/**"/>
224      <exclude name="src/emulation/**"/>
225      <exclude name="**/SyntaxTest.java"/>
226      <exclude name="**/SuperfluousAbstract.java"/>
227    </jar>
228
229  </target>
230
231
232
429    <target name="clean"
430            description="Removes all build products">
235
431      <delete dir="${build.dir}"/>
237    <delete dir="${build.classes.dir}"/>
238    <delete dir="${build.lib.dir}"/>
239
432    </target>
433  
434  
243
435    <target name="dist-clean"
436            description="Removes all build and distribution products">
437 <
437 >    <delete dir="${build.dir}"/>
438      <delete dir="${dist.dir}"/>
248
249  </target>
250
251
252
253  <target name="dist-docs"
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.5.0/docs/api"
261            overview="${src.dir}/intro.html"
262
263            sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
264     >
265      <packageset dir="${src.dir}" defaultexcludes="yes">
266      <include name="java/util/concurrent"/>
267      <include name="java/util/concurrent/atomic"/>
268      <include name="java/util/concurrent/locks"/>
269      </packageset>
270      <fileset dir="${topsrc.dir}" defaultexcludes="yes">
271      <include name="main/java/util/*.java"/>
272 <!--      <include name="jsr166x/*.java"/> -->
273      </fileset>
274    </javadoc>
275
276  </target>
277
278
279
280  <!-- Internal targets -->
281
282
283  <target name="init">
284
285    <!-- Version is kept in a separate file -->
286    <loadfile property="version" srcFile="version.properties"/>
287    <echo>Building JSR-166 version ${version}</echo>
288    <echo>java.home is ${java.home}</echo>
289
439    </target>
440  
441  
442    <target name="dist-jar"
443            depends="clean, jar">
295
444      <copy file="${product.jar}" todir="${dist.dir}"/>
297
445    </target>
446  
447 <
448 <  <target name="compile-ant-filter"
449 <          depends="init">
303 <
304 <    <mkdir dir="${build.ant.dir}"/>
305 <
306 <    <javac srcdir="${ant.src.dir}"
307 <          destdir="${build.ant.dir}"
308 <           source="1.4"/>
309 <
447 >  <target name="dist-docs"
448 >          depends="clean, docs">
449 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
450    </target>
451  
452 <
453 <  <target name="filter-src"
454 <          depends="compile-ant-filter">
455 <
456 <    <mkdir dir="${build.filter.src.dir}"/>
457 <
458 <    <copy todir="${build.filter.src.dir}">
459 <      <fileset dir="${src.dir}">
460 <        <include name="**/*.html"/>
461 <      </fileset>
462 <    </copy>
463 <
464 <    <copy todir="${build.filter.src.dir}">
465 <      <fileset dir="${src.dir}">
466 <        <exclude name="**/*.html"/>
467 <        <!-- Files excluded from dist-docs -->
468 <        <exclude name="java/util/Random.*"/>
469 <        <exclude name="sun/misc/Unsafe.*"/>
470 <      </fileset>
471 <      <!--
472 <      <filterchain>
473 <      -->
474 <
475 <        <!--
476 <         # This filter gets rid of angle-bracketed type parameters
477 <         # so that javadoc can run on the result. The following
478 <         # heuristic seems to work:
479 <         #
480 <         # For all lines not starting with space(s)-asterisk-space(s),
481 <         #   replace <something> with a space, where there may be more
482 <         #   than one right angle bracket at the end, and "something"
483 <         #   must not contain parens or pipes. (This may need some
484 <         #   tweaking.)
485 <         -->
486 <
487 <        <!--
488 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
489 <                      classpath="${build.ant.dir}">
490 <          <param name="notmatching" value="^\s+\*\s.*$"/>
491 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
492 <          <param name="replacement" value=" "/>
493 <        </filterreader>
354 <        -->
355 <
356 <      <!--
357 <      </filterchain>
358 <      -->
359 <    </copy>
360 <
452 >  <target name="tck"
453 >          depends="jar"
454 >          description="Runs tck tests for src/main directly">
455 >
456 >    <run-tck-tests
457 >      target="${java.runtime.target}"
458 >      workdir="${build.dir}"
459 >      classes="${product.jar}">
460 >      <javac-elements>
461 >        <compilerarg value="-Werror"/>
462 >      </javac-elements>
463 >    </run-tck-tests>
464 >  </target>
465 >
466 >  <target name="tck-parallelism-1"
467 >          description="Runs tck with common pool parallelism 1">
468 >    <antcall target="tck">
469 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
470 >    </antcall>
471 >  </target>
472 >
473 >  <target name="tck-parallelism-0"
474 >          description="Runs tck with common pool parallelism 0">
475 >    <antcall target="tck">
476 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
477 >    </antcall>
478 >  </target>
479 >
480 >  <target name="tck-security-manager"
481 >          description="Runs tck with a security manager">
482 >    <antcall target="tck">
483 >      <param name="jsr166.useSecurityManager" value="true"/>
484 >    </antcall>
485 >  </target>
486 >
487 >  <target name="jtreg"
488 >          depends="jar"
489 >          description="Runs jtreg tests for src/main using the jtreg ant task">
490 >    <run-jtreg-tests
491 >       target="${java.runtime.target}"
492 >       workdir="${build.dir}"
493 >       classes="${product.jar}"/>
494    </target>
495  
496 +  <target name="test"
497 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
498 +          description="Runs tck and jtreg tests for src/main"/>
499  
500 <  <target name="filter-doccheck"
501 <          depends="filter-src">
366 <
367 <    <mkdir dir="${build.dc-filter.dir}"/>
368 <
369 <    <copy todir="${build.dc-filter.dir}">
370 <      <fileset dir="${build.filter.src.dir}">
371 <        <include name="**/*.html"/>
372 <      </fileset>
373 <    </copy>
374 <
375 <    <property name="generic.declarations"
376 <             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 {}"
377 <    />
378 <
379 <    <copy todir="${build.dc-filter.dir}">
380 <      <fileset dir="${build.filter.src.dir}">
381 <        <exclude name="**/*.html"/>
382 <      </fileset>
383 <      <filterchain>
384 <        <!--
385 <         # These two filters try to make the source look like
386 <         # something that doccheck can process. The first removes
387 <         # -source 1.4 assertions and the second adds in a bunch
388 <         # of single letter public nested marker interfaces so that
389 <         # the generic type parameters are recognized.
390 <         -->
391 <
392 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
393 <                      classpath="${build.ant.dir}">
394 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
395 <          <param name="pattern"     value="assert"/>
396 <          <param name="replacement" value="//assert"/>
397 <        </filterreader>
398 <
399 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
400 <                      classpath="${build.ant.dir}">
401 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
402 <          <param name="pattern"     value="$"/>
403 <          <param name="replacement" value=" ${generic.declarations}"/>
404 <        </filterreader>
405 <
406 <      </filterchain>
407 <    </copy>
408 <
409 <  </target>
410 <
411 <
412 <  <target name="compile-tests"
413 <          depends="jar">
414 <
415 <    <mkdir dir="${build.testcases.dir}"/>
416 <
417 <    <javac srcdir="${tck.src.dir}"
418 <          destdir="${build.testcases.dir}"
419 <            debug="${build.debug}"
420 <       debuglevel="${build.debuglevel}"
421 <      deprecation="${build.deprecation}"
422 <           source="${build.sourcelevel}"
423 <             fork="true">
424 <
425 <      <compilerarg value="${bootclasspath.args}"/>
426 <      <compilerarg line="${build.args}"/>
427 <
428 <      <classpath refid="test.classpath"/>
429 <
430 <    </javac>
431 <
432 <    <javac srcdir="${test.src.dir}"
433 <          destdir="${build.testcases.dir}"
434 <            debug="${build.debug}"
435 <       debuglevel="${build.debuglevel}"
436 <      deprecation="${build.deprecation}"
437 <           source="${build.sourcelevel}"
438 <             fork="true">
439 <
440 <      <include name="jsr166/test/**"/>
441 <
442 <      <compilerarg value="${bootclasspath.args}"/>
443 <      <compilerarg line="${build.args}"/>
444 <
445 <      <classpath refid="test.classpath"/>
446 <
447 <    </javac>
448 <
449 < <!--
450 <    <javac srcdir="${jtreg.src.dir}"
451 <          destdir="${build.testcases.dir}"
452 <            debug="${build.debug}"
453 <       debuglevel="${build.debuglevel}"
454 <      deprecation="${build.deprecation}"
455 <           source="${build.sourcelevel}"
456 <             fork="true">
457 <
458 <      <compilerarg value="${bootclasspath.args}"/>
459 <      <compilerarg line="${build.args}"/>
460 <
461 <      <classpath refid="test.classpath"/>
462 <
463 <    </javac>
464 < -->
465 <
466 <  </target>
467 <
468 <
469 <  <target name="run-tests"
470 <          depends="compile-tests">
471 <
472 <    <!-- May be overridden by user.properties -->
473 <    <property name="testcase" value="*"/>
474 <
475 <    <mkdir dir="${build.reports.dir}"/>
476 <
477 <    <junit printsummary="true"
478 <             showoutput="true"
479 <          errorProperty="junit.failed"
480 <        failureProperty="junit.failed"
481 <                    dir="${build.reports.dir}"
482 <                   fork="true">
483 <
484 <      <jvmarg value="${bootclasspath.args}"/>
485 <      <jvmarg value="-server"/>
486 <      <jvmarg value="-showversion"/>
487 <
488 <      <classpath refid="test.classpath"/>
489 <
490 <      <formatter type="xml"/>
491 <
492 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
493 <        <fileset dir="${tck.src.dir}">
494 <          <include name="**/${testcase}Test.java"/>
495 <        </fileset>
496 <      </batchtest>
497 <
498 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
499 <        <fileset dir="${test.src.dir}">
500 <          <include name="jsr166/test/**/${testcase}Test.java"/>
501 <        </fileset>
502 <      </batchtest>
503 <
504 < <!--
505 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
506 <        <fileset dir="${jtreg.src.dir}">
507 <          <include name="**/${testcase}Test.java"/>
508 <        </fileset>
509 <      </batchtest>
510 < -->
511 <
512 <    </junit>
513 <
500 >  <target name="test-version-permutations"
501 >          depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
502    </target>
503  
504 <
505 <  <target name="report-tests"
506 <          depends="run-tests">
507 <
508 <    <!-- Sets junit.report.format to frames if redirection is present,
509 <         otherwise sets it to noframes. -->
510 <    <available property="junit.report.format"
511 <                  value="frames"
512 <              classname="org.apache.xalan.lib.Redirect"
513 <    />
514 <    <property name="junit.report.format" value="noframes"/>
515 <
516 <    <junitreport todir="${build.reports.dir}">
517 <      <fileset dir="${build.reports.dir}">
518 <        <include name="TEST-*.xml"/>
519 <      </fileset>
520 <      <report styledir="${stylesheet.dir}"
521 <                format="${junit.report.format}"
522 <                 todir="${build.reports.dir}"
523 <      />
524 <    </junitreport>
525 <
526 <    <fail message="Test Cases Failed" if="junit.failed"/>
527 <
504 >  <target name="test11">
505 >    <antcall target="clean"/>
506 >    <antcall>
507 >      <param name="java.runtime.target" value="11"/>
508 >      <param name="build.main.javac" value="${javac11}"/>
509 >      <param name="build.main.javadoc" value="${javadoc12}"/>
510 >      <param name="build.main.javadoc.source" value="11"/>
511 >      <target name="test"/>
512 >      <target name="docs"/>
513 >    </antcall>
514 >  </target>
515 >
516 >  <target name="test12">
517 >    <antcall target="clean"/>
518 >    <antcall>
519 >      <param name="java.runtime.target" value="12"/>
520 >      <param name="build.main.javac" value="${javac12}"/>
521 >      <param name="build.main.javadoc" value="${javadoc12}"/>
522 >      <param name="build.main.javadoc.source" value="12"/>
523 >      <target name="test"/>
524 >      <target name="docs"/>
525 >    </antcall>
526 >  </target>
527 >
528 >  <target name="test13">
529 >    <antcall target="clean"/>
530 >    <antcall>
531 >      <param name="java.runtime.target" value="13"/>
532 >      <param name="build.main.javac" value="${javac13}"/>
533 >      <param name="build.main.javadoc" value="${javadoc13}"/>
534 >      <param name="build.main.javadoc.source" value="13"/>
535 >      <target name="test"/>
536 >      <target name="docs"/>
537 >    </antcall>
538 >  </target>
539 >
540 >  <target name="test14">
541 >    <antcall target="clean"/>
542 >    <antcall>
543 >      <param name="java.runtime.target" value="14"/>
544 >      <param name="build.main.javac" value="${javac14}"/>
545 >      <param name="build.main.javadoc" value="${javadoc14}"/>
546 >      <param name="build.main.javadoc.source" value="14"/>
547 >      <target name="test"/>
548 >      <target name="docs"/>
549 >    </antcall>
550 >  </target>
551 >
552 >  <target name="test11-12">
553 >    <antcall target="clean"/>
554 >    <antcall>
555 >      <param name="java.runtime.target" value="12"/>
556 >      <param name="build.main.javac" value="${javac11}"/>
557 >      <param name="build.main.javadoc" value="${javadoc12}"/>
558 >      <param name="build.main.javadoc.source" value="11"/>
559 >      <target name="test"/>
560 >      <target name="docs"/>
561 >    </antcall>
562 >  </target>
563 >
564 >  <target name="test11-13">
565 >    <antcall target="clean"/>
566 >    <antcall>
567 >      <param name="java.runtime.target" value="13"/>
568 >      <param name="build.main.javac" value="${javac11}"/>
569 >      <param name="build.main.javadoc" value="${javadoc13}"/>
570 >      <param name="build.main.javadoc.source" value="11"/>
571 >      <target name="test"/>
572 >      <target name="docs"/>
573 >    </antcall>
574 >  </target>
575 >
576 >  <target name="test11-14">
577 >    <antcall target="clean"/>
578 >    <antcall>
579 >      <param name="java.runtime.target" value="14"/>
580 >      <param name="build.main.javac" value="${javac11}"/>
581 >      <param name="build.main.javadoc" value="${javadoc14}"/>
582 >      <param name="build.main.javadoc.source" value="11"/>
583 >      <target name="test"/>
584 >      <target name="docs"/>
585 >    </antcall>
586    </target>
587  
588  
589    <target name="configure-compiler">
590 +    <fail message="ant version too old">
591 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
592 +    </fail>
593  
594      <property name="unchecked.option" value="-Xlint:unchecked"/>
595  
# Line 557 | Line 606
606    </target>
607  
608  
609 <  <target name="configure-tests"
610 <       depends="configure-compiler">
562 <
563 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
564 <    <available property="junit.available"
565 <               classname="junit.framework.Protectable"/>
566 <
567 <    <!-- Xalan -->
568 <    <available property="xalan.available"
569 <               classname="org.apache.xalan.Version"/>
570 <
571 <
572 <    <!-- Ant 1.6beta and later don't need or want this check -->
573 <    <!--
574 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
575 <          unless="junit.available"/>
576 <
577 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
578 <          unless="xalan.available"/>
579 <    -->
580 <
581 <  </target>
582 <
583 <
584 <
585 <  <!-- Anthill targets -->
586 <
587 <  <target name="anthill-build">
588 <
589 <    <!-- Override this in user.properties -->
590 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
591 <
592 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
593 <      <arg value="-Xmx256000000"/>
594 <      <!-- classpath of new JVM -->
595 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
596 <      <!-- location of Ant home directory -->
597 <      <arg value="-Dant.home=${ant.home}"/>
598 <      <!-- the Ant main class -->
599 <      <arg value="org.apache.tools.ant.Main"/>
600 <      <!-- The build file -->
601 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
602 <      <!-- the target to build on the new Ant instance -->
603 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
604 <      <arg value="do-anthill-build"/>
605 <    </exec>
606 <  </target>
607 <
608 <  <target name="do-anthill-build"
609 <          depends="jar, test, docs, dist-docs"/>
610 <
611 <  <target name="anthill-publish">
612 <
613 <    <copy todir="${deployDir}/docs/private">
614 <      <fileset dir="${build.javadocs.dir}"/>
615 <    </copy>
616 <
617 <    <copy todir="${deployDir}/docs/public">
618 <      <fileset dir="${dist.javadocs.dir}"/>
619 <    </copy>
620 <
621 <    <copy tofile="${deployDir}/index.html"
622 <          file="${basedir}/etc/anthill-index.html"/>
623 <
624 <    <copy todir="${deployDir}/notes">
625 <      <fileset dir="${basedir}/etc/notes"/>
626 <    </copy>
627 <
628 <  </target>
629 <
630 <
631 <
632 <  <!-- Various demos and test programs -->
633 <
634 <
635 <  <target name="sample" depends="init, configure-compiler"
636 <          description="Standalone demo program">
637 <
638 <    <mkdir dir="${build.testcases.dir}"/>
639 <
640 <    <javac srcdir="${test.src.dir}"
641 <          destdir="${build.testcases.dir}"
642 <            debug="${build.debug}"
643 <       debuglevel="${build.debuglevel}"
644 <      deprecation="${build.deprecation}"
645 <           source="${build.sourcelevel}"
646 <             fork="true">
647 <
648 <      <include name="jsr166/test/Sample.java"/>
649 <
650 <    </javac>
651 <
652 <    <copy todir="${build.testcases.dir}">
653 <      <fileset dir="${test.src.dir}">
654 <        <include name="**/*.properties"/>
655 <      </fileset>
656 <    </copy>
657 <
658 <
659 <    <java classname="jsr166.test.Sample" fork="true">
660 <      <classpath refid="test.classpath"/>
661 <      <!-- <jvmarg value="-ea"/> -->
662 <      <!-- <jvmarg value="-server"/> -->
663 <      <!-- <arg value="1000"/> -->
664 <    </java>
665 <  </target>
666 <
667 <
668 <  <target name="loops" depends="init, configure-compiler"
669 <          description="Benchmark from Doug Lea's AQS paper">
670 <
671 <    <mkdir dir="${build.loops.dir}"/>
672 <
673 <    <javac srcdir="${loops.src.dir}"
674 <          destdir="${build.loops.dir}"
675 <            debug="${build.debug}"
676 <       debuglevel="${build.debuglevel}"
677 <      deprecation="${build.deprecation}"
678 <           source="${build.sourcelevel}"
679 <             fork="true">
680 <
681 <      <compilerarg line="${build.args}"/>
682 <      <classpath refid="loops.classpath"/>
683 <
684 <    </javac>
685 <
686 <    <java classname="ALoops" fork="true">
687 <      <classpath refid="loops.classpath"/>
688 <    </java>
689 <
690 <  </target>
691 <
692 <
693 <  <target name="compile-j1" depends="init, configure-compiler, compile">
694 <
695 <    <mkdir dir="${build.j1.dir}"/>
696 <
697 <    <javac srcdir="${j1.src.dir}"
698 <          destdir="${build.j1.dir}"
699 <            debug="${build.debug}"
700 <       debuglevel="${build.debuglevel}"
701 <      deprecation="${build.deprecation}"
702 <           source="${build.sourcelevel}" >
703 <
704 <      <include name="**/*.java"/>
705 <      <exclude name="**/dijkstra/**"/>
706 <
707 <      <compilerarg line="${build.args}"/>
708 <      <classpath refid="j1.classpath"/>
709 <
710 <    </javac>
711 <
712 <  </target>
713 <
714 <
715 <  <target name="sw" depends="compile-j1"
716 <          description="Runs the SwingWorker demo">
717 <
718 <    <!--
719 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
720 <      <classpath refid="j1.classpath"/>
721 <    </java>
722 <    -->
723 <
724 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
725 <
726 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
727 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
728 <    </exec>
729 <
730 <  </target>
731 <
732 <  <target name="j1" depends="compile-j1"
733 <          description="Runs a standalone JavaOne program">
734 <
735 <    <java classname="${j1.test}" fork="true">
736 <      <classpath refid="j1.classpath"/>
737 <      <jvmarg value="-client"/>
738 <
739 <      <!-- TestPseudoRandom args -->
740 <      <arg value="2"/>
741 <      <arg value="25"/>
742 <      <arg value="100000"/>
743 <
744 <      <!-- WebCrawler args -->
745 <      <!--
746 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
747 <      <arg value="http://www.priorartisans.com"/>
748 <      <arg value="25"/>
749 <      -->
750 <
751 <    </java>
752 <
753 <  </target>
754 <
755 <
756 <  <target name="test-j1" depends="compile-j1"
757 <          description="Runs testcases from the JavaOne source directories">
758 <
759 <    <junit printsummary="true"
760 <             showoutput="true"
761 <          errorProperty="junit.failed"
762 <        failureProperty="junit.failed"
763 <                    dir="${build.j1.dir}"
764 <                   fork="true">
765 <
766 <      <!-- <jvmarg value="-server"/> -->
767 <      <classpath refid="j1.classpath"/>
768 <      <formatter type="xml"/>
769 <
770 <      <batchtest todir="${build.j1.dir}">
771 <        <fileset dir="${j1.src.dir}">
772 <          <include name="**/*Test.java"/>
773 <        </fileset>
774 <      </batchtest>
775 <
776 <    </junit>
777 <
778 <    <available property="junit.report.format"
779 <                  value="frames"
780 <              classname="org.apache.xalan.lib.Redirect"/>
781 <    <property name="junit.report.format" value="noframes"/>
782 <
783 <    <junitreport todir="${build.j1.dir}">
784 <      <fileset dir="${build.j1.dir}">
785 <        <include name="TEST-*.xml"/>
786 <      </fileset>
787 <      <report styledir="${stylesheet.dir}"
788 <                format="${junit.report.format}"
789 <                 todir="${build.j1.dir}"
790 <      />
791 <    </junitreport>
792 <
793 <    <fail message="Test Cases Failed" if="junit.failed"/>
794 <
795 <  </target>
796 <
797 <
798 <
799 <  <!-- C++ and JNI definitions and demos -->
800 <
801 <  <target name="configure-cpp">
802 <
803 <    <!-- Define tasks and types -->
804 <
805 <    <path id="cpptasks.path">
806 <      <pathelement location="${lib.dir}/cpptasks.jar"/>
807 <    </path>
808 <    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
809 <    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
810 <
811 <    <!-- Set platform property for JNI includes -->
812 <
813 <    <condition property="platform" value="linux">
814 <      <os name="Linux"/>
815 <    </condition>
816 <    <condition property="platform" value="win32">
817 <      <os family="windows"/>
818 <    </condition>
819 <    <condition property="platform" value="solaris">
820 <      <os name="SunOS"/>
821 <    </condition>
822 <
823 <  </target>
824 <
825 <
826 <  <target name="cppdemo" depends="configure-cpp">
827 <
828 <    <mkdir dir="${build.dir}"/>
829 <
830 <    <cc multithreaded="true"
831 <                 name="g++"
832 <               objdir="${build.dir}"
833 <              outfile="${build.dir}/CppDemo">
834 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
835 <      <libset libs="stdc++"/>
836 <    </cc>
837 <
838 <    <exec executable="${build.dir}/CppDemo">
839 <      <arg line="count in word frequency of word in command line count"/>
840 <    </exec>
841 <
842 <  </target>
843 <
609 >  <target name="compile-test-loops" depends="jar"
610 >          description="Compiles all the perf tests in src/test/loops">
611  
612 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
612 >    <mkdir dir="${build.dir}/test/loops"/>
613  
614 <    <mkdir dir="${build.testcases.dir}"/>
615 <
616 <    <javac srcdir="${test.src.dir}"
617 <          destdir="${build.testcases.dir}"
618 <            debug="${build.debug}"
619 <       debuglevel="${build.debuglevel}"
620 <      deprecation="${build.deprecation}"
621 <           source="${build.sourcelevel}"
622 <             fork="true">
623 <      <compilerarg value="${bootclasspath.args}"/>
614 >    <javac srcdir="${basedir}/src/test/loops"
615 >           destdir="${build.dir}/test/loops"
616 >           debug="${build.debug}"
617 >           debuglevel="${build.debuglevel}"
618 >           deprecation="${build.deprecation}"
619 >           includeAntRuntime="false"
620 >           includeJavaRuntime="false"
621 >           encoding="ASCII"
622 >           executable="${build.main.javac}"
623 >           fork="true">
624 >
625 >      <include name="*.java"/>
626 >      <compilerarg value="-XDignore.symbol.file=true"/>
627 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
628 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
629        <compilerarg line="${build.args}"/>
858      <classpath refid="test.classpath"/>
859      <include name="JniDemo.java"/>
630      </javac>
861
862    <javah destdir="${build.testcases.dir}"
863      classpathref="test.classpath">
864      <class name="JniDemo"/>
865    </javah>
866
867    <cc multithreaded="true"
868                 name="g++"
869               objdir="${build.dir}"
870              outfile="${build.dir}/JniDemo"
871              outtype="shared">
872
873      <compiler>
874        <defineset>
875          <define name="__int64" value="long long"/>
876        </defineset>
877        <includepath location="${java.home}/../include"/>
878        <includepath location="${java.home}/../include/${platform}"/>
879        <compilerarg value="-mno-cygwin"/>
880      </compiler>
881
882      <linker>
883        <linkerarg value="--add-stdcall-alias"/>
884      </linker>
885
886      <includepath location="${build.testcases.dir}"/>
887
888      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
889
890      <libset libs="stdc++"/>
891
892    </cc>
893
894    <!-- Necessary if windows, harmless if not -->
895    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
896
897    <java classname="JniDemo" fork="true">
898      <!-- Watch out: path separator hardwired to semicolon here! -->
899      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
900      <classpath refid="test.classpath"/>
901      <arg line="count in word frequency of word in command line count"/>
902    </java>
903
631    </target>
632  
633  
634 <
635 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
636 <
637 <
638 <
639 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
640 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
641 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
642 <  <property name="pretiger.sourcelevel" value="1.4"/>
643 <
644 <  <target name="defang"
645 <       depends="init"
646 <   description="Generates pre-Tiger compatible source">
647 <
648 <    <delete dir="${pretiger.src.dir}"/>
649 <    <mkdir dir="${pretiger.src.dir}"/>
650 <
651 <    <exec executable="perl">
652 <      <arg file="etc/defang.pl"/>
653 <      <!-- <arg value="-v"/> -->
654 <      <arg value="-s"/> <arg file="${src.dir}"/>
928 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
929 <    </exec>
930 <
931 <  </target>
932 <
933 <  <target name="compile-pretiger"
934 <          depends="init, configure-compiler, defang"
935 <          description="Compiles pre-Tiger sources to build folder">
936 <
937 <    <mkdir dir="${build.pretiger.dir}"/>
938 <
939 <    <javac srcdir="${pretiger.src.dir}"
940 <          destdir="${build.pretiger.dir}"
941 <            debug="${build.debug}"
942 <       debuglevel="${build.debuglevel}"
943 <      deprecation="${build.deprecation}"
944 <           source="${pretiger.sourcelevel}"
945 <             fork="true">
946 <
947 <      <compilerarg line="${build.args}"/>
948 <      <exclude name="**/Thread.java"/>
949 <
950 <    </javac>
951 <
952 <  </target>
953 <
954 <  <target name="pretiger" depends="compile-pretiger">
955 <
956 <    <mkdir dir="${build.lib.dir}"/>
957 <
958 <    <jar destfile="${pretiger.jar}">
959 <      <fileset dir="${build.pretiger.dir}">
960 <      </fileset>
961 <    </jar>
962 <
634 >  <!-- old branches no longer maintained.  build support deleted -->
635 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
636 >  <!-- jsr166 4jdk7 (no longer maintained) -->
637 >  <!-- jsr166x (no longer maintained) -->
638 >  <!-- jsr166y (no longer maintained) -->
639 >  <!-- extra166y (no longer maintained) -->
640 >  <!-- jsr166e (no longer maintained) -->
641 >
642 > <!-- Find buglets that can be detected by static build tools -->
643 >
644 > <!--   <target name="lint"> -->
645 > <!--     <antcall target="dists"> -->
646 > <!--       <param name="build.javadoc.access" value="protected"/> -->
647 > <!--     </antcall> -->
648 > <!--   </target> -->
649 >
650 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
651 >  <target name="doclint-private">
652 >    <antcall target="dist">
653 >      <param name="build.javadoc.access" value="private"/>
654 >    </antcall>
655    </target>
656  
965  <!-- jsr166x -->
657  
658 + <!-- ==============================================================
659 +  Experimental errorprone support
660 +  https://errorprone.info
661 +  https://errorprone.info/docs/installation
662 +  https://github.com/google/error-prone/issues/1143
663 + =================================================================== -->
664 +  <path id="errorprone.processorpath.path">
665 +    <pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
666 +    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
667 +    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
668 +    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
669 +  </path>
670 +  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
671 +  <property name="errorprone.jsr166.user.flags" value=""/>
672 +  <property name="errorprone.jsr166.flags"
673 +            value="-Xep:HashtableContains:OFF
674 +                   -Xep:JdkObsolete:OFF
675 +                   -Xep:MissingOverride:OFF
676 +                   -Xep:MissingFail:OFF
677 +                   -Xep:ThreadPriorityCheck:OFF
678 +                   -Xep:MixedArrayDimensions:ERROR
679 +                   -Xep:RemoveUnusedImports:ERROR
680 +                   -Xep:EmptyIf:ERROR
681 +                   -Xep:MultipleTopLevelClasses:ERROR
682 +                   -Xep:ClassName:ERROR
683 +                   -Xep:LongLiteralLowerCaseSuffix:ERROR
684 +                   -Xep:RedundantThrows:ERROR
685 +                   -Xep:IdentityBinaryExpression:WARN
686 +                   -Xep:ConstructorInvokesOverridable:WARN
687 +                   -Xep:MethodCanBeStatic:WARN
688 +                   ${errorprone.jsr166.user.flags}"/>
689 +  <!-- -Xep:WildcardImport:ERROR -->
690 +  <property name="errorprone.jsr166.test.flags"
691 +            value="-Xep:StringSplitter:OFF
692 +                   -Xep:BoxedPrimitiveConstructor:OFF
693 +                   -Xep:ModifyingCollectionWithItself:OFF"/>
694 +  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
695 +  <target name="errorprone"
696 +          depends="clean, configure-compiler"
697 +          description="Run errorprone over jsr166 source code (experimental)">
698 +
699 +    <local name="destdir"/>
700 +    <property name="destdir" value="${build.classes.dir}/java.base"/>
701 +    <mkdir dir="${destdir}"/>
702  
703 <  <target name="jsr166xcompile"
704 <          depends="init, configure-compiler"
705 <          description="Compiles jsr166x sources">
706 <
707 <    <mkdir dir="${build.jsr166x.dir}"/>
708 <
709 <    <javac srcdir="${jsr166xsrc.dir}"
710 <          destdir="${build.jsr166x.dir}"
711 <            debug="${build.debug}"
712 <       debuglevel="${build.debuglevel}"
713 <      deprecation="${build.deprecation}"
979 <           source="${build.sourcelevel}"
980 <             fork="true">
703 >    <javac srcdir="${src.dir}"
704 >           destdir="${destdir}"
705 >           debug="${build.debug}"
706 >           debuglevel="${build.debuglevel}"
707 >           deprecation="${build.deprecation}"
708 >           classpath=""
709 >           includeAntRuntime="false"
710 >           includeJavaRuntime="false"
711 >           encoding="ASCII"
712 >           executable="${build.main.javac}"
713 >           fork="true">
714  
715        <include name="**/*.java"/>
716 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
717 +      <compilerarg value="-J--illegal-access=permit"/>
718 +      <compilerarg value="-XDcompilePolicy=simple"/>
719 +      <compilerarg value="-processorpath"/>
720 +      <compilerarg pathref="errorprone.processorpath.path"/>
721 +      <compilerarg value="-Xplugin:ErrorProne
722 +                          ${errorprone.jsr166.flags}"/>
723 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
724 +      <compilerarg value="-Xprefer:source"/>
725 +      <compilerarg value="-XDignore.symbol.file=true"/>
726 +      <compilerarg value="-Xlint:all"/>
727 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
728 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
729        <compilerarg line="${build.args}"/>
984
730      </javac>
731  
732 <  </target>
733 <
989 <
990 <
991 <  <target name="jsr166xjar"
992 <          depends="jsr166xcompile"
993 <          description="Builds library jar from compiled sources">
994 <
995 <    <mkdir dir="${build.jsr166xlib.dir}"/>
996 <
997 <    <jar destfile="${jsr166xproduct.jar}">
998 <      <fileset dir="${build.jsr166x.dir}"/>
732 >    <jar destfile="${product.jar}">
733 >      <fileset dir="${destdir}"/>
734      </jar>
735  
736 <  </target>
737 <
738 <
739 <
740 <  <target name="jsr166xdocs"
741 <          description="Builds javadocs with custom tags to build folder">
742 <
743 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
744 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
745 <
746 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
747 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
748 <            sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
749 <
750 <    >
751 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
752 <      <include name="jsr166x"/>
753 <      </packageset>
754 <
755 <
756 <    </javadoc>
757 <
758 <  </target>
759 <
760 <
761 <  <target name="jsr166xdist"
762 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
763 <          description="Puts all distributable products in single hierarchy"/>
764 <
765 <
766 <
767 <  <target name="jsr166xclean"
768 <          description="Removes all build products">
769 <
770 <    <delete dir="${build.jsr166x.dir}"/>
771 <    <delete dir="${build.jsr166xlib.dir}"/>
772 <
773 <  </target>
774 <
775 <
776 <
777 <  <target name="jsr166xdist-clean"
778 <          description="Removes all build and distribution products">
779 <
780 <  </target>
781 <
782 <
783 <
784 <  <target name="jsr166xdist-docs"
785 <          description="Builds javadocs without custom tags to dist folder">
786 <
787 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
788 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
789 <
790 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
791 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
792 <              source="${build.sourcelevel}">
793 <
794 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
795 <      <include name="jsr166x"/>
796 <      </packageset>
797 <
798 <    </javadoc>
799 <
800 <  </target>
801 <
802 <  <target name="jsr166xdist-jar"
803 <          depends="jsr166xclean, jsr166xjar">
804 <
805 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
736 >    <run-tck-tests
737 >      target="${java.runtime.target}"
738 >      workdir="${build.dir}"
739 >      classes="${product.jar}">
740 >      <javac-elements>
741 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
742 >        <compilerarg value="-J--illegal-access=permit"/>
743 >        <compilerarg value="-XDcompilePolicy=simple"/>
744 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
745 >        <compilerarg value="-Xplugin:ErrorProne
746 >                            ${errorprone.jsr166.flags}
747 >                            ${errorprone.jsr166.test.flags}"/>
748 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
749 >      </javac-elements>
750 >    </run-tck-tests>
751 >  </target>
752 >
753 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
754 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
755 >  <target name="errorprone-jtreg"
756 >          depends="jar"
757 >          description="Run errorprone over jtreg tests (experimental)">
758 >
759 >    <run-jtreg-tests
760 >       target="${java.runtime.target}"
761 >       workdir="${build.dir}"
762 >       classes="${product.jar}"
763 >       verbose="all">
764 >      <jtreg-elements>
765 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
766 >        <arg value="-javacoption:-processorpath"/>
767 >        <arg value="-javacoption:${errorprone.processorpath}"/>
768 >        <arg value="-javacoption:-Xplugin:ErrorProne
769 >                            ${errorprone.jsr166.flags}
770 >                            ${errorprone.jsr166.test.flags}
771 >                            -Xep:MultipleTopLevelClasses:WARN
772 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
773 >      </jtreg-elements>
774 >    </run-jtreg-tests>
775 >  </target>
776 >
777 >
778 > <!-- ==============================================================
779 >  Running guava tests against jsr166 code
780 > =================================================================== -->
781 >
782 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
783 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
784 > <!-- <property name="guava.version" value="21.0"/> -->
785 >
786 > <!-- HOWTO debug print a path id -->
787 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
788 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
789 >
790 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
791 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
792 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
793 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
794 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
795 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
796 >
797 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
798 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
799 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
800 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
801 >
802 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
803 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
804 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
805 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
806 >
807 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
808 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
809 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
810 >
811 >  <target name="init-ivy">
812 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
813 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
814 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
815 >             classpath="${build.dir}/ivy.jar"/>
816 >  </target>
817 >
818 >  <target name="guava-tests" depends="jar, init-ivy"
819 >          description="Guava tests run against jsr166 collections">
820 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
821 >    <mkdir dir="${guava.dir}"/>
822 >    <ivy:retrieve pathid="guava.testlib.classpath"
823 >      type="jar,bundle" inline="true" conf="default,master"
824 >      pattern="${guava.dir}/[artifact].[ext]"
825 >      organisation="com.google.guava" module="guava-testlib"/>
826 >    <property name="guava.version" value="21.0"/>
827 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
828 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
829 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
830 >           jvm="${build.main.java}" fork="true">
831 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
832 >      <formatter type="brief"/>
833 >      <classpath>
834 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
835 >        <path refid="guava.testlib.classpath"/>
836 >      </classpath>
837  
838 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
839 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
840 +    </junit>
841    </target>
842  
843   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines