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.129 by jsr166, Wed Jan 23 07:17:13 2013 UTC vs.
Revision 1.315 by jsr166, Fri Jun 5 00:59:33 2020 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 6 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17  
# Line 13 | Line 19
19    itself.  Because the JDK version matters and because different
20    targets require different JDKs, we assume that users have created a
21    hierarchy containing:
22 <  $HOME/jdk/jdk6
23 <  $HOME/jdk/jdk7
24 <  $HOME/jdk/jdk8
22 >  $HOME/jdk/jdk11
23 >  $HOME/jdk/jdk12
24 >  $HOME/jdk/jdk13
25 >  $HOME/jdk/jdk14
26 >  $HOME/jdk/jdk15
27    where each of the above is a JDK or a symlink to same, and
28 <  $HOME/jdk/src/jdk6
29 <  $HOME/jdk/src/jdk7
30 <  $HOME/jdk/src/jdk8
31 <  where each of the above is a complete JDK source tree
32 <  (e.g. mercurial forest) or a symlink to same.
28 >  $HOME/jdk/src/jdk11
29 >  $HOME/jdk/src/jdk12
30 >  $HOME/jdk/src/jdk13
31 >  $HOME/jdk/src/jdk14
32 >  $HOME/jdk/src/jdk15
33 >  where each of the above is a JDK source tree or a symlink to same.
34 >
35 >  Alternatively, define ant variables thus:
36 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
37 >  for $N in 11 .. 15 ...
38 >
39 >  As of 2016-03, the sources in src/main are for jdk9+ only.
40 >  As of 2019-08, the sources in src/main are for jdk11+ only.
41 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
42   ------------------------------------------------------------------------------
43    </description>
44  
45 <  <target name="usage" description="Display main targets by running 'ant -projecthelp'">
45 >  <!-- Run 'ant -projecthelp' (default target) -->
46 >  <target name="usage">
47      <java classname="org.apache.tools.ant.Main">
48        <arg value="-projecthelp" />
49      </java>
50    </target>
51  
52 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
53  
54    <!-- User-specific settings -->
55    <property file="user.properties"/>
56  
57  
58    <!-- Compilation options -->
40  <property name="build.sourcelevel"    value="6"/>
59    <property name="build.debug"          value="true"/>
60    <property name="build.debuglevel"     value="source,lines,vars"/>
61    <property name="build.deprecation"    value="false"/>
62 +  <property name="build.javadoc.access" value="protected"/>
63  
64    <!-- Build locations -->
65    <property name="build.dir"                   location="build"/>
66    <property name="build.classes.dir"           location="${build.dir}/classes"/>
67    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
68    <property name="build.loops.dir"             location="${build.dir}/loops"/>
50  <property name="build.reports.dir"           location="${build.dir}/reports"/>
51
52  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
53  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
54  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
55  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
56
57  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
58  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
59  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
60  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
61
62  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
63  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
64  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
65  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
69  
70    <!-- JDK locations -->
71    <property name="jdks.home"  location="${user.home}/jdk"/>
# Line 70 | Line 73
73    <macrodef name="defjdklocations">
74      <attribute name="v"/>
75      <sequential>
76 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
77 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
78 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
79 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
80 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
81 <    <local name="boot.jar.dir"/>
79 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
80 <    <path id="bootclasspath@{v}">
81 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
82 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
83 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
84 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
85 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
86 <    </path>
87 <    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
76 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
77 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
78 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
79 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
80 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
81 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
82      </sequential>
83    </macrodef>
84  
# Line 100 | Line 94
94      </sequential>
95    </macrodef>
96  
97 <  <defjdklocations v="6"/>
98 <  <defjdklocations v="7"/>
99 <  <defjdklocations v="8"/>
97 >  <defjdklocations v="11"/>
98 >  <defjdklocations v="12"/>
99 >  <defjdklocations v="13"/>
100 >  <defjdklocations v="14"/>
101 >  <defjdklocations v="15"/>
102  
103    <!-- Source locations -->
104    <property name="src.dir"              location="${basedir}/src/main"/>
105    <property name="test.src.dir"         location="${basedir}/src/test"/>
106    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
107    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
108 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
108 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
109 >  <property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
110 >  <property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
111 >  <property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
112 >  <property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
113 >  <property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
114    <property name="lib.dir"              location="${basedir}/lib"/>
115    <property name="dist.dir"             location="${basedir}/dist"/>
116    <property name="topsrc.dir"           location="${basedir}/src"/>
116  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
117  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
118  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
119  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
120  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
117  
118    <!-- Javadoc locations -->
119    <property name="docs.dir"          location="${build.dir}/docs"/>
120 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
125 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
126 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
127 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
128 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
129 <
130 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
131 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
132 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
133 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
134 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
135 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
120 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
121  
122    <!-- Jar locations -->
123    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
139  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
140  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
141  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
142  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
143  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
124    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
125  
126 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
127 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
128 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
129 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
130 <
131 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
132 <  <!-- The below does not yet exist as of 2013-01 -->
133 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
126 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
127 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
128 >  <!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
129 >  <!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
130 >  <!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
131 >  <!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
132 >  <!-- The location of jdk early access docs (RIP) -->
133 >  <!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
134 >  <!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
135 >  <!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
136 >  <property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
137 >  <property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
138 >  <property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
139 >  <property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
140 >  <property name="java15.docroot.url" value="https://download.java.net/java/early_access/jdk15/docs"/>
141 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
142 >  <property name="java.docroot.url"   value="${java11.docroot.url}"/>
143  
144 <  <!-- Default jdk api doc location (latest stable release seems best) -->
145 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
144 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
145 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
146 >  <property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
147 >  <property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
148 >  <property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
149 >  <property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
150 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
151  
152    <!-- Define the "jtreg" task -->
153    <!-- See the docs in "jtreg -onlineHelp" -->
154    <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
155             classpath="${lib.dir}/jtreg.jar" />
156  
157 <  <!-- Test classpath -->
158 <  <path id="test.classpath">
159 <    <pathelement location="${build.testcases.dir}"/>
160 <    <pathelement location="${junit.jar}"/>
161 <  </path>
162 <
157 >  <!-- Tck configuration options; see JSR166TestCase.java
158 >   To profile a single tck test class:
159 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
160 >   To stress test a single tck test class:
161 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
162 >   To stress test a single tck test method:
163 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
164 >  -->
165 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
166    <macrodef name="run-tck-tests">
167      <attribute name="tck.src.dir" default="${tck.src.dir}"/>
171    <attribute name="source" default="6"/>
168      <attribute name="target"/>
169 +    <attribute name="compile-target" default="@{target}"/>
170      <attribute name="workdir"/>
171      <attribute name="classes"/>
172 <    <attribute name="jvmflags" default=""/>
172 >    <!--
173 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
174 >    -->
175 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
176 >    <element name="javac-elements" optional="true"/>
177 >
178      <sequential>
179  
180      <mkdir dir="@{workdir}/tck-classes"/>
# Line 182 | Line 184
184             debug="${build.debug}"
185             debuglevel="${build.debuglevel}"
186             deprecation="${build.deprecation}"
187 <           source="@{source}"
187 >           source="@{compile-target}"
188 >           target="@{compile-target}"
189             classpath="${junit.jar}"
187           bootclasspath="@{classes}:${bootclasspath@{source}}"
190             includeAntRuntime="false"
191             includeJavaRuntime="false"
192 <           executable="${javac@{target}}"
192 >           encoding="ASCII"
193 >           executable="${javac@{compile-target}}"
194             fork="true">
195  
196        <include name="*.java"/>
197        <compilerarg value="-XDignore.symbol.file=true"/>
198 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
198 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
199 >      <compilerarg value="-Xdoclint:reference/private"/>
200 >      <compilerarg value="--patch-module=java.base=@{classes}"/>
201        <compilerarg line="${build.args}"/>
202 +      <javac-elements/>
203  
204      </javac>
205  
206 <    <java classname="JSR166TestCase"
206 >    <java classname="${jsr166.tckTestClass}"
207            failonerror="true"
208            jvm="${java@{target}}"
209            fork="true">
210 <        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
211 <        <jvmarg line="@{jvmflags}"/>
212 <        <classpath>
213 <          <pathelement location="${junit.jar}"/>
214 <          <pathelement location="@{workdir}/tck-classes"/>
215 <        </classpath>
210 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
211 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
212 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
213 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
214 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
215 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
216 >        <jvmarg line="@{jvmflags}"/>
217 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
218 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
219 >
220 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
221 >        <syspropertyset id="system-properties-used-by-tck">
222 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
223 >          <propertyref prefix="jsr166."/>
224 >          <propertyref name="test.timeout.factor"/>
225 >        </syspropertyset>
226 >
227 >        <classpath>
228 >          <pathelement location="${junit.jar}"/>
229 >          <pathelement location="@{workdir}/tck-classes"/>
230 >        </classpath>
231      </java>
232  
233      </sequential>
234    </macrodef>
235  
236 +  <!-- Define jtreg test sets for different jdk versions -->
237 +  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
238 +  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
239 +  <property name="jtreg.test.pattern" value="**/*.java"/>
240 +  <macrodef name="defjtregtests">
241 +    <attribute name="v"/>
242 +    <sequential>
243 +      <fileset dir="${jtreg@{v}.src.dir}">
244 +        <patternset id="jdk@{v}.jtreg.tests">
245 +          <include name="${jtreg.test.pattern}"/>
246 +        </patternset>
247 +      </fileset>
248 +    </sequential>
249 +  </macrodef>
250 +
251 +  <defjtregtests v="15"/>
252 +  <defjtregtests v="14"/>
253 +  <defjtregtests v="13"/>
254 +  <defjtregtests v="12"/>
255 +  <defjtregtests v="11"/>
256 +
257 +  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
258 +  <property name="jtreg.flags" value=""/>
259 +
260 +  <macrodef name="run-jtreg-tests">
261 +    <!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
262 +    <attribute name="target"/>
263 +    <attribute name="workdir"/>
264 +    <attribute name="classes"/>
265 +    <attribute name="verbose" default="${jtreg.verbose}"/>
266 +    <attribute name="jtregflags" default=""/>
267 +    <element name="jtreg-elements" optional="true"/>
268 +
269 +    <sequential>
270 +
271 +    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
272 +    <property name="jtreg.verbose" value="nopass,fail,error"/>
273 +
274 +    <delete dir="@{workdir}/JTwork"   quiet="true"/>
275 +    <jtreg dir="${jtreg@{target}.src.dir}"
276 +           jdk="${jdk@{target}.home}"
277 +           workDir="@{workdir}/JTwork">
278 +      <patternset refid="jdk@{target}.jtreg.tests"/>
279 +      <arg value="-javacoptions:--patch-module=java.base=@{classes}"/>
280 +      <arg value="-vmoptions:--patch-module=java.base=@{classes}"/>
281 +      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
282 +      <arg value="-agentvm"/>
283 +      <arg value="-noreport"/>
284 +      <arg value="-verbose:@{verbose}"/>
285 +      <arg value="-vmoptions:-esa -ea"/>
286 +      <arg value="-automatic"/>
287 +      <arg value="-k:!ignore"/>
288 +      <arg line="@{jtregflags}"/>
289 +      <arg line="${jtreg.flags}"/>
290 +      <jtreg-elements/>
291 +    </jtreg>
292 +    </sequential>
293 +  </macrodef>
294 +
295    <!-- ALoops classpath -->
296    <path id="loops.classpath">
297      <pathelement location="${build.loops.dir}"/>
298    </path>
299  
300    <!-- Support @jls tag, used in jdk8+ javadoc -->
301 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
302    <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
303    <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
304  
305    <!-- Main targets -->
306  
307 +  <!-- Default values: may seem strange ... -->
308 +  <!-- At runtime, target latest LTS, i.e. jdk11 -->
309 +  <!-- But at build time, target jdk9, for maximal binary portability -->
310 +  <!-- ButButBut as of 2019-08, target jdk11 at build time -->
311 +  <!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
312 +    o override-methods=summary
313 +    o {@systemProperty ...}
314 +    o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
315 +    o 8202628: javadoc generates bad links in TestModules.java
316 +    -->
317 +  <property name="java.runtime.target" value="11"/>
318 +  <property name="build.main.java" value="${java11}"/>
319 +  <property name="build.main.javac" value="${javac11}"/>
320 +  <property name="build.main.javadoc" value="${javadoc12}"/>
321 +  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
322 +
323    <target name="dists"
324 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
324 >          depends="dist"
325            description="Builds all public jars and docs"/>
326  
327    <target name="compile"
328            depends="configure-compiler"
329            description="Compiles src/main sources to build dir">
330  
331 <    <mkdir dir="${build.classes.dir}"/>
331 >    <local name="destdir"/>
332 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
333 >
334 >    <mkdir dir="${destdir}"/>
335  
336      <javac srcdir="${src.dir}"
337 <           destdir="${build.classes.dir}"
337 >           destdir="${destdir}"
338             debug="${build.debug}"
339             debuglevel="${build.debuglevel}"
340             deprecation="${build.deprecation}"
341             classpath=""
342             includeAntRuntime="false"
343             includeJavaRuntime="false"
344 <           executable="${javac8}"
344 >           encoding="ASCII"
345 >           executable="${build.main.javac}"
346             fork="true">
347  
348        <include name="**/*.java"/>
349 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
350 +      <compilerarg value="-Xprefer:source"/>
351        <compilerarg value="-XDignore.symbol.file=true"/>
352 <      <compilerarg value="-Xlint:all"/>
352 > <!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
353 >      <compilerarg value="-Xlint:all,-removal"/>
354 >      <compilerarg line="--doclint-format html5"/>
355 > <!--  Temporarily disable doclint for private elements, due to -->
356 > <!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
357 > <!--  which is expected to be fixed in openjdk 11.0.8 -->
358 > <!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
359 >      <compilerarg value="-Xdoclint:all/protected"/>
360 >      <compilerarg value="-Xdoclint/package:java.util.*"/>
361 >      <compilerarg value="-Werror"/>
362 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
363        <compilerarg line="${build.args}"/>
364  
365      </javac>
# Line 255 | Line 368
368  
369    <target name="jar"
370            depends="compile"
371 <          description="Builds library jar from compiled sources">
372 <
371 >          description="Builds library jar for src/main from compiled sources">
372 >    <local name="subdir"/>
373 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
374      <jar destfile="${product.jar}">
375 <      <fileset dir="${build.classes.dir}"/>
375 >      <fileset dir="${build.classes.dir}${subdir}"/>
376 >      <manifest>
377 >        <attribute name="Built-By" value="${user.name}"/>
378 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
379 >      </manifest>
380      </jar>
381    </target>
382  
383  
266  <target name="test"
267          depends="configure-tests, report-tests"
268          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
269
270
384    <target name="docs"
385            description="Builds javadocs for src/main to dist dir">
386  
387 <    <delete dir="${docs.dir}"/>
387 >    <delete dir="${docs.dir}" quiet="true"/>
388      <mkdir dir="${docs.dir}"/>
389  
390 +    <!-- old school frames via docs/index.html?overview-summary.html -->
391 +    <!-- dash-dash-frames no longer a supported option in jdk13+ -->
392 +    <local name="use-frames"/>
393 +    <condition property="use-frames">
394 +      <equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
395 +    </condition>
396 +
397      <!-- the packagenames="none" hack below prevents scanning the -->
398      <!-- sourcepath for packages -->
399  
400 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
401 + <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
402 + <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
403 + <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
404 + <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
405      <javadoc destdir="${docs.dir}"
406               packagenames="none"
407 <             link="${jdkapi8docs.url}"
407 >             link="${java.api.url}"
408               overview="${src.dir}/intro.html"
409 <             sourcepath="${src.dir}:${jdk8src.dir}"
409 >             access="${build.javadoc.access}"
410 >             sourcepath="${src.dir}"
411               classpath=""
412 <             executable="${javadoc8}">
412 >             source="${build.main.javadoc.source}"
413 >             executable="${build.main.javadoc}">
414 > <!-- TODO: JDK-8214571 failonerror = "true" -->
415        <fileset dir="${src.dir}" defaultexcludes="yes">
416 <        <include name="**/*.java"/>
416 >        <include name="java/**/*.java"/>
417        </fileset>
418 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
419 +      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
420 +      <arg value="-quiet"/>
421        <arg value="-XDignore.symbol.file=true"/>
422 <      <arg value="-tag"/>
423 <      <arg value="${javadoc.jls.option}"/>
422 >      <arg value="-html5"/>
423 >      <arg value="--patch-module=java.base=${src.dir}"/>
424 >      <arg value="--frames" if:set="use-frames"/>
425 >      <arg value="--override-methods=summary"/>
426 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
427 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
428 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
429 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
430 > <!-- tags added in jdk9: currently unused -->
431 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
432 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
433      </javadoc>
434    </target>
435  
# Line 299 | Line 439
439            description="Puts all distributable products in single hierarchy"/>
440  
441  
302  <target name="release"
303          depends="dist"
304          description="Puts entire CVS tree, plus distribution productions, in a jar">
305
306    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
307
308    <jar basedir="${basedir}" destfile="${release.jar}">
309      <!-- <exclude name="build/**"/> -->
310      <exclude name="${release.jar}"/>
311      <exclude name="user.properties"/>
312      <exclude name="etc/notes/**"/>
313      <exclude name="src/emulation/**"/>
314      <exclude name="**/SyntaxTest.java"/>
315      <exclude name="**/SuperfluousAbstract.java"/>
316    </jar>
317  </target>
318
319
442    <target name="clean"
443            description="Removes all build products">
322
444      <delete dir="${build.dir}"/>
324
445    </target>
446  
447  
448    <target name="dist-clean"
449            description="Removes all build and distribution products">
450 <
450 >    <delete dir="${build.dir}"/>
451      <delete dir="${dist.dir}"/>
332
452    </target>
453  
454  
336  <!-- Internal targets -->
337
338
455    <target name="dist-jar"
456            depends="clean, jar">
457      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 346 | Line 462
462      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
463    </target>
464  
465 +  <target name="tck"
466 +          depends="jar"
467 +          description="Runs tck tests for src/main directly">
468  
469 <  <target name="compile-tests"
470 <          depends="jar">
471 <
472 <    <mkdir dir="${build.testcases.dir}"/>
473 <
474 <    <javac srcdir="${tck.src.dir}"
475 <           destdir="${build.testcases.dir}"
476 <           debug="${build.debug}"
477 <           debuglevel="${build.debuglevel}"
478 <           deprecation="${build.deprecation}"
479 <           source="6"
480 <           classpath="${junit.jar}"
481 <           bootclasspath="@{product.jar}:${bootclasspath6}"
482 <           includeAntRuntime="false"
483 <           includeJavaRuntime="false"
484 <           executable="${javac8}"
485 <           fork="true">
486 <
487 <      <include name="**/*.java"/>
488 <      <compilerarg value="-XDignore.symbol.file=true"/>
489 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
490 <      <compilerarg line="${build.args}"/>
491 <
492 <    </javac>
493 <
494 <    <javac srcdir="${test.src.dir}"
495 <           destdir="${build.testcases.dir}"
496 <           debug="${build.debug}"
497 <           debuglevel="${build.debuglevel}"
498 <           deprecation="${build.deprecation}"
499 <           source="6"
500 <           classpath=""
501 <           bootclasspath="@{product.jar}:${bootclasspath6}"
502 <           includeAntRuntime="false"
503 <           includeJavaRuntime="false"
504 <           executable="${javac8}"
505 <           fork="true">
506 <
388 <      <include name="jsr166/test/**/*.java"/>
389 <      <compilerarg value="-XDignore.symbol.file=true"/>
390 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
391 <      <compilerarg line="${build.args}"/>
392 <
393 <    </javac>
394 <
395 < <!--
396 <    <javac srcdir="${jtreg.src.dir}"
397 <          destdir="${build.testcases.dir}"
398 <            debug="${build.debug}"
399 <       debuglevel="${build.debuglevel}"
400 <      deprecation="${build.deprecation}"
401 <           source="${build.sourcelevel}"
402 <             fork="true">
403 <
404 <      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
405 <      <compilerarg value="-XDignore.symbol.file=true"/>
406 <      <compilerarg line="${build.args}"/>
407 <
408 <    </javac>
409 < -->
410 <
411 <  </target>
412 <
413 <
414 <  <target name="run-tests"
415 <          depends="compile-tests">
416 <
417 <    <!-- May be overridden by user.properties -->
418 <    <property name="testcase" value="*"/>
419 <
420 <    <mkdir dir="${build.reports.dir}"/>
421 <
422 <    <junit printsummary="true"
423 <             showoutput="true"
424 <          errorProperty="junit.failed"
425 <        failureProperty="junit.failed"
426 <                    dir="${build.reports.dir}"
427 <                    jvm="${java8}"
428 <                   fork="true">
429 <
430 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
431 <      <jvmarg value="-server"/>
432 <      <jvmarg value="-showversion"/>
433 <
434 <      <classpath refid="test.classpath"/>
435 <
436 <      <formatter type="xml"/>
437 <
438 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
439 <        <fileset dir="${tck.src.dir}">
440 <          <include name="**/${testcase}Test.java"/>
441 <        </fileset>
442 <      </batchtest>
443 <
444 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
445 <        <fileset dir="${test.src.dir}">
446 <          <include name="jsr166/test/**/${testcase}Test.java"/>
447 <        </fileset>
448 <      </batchtest>
449 <
450 < <!--
451 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
452 <        <fileset dir="${jtreg.src.dir}">
453 <          <include name="**/${testcase}Test.java"/>
454 <        </fileset>
455 <      </batchtest>
456 < -->
457 <
458 <    </junit>
459 <
469 >    <run-tck-tests
470 >      target="${java.runtime.target}"
471 >      workdir="${build.dir}"
472 >      classes="${product.jar}">
473 >      <javac-elements>
474 >        <compilerarg value="-Werror"/>
475 >      </javac-elements>
476 >    </run-tck-tests>
477 >  </target>
478 >
479 >  <target name="tck-parallelism-1"
480 >          description="Runs tck with common pool parallelism 1">
481 >    <antcall target="tck">
482 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
483 >    </antcall>
484 >  </target>
485 >
486 >  <target name="tck-parallelism-0"
487 >          description="Runs tck with common pool parallelism 0">
488 >    <antcall target="tck">
489 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
490 >    </antcall>
491 >  </target>
492 >
493 >  <target name="tck-security-manager"
494 >          description="Runs tck with a security manager">
495 >    <antcall target="tck">
496 >      <param name="jsr166.useSecurityManager" value="true"/>
497 >    </antcall>
498 >  </target>
499 >
500 >  <target name="jtreg"
501 >          depends="jar"
502 >          description="Runs jtreg tests for src/main using the jtreg ant task">
503 >    <run-jtreg-tests
504 >       target="${java.runtime.target}"
505 >       workdir="${build.dir}"
506 >       classes="${product.jar}"/>
507    </target>
508  
509 +  <target name="test"
510 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
511 +          description="Runs tck and jtreg tests for src/main"/>
512  
513 <  <target name="report-tests"
514 <          depends="run-tests">
515 <
516 <    <!-- Sets junit.report.format to frames if redirection is present,
517 <         otherwise sets it to noframes. -->
518 <    <available property="junit.report.format"
519 <                  value="frames"
520 <              classname="org.apache.xalan.lib.Redirect"
521 <    />
522 <    <property name="junit.report.format" value="noframes"/>
523 <
524 <    <junitreport todir="${build.reports.dir}">
525 <      <fileset dir="${build.reports.dir}">
526 <        <include name="TEST-*.xml"/>
527 <      </fileset>
528 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
529 <      />
530 <    </junitreport>
531 <
532 <    <fail message="Test Cases Failed" if="junit.failed"/>
533 <
513 >  <target name="test-version-permutations"
514 >          depends="test11, test12, test13, test14, test15, test11-12, test11-13, test11-14, test11-15, clean, test, docs"
515 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
516 >
517 >  <target name="test11">
518 >    <antcall>
519 >      <param name="java.runtime.target" value="11"/>
520 >      <param name="build.main.javac" value="${javac11}"/>
521 >      <param name="build.main.javadoc" value="${javadoc12}"/>
522 >      <param name="build.main.javadoc.source" value="11"/>
523 >      <target name="clean"/>
524 >      <target name="test"/>
525 >      <target name="docs"/>
526 >    </antcall>
527 >  </target>
528 >
529 >  <target name="test12">
530 >    <antcall>
531 >      <param name="java.runtime.target" value="12"/>
532 >      <param name="build.main.javac" value="${javac12}"/>
533 >      <param name="build.main.javadoc" value="${javadoc12}"/>
534 >      <param name="build.main.javadoc.source" value="12"/>
535 >      <target name="clean"/>
536 >      <target name="test"/>
537 >      <target name="docs"/>
538 >    </antcall>
539 >  </target>
540 >
541 >  <target name="test13">
542 >    <antcall>
543 >      <param name="java.runtime.target" value="13"/>
544 >      <param name="build.main.javac" value="${javac13}"/>
545 >      <param name="build.main.javadoc" value="${javadoc13}"/>
546 >      <param name="build.main.javadoc.source" value="13"/>
547 >      <target name="clean"/>
548 >      <target name="test"/>
549 >      <target name="docs"/>
550 >    </antcall>
551 >  </target>
552 >
553 >  <target name="test14">
554 >    <antcall>
555 >      <param name="java.runtime.target" value="14"/>
556 >      <param name="build.main.javac" value="${javac14}"/>
557 >      <param name="build.main.javadoc" value="${javadoc14}"/>
558 >      <param name="build.main.javadoc.source" value="14"/>
559 >      <target name="clean"/>
560 >      <target name="test"/>
561 >      <target name="docs"/>
562 >    </antcall>
563 >  </target>
564 >
565 >  <target name="test15">
566 >    <antcall>
567 >      <param name="java.runtime.target" value="15"/>
568 >      <param name="build.main.javac" value="${javac15}"/>
569 >      <param name="build.main.javadoc" value="${javadoc15}"/>
570 >      <param name="build.main.javadoc.source" value="15"/>
571 >      <target name="clean"/>
572 >      <target name="test"/>
573 >      <target name="docs"/>
574 >    </antcall>
575 >  </target>
576 >
577 >  <target name="test11-12">
578 >    <antcall>
579 >      <param name="java.runtime.target" value="12"/>
580 >      <param name="build.main.javac" value="${javac11}"/>
581 >      <param name="build.main.javadoc" value="${javadoc12}"/>
582 >      <param name="build.main.javadoc.source" value="11"/>
583 >      <target name="clean"/>
584 >      <target name="test"/>
585 >      <target name="docs"/>
586 >    </antcall>
587 >  </target>
588 >
589 >  <target name="test11-13">
590 >    <antcall>
591 >      <param name="java.runtime.target" value="13"/>
592 >      <param name="build.main.javac" value="${javac11}"/>
593 >      <param name="build.main.javadoc" value="${javadoc13}"/>
594 >      <param name="build.main.javadoc.source" value="11"/>
595 >      <target name="clean"/>
596 >      <target name="test"/>
597 >      <target name="docs"/>
598 >    </antcall>
599 >  </target>
600 >
601 >  <target name="test11-14">
602 >    <antcall>
603 >      <param name="java.runtime.target" value="14"/>
604 >      <param name="build.main.javac" value="${javac11}"/>
605 >      <param name="build.main.javadoc" value="${javadoc14}"/>
606 >      <param name="build.main.javadoc.source" value="11"/>
607 >      <target name="clean"/>
608 >      <target name="test"/>
609 >      <target name="docs"/>
610 >    </antcall>
611 >  </target>
612 >
613 >  <target name="test11-15">
614 >    <antcall>
615 >      <param name="java.runtime.target" value="15"/>
616 >      <param name="build.main.javac" value="${javac11}"/>
617 >      <param name="build.main.javadoc" value="${javadoc15}"/>
618 >      <param name="build.main.javadoc.source" value="11"/>
619 >      <target name="clean"/>
620 >      <target name="test"/>
621 >      <target name="docs"/>
622 >    </antcall>
623    </target>
624  
625  
626    <target name="configure-compiler">
627 +    <fail message="ant version too old">
628 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
629 +    </fail>
630  
631      <property name="unchecked.option" value="-Xlint:unchecked"/>
632  
# Line 501 | Line 643
643    </target>
644  
645  
646 <  <target name="configure-tests"
647 <       depends="configure-compiler">
506 <
507 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
508 <    <available property="junit.available"
509 <               classname="junit.framework.Protectable"/>
510 <
511 <    <!-- Xalan -->
512 <    <available property="xalan.available"
513 <               classname="org.apache.xalan.Version"/>
514 <
515 <
516 <    <!-- Ant 1.6beta and later don't need or want this check -->
517 <    <!--
518 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
519 <          unless="junit.available"/>
520 <
521 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
522 <          unless="xalan.available"/>
523 <    -->
524 <
525 <  </target>
526 <
527 <
528 <  <!-- Various demos and test programs -->
529 <
530 <
531 <  <target name="loops" depends="configure-compiler"
532 <          description="Benchmark from Doug Lea's AQS paper">
646 >  <target name="compile-test-loops" depends="jar"
647 >          description="Compiles all the perf tests in src/test/loops">
648  
649 <    <mkdir dir="${build.loops.dir}"/>
649 >    <mkdir dir="${build.dir}/test/loops"/>
650  
651 <    <javac srcdir="${loops.src.dir}"
652 <          destdir="${build.loops.dir}"
538 <            debug="${build.debug}"
539 <       debuglevel="${build.debuglevel}"
540 <      deprecation="${build.deprecation}"
541 <           source="${build.sourcelevel}"
542 <             fork="true">
543 <
544 <      <compilerarg line="${build.args}"/>
545 <      <classpath refid="loops.classpath"/>
546 <      <compilerarg value="-XDignore.symbol.file=true"/>
547 <
548 <    </javac>
549 <
550 <    <java classname="ALoops" fork="true">
551 <      <classpath refid="loops.classpath"/>
552 <    </java>
553 <
554 <  </target>
555 <
556 <
557 <  <!-- jsr166 4jdk7 -->
558 <
559 <  <target name="4jdk7compile"
560 <          depends="configure-compiler"
561 <          description="Compiles src/jdk7 sources, targeting jdk7">
562 <
563 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
564 <
565 <    <javac srcdir="${4jdk7src.dir}"
566 <           destdir="${build.4jdk7.classes.dir}"
651 >    <javac srcdir="${basedir}/src/test/loops"
652 >           destdir="${build.dir}/test/loops"
653             debug="${build.debug}"
654             debuglevel="${build.debuglevel}"
655             deprecation="${build.deprecation}"
570           source="6"
571           classpath=""
572           bootclasspath="${bootclasspath6}"
656             includeAntRuntime="false"
657             includeJavaRuntime="false"
658 <           executable="${javac7}"
659 <           fork="true">
577 <
578 <      <include name="**/*.java"/>
579 <      <compilerarg value="-XDignore.symbol.file=true"/>
580 <      <compilerarg value="-Xlint:all"/>
581 <      <compilerarg line="${build.args}"/>
582 <
583 <    </javac>
584 <  </target>
585 <
586 <
587 <  <target name="4jdk7jar"
588 <          depends="4jdk7compile"
589 <          description="Builds library jar from compiled sources">
590 <
591 <    <jar destfile="${4jdk7product.jar}">
592 <      <fileset dir="${build.4jdk7.classes.dir}"/>
593 <    </jar>
594 <
595 <  </target>
596 <
597 <
598 <  <target name="4jdk7-test-tck"
599 <          depends="4jdk7jar"
600 <          description="Runs tck tests for jsr166-4jdk7 directly">
601 <
602 <    <run-tck-tests
603 <      target="7"
604 <      workdir="${build.4jdk7.dir}"
605 <      classes="${4jdk7product.jar}"/>
606 <  </target>
607 <
608 <
609 <  <target name="4jdk7-test-tck-junit"
610 <          depends="4jdk7compile"
611 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
612 <
613 <    <junit printsummary="true"
614 <           showoutput="true"
615 <           errorProperty="junit.failed"
616 <           failureProperty="junit.failed"
617 <           includeantruntime="true"
618 <           jvm="${java7}"
658 >           encoding="ASCII"
659 >           executable="${build.main.javac}"
660             fork="true">
661  
662 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
622 <      <jvmarg value="-server"/>
623 <
624 <      <classpath>
625 <        <pathelement location="${junit.jar}"/>
626 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
627 <      </classpath>
628 <
629 <      <formatter type="brief"/>
630 <
631 <      <test name="JSR166TestCase" haltonfailure="no">
632 <      </test>
633 <
634 <    </junit>
635 <  </target>
636 <
637 <  <target name="4jdk7-test-jtreg"
638 <          depends="4jdk7compile"
639 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
640 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
641 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
642 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
643 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
644 <    <jtreg dir="${jtreg.src.dir}"
645 <           jdk="${jdk7.home}"
646 <           workDir="${build.4jdk7.dir}/JTwork"
647 <           reportDir="${build.4jdk7.dir}/JTreport">
648 <
649 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
650 <      <arg value="-agentvm"/>
651 <      <arg value="-v:nopass,fail"/>
652 <      <arg value="-vmoptions:-esa -ea"/>
653 <      <arg value="-automatic"/>
654 <      <arg value="-k:!ignore"/>
655 <    </jtreg>
656 <  </target>
657 <
658 <
659 <  <target name="4jdk7-test"
660 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
661 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
662 <  </target>
663 <
664 <
665 <  <target name="4jdk7docs"
666 <          description="Builds javadocs for src/jdk7 to dist dir">
667 <
668 <    <delete dir="${4jdk7docs.dir}"/>
669 <    <mkdir dir="${4jdk7docs.dir}"/>
670 <
671 <    <javadoc destdir="${4jdk7docs.dir}"
672 <             packagenames="none"
673 <             link="${jdkapi7docs.url}"
674 <             overview="${4jdk7src.dir}/intro.html"
675 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
676 <             classpath=""
677 <             executable="${javadoc7}">
678 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
679 <        <include name="**/*.java"/>
680 <      </fileset>
681 <      <arg value="-XDignore.symbol.file=true"/>
682 <    </javadoc>
683 <  </target>
684 <
685 <
686 <  <target name="4jdk7dist"
687 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
688 <          description="Puts all distributable products in single hierarchy"/>
689 <
690 <
691 <  <target name="4jdk7clean"
692 <          description="Removes all 4jdk7 build products">
693 <
694 <    <delete dir="${build.4jdk7.dir}"/>
695 <
696 <  </target>
697 <
698 <
699 <  <target name="4jdk7dist-clean"
700 <          description="Removes all build and distribution products">
701 <
702 <  </target>
703 <
704 <  <target name="4jdk7dist-jar"
705 <          depends="4jdk7clean, 4jdk7jar">
706 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
707 <  </target>
708 <
709 <
710 <  <target name="4jdk7dist-docs"
711 <          depends="4jdk7clean, 4jdk7docs">
712 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
713 <  </target>
714 <
715 <
716 <  <!-- jsr166x -->
717 <
718 <  <target name="jsr166xcompile"
719 <          depends="configure-compiler"
720 <          description="Compiles jsr166x sources to build dir">
721 <
722 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
723 <
724 <    <javac srcdir="${topsrc.dir}"
725 <           destdir="${build.jsr166x.classes.dir}"
726 <           debug="${build.debug}"
727 <           debuglevel="${build.debuglevel}"
728 <           deprecation="${build.deprecation}"
729 <           classpath=""
730 <           bootclasspath="${bootclasspath6}"
731 <           source="5"
732 <           includeAntRuntime="false"
733 <           includeJavaRuntime="false"
734 <           executable="${javac7}"
735 <           fork="true">
736 <
737 <      <include name="jsr166x/**/*.java"/>
738 <      <compilerarg value="-XDignore.symbol.file=true"/>
739 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
740 <      <compilerarg line="${build.args}"/>
741 <
742 <    </javac>
743 <  </target>
744 <
745 <
746 <  <target name="jsr166xjar"
747 <          depends="jsr166xcompile"
748 <          description="Builds library jar from compiled sources">
749 <
750 <    <jar destfile="${jsr166x.jar}">
751 <      <fileset dir="${build.jsr166x.classes.dir}"/>
752 <    </jar>
753 <
754 <  </target>
755 <
756 <
757 <  <target name="jsr166xdocs"
758 <          description="Builds javadocs to dist dir">
759 <
760 <    <delete dir="${jsr166xdocs.dir}"/>
761 <    <mkdir dir="${jsr166xdocs.dir}"/>
762 <
763 <    <javadoc destdir="${jsr166xdocs.dir}"
764 <             packagenames="jsr166x.*"
765 <             link="${jdkapidocs.url}"
766 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
767 <             bootclasspath="${bootclasspath6}"
768 <             source="5"
769 <             executable="${javadoc7}">
770 <      <arg value="-XDignore.symbol.file=true"/>
771 <
772 <    </javadoc>
773 <  </target>
774 <
775 <
776 <  <target name="jsr166xdist"
777 <          depends="jsr166xdist-jar, jsr166xdist-docs"
778 <          description="Puts all distributable products in single hierarchy"/>
779 <
780 <
781 <  <target name="jsr166xclean"
782 <          description="Removes all jsr166x build products">
783 <
784 <    <delete dir="${build.jsr166x.dir}"/>
785 <
786 <  </target>
787 <
788 <
789 <  <target name="jsr166xdist-clean"
790 <          description="Removes all build and distribution products">
791 <
792 <  </target>
793 <
794 <
795 <  <target name="jsr166xdist-jar"
796 <          depends="jsr166xclean, jsr166xjar">
797 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
798 <  </target>
799 <
800 <  <target name="jsr166xdist-docs"
801 <          depends="jsr166xclean, jsr166xdocs">
802 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
803 <  </target>
804 <
805 <  <!-- jsr166y -->
806 <
807 <
808 <  <target name="jsr166ycompile"
809 <          depends="configure-compiler"
810 <          description="Compiles jsr166y sources">
811 <
812 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
813 <
814 <    <javac srcdir="${topsrc.dir}"
815 <           destdir="${build.jsr166y.classes.dir}"
816 <           debug="${build.debug}"
817 <           debuglevel="${build.debuglevel}"
818 <           deprecation="${build.deprecation}"
819 <           source="6"
820 <           classpath=""
821 <           bootclasspath="${bootclasspath6}"
822 <           includeAntRuntime="false"
823 <           includeJavaRuntime="false"
824 <           executable="${javac7}"
825 <           fork="true">
826 <
827 <      <include name="jsr166y/**/*.java"/>
828 <      <compilerarg value="-XDignore.symbol.file=true"/>
829 <      <compilerarg value="-Xlint:all"/>
830 <      <compilerarg line="${build.args}"/>
831 <
832 <    </javac>
833 <  </target>
834 <
835 <
836 <  <target name="jsr166yjar"
837 <          depends="jsr166ycompile"
838 <          description="Builds library jar from compiled sources">
839 <
840 <    <jar destfile="${jsr166y.jar}" index="true">
841 <      <fileset dir="${build.jsr166y.classes.dir}"/>
842 <    </jar>
843 <
844 <  </target>
845 <
846 <
847 <  <target name="jsr166ydocs"
848 <          description="Builds javadocs to dist dir">
849 <
850 <    <delete dir="${jsr166ydocs.dir}"/>
851 <    <mkdir dir="${jsr166ydocs.dir}"/>
852 <
853 <    <javadoc destdir="${jsr166ydocs.dir}"
854 <             packagenames="jsr166y.*"
855 <             link="${jdkapidocs.url}"
856 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
857 <             bootclasspath="${bootclasspath6}"
858 <             source="6"
859 <             executable="${javadoc7}">
860 <      <arg value="-XDignore.symbol.file=true"/>
861 <
862 <    </javadoc>
863 <  </target>
864 <
865 <
866 <  <target name="jsr166ydist"
867 <          depends="jsr166ydist-jar, jsr166ydist-docs"
868 <          description="Puts all distributable products in single hierarchy"/>
869 <
870 <
871 <  <target name="jsr166yclean"
872 <          description="Removes all jsr166y build products">
873 <
874 <    <delete dir="${build.jsr166y.dir}"/>
875 <
876 <  </target>
877 <
878 <
879 <  <target name="jsr166ydist-clean"
880 <          description="Removes all build and distribution products">
881 <
882 <  </target>
883 <
884 <  <target name="jsr166ydist-jar"
885 <          depends="jsr166yclean, jsr166yjar">
886 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
887 <  </target>
888 <
889 <  <target name="jsr166ydist-docs"
890 <          depends="jsr166yclean, jsr166ydocs">
891 <    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
892 <  </target>
893 <
894 <
895 <  <!-- extra166y -->
896 <
897 <
898 <  <target name="extra166ycompile"
899 <          depends="configure-compiler, jsr166yjar"
900 <          description="Compiles extra166y sources">
901 <
902 <    <mkdir dir="${build.extra166y.classes.dir}"/>
903 <
904 <    <javac srcdir="${topsrc.dir}"
905 <           destdir="${build.extra166y.classes.dir}"
906 <           debug="${build.debug}"
907 <           debuglevel="${build.debuglevel}"
908 <           deprecation="${build.deprecation}"
909 <           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
910 <           classpath=""
911 <           source="6"
912 <           includeAntRuntime="false"
913 <           includeJavaRuntime="false"
914 <           executable="${javac7}"
915 <           fork="true">
916 <
917 <      <include name="extra166y/**/*.java"/>
662 >      <include name="*.java"/>
663        <compilerarg value="-XDignore.symbol.file=true"/>
664 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
664 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
665 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
666        <compilerarg line="${build.args}"/>
921
667      </javac>
668    </target>
669  
670  
671 <  <target name="extra166yjar"
672 <          depends="extra166ycompile"
673 <          description="Builds library jar from compiled sources">
674 <
675 <    <jar destfile="${extra166y.jar}" index="true">
676 <      <fileset dir="${build.extra166y.classes.dir}"/>
677 <    </jar>
933 <
934 <  </target>
935 <
936 <
937 <  <target name="extra166ydocs"
938 <          description="Builds javadocs to build dir">
939 <
940 <    <delete dir="${extra166ydocs.dir}"/>
941 <    <mkdir dir="${extra166ydocs.dir}"/>
942 <
943 <    <javadoc destdir="${extra166ydocs.dir}"
944 <             packagenames="extra166y.*"
945 <             link="${jdkapidocs.url}"
946 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
947 <             bootclasspath="${bootclasspath6}"
948 <             source="6"
949 <             executable="${javadoc7}">
950 <      <arg value="-XDignore.symbol.file=true"/>
951 <
952 <    </javadoc>
953 <  </target>
954 <
955 <
956 <  <target name="extra166ydist"
957 <          depends="extra166ydist-jar, extra166ydist-docs"
958 <          description="Puts all distributable products in single hierarchy"/>
959 <
671 >  <!-- old branches no longer maintained.  build support deleted -->
672 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
673 >  <!-- jsr166 4jdk7 (no longer maintained) -->
674 >  <!-- jsr166x (no longer maintained) -->
675 >  <!-- jsr166y (no longer maintained) -->
676 >  <!-- extra166y (no longer maintained) -->
677 >  <!-- jsr166e (no longer maintained) -->
678  
679 <  <target name="extra166yclean"
962 <          description="Removes all extra166y build products">
679 > <!-- Find buglets that can be detected by static build tools -->
680  
681 <    <delete dir="${build.extra166y.dir}"/>
681 > <!--   <target name="lint"> -->
682 > <!--     <antcall target="dists"> -->
683 > <!--       <param name="build.javadoc.access" value="protected"/> -->
684 > <!--     </antcall> -->
685 > <!--   </target> -->
686  
687 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
688 +  <target name="doclint-private">
689 +    <antcall target="dist">
690 +      <param name="build.javadoc.access" value="private"/>
691 +    </antcall>
692    </target>
693  
694  
695 <  <target name="extra166ydist-clean"
696 <          description="Removes all build and distribution products">
697 <
698 <  </target>
699 <
700 <  <target name="extra166ydist-jar"
701 <          depends="extra166yclean, extra166yjar">
702 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
703 <  </target>
704 <
705 <  <target name="extra166ydist-docs"
706 <          depends="extra166yclean, extra166ydocs">
707 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
708 <  </target>
709 <
710 <  <!-- jsr166e -->
711 <
712 <  <target name="jsr166ecompile"
713 <          depends="configure-compiler"
714 <          description="Compiles jsr166e sources">
715 <
716 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
695 > <!-- ==============================================================
696 >  Experimental errorprone support
697 >  https://errorprone.info
698 >  https://errorprone.info/docs/installation
699 >  https://github.com/google/error-prone/issues/1143
700 > =================================================================== -->
701 >  <path id="errorprone.processorpath.path">
702 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
703 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
704 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
705 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
706 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
707 >  </path>
708 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
709 >  <property name="errorprone.jsr166.user.flags" value=""/>
710 >  <property name="errorprone.jsr166.flags"
711 >            value="-Xep:HashtableContains:OFF
712 >                   -Xep:JdkObsolete:OFF
713 >                   -Xep:MissingOverride:OFF
714 >                   -Xep:MissingFail:OFF
715 >                   -Xep:ThreadPriorityCheck:OFF
716 >                   -Xep:MixedArrayDimensions:ERROR
717 >                   -Xep:RemoveUnusedImports:ERROR
718 >                   -Xep:EmptyIf:ERROR
719 >                   -Xep:MultipleTopLevelClasses:ERROR
720 >                   -Xep:ClassName:ERROR
721 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
722 >                   -Xep:RedundantThrows:ERROR
723 >                   -Xep:IdentityBinaryExpression:WARN
724 >                   -Xep:ConstructorInvokesOverridable:WARN
725 >                   -Xep:MethodCanBeStatic:WARN
726 >                   ${errorprone.jsr166.user.flags}"/>
727 >  <!-- -Xep:WildcardImport:ERROR -->
728 >  <property name="errorprone.jsr166.test.flags"
729 >            value="-Xep:StringSplitter:OFF
730 >                   -Xep:BoxedPrimitiveConstructor:OFF
731 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
732 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
733 >  <target name="errorprone"
734 >          depends="clean, configure-compiler"
735 >          description="Run errorprone over jsr166 source code (experimental)">
736 >
737 >    <local name="destdir"/>
738 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
739 >    <mkdir dir="${destdir}"/>
740  
741 <    <javac srcdir="${topsrc.dir}"
742 <           destdir="${build.jsr166e.classes.dir}"
741 >    <javac srcdir="${src.dir}"
742 >           destdir="${destdir}"
743             debug="${build.debug}"
744             debuglevel="${build.debuglevel}"
745             deprecation="${build.deprecation}"
997           source="7"
746             classpath=""
747             includeAntRuntime="false"
748             includeJavaRuntime="false"
749 <           executable="${javac7}"
749 >           encoding="ASCII"
750 >           executable="${build.main.javac}"
751             fork="true">
752  
753 <      <include name="jsr166e/**/*.java"/>
753 >      <include name="**/*.java"/>
754 >      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
755 >      <compilerarg value="-J--illegal-access=permit"/>
756 >      <compilerarg value="-XDcompilePolicy=simple"/>
757 >      <compilerarg value="-processorpath"/>
758 >      <compilerarg pathref="errorprone.processorpath.path"/>
759 >      <compilerarg value="-Xplugin:ErrorProne
760 >                          ${errorprone.jsr166.flags}"/>
761 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
762 >      <compilerarg value="-Xprefer:source"/>
763        <compilerarg value="-XDignore.symbol.file=true"/>
764        <compilerarg value="-Xlint:all"/>
765 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
766 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
767        <compilerarg line="${build.args}"/>
1008
768      </javac>
1010  </target>
769  
770 <
771 <  <target name="jsr166ejar"
1014 <          depends="jsr166ecompile"
1015 <          description="Builds library jar from compiled sources">
1016 <
1017 <    <jar destfile="${jsr166e.jar}" index="true">
1018 <      <fileset dir="${build.jsr166e.classes.dir}"/>
770 >    <jar destfile="${product.jar}">
771 >      <fileset dir="${destdir}"/>
772      </jar>
773  
1021  </target>
1022
1023
1024  <target name="jsr166edocs"
1025          description="Builds javadocs to build dir">
1026
1027    <delete dir="${jsr166edocs.dir}"/>
1028    <mkdir dir="${jsr166edocs.dir}"/>
1029
1030    <javadoc destdir="${jsr166edocs.dir}"
1031             packagenames="jsr166e.*"
1032             link="${jdkapidocs.url}"
1033             sourcepath="${topsrc.dir}:${jdk7src.dir}"
1034             source="7"
1035             executable="${javadoc7}">
1036      <arg value="-XDignore.symbol.file=true"/>
1037
1038    </javadoc>
1039  </target>
1040
1041
1042  <target name="jsr166e-test-tck"
1043          depends="jsr166ejar"
1044          description="Runs tck tests for jsr166e">
1045
774      <run-tck-tests
775 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
776 <      source="7"
777 <      target="8"
778 <      workdir="${build.jsr166e.dir}"
779 <      classes="${jsr166e.jar}"/>
780 <  </target>
781 <
782 <
783 <  <target name="jsr166edist"
784 <          depends="jsr166edist-jar, jsr166edist-docs"
785 <          description="Puts all distributable products in single hierarchy"/>
786 <
787 <
788 <  <target name="jsr166eclean"
789 <          description="Removes all jsr166e build products">
790 <    <delete dir="${build.jsr166e.dir}"/>
791 <  </target>
792 <
793 <
794 <  <target name="jsr166edist-clean"
795 <          description="Removes all build and distribution products">
796 <
797 <  </target>
798 <
799 <  <target name="jsr166edist-jar"
800 <          depends="jsr166eclean, jsr166ejar">
801 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
802 <  </target>
775 >      target="${java.runtime.target}"
776 >      workdir="${build.dir}"
777 >      classes="${product.jar}">
778 >      <javac-elements>
779 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
780 >        <compilerarg value="-J--illegal-access=permit"/>
781 >        <compilerarg value="-XDcompilePolicy=simple"/>
782 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
783 >        <compilerarg value="-Xplugin:ErrorProne
784 >                            ${errorprone.jsr166.flags}
785 >                            ${errorprone.jsr166.test.flags}"/>
786 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
787 >      </javac-elements>
788 >    </run-tck-tests>
789 >  </target>
790 >
791 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
792 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
793 >  <target name="errorprone-jtreg"
794 >          depends="jar"
795 >          description="Run errorprone over jtreg tests (experimental)">
796 >
797 >    <run-jtreg-tests
798 >       target="${java.runtime.target}"
799 >       workdir="${build.dir}"
800 >       classes="${product.jar}"
801 >       verbose="all">
802 >      <jtreg-elements>
803 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
804 >        <arg value="-javacoption:-processorpath"/>
805 >        <arg value="-javacoption:${errorprone.processorpath}"/>
806 >        <arg value="-javacoption:-Xplugin:ErrorProne
807 >                            ${errorprone.jsr166.flags}
808 >                            ${errorprone.jsr166.test.flags}
809 >                            -Xep:MultipleTopLevelClasses:WARN
810 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
811 >      </jtreg-elements>
812 >    </run-jtreg-tests>
813 >  </target>
814 >
815 >
816 > <!-- ==============================================================
817 >  Running guava tests against jsr166 code
818 > =================================================================== -->
819 >
820 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
821 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
822 > <!-- <property name="guava.version" value="21.0"/> -->
823 >
824 > <!-- HOWTO debug print a path id -->
825 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
826 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
827 >
828 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
829 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
830 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
831 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
832 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
833 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
834 >
835 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
836 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
837 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
838 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
839 >
840 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
841 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
842 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
843 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
844 >
845 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
846 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
847 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
848 >
849 >  <target name="init-ivy">
850 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
851 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
852 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
853 >             classpath="${build.dir}/ivy.jar"/>
854 >  </target>
855 >
856 >  <target name="guava-tests" depends="jar, init-ivy"
857 >          description="Guava tests run against jsr166 collections">
858 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
859 >    <mkdir dir="${guava.dir}"/>
860 >    <ivy:retrieve pathid="guava.testlib.classpath"
861 >      type="jar,bundle" inline="true" conf="default,master"
862 >      pattern="${guava.dir}/[artifact].[ext]"
863 >      organisation="com.google.guava" module="guava-testlib"/>
864 >    <property name="guava.version" value="21.0"/>
865 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
866 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
867 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
868 >           jvm="${build.main.java}" fork="true">
869 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
870 >      <formatter type="brief"/>
871 >      <classpath>
872 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
873 >        <path refid="guava.testlib.classpath"/>
874 >      </classpath>
875  
876 <  <target name="jsr166edist-docs"
877 <          depends="jsr166eclean, jsr166edocs">
878 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
876 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
877 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
878 >    </junit>
879    </target>
880  
881   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines