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.70 by dl, Wed Aug 11 10:57:33 2004 UTC vs.
Revision 1.267 by jsr166, Tue Feb 27 21:18:06 2018 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/jdk8
23 +  $HOME/jdk/jdk9
24 +  $HOME/jdk/jdk10
25 +  $HOME/jdk/jdk11
26 +  where each of the above is a JDK or a symlink to same, and
27 +  $HOME/jdk/src/jdk8
28 +  $HOME/jdk/src/jdk9
29 +  $HOME/jdk/src/jdk10
30 +  $HOME/jdk/src/jdk11
31 +  where each of the above is a complete JDK source tree
32 +  (e.g. mercurial forest) or a symlink to same.
33 +
34 +  Alternatively, define ant variables thus:
35 +  ant -Djdk$N.home=... -Djdk$N.src.home=...
36 +  for $N in 8 9 10 ...
37 +
38 +  As of 2016-03, the sources in src/main are for jdk9+ only.
39   ------------------------------------------------------------------------------
40    </description>
41  
42 <  <target name="usage" description="Advises user to run with -projecthelp">
43 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
42 >  <!-- Run 'ant -projecthelp' (default target) -->
43 >  <target name="usage">
44 >    <java classname="org.apache.tools.ant.Main">
45 >      <arg value="-projecthelp" />
46 >    </java>
47    </target>
48  
49 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
50  
51    <!-- User-specific settings -->
52    <property file="user.properties"/>
53  
54  
55    <!-- Compilation options -->
56 <  <property name="build.sourcelevel"    value="1.5"/>
56 >  <property name="build.sourcelevel"    value="6"/>
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 >  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
69 >  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
70 >  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71 >  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72 >
73 >  <property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74 >  <property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75 >  <property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76 >  <property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77 >
78 >  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79 >  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80 >  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
81 >  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
82 >
83 >  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
84 >  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
85 >  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
86 >  <property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
87 >
88 >  <!-- JDK locations -->
89 >  <property name="jdks.home"  location="${user.home}/jdk"/>
90 >
91 >  <macrodef name="defjdklocations">
92 >    <attribute name="v"/>
93 >    <sequential>
94 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
95 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
96 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
97 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
98 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
99 >    <local name="have.java.base"/>
100 >    <available property="have.java.base"
101 >      file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103 >      if:set="have.java.base"/>
104 >    <property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105 >      unless:set="have.java.base"/>
106 >    <local name="modules"/>
107 >    <available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108 >    <local name="boot.jar.dir"/>
109 >    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
110 >    <path id="bootclasspath@{v}" unless:set="modules">
111 >      <pathelement path="${boot.jar.dir}/resources.jar"/>
112 >      <pathelement path="${boot.jar.dir}/rt.jar"/>
113 >      <pathelement path="${boot.jar.dir}/jsse.jar"/>
114 >      <pathelement path="${boot.jar.dir}/jce.jar"/>
115 >      <pathelement path="${boot.jar.dir}/charsets.jar"/>
116 >    </path>
117 >    <property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
118 >    </sequential>
119 >  </macrodef>
120 >
121 >  <macrodef name="mirror-dir">
122 >    <attribute name="src"/>
123 >    <attribute name="dst"/>
124 >    <sequential>
125 >    <delete dir="@{dst}"/>
126 >    <mkdir dir="@{dst}"/>
127 >    <copy todir="@{dst}" preservelastmodified="true">
128 >      <fileset dir="@{src}"/>
129 >    </copy>
130 >    </sequential>
131 >  </macrodef>
132 >
133 >  <defjdklocations v="6"/>
134 >  <defjdklocations v="7"/>
135 >  <defjdklocations v="8"/>
136 >  <defjdklocations v="9"/>
137 >  <defjdklocations v="10"/>
138 >  <defjdklocations v="11"/>
139  
140    <!-- Source locations -->
141    <property name="src.dir"              location="${basedir}/src/main"/>
142    <property name="test.src.dir"         location="${basedir}/src/test"/>
50  <property name="j1.src.dir"           location="${basedir}/src/javaone"/>
143    <property name="loops.src.dir"        location="${basedir}/src/loops"/>
144    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
145 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
146 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
147 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
145 >  <property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
146 >  <property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
147 >  <property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
148 >  <property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
149 >  <property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
150 >  <property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
151    <property name="lib.dir"              location="${basedir}/lib"/>
152    <property name="dist.dir"             location="${basedir}/dist"/>
153    <property name="topsrc.dir"           location="${basedir}/src"/>
154 <  <property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
155 <
156 <  <!-- Distribution locations -->
157 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
158 <  <property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
154 >  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
155 >  <property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
156 >  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
157 >  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
158 >  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
159 >  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
160 >
161 >  <!-- Javadoc locations -->
162 >  <property name="docs.dir"          location="${build.dir}/docs"/>
163 >  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
164 >  <property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
165 >  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
166 >  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
167 >  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
168 >  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
169 >
170 >  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
171 >  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
172 >  <property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
173 >  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
174 >  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
175 >  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
176 >  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
177  
178    <!-- Jar locations -->
179 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
180 <  <property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
181 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
182 <  <property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
183 <
184 <  <!-- Bootclasspath argument -->
185 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
186 <
187 <  <!-- Test classpath -->
188 <  <path id="test.classpath">
189 <    <pathelement location="${build.testcases.dir}"/>
190 <    <pathelement location="${junit.jar}"/>
191 <  </path>
179 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
180 >  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
181 >  <property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
182 >  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
183 >  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
184 >  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
185 >  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
186 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
187 >
188 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
189 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
190 >  <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
191 >  <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
192 >  <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
193 >  <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
194 >  <property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
195 >  <!-- The location of jdk9 early access docs (RIP) -->
196 >  <!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
197 >  <!-- Default jdk doc location (latest stable release seems best) -->
198 >  <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
199 >  <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
200 >  <property name="java.docroot.url"   value="${java9.docroot.url}"/>
201 >
202 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
203 >  <property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
204 >  <property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
205 >  <property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
206 >  <property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
207 >  <property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
208 >  <property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
209 >  <property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
210 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
211 >
212 >  <!-- Define the "jtreg" task -->
213 >  <!-- See the docs in "jtreg -onlineHelp" -->
214 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
215 >           classpath="${lib.dir}/jtreg.jar" />
216 >
217 >  <!-- Tck options; see JSR166TestCase.java
218 >   To profile a single tck test class:
219 >   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
220 >   To stress test a single tck test class:
221 >   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
222 >   To stress test a single tck test method:
223 >   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
224 >  -->
225 >  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
226 >  <macrodef name="run-tck-tests">
227 >    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
228 >    <attribute name="target"/>
229 >    <attribute name="compile-target" default="@{target}"/>
230 >    <attribute name="workdir"/>
231 >    <attribute name="classes"/>
232 >    <!--
233 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
234 >    -->
235 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
236 >    <element name="javac-elements" optional="true"/>
237 >
238 >    <sequential>
239 >
240 >    <local name="modules"/>
241 >    <condition property="modules">
242 >      <available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
243 >    </condition>
244 >
245 >    <local name="use-doclint"/>
246 >    <condition property="use-doclint">
247 >      <not> <equals arg1="@{target}" arg2="7"/> </not>
248 >    </condition>
249 >
250 >    <mkdir dir="@{workdir}/tck-classes"/>
251 >
252 >    <javac srcdir="@{tck.src.dir}"
253 >           destdir="@{workdir}/tck-classes"
254 >           debug="${build.debug}"
255 >           debuglevel="${build.debuglevel}"
256 >           deprecation="${build.deprecation}"
257 >           source="@{compile-target}"
258 >           target="@{compile-target}"
259 >           classpath="${junit.jar}"
260 >           includeAntRuntime="false"
261 >           includeJavaRuntime="false"
262 >           encoding="ASCII"
263 >           executable="${javac@{compile-target}}"
264 >           fork="true">
265 >
266 >      <include name="*.java"/>
267 >      <compilerarg value="-XDignore.symbol.file=true"/>
268 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
269 >      <compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
270 >      <compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
271 >      <compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
272 >      <compilerarg line="${build.args}"/>
273 >      <javac-elements/>
274 >
275 >    </javac>
276 >
277 >    <java classname="${jsr166.tckTestClass}"
278 >          failonerror="true"
279 >          jvm="${java@{target}}"
280 >          fork="true">
281 >        <jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
282 >        <jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
283 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
284 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
285 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
286 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
287 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
288 >        <jvmarg line="@{jvmflags}"/>
289 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
290 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
291 >
292 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
293 >        <syspropertyset id="system-properties-used-by-tck">
294 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
295 >          <propertyref prefix="jsr166."/>
296 >          <propertyref name="test.timeout.factor"/>
297 >        </syspropertyset>
298 >
299 >        <classpath>
300 >          <pathelement location="${junit.jar}"/>
301 >          <pathelement location="@{workdir}/tck-classes"/>
302 >        </classpath>
303 >    </java>
304 >
305 >    </sequential>
306 >  </macrodef>
307 >
308 >  <!-- Define jtreg test sets for different jdk versions -->
309 >  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
310 >  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
311 >  <property name="jtreg.test.pattern" value="**/*.java"/>
312 >  <macrodef name="defjtregtests">
313 >    <attribute name="v"/>
314 >    <sequential>
315 >      <fileset dir="${jtreg@{v}.src.dir}">
316 >        <patternset id="jdk@{v}.jtreg.tests">
317 >          <include name="${jtreg.test.pattern}"/>
318 >        </patternset>
319 >      </fileset>
320 >    </sequential>
321 >  </macrodef>
322 >
323 >  <defjtregtests v="11"/>
324 >  <defjtregtests v="10"/>
325 >  <defjtregtests v="9"/>
326 >  <defjtregtests v="8"/>
327 >  <defjtregtests v="7"/>
328 >
329 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
330 >  <property name="jtreg.flags" value=""/>
331 >
332 >  <macrodef name="run-jtreg-tests">
333 >    <!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
334 >    <attribute name="target"/>
335 >    <attribute name="workdir"/>
336 >    <attribute name="classes"/>
337 >    <attribute name="verbose" default="${jtreg.verbose}"/>
338 >    <attribute name="jtregflags" default=""/>
339 >    <element name="jtreg-elements" optional="true"/>
340 >
341 >    <sequential>
342 >
343 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
344 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
345 >
346 >    <local name="modules"/>
347 >    <condition property="modules">
348 >      <available file="${jdk@{target}.home}/jmods" type="dir"/>
349 >    </condition>
350 >
351 >    <delete dir="@{workdir}/JTwork"   quiet="true"/>
352 >    <jtreg dir="${jtreg@{target}.src.dir}"
353 >           jdk="${jdk@{target}.home}"
354 >           workDir="@{workdir}/JTwork">
355 >      <patternset refid="jdk@{target}.jtreg.tests"/>
356 >      <arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
357 >      <arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
358 >      <arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
359 >      <arg value="-agentvm"/>
360 >      <arg value="-noreport"/>
361 >      <arg value="-verbose:@{verbose}"/>
362 >      <arg value="-vmoptions:-esa -ea"/>
363 >      <arg value="-automatic"/>
364 >      <arg value="-k:!ignore"/>
365 >      <arg line="@{jtregflags}"/>
366 >      <arg line="${jtreg.flags}"/>
367 >      <jtreg-elements/>
368 >    </jtreg>
369 >    </sequential>
370 >  </macrodef>
371  
372    <!-- ALoops classpath -->
373    <path id="loops.classpath">
374      <pathelement location="${build.loops.dir}"/>
375    </path>
376  
377 <  <!-- J1 classpath -->
378 <  <path id="j1.classpath">
379 <    <pathelement location="${build.j1.dir}"/>
88 <    <pathelement location="${junit.jar}"/>
89 <    <pathelement location="${concurrent.jar}"/>
90 <  </path>
91 <
377 >  <!-- Support @jls tag, used in jdk8+ javadoc -->
378 >  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
379 >  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
380  
381    <!-- Main targets -->
382  
383 +  <property name="build.main.java.version" value="9"/>
384 +  <!-- Workaround "no nested properties in ant" -->
385 +  <macrodef name="define-build-main-properties">
386 +    <attribute name="v"/>
387 +    <sequential>
388 +      <property name="build.main.java"    value="${java@{v}}"/>
389 +      <property name="build.main.javac"   value="${javac@{v}}"/>
390 +      <!-- Force javadoc version to be at least 10,
391 +           so we can use override-methods=summary -->
392 +      <condition property="build.main.javadoc"
393 +                 value="${javadoc10}"
394 +                 else="${javadoc@{v}}">
395 +        <equals arg1="@{v}" arg2="9"/>
396 +      </condition>
397 +    </sequential>
398 +  </macrodef>
399 +  <define-build-main-properties v="${build.main.java.version}"/>
400 +
401 +  <target name="dists"
402 +          depends="dist, 4jdk8dist"
403 +          description="Builds all public jars and docs"/>
404 +          <!--
405 +              depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
406 +          -->
407  
408    <target name="compile"
409 <          depends="init, configure-compiler"
410 <          description="Compiles main sources to build folder">
409 >          depends="configure-compiler"
410 >          description="Compiles src/main sources to build dir">
411 >
412 >    <local name="destdir"/>
413 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
414  
415 <    <mkdir dir="${build.classes.dir}"/>
415 >    <mkdir dir="${destdir}"/>
416  
417      <javac srcdir="${src.dir}"
418 <          destdir="${build.classes.dir}"
419 <            debug="${build.debug}"
420 <       debuglevel="${build.debuglevel}"
421 <      deprecation="${build.deprecation}"
422 <           source="${build.sourcelevel}"
423 <             fork="true">
418 >           destdir="${destdir}"
419 >           debug="${build.debug}"
420 >           debuglevel="${build.debuglevel}"
421 >           deprecation="${build.deprecation}"
422 >           classpath=""
423 >           includeAntRuntime="false"
424 >           includeJavaRuntime="false"
425 >           encoding="ASCII"
426 >           executable="${build.main.javac}"
427 >           fork="true">
428  
429        <include name="**/*.java"/>
430 <      <exclude name="java/lang/**"/>
430 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
431 >      <compilerarg value="-Xprefer:source"/>
432 >      <compilerarg value="-XDignore.symbol.file=true"/>
433 >      <compilerarg value="-Xlint:all"/>
434 >      <compilerarg line="--doclint-format html5"/>
435 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
436 >      <compilerarg value="-Werror"/>
437 >      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
438        <compilerarg line="${build.args}"/>
439  
440      </javac>
115
441    </target>
442  
443  
119
444    <target name="jar"
445            depends="compile"
446 <          description="Builds library jar from compiled sources">
447 <
448 <    <mkdir dir="${build.lib.dir}"/>
125 <
446 >          description="Builds library jar for src/main from compiled sources">
447 >    <local name="subdir"/>
448 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
449      <jar destfile="${product.jar}">
450 <      <fileset dir="${build.classes.dir}"/>
450 >      <fileset dir="${build.classes.dir}${subdir}"/>
451 >      <manifest>
452 >        <attribute name="Built-By" value="${user.name}"/>
453 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
454 >      </manifest>
455      </jar>
129
456    </target>
457  
458  
133
134  <target name="test"
135          depends="init, configure-tests, report-tests"
136          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
137
138
139
459    <target name="docs"
460 <          description="Builds javadocs with custom tags to build folder">
142 <
143 <    <delete dir="${build.javadocs.dir}"/>
144 <    <mkdir dir="${build.javadocs.dir}"/>
145 <
146 <    <javadoc destdir="${build.javadocs.dir}"
147 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
148 <            overview="${src.dir}/intro.html"
149 <              source="${build.sourcelevel}">
150 <
151 <      <tag name="revised" description="Last revised:"/>
152 <      <tag name="spec"    description="Specified by:"/>
460 >          description="Builds javadocs for src/main to dist dir">
461  
462 <      <packageset dir="${src.dir}"/>
462 >    <delete dir="${docs.dir}"/>
463 >    <mkdir dir="${docs.dir}"/>
464  
465 <    </javadoc>
466 <
158 <  </target>
465 >    <!-- the packagenames="none" hack below prevents scanning the -->
466 >    <!-- sourcepath for packages -->
467  
468 <
469 <
470 <  <target name="doccheck"
471 <          depends="filter-doccheck"
472 <          description="Reports on javadoc style errors">
473 <
474 <    <delete dir="${build.doccheck.dir}"/>
475 <    <mkdir dir="${build.doccheck.dir}"/>
476 <
477 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
478 <         docletpath="${lib.dir}/doccheck.jar"
479 <            destdir="${build.doccheck.dir}">
480 <      <packageset dir="${build.dc-filter.dir}"/>
468 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
469 > <!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
470 > <!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
471 > <!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
472 > <!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
473 >    <javadoc destdir="${docs.dir}"
474 >             packagenames="none"
475 >             link="${java9.api.url}"
476 >             overview="${src.dir}/intro.html"
477 >             access="${build.javadoc.access}"
478 >             sourcepath="${src.dir}"
479 >             classpath=""
480 >             source="9"
481 >             executable="${build.main.javadoc}">
482 >      <fileset dir="${src.dir}" defaultexcludes="yes">
483 >        <include name="**/*.java"/>
484 >      </fileset>
485 >      <arg line="-Xdocrootparent ${java9.docroot.url}"/>
486 >      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
487 >      <arg value="-XDignore.symbol.file=true"/>
488 >      <arg value="-html5"/>
489 >      <arg value="--patch-module=java.base=${src.dir}"/>
490 >      <arg value="--override-methods=summary"/>
491 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
492 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
493 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
494 > <!-- @apiNote tag currently unused -->
495 > <!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
496 > <!-- tags added in jdk9: currently unused -->
497 > <!--  <arg value="-tag"/> <arg value="revised:X"/> -->
498 > <!--  <arg value="-tag"/> <arg value="spec:X"/> -->
499      </javadoc>
174
175    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
176
177  </target>
178
179
180
181  <target name="checkstyle"
182          depends="filter-src"
183          description="Reports on style errors in Java source (verbose, mostly chaff)">
184
185    <taskdef resource="checkstyletask.properties"
186            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
187
188    <mkdir dir="${build.checkstyle.dir}"/>
189
190    <checkstyle config="etc/checkstyle/sun_checks.xml"
191       failOnViolation="false">
192      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
193      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
194    </checkstyle>
195
196    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
197          out="${build.checkstyle.dir}/checkstyle-report.html"
198        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
199
500    </target>
501  
502  
203
503    <target name="dist"
504 <          depends="init, dist-clean, dist-jar, dist-docs"
504 >          depends="dist-clean, dist-jar, dist-docs"
505            description="Puts all distributable products in single hierarchy"/>
506  
507  
209
508    <target name="release"
509            depends="dist"
510            description="Puts entire CVS tree, plus distribution productions, in a jar">
# Line 221 | Line 519
519        <exclude name="src/emulation/**"/>
520        <exclude name="**/SyntaxTest.java"/>
521        <exclude name="**/SuperfluousAbstract.java"/>
522 +      <manifest>
523 +        <attribute name="Built-By" value="${user.name}"/>
524 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
525 +      </manifest>
526      </jar>
225
527    </target>
528  
529  
229
530    <target name="clean"
531            description="Removes all build products">
232
532      <delete dir="${build.dir}"/>
234    <delete dir="${build.classes.dir}"/>
235    <delete dir="${build.lib.dir}"/>
236
533    </target>
534  
535  
240
536    <target name="dist-clean"
537            description="Removes all build and distribution products">
538 <
538 >    <delete dir="${build.dir}"/>
539      <delete dir="${dist.dir}"/>
245
246  </target>
247
248
249
250  <target name="dist-docs"
251          description="Builds javadocs without custom tags to dist folder">
252
253    <delete dir="${dist.javadocs.dir}"/>
254    <mkdir dir="${dist.javadocs.dir}"/>
255
256    <javadoc destdir="${dist.javadocs.dir}"
257                link="http://java.sun.com/j2se/1.4.2/docs/api"
258            overview="${src.dir}/intro.html"
259              source="${build.sourcelevel}">
260
261      <packageset dir="${src.dir}"/>
262
263    </javadoc>
264
265  </target>
266
267
268
269  <!-- Internal targets -->
270
271
272  <target name="init">
273
274    <!-- Version is kept in a separate file -->
275    <loadfile property="version" srcFile="version.properties"/>
276    <echo>Building JSR-166 version ${version}</echo>
277    <echo>java.home is ${java.home}</echo>
278
540    </target>
541  
542  
543    <target name="dist-jar"
544            depends="clean, jar">
284
545      <copy file="${product.jar}" todir="${dist.dir}"/>
286
546    </target>
547  
548 <
549 <  <target name="compile-ant-filter"
550 <          depends="init">
292 <
293 <    <mkdir dir="${build.ant.dir}"/>
294 <
295 <    <javac srcdir="${ant.src.dir}"
296 <          destdir="${build.ant.dir}"
297 <           source="1.4"/>
298 <
299 <  </target>
300 <
301 <
302 <  <target name="filter-src"
303 <          depends="compile-ant-filter">
304 <
305 <    <mkdir dir="${build.filter.src.dir}"/>
306 <
307 <    <copy todir="${build.filter.src.dir}">
308 <      <fileset dir="${src.dir}">
309 <        <include name="**/*.html"/>
310 <      </fileset>
311 <    </copy>
312 <
313 <    <copy todir="${build.filter.src.dir}">
314 <      <fileset dir="${src.dir}">
315 <        <exclude name="**/*.html"/>
316 <        <!-- Files excluded from dist-docs -->
317 <        <exclude name="java/util/Random.*"/>
318 <        <exclude name="sun/misc/Unsafe.*"/>
319 <      </fileset>
320 <      <!--
321 <      <filterchain>
322 <      -->
323 <
324 <        <!--
325 <         # This filter gets rid of angle-bracketed type parameters
326 <         # so that javadoc can run on the result. The following
327 <         # heuristic seems to work:
328 <         #
329 <         # For all lines not starting with space(s)-asterisk-space(s),
330 <         #   replace <something> with a space, where there may be more
331 <         #   than one right angle bracket at the end, and "something"
332 <         #   must not contain parens or pipes. (This may need some
333 <         #   tweaking.)
334 <         -->
335 <
336 <        <!--
337 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
338 <                      classpath="${build.ant.dir}">
339 <          <param name="notmatching" value="^\s+\*\s.*$"/>
340 <          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
341 <          <param name="replacement" value=" "/>
342 <        </filterreader>
343 <        -->
344 <
345 <      <!--
346 <      </filterchain>
347 <      -->
348 <    </copy>
349 <
548 >  <target name="dist-docs"
549 >          depends="clean, docs">
550 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
551    </target>
552  
553 <
554 <  <target name="filter-doccheck"
555 <          depends="filter-src">
556 <
557 <    <mkdir dir="${build.dc-filter.dir}"/>
558 <
559 <    <copy todir="${build.dc-filter.dir}">
560 <      <fileset dir="${build.filter.src.dir}">
561 <        <include name="**/*.html"/>
562 <      </fileset>
563 <    </copy>
564 <
565 <    <property name="generic.declarations"
566 <             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 {}"
567 <    />
568 <
569 <    <copy todir="${build.dc-filter.dir}">
570 <      <fileset dir="${build.filter.src.dir}">
571 <        <exclude name="**/*.html"/>
572 <      </fileset>
573 <      <filterchain>
574 <        <!--
575 <         # These two filters try to make the source look like
576 <         # something that doccheck can process. The first removes
577 <         # -source 1.4 assertions and the second adds in a bunch
578 <         # of single letter public nested marker interfaces so that
579 <         # the generic type parameters are recognized.
580 <         -->
581 <
582 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
583 <                      classpath="${build.ant.dir}">
584 <          <param name="matching"    value="^\s*assert[\s ].*$"/>
585 <          <param name="pattern"     value="assert"/>
586 <          <param name="replacement" value="//assert"/>
587 <        </filterreader>
588 <
589 <        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
590 <                      classpath="${build.ant.dir}">
591 <          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
592 <          <param name="pattern"     value="$"/>
593 <          <param name="replacement" value=" ${generic.declarations}"/>
594 <        </filterreader>
394 <
395 <      </filterchain>
396 <    </copy>
397 <
553 >  <target name="tck"
554 >          depends="jar"
555 >          description="Runs tck tests for src/main directly">
556 >
557 >    <run-tck-tests
558 >      target="${build.main.java.version}"
559 >      workdir="${build.dir}"
560 >      classes="${product.jar}">
561 >      <javac-elements>
562 >        <compilerarg value="-Werror"/>
563 >      </javac-elements>
564 >    </run-tck-tests>
565 >  </target>
566 >
567 >  <target name="tck-parallelism-1"
568 >          description="Runs tck with common pool parallelism 1">
569 >    <antcall target="tck">
570 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
571 >    </antcall>
572 >  </target>
573 >
574 >  <target name="tck-parallelism-0"
575 >          description="Runs tck with common pool parallelism 0">
576 >    <antcall target="tck">
577 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
578 >    </antcall>
579 >  </target>
580 >
581 >  <target name="tck-security-manager"
582 >          description="Runs tck with a security manager">
583 >    <antcall target="tck">
584 >      <param name="jsr166.useSecurityManager" value="true"/>
585 >    </antcall>
586 >  </target>
587 >
588 >  <target name="jtreg"
589 >          depends="jar"
590 >          description="Runs jtreg tests for src/main using the jtreg ant task">
591 >    <run-jtreg-tests
592 >       target="${build.main.java.version}"
593 >       workdir="${build.dir}"
594 >       classes="${product.jar}"/>
595    </target>
596  
597 +  <target name="test"
598 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
599 +          description="Runs tck and jtreg tests for src/main"/>
600  
601 <  <target name="compile-tests"
402 <          depends="jar">
403 <
404 <    <mkdir dir="${build.testcases.dir}"/>
405 <
406 <    <javac srcdir="${tck.src.dir}"
407 <          destdir="${build.testcases.dir}"
408 <            debug="${build.debug}"
409 <       debuglevel="${build.debuglevel}"
410 <      deprecation="${build.deprecation}"
411 <           source="${build.sourcelevel}"
412 <             fork="true">
413 <
414 <      <compilerarg value="${bootclasspath.args}"/>
415 <      <compilerarg line="${build.args}"/>
416 <
417 <      <classpath refid="test.classpath"/>
418 <
419 <    </javac>
420 <
421 <    <javac srcdir="${test.src.dir}"
422 <          destdir="${build.testcases.dir}"
423 <            debug="${build.debug}"
424 <       debuglevel="${build.debuglevel}"
425 <      deprecation="${build.deprecation}"
426 <           source="${build.sourcelevel}"
427 <             fork="true">
428 <
429 <      <include name="jsr166/test/**"/>
430 <
431 <      <compilerarg value="${bootclasspath.args}"/>
432 <      <compilerarg line="${build.args}"/>
433 <
434 <      <classpath refid="test.classpath"/>
435 <
436 <    </javac>
437 <
438 < <!--
439 <    <javac srcdir="${jtreg.src.dir}"
440 <          destdir="${build.testcases.dir}"
441 <            debug="${build.debug}"
442 <       debuglevel="${build.debuglevel}"
443 <      deprecation="${build.deprecation}"
444 <           source="${build.sourcelevel}"
445 <             fork="true">
446 <
447 <      <compilerarg value="${bootclasspath.args}"/>
448 <      <compilerarg line="${build.args}"/>
449 <
450 <      <classpath refid="test.classpath"/>
451 <
452 <    </javac>
453 < -->
454 <
455 <  </target>
456 <
457 <
458 <  <target name="run-tests"
459 <          depends="compile-tests">
460 <
461 <    <!-- May be overridden by user.properties -->
462 <    <property name="testcase" value="*"/>
463 <
464 <    <mkdir dir="${build.reports.dir}"/>
465 <
466 <    <junit printsummary="true"
467 <             showoutput="true"
468 <          errorProperty="junit.failed"
469 <        failureProperty="junit.failed"
470 <                    dir="${build.reports.dir}"
471 <                   fork="true">
472 <
473 <      <jvmarg value="${bootclasspath.args}"/>
474 <      <jvmarg value="-server"/>
475 <      <jvmarg value="-showversion"/>
476 <
477 <      <classpath refid="test.classpath"/>
478 <
479 <      <formatter type="xml"/>
601 > <!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
602  
603 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
604 <        <fileset dir="${tck.src.dir}">
605 <          <include name="**/${testcase}Test.java"/>
606 <        </fileset>
607 <      </batchtest>
608 <
609 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
610 <        <fileset dir="${test.src.dir}">
611 <          <include name="jsr166/test/**/${testcase}Test.java"/>
612 <        </fileset>
613 <      </batchtest>
614 <
615 < <!--
616 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
617 <        <fileset dir="${jtreg.src.dir}">
618 <          <include name="**/${testcase}Test.java"/>
619 <        </fileset>
620 <      </batchtest>
621 < -->
603 > <!--     <antcall target="jtreg"> -->
604 > <!--       <param name="build.main.java.version" value="8"/> -->
605 > <!--       <param name="build.main.javac" value="${javac8}"/> -->
606 > <!--     </antcall> -->
607 >
608 > <!--   </target> -->
609 >
610 >  <target name="test91011"
611 >          description="Runs tck and jtreg tests for src/main for multiple java versions">
612 >
613 >    <antcall target="clean"/>
614 >    <antcall target="test">
615 >      <param name="build.main.java.version" value="9"/>
616 >    </antcall>
617 >
618 >    <antcall target="clean"/>
619 >    <antcall target="test">
620 >      <param name="build.main.java.version" value="10"/>
621 >    </antcall>
622 >
623 >    <antcall target="clean"/>
624 >    <antcall target="test">
625 >      <param name="build.main.java.version" value="11"/>
626 >    </antcall>
627  
628 <    </junit>
628 >    <!-- Clean up to avoid obscure wrong class file version bugs -->
629 >    <antcall target="clean"/>
630  
631    </target>
632  
633  
506  <target name="report-tests"
507          depends="run-tests">
508
509    <!-- Sets junit.report.format to frames if redirection is present,
510         otherwise sets it to noframes. -->
511    <available property="junit.report.format"
512                  value="frames"
513              classname="org.apache.xalan.lib.Redirect"
514    />
515    <property name="junit.report.format" value="noframes"/>
516
517    <junitreport todir="${build.reports.dir}">
518      <fileset dir="${build.reports.dir}">
519        <include name="TEST-*.xml"/>
520      </fileset>
521      <report styledir="${stylesheet.dir}"
522                format="${junit.report.format}"
523                 todir="${build.reports.dir}"
524      />
525    </junitreport>
526
527    <fail message="Test Cases Failed" if="junit.failed"/>
528
529  </target>
530
634  
635    <target name="configure-compiler">
636 +    <fail message="ant version too old">
637 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
638 +    </fail>
639  
640      <property name="unchecked.option" value="-Xlint:unchecked"/>
641  
# Line 546 | Line 652
652    </target>
653  
654  
549  <target name="configure-tests"
550       depends="configure-compiler">
551
552    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
553    <available property="junit.available"
554               classname="junit.framework.Protectable"/>
555
556    <!-- Xalan -->
557    <available property="xalan.available"
558               classname="org.apache.xalan.Version"/>
559
560
561    <!-- Ant 1.6beta and later don't need or want this check -->
562    <!--
563    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
564          unless="junit.available"/>
565
566    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
567          unless="xalan.available"/>
568    -->
569
570  </target>
571
572
573
574  <!-- Anthill targets -->
575
576  <target name="anthill-build">
577
578    <!-- Override this in user.properties -->
579    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
580
581    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
582      <arg value="-Xmx256000000"/>
583      <!-- classpath of new JVM -->
584      <arg value="-classpath"/> <arg path="${java.class.path}"/>
585      <!-- location of Ant home directory -->
586      <arg value="-Dant.home=${ant.home}"/>
587      <!-- the Ant main class -->
588      <arg value="org.apache.tools.ant.Main"/>
589      <!-- The build file -->
590      <arg value="-buildfile"/>  <arg value="build.xml"/>
591      <!-- the target to build on the new Ant instance -->
592      <arg value="-DJAVA_HOME=${tiger.home}"/>
593      <arg value="do-anthill-build"/>
594    </exec>
595  </target>
596
597  <target name="do-anthill-build"
598          depends="jar, test, docs, dist-docs"/>
599
600  <target name="anthill-publish">
601
602    <copy todir="${deployDir}/docs/private">
603      <fileset dir="${build.javadocs.dir}"/>
604    </copy>
605
606    <copy todir="${deployDir}/docs/public">
607      <fileset dir="${dist.javadocs.dir}"/>
608    </copy>
609
610    <copy tofile="${deployDir}/index.html"
611          file="${basedir}/etc/anthill-index.html"/>
612
613    <copy todir="${deployDir}/notes">
614      <fileset dir="${basedir}/etc/notes"/>
615    </copy>
616
617  </target>
618
619
655  
656    <!-- Various demos and test programs -->
657  
658  
659 <  <target name="sample" depends="init, configure-compiler"
660 <          description="Standalone demo program">
626 <
627 <    <mkdir dir="${build.testcases.dir}"/>
628 <
629 <    <javac srcdir="${test.src.dir}"
630 <          destdir="${build.testcases.dir}"
631 <            debug="${build.debug}"
632 <       debuglevel="${build.debuglevel}"
633 <      deprecation="${build.deprecation}"
634 <           source="${build.sourcelevel}"
635 <             fork="true">
636 <
637 <      <include name="jsr166/test/Sample.java"/>
638 <
639 <    </javac>
640 <
641 <    <copy todir="${build.testcases.dir}">
642 <      <fileset dir="${test.src.dir}">
643 <        <include name="**/*.properties"/>
644 <      </fileset>
645 <    </copy>
646 <
647 <
648 <    <java classname="jsr166.test.Sample" fork="true">
649 <      <classpath refid="test.classpath"/>
650 <      <!-- <jvmarg value="-ea"/> -->
651 <      <!-- <jvmarg value="-server"/> -->
652 <      <!-- <arg value="1000"/> -->
653 <    </java>
654 <  </target>
655 <
656 <
657 <  <target name="loops" depends="init, configure-compiler"
658 <          description="Benchmark from Doug Lea's AQS paper">
659 >  <!-- description="Benchmark from Doug Lea's AQS paper" -->
660 >  <target name="loops" depends="configure-compiler">
661  
662      <mkdir dir="${build.loops.dir}"/>
663  
# Line 665 | Line 667
667         debuglevel="${build.debuglevel}"
668        deprecation="${build.deprecation}"
669             source="${build.sourcelevel}"
670 +           target="${build.sourcelevel}"
671 +         encoding="ASCII"
672               fork="true">
673  
674        <compilerarg line="${build.args}"/>
675        <classpath refid="loops.classpath"/>
676 +      <compilerarg value="-XDignore.symbol.file=true"/>
677  
678      </javac>
679  
680      <java classname="ALoops" fork="true">
681        <classpath refid="loops.classpath"/>
682      </java>
678
683    </target>
684  
685  
686 <  <target name="compile-j1" depends="init, configure-compiler">
687 <
684 <    <mkdir dir="${build.j1.dir}"/>
686 >  <target name="compile-test-loops" depends="jar"
687 >          description="Compiles all the perf tests in src/test/loops">
688  
689 <    <javac srcdir="${j1.src.dir}"
687 <          destdir="${build.j1.dir}"
688 <            debug="${build.debug}"
689 <       debuglevel="${build.debuglevel}"
690 <      deprecation="${build.deprecation}"
691 <           source="${build.sourcelevel}" >
692 <
693 <      <include name="**/*.java"/>
694 <      <exclude name="**/dijkstra/**"/>
689 >    <mkdir dir="${build.dir}/test/loops"/>
690  
691 +    <javac srcdir="${basedir}/src/test/loops"
692 +           destdir="${build.dir}/test/loops"
693 +           debug="${build.debug}"
694 +           debuglevel="${build.debuglevel}"
695 +           deprecation="${build.deprecation}"
696 +           includeAntRuntime="false"
697 +           includeJavaRuntime="false"
698 +           encoding="ASCII"
699 +           executable="${build.main.javac}"
700 +           fork="true">
701 +
702 +      <include name="*.java"/>
703 +      <compilerarg value="-XDignore.symbol.file=true"/>
704 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
705 +      <compilerarg value="-Xbootclasspath/p:${product.jar}"/>
706        <compilerarg line="${build.args}"/>
697      <classpath refid="j1.classpath"/>
698
707      </javac>
700
708    </target>
709  
710  
711 <  <target name="sw" depends="compile-j1"
705 <          description="Runs the SwingWorker demo">
706 <
707 <    <!--
708 <    <java classname="jsr166.swing.SwingWorkerDemo" fork="true">
709 <      <classpath refid="j1.classpath"/>
710 <    </java>
711 <    -->
712 <
713 <    <copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
714 <
715 <    <exec dir="${build.j1.dir}" executable="appletviewer.exe">
716 <      <arg value="${build.j1.dir}/SwingWorker.html"/>
717 <    </exec>
711 >  <!-- jsr166 4jdk8 -->
712  
713 +  <target name="4jdk8compile"
714 +          depends="configure-compiler"
715 +          description="Compiles src/jdk8 sources, targeting jdk8">
716 +
717 +    <mkdir dir="${build.4jdk8.classes.dir}"/>
718 +
719 +    <javac srcdir="${4jdk8src.dir}"
720 +           destdir="${build.4jdk8.classes.dir}"
721 +           debug="${build.debug}"
722 +           debuglevel="${build.debuglevel}"
723 +           deprecation="${build.deprecation}"
724 +           source="8"
725 +           target="8"
726 +           classpath=""
727 +           bootclasspath="${bootclasspath8}"
728 +           includeAntRuntime="false"
729 +           includeJavaRuntime="false"
730 +           encoding="ASCII"
731 +           executable="${javac8}"
732 +           fork="true">
733 +      <include name="**/*.java"/>
734 +      <compilerarg value="-Xprefer:source"/>
735 +      <compilerarg value="-XDignore.symbol.file=true"/>
736 +      <compilerarg value="-Xlint:all"/>
737 +      <compilerarg value="-Werror"/>
738 +      <compilerarg line="${build.args}"/>
739 +    </javac>
740    </target>
741  
742 <  <target name="j1" depends="compile-j1"
743 <          description="Runs a standalone JavaOne program">
742 >  <target name="4jdk8doclint"
743 >          depends="configure-compiler"
744 >          description="Finds doclint warnings">
745 >
746 >    <mkdir dir="${build.4jdk8.classes.dir}"/>
747 >
748 >    <javac srcdir="${4jdk8src.dir}"
749 >           destdir="${build.4jdk8.classes.dir}"
750 >           debug="${build.debug}"
751 >           debuglevel="${build.debuglevel}"
752 >           deprecation="${build.deprecation}"
753 >           source="8"
754 >           target="8"
755 >           classpath=""
756 >           bootclasspath="${bootclasspath8}"
757 >           includeAntRuntime="false"
758 >           includeJavaRuntime="false"
759 >           encoding="ASCII"
760 >           executable="${javac8}"
761 >           fork="true">
762 >      <include name="**/*.java"/>
763 >      <compilerarg value="-Xprefer:source"/>
764 >      <compilerarg value="-XDignore.symbol.file=true"/>
765 >      <compilerarg value="-Xlint:all"/>
766 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
767 >      <compilerarg line="${build.args}"/>
768 >    </javac>
769 >  </target>
770  
724    <java classname="${j1.test}" fork="true">
725      <classpath refid="j1.classpath"/>
726      <jvmarg value="-client"/>
771  
772 <      <!-- TestPseudoRandom args -->
773 <      <arg value="2"/>
774 <      <arg value="25"/>
731 <      <arg value="100000"/>
772 >  <target name="4jdk8jar"
773 >          depends="4jdk8compile"
774 >          description="Builds library jar from compiled sources">
775  
776 <      <!-- WebCrawler args -->
777 <      <!--
778 <      <arg value="jsr166.webcrawler.WebCrawler3"/>
779 <      <arg value="http://www.priorartisans.com"/>
780 <      <arg value="25"/>
781 <      -->
776 >    <jar destfile="${4jdk8product.jar}">
777 >      <fileset dir="${build.4jdk8.classes.dir}"/>
778 >      <manifest>
779 >        <attribute name="Built-By" value="${user.name}"/>
780 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
781 >      </manifest>
782 >    </jar>
783 >  </target>
784  
740    </java>
785  
786 +  <target name="4jdk8-tck"
787 +          depends="4jdk8jar"
788 +          description="Runs tck tests for jsr166-4jdk8 directly">
789 +
790 +    <run-tck-tests
791 +      target="8"
792 +      workdir="${build.4jdk8.dir}"
793 +      classes="${4jdk8product.jar}">
794 +      <javac-elements>
795 +        <!-- JDK9+ test classes -->
796 +        <exclude name="*9Test.java"/>
797 +        <exclude name="*10Test.java"/>
798 +        <compilerarg value="-Werror"/>
799 +      </javac-elements>
800 +    </run-tck-tests>
801    </target>
802  
803  
804 <  <target name="test-j1" depends="compile-j1"
805 <          description="Runs testcases from the JavaOne source directories">
806 <
807 <    <junit printsummary="true"
808 <             showoutput="true"
809 <          errorProperty="junit.failed"
810 <        failureProperty="junit.failed"
811 <                    dir="${build.j1.dir}"
753 <                   fork="true">
754 <
755 <      <!-- <jvmarg value="-server"/> -->
756 <      <classpath refid="j1.classpath"/>
757 <      <formatter type="xml"/>
758 <
759 <      <batchtest todir="${build.j1.dir}">
760 <        <fileset dir="${j1.src.dir}">
761 <          <include name="**/*Test.java"/>
762 <        </fileset>
763 <      </batchtest>
804 >  <target name="4jdk8-jtreg"
805 >          depends="4jdk8jar"
806 >          description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
807 >    <run-jtreg-tests
808 >       target="8"
809 >       workdir="${build.4jdk8.dir}"
810 >       classes="${4jdk8product.jar}"/>
811 >  </target>
812  
765    </junit>
813  
814 <    <available property="junit.report.format"
815 <                  value="frames"
816 <              classname="org.apache.xalan.lib.Redirect"/>
817 <    <property name="junit.report.format" value="noframes"/>
818 <
819 <    <junitreport todir="${build.j1.dir}">
820 <      <fileset dir="${build.j1.dir}">
821 <        <include name="TEST-*.xml"/>
814 >  <target name="4jdk8-test"
815 >          depends="4jdk8-tck, 4jdk8-jtreg"
816 >          description="Runs tck and jtreg tests for jsr166-4jdk8"/>
817 >
818 >
819 >  <target name="4jdk8docs"
820 >          description="Builds javadocs for src/jdk8 to dist dir">
821 >
822 >    <delete dir="${4jdk8docs.dir}"/>
823 >    <mkdir dir="${4jdk8docs.dir}"/>
824 >
825 >    <javadoc destdir="${4jdk8docs.dir}"
826 >             packagenames="none"
827 >             link="${java8.api.url}"
828 >             overview="${4jdk8src.dir}/intro.html"
829 >             access="${build.javadoc.access}"
830 >             sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
831 >             classpath=""
832 >             source="8"
833 >             executable="${javadoc8}"
834 >             failonerror = "true">
835 >      <fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
836 >        <include name="**/*.java"/>
837        </fileset>
838 <      <report styledir="${stylesheet.dir}"
839 <                format="${junit.report.format}"
840 <                 todir="${build.j1.dir}"
841 <      />
842 <    </junitreport>
843 <
844 <    <fail message="Test Cases Failed" if="junit.failed"/>
845 <
838 >      <arg line="-Xdocrootparent ${java8.docroot.url}"/>
839 >      <arg value="-XDignore.symbol.file=true"/>
840 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
841 >      <arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
842 >      <arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
843 > <!-- @apiNote tag currently unused -->
844 > <!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
845 >    </javadoc>
846    </target>
847  
848  
849 +  <target name="4jdk8dist"
850 +          depends="4jdk8dist-jar, 4jdk8dist-docs"
851 +          description="Puts all distributable products in single hierarchy"/>
852  
788  <!-- C++ and JNI definitions and demos -->
789
790  <target name="configure-cpp">
853  
854 <    <!-- Define tasks and types -->
854 >  <target name="4jdk8clean"
855 >          description="Removes all 4jdk8 build products">
856 >    <delete dir="${build.4jdk8.dir}"/>
857 >  </target>
858  
794    <path id="cpptasks.path">
795      <pathelement location="${lib.dir}/cpptasks.jar"/>
796    </path>
797    <taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
798    <typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
859  
860 <    <!-- Set platform property for JNI includes -->
860 >  <target name="4jdk8dist-jar"
861 >          depends="4jdk8clean, 4jdk8jar">
862 >    <copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
863 >  </target>
864  
802    <condition property="platform" value="linux">
803      <os name="Linux"/>
804    </condition>
805    <condition property="platform" value="win32">
806      <os family="windows"/>
807    </condition>
808    <condition property="platform" value="solaris">
809      <os name="SunOS"/>
810    </condition>
865  
866 +  <target name="4jdk8dist-docs"
867 +          depends="4jdk8clean, 4jdk8docs">
868 +    <mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
869    </target>
870  
871  
872 <  <target name="cppdemo" depends="configure-cpp">
816 <
817 <    <mkdir dir="${build.dir}"/>
872 >  <!-- jsr166 4jdk7 (no longer maintained) -->
873  
874 <    <cc multithreaded="true"
875 <                 name="g++"
821 <               objdir="${build.dir}"
822 <              outfile="${build.dir}/CppDemo">
823 <      <fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
824 <      <libset libs="stdc++"/>
825 <    </cc>
874 >  <target name="4jdk7compile" depends="configure-compiler">
875 >    <mkdir dir="${build.4jdk7.classes.dir}"/>
876  
877 <    <exec executable="${build.dir}/CppDemo">
878 <      <arg line="count in word frequency of word in command line count"/>
879 <    </exec>
877 >    <javac srcdir="${4jdk7src.dir}"
878 >           destdir="${build.4jdk7.classes.dir}"
879 >           debug="${build.debug}"
880 >           debuglevel="${build.debuglevel}"
881 >           deprecation="${build.deprecation}"
882 >           source="6"
883 >           target="6"
884 >           classpath=""
885 >           bootclasspath="${bootclasspath6}"
886 >           includeAntRuntime="false"
887 >           includeJavaRuntime="false"
888 >           encoding="ASCII"
889 >           executable="${javac7}"
890 >           fork="true">
891  
892 +      <include name="**/*.java"/>
893 +      <compilerarg value="-Xprefer:source"/>
894 +      <compilerarg value="-XDignore.symbol.file=true"/>
895 +      <compilerarg value="-Xlint:all"/>
896 +      <compilerarg value="-Werror"/>
897 +      <compilerarg line="${build.args}"/>
898 +    </javac>
899    </target>
900  
901 +  <target name="4jdk7doclint" depends="configure-compiler">
902 +    <mkdir dir="${build.4jdk7.classes.dir}"/>
903  
904 <  <target name="jnidemo" depends="init, configure-compiler, configure-cpp">
905 <
906 <    <mkdir dir="${build.testcases.dir}"/>
904 >    <javac srcdir="${4jdk7src.dir}"
905 >           destdir="${build.4jdk7.classes.dir}"
906 >           debug="${build.debug}"
907 >           debuglevel="${build.debuglevel}"
908 >           deprecation="${build.deprecation}"
909 >           source="6"
910 >           target="6"
911 >           classpath=""
912 >           bootclasspath="${bootclasspath6}"
913 >           includeAntRuntime="false"
914 >           includeJavaRuntime="false"
915 >           encoding="ASCII"
916 >           executable="${javac8}"
917 >           fork="true">
918  
919 <    <javac srcdir="${test.src.dir}"
920 <          destdir="${build.testcases.dir}"
921 <            debug="${build.debug}"
922 <       debuglevel="${build.debuglevel}"
923 <      deprecation="${build.deprecation}"
843 <           source="${build.sourcelevel}"
844 <             fork="true">
845 <      <compilerarg value="${bootclasspath.args}"/>
919 >      <include name="**/*.java"/>
920 >      <compilerarg value="-Xprefer:source"/>
921 >      <compilerarg value="-XDignore.symbol.file=true"/>
922 >      <compilerarg value="-Xlint:all"/>
923 >      <compilerarg value="-Xdoclint:all/protected"/>
924        <compilerarg line="${build.args}"/>
847      <classpath refid="test.classpath"/>
848      <include name="JniDemo.java"/>
925      </javac>
926 +  </target>
927  
928 <    <javah destdir="${build.testcases.dir}"
929 <      classpathref="test.classpath">
930 <      <class name="JniDemo"/>
931 <    </javah>
932 <
933 <    <cc multithreaded="true"
934 <                 name="g++"
935 <               objdir="${build.dir}"
936 <              outfile="${build.dir}/JniDemo"
860 <              outtype="shared">
861 <
862 <      <compiler>
863 <        <defineset>
864 <          <define name="__int64" value="long long"/>
865 <        </defineset>
866 <        <includepath location="${java.home}/../include"/>
867 <        <includepath location="${java.home}/../include/${platform}"/>
868 <        <compilerarg value="-mno-cygwin"/>
869 <      </compiler>
870 <
871 <      <linker>
872 <        <linkerarg value="--add-stdcall-alias"/>
873 <      </linker>
874 <
875 <      <includepath location="${build.testcases.dir}"/>
876 <
877 <      <fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
878 <
879 <      <libset libs="stdc++"/>
880 <
881 <    </cc>
882 <
883 <    <!-- Necessary if windows, harmless if not -->
884 <    <copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
885 <
886 <    <java classname="JniDemo" fork="true">
887 <      <!-- Watch out: path separator hardwired to semicolon here! -->
888 <      <sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
889 <      <classpath refid="test.classpath"/>
890 <      <arg line="count in word frequency of word in command line count"/>
891 <    </java>
928 >  <target name="4jdk7jar" depends="4jdk7compile">
929 >    <jar destfile="${4jdk7product.jar}">
930 >      <fileset dir="${build.4jdk7.classes.dir}"/>
931 >      <manifest>
932 >        <attribute name="Built-By" value="${user.name}"/>
933 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
934 >      </manifest>
935 >    </jar>
936 >  </target>
937  
938 +  <target name="4jdk7-tck" depends="4jdk7jar">
939 +    <run-tck-tests
940 +      target="7"
941 +      workdir="${build.4jdk7.dir}"
942 +      classes="${4jdk7product.jar}">
943 +      <javac-elements>
944 +        <!-- JDK8+ test classes -->
945 +        <exclude name="*8Test.java"/>
946 +        <exclude name="*9Test.java"/>
947 +        <exclude name="*10Test.java"/>
948 +        <exclude name="DoubleAccumulatorTest.java"/>
949 +        <exclude name="DoubleAdderTest.java"/>
950 +        <exclude name="LongAccumulatorTest.java"/>
951 +        <exclude name="LongAdderTest.java"/>
952 +        <exclude name="CompletableFutureTest.java"/>
953 +        <exclude name="SplittableRandomTest.java"/>
954 +        <exclude name="StampedLockTest.java"/>
955 +        <exclude name="SubmissionPublisherTest.java"/>
956 +        <compilerarg value="-Werror"/>
957 +      </javac-elements>
958 +    </run-tck-tests>
959    </target>
960  
961 +  <!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
962 +  <target name="4jdk7-tck-junit" depends="4jdk7compile">
963  
964 +    <junit printsummary="true"
965 +           showoutput="true"
966 +           errorProperty="junit.failed"
967 +           failureProperty="junit.failed"
968 +           includeantruntime="true"
969 +           jvm="${java7}"
970 +           fork="true">
971  
972 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
972 >      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
973 >      <jvmarg value="-server"/>
974  
975 +      <classpath>
976 +        <pathelement location="${junit.jar}"/>
977 +        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
978 +      </classpath>
979  
980 +      <formatter type="brief"/>
981  
982 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
983 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
984 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
985 <  <property name="pretiger.sourcelevel" value="1.4"/>
982 >      <test name="${jsr166.tckTestClass}" haltonfailure="no">
983 >      </test>
984 >    </junit>
985 >  </target>
986  
987 <  <target name="defang"
988 <       depends="init"
989 <   description="Generates pre-Tiger compatible source">
987 >  <target name="4jdk7-jtreg" depends="4jdk7jar">
988 >    <run-jtreg-tests
989 >       target="7"
990 >       workdir="${build.4jdk7.dir}"
991 >       classes="${4jdk7product.jar}"/>
992 >  </target>
993 >
994 >  <target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
995 >
996 >  <target name="4jdk7docs">
997 >    <delete dir="${4jdk7docs.dir}"/>
998 >    <mkdir dir="${4jdk7docs.dir}"/>
999 >
1000 >    <javadoc destdir="${4jdk7docs.dir}"
1001 >             packagenames="none"
1002 >             link="${java7.api.url}"
1003 >             overview="${4jdk7src.dir}/intro.html"
1004 >             access="${build.javadoc.access}"
1005 >             sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1006 >             classpath=""
1007 >             executable="${javadoc7}"
1008 >             failonerror = "true">
1009 >      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1010 >        <include name="**/*.java"/>
1011 >      </fileset>
1012 >      <arg line="-Xdocrootparent ${java7.docroot.url}"/>
1013 >      <arg value="-XDignore.symbol.file=true"/>
1014 >    </javadoc>
1015 >  </target>
1016  
1017 <    <delete dir="${pretiger.src.dir}"/>
911 <    <mkdir dir="${pretiger.src.dir}"/>
1017 >  <target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1018  
1019 <    <exec executable="perl">
1020 <      <arg file="etc/defang.pl"/>
1021 <      <!-- <arg value="-v"/> -->
916 <      <arg value="-s"/> <arg file="${src.dir}"/>
917 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
918 <    </exec>
1019 >  <target name="4jdk7clean">
1020 >    <delete dir="${build.4jdk7.dir}"/>
1021 >  </target>
1022  
1023 +  <target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1024 +    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1025    </target>
1026  
1027 <  <target name="compile-pretiger"
1028 <          depends="init, configure-compiler, defang"
1029 <          description="Compiles pre-Tiger sources to build folder">
1027 >  <target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1028 >    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1029 >  </target>
1030  
926    <mkdir dir="${build.pretiger.dir}"/>
1031  
1032 <    <javac srcdir="${pretiger.src.dir}"
929 <          destdir="${build.pretiger.dir}"
930 <            debug="${build.debug}"
931 <       debuglevel="${build.debuglevel}"
932 <      deprecation="${build.deprecation}"
933 <           source="${pretiger.sourcelevel}"
934 <             fork="true">
1032 >  <!-- jsr166x (no longer maintained) -->
1033  
1034 <      <compilerarg line="${build.args}"/>
1035 <      <exclude name="**/Thread.java"/>
1034 >  <target name="jsr166xcompile" depends="configure-compiler">
1035 >    <mkdir dir="${build.jsr166x.classes.dir}"/>
1036  
1037 +    <javac srcdir="${topsrc.dir}"
1038 +           destdir="${build.jsr166x.classes.dir}"
1039 +           debug="${build.debug}"
1040 +           debuglevel="${build.debuglevel}"
1041 +           deprecation="${build.deprecation}"
1042 +           classpath=""
1043 +           bootclasspath="${bootclasspath6}"
1044 +           source="5"
1045 +           target="5"
1046 +           includeAntRuntime="false"
1047 +           includeJavaRuntime="false"
1048 +           encoding="ASCII"
1049 +           executable="${javac7}"
1050 +           fork="true">
1051 +      <include name="jsr166x/**/*.java"/>
1052 +      <compilerarg value="-XDignore.symbol.file=true"/>
1053 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1054 +      <compilerarg value="-Werror"/>
1055 +      <compilerarg line="${build.args}"/>
1056      </javac>
940
1057    </target>
1058  
1059 <  <target name="pretiger" depends="compile-pretiger">
1060 <
1061 <    <mkdir dir="${build.lib.dir}"/>
1062 <
1063 <    <jar destfile="${pretiger.jar}">
1064 <      <fileset dir="${build.pretiger.dir}">
1065 <      </fileset>
1059 >  <target name="jsr166xjar" depends="jsr166xcompile">
1060 >    <jar destfile="${jsr166x.jar}">
1061 >      <fileset dir="${build.jsr166x.classes.dir}"/>
1062 >      <manifest>
1063 >        <attribute name="Built-By" value="${user.name}"/>
1064 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1065 >      </manifest>
1066      </jar>
1067 +  </target>
1068  
1069 +  <target name="jsr166xdocs">
1070 +    <delete dir="${jsr166xdocs.dir}"/>
1071 +    <mkdir dir="${jsr166xdocs.dir}"/>
1072 +
1073 +    <javadoc destdir="${jsr166xdocs.dir}"
1074 +             packagenames="jsr166x.*"
1075 +             link="${java.api.url}"
1076 +             access="${build.javadoc.access}"
1077 +             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1078 +             bootclasspath="${bootclasspath6}"
1079 +             source="5"
1080 +             executable="${javadoc7}"
1081 +             failonerror = "true">
1082 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1083 +      <arg value="-XDignore.symbol.file=true"/>
1084 +    </javadoc>
1085    </target>
1086  
1087 <  <!-- jsr166x -->
1087 >  <target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1088  
1089 +  <target name="jsr166xclean">
1090 +    <delete dir="${build.jsr166x.dir}"/>
1091 +  </target>
1092  
1093 <  <target name="jsr166xcompile"
1094 <          depends="init, configure-compiler"
1095 <          description="Compiles jsr166x sources">
1093 >  <target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1094 >    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1095 >  </target>
1096  
1097 <    <mkdir dir="${build.jsr166x.dir}"/>
1097 >  <target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1098 >    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1099 >  </target>
1100  
963    <javac srcdir="${jsr166xsrc.dir}"
964          destdir="${build.jsr166x.dir}"
965            debug="${build.debug}"
966       debuglevel="${build.debuglevel}"
967      deprecation="${build.deprecation}"
968           source="${build.sourcelevel}"
969             fork="true">
1101  
1102 <      <include name="**/*.java"/>
1102 >  <!-- jsr166y (no longer maintained) -->
1103 >
1104 >  <target name="jsr166ycompile" depends="configure-compiler">
1105 >    <mkdir dir="${build.jsr166y.classes.dir}"/>
1106 >
1107 >    <javac srcdir="${topsrc.dir}"
1108 >           destdir="${build.jsr166y.classes.dir}"
1109 >           debug="${build.debug}"
1110 >           debuglevel="${build.debuglevel}"
1111 >           deprecation="${build.deprecation}"
1112 >           source="6"
1113 >           target="6"
1114 >           classpath=""
1115 >           bootclasspath="${bootclasspath6}"
1116 >           includeAntRuntime="false"
1117 >           includeJavaRuntime="false"
1118 >           encoding="ASCII"
1119 >           executable="${javac7}"
1120 >           fork="true">
1121 >
1122 >      <include name="jsr166y/**/*.java"/>
1123 >      <compilerarg value="-XDignore.symbol.file=true"/>
1124 >      <compilerarg value="-Xlint:all"/>
1125 >      <compilerarg value="-Werror"/>
1126        <compilerarg line="${build.args}"/>
973
1127      </javac>
975
1128    </target>
1129  
1130 +  <target name="jsr166yjar" depends="jsr166ycompile">
1131 +    <jar destfile="${jsr166y.jar}" index="true">
1132 +      <fileset dir="${build.jsr166y.classes.dir}"/>
1133 +      <manifest>
1134 +        <attribute name="Built-By" value="${user.name}"/>
1135 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1136 +      </manifest>
1137 +    </jar>
1138 +  </target>
1139  
1140 +  <target name="jsr166ydocs">
1141 +    <delete dir="${jsr166ydocs.dir}"/>
1142 +    <mkdir dir="${jsr166ydocs.dir}"/>
1143 +
1144 +    <javadoc destdir="${jsr166ydocs.dir}"
1145 +             packagenames="jsr166y.*"
1146 +             link="${java.api.url}"
1147 +             access="${build.javadoc.access}"
1148 +             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1149 +             bootclasspath="${bootclasspath6}"
1150 +             source="6"
1151 +             executable="${javadoc7}"
1152 +             failonerror = "true">
1153 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1154 +      <arg value="-XDignore.symbol.file=true"/>
1155 +    </javadoc>
1156 +  </target>
1157  
1158 <  <target name="jsr166xjar"
981 <          depends="jsr166xcompile"
982 <          description="Builds library jar from compiled sources">
1158 >  <target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1159  
1160 <    <mkdir dir="${build.jsr166xlib.dir}"/>
1160 >  <target name="jsr166yclean">
1161 >    <delete dir="${build.jsr166y.dir}"/>
1162 >  </target>
1163  
1164 <    <jar destfile="${jsr166xproduct.jar}">
1165 <      <fileset dir="${build.jsr166x.dir}"/>
1166 <    </jar>
1164 >  <target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1165 >    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1166 >  </target>
1167  
1168 +  <target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1169 +    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1170    </target>
1171  
1172  
1173 +  <!-- extra166y (no longer maintained) -->
1174  
1175 <  <target name="jsr166xdocs"
1176 <          description="Builds javadocs with custom tags to build folder">
1175 >  <target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1176 >    <mkdir dir="${build.extra166y.classes.dir}"/>
1177  
1178 <    <delete dir="${build.jsr166xjavadocs.dir}"/>
1179 <    <mkdir dir="${build.jsr166xjavadocs.dir}"/>
1178 >    <javac srcdir="${topsrc.dir}"
1179 >           destdir="${build.extra166y.classes.dir}"
1180 >           debug="${build.debug}"
1181 >           debuglevel="${build.debuglevel}"
1182 >           deprecation="${build.deprecation}"
1183 >           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1184 >           classpath=""
1185 >           source="6"
1186 >           target="6"
1187 >           includeAntRuntime="false"
1188 >           includeJavaRuntime="false"
1189 >           encoding="ASCII"
1190 >           executable="${javac7}"
1191 >           fork="true">
1192  
1193 <    <javadoc destdir="${build.jsr166xjavadocs.dir}"
1194 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1195 <    >
1196 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1197 <      <include name="jsr166x"/>
1198 <      </packageset>
1193 >      <include name="extra166y/**/*.java"/>
1194 >      <compilerarg value="-XDignore.symbol.file=true"/>
1195 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1196 >      <compilerarg value="-Werror"/>
1197 >      <compilerarg line="${build.args}"/>
1198 >    </javac>
1199 >  </target>
1200  
1201 +  <target name="extra166yjar" depends="extra166ycompile">
1202 +    <jar destfile="${extra166y.jar}" index="true">
1203 +      <fileset dir="${build.extra166y.classes.dir}"/>
1204 +      <manifest>
1205 +        <attribute name="Built-By" value="${user.name}"/>
1206 +        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1207 +      </manifest>
1208 +    </jar>
1209 +  </target>
1210  
1211 +  <target name="extra166ydocs">
1212 +    <delete dir="${extra166ydocs.dir}"/>
1213 +    <mkdir dir="${extra166ydocs.dir}"/>
1214 +
1215 +    <javadoc destdir="${extra166ydocs.dir}"
1216 +             packagenames="extra166y.*"
1217 +             link="${java.api.url}"
1218 +             access="${build.javadoc.access}"
1219 +             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1220 +             bootclasspath="${bootclasspath6}"
1221 +             source="6"
1222 +             executable="${javadoc7}">
1223 +      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1224 +      <arg value="-XDignore.symbol.file=true"/>
1225      </javadoc>
1009
1226    </target>
1227  
1228 +  <target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1229  
1230 <  <target name="jsr166xdist"
1231 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1232 <          description="Puts all distributable products in single hierarchy"/>
1016 <
1230 >  <target name="extra166yclean">
1231 >    <delete dir="${build.extra166y.dir}"/>
1232 >  </target>
1233  
1234 +  <target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1235 +    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
1236 +  </target>
1237  
1238 <  <target name="jsr166xclean"
1239 <          description="Removes all build products">
1238 >  <target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1239 >    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1240 >  </target>
1241  
1022    <delete dir="${build.jsr166x.dir}"/>
1023    <delete dir="${build.jsr166xlib.dir}"/>
1242  
1243 <  </target>
1243 >  <!-- jsr166e (no longer maintained) -->
1244  
1245 +  <property name="build.jsr166e.java.version" value="6"/>
1246 +  <property name="build.jsr166e.javac" value="${javac6}"/>
1247  
1248 +  <target name="jsr166ecompile" depends="configure-compiler">
1249 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1250  
1251 <  <target name="jsr166xdist-clean"
1252 <          description="Removes all build and distribution products">
1251 >    <javac srcdir="${topsrc.dir}"
1252 >           destdir="${build.jsr166e.classes.dir}"
1253 >           debug="${build.debug}"
1254 >           debuglevel="${build.debuglevel}"
1255 >           deprecation="${build.deprecation}"
1256 >           source="${build.jsr166e.java.version}"
1257 >           target="${build.jsr166e.java.version}"
1258 >           classpath=""
1259 >           includeAntRuntime="false"
1260 >           includeJavaRuntime="false"
1261 >           executable="${build.jsr166e.javac}"
1262 >           fork="true">
1263  
1264 +      <include name="jsr166e/**/*.java"/>
1265 +      <compilerarg value="-XDignore.symbol.file=true"/>
1266 +      <compilerarg value="-Xlint:all"/>
1267 +      <compilerarg value="-Werror"/>
1268 +      <compilerarg line="${build.args}"/>
1269 +    </javac>
1270    </target>
1271  
1272 +  <target name="jsr166edoclint">
1273 +    <mkdir dir="${build.jsr166e.classes.dir}"/>
1274  
1275 +    <javac srcdir="${topsrc.dir}"
1276 +           destdir="${build.jsr166e.classes.dir}"
1277 +           debug="${build.debug}"
1278 +           debuglevel="${build.debuglevel}"
1279 +           deprecation="${build.deprecation}"
1280 +           source="${build.jsr166e.java.version}"
1281 +           target="${build.jsr166e.java.version}"
1282 +           classpath=""
1283 +           bootclasspath="${bootclasspath6}"
1284 +           includeAntRuntime="false"
1285 +           includeJavaRuntime="false"
1286 +           executable="${javac8}"
1287 +           fork="true">
1288 +
1289 +      <include name="jsr166e/**/*.java"/>
1290 +      <compilerarg value="-XDignore.symbol.file=true"/>
1291 +      <compilerarg value="-Xlint:all"/>
1292 +      <compilerarg value="-Werror"/>
1293 +      <compilerarg value="-Xdoclint:all/protected"/>
1294 +    </javac>
1295 +  </target>
1296  
1297 <  <target name="jsr166xdist-docs"
1298 <          description="Builds javadocs without custom tags to dist folder">
1297 >  <target name="jsr166ejar" depends="jsr166ecompile">
1298 >    <jar destfile="${jsr166e.jar}" index="true">
1299 >      <fileset dir="${build.jsr166e.classes.dir}"/>
1300 >      <manifest>
1301 >        <attribute name="Built-By" value="${user.name}"/>
1302 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1303 >      </manifest>
1304 >    </jar>
1305 >  </target>
1306  
1307 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
1308 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1307 >  <target name="jsr166edocs">
1308 >    <delete dir="${jsr166edocs.dir}"/>
1309 >    <mkdir dir="${jsr166edocs.dir}"/>
1310 >
1311 >    <javadoc destdir="${jsr166edocs.dir}"
1312 >             packagenames="jsr166e.*"
1313 >             link="${java.api.url}"
1314 >             access="${build.javadoc.access}"
1315 >             sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1316 >             source="${build.jsr166e.java.version}"
1317 >             executable="${javadoc7}"
1318 >             failonerror = "true">
1319 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
1320 >      <arg value="-XDignore.symbol.file=true"/>
1321 >    </javadoc>
1322 >  </target>
1323  
1324 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
1325 <                link="http://java.sun.com/j2se/1.5.0/docs/api/"
1326 <              source="${build.sourcelevel}">
1327 <
1328 <      <packageset dir="${topsrc.dir}" defaultexcludes="yes">
1329 <      <include name="jsr166x"/>
1330 <      </packageset>
1324 >  <target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1325 >    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1326 >    <run-tck-tests
1327 >      tck.src.dir="${test.src.dir}/tck-jsr166e"
1328 >      target="${build.jsr166e.java.version}"
1329 >      workdir="${build.jsr166e.dir}"
1330 >      classes="${jsr166e.jar}"/>
1331 >  </target>
1332 >
1333 >  <target name="jsr166e-tck">
1334 >
1335 > <!--     <antcall target="clean"/> -->
1336 > <!--     <antcall target="jsr166e-tck-one-java-version"> -->
1337 > <!--       <param name="build.jsr166e.java.version" value="8"/> -->
1338 > <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1339 > <!--     </antcall> -->
1340 >
1341 >    <antcall target="clean"/>
1342 >    <antcall target="jsr166e-tck-one-java-version">
1343 >      <param name="build.jsr166e.java.version" value="7"/>
1344 >      <param name="build.jsr166e.javac" value="${javac7}"/>
1345 >    </antcall>
1346 >
1347 >    <antcall target="clean"/>
1348 >    <antcall target="jsr166e-tck-one-java-version">
1349 >      <param name="build.jsr166e.java.version" value="6"/>
1350 >      <param name="build.jsr166e.javac" value="${javac6}"/>
1351 >    </antcall>
1352 >  </target>
1353 >
1354 >  <target name="jsr166e-test" depends="jsr166e-tck"/>
1355 >
1356 >  <target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1357 >
1358 >  <target name="jsr166eclean">
1359 >    <delete dir="${build.jsr166e.dir}"/>
1360 >  </target>
1361 >
1362 >  <target name="jsr166edist-jar"
1363 >          depends="jsr166eclean, jsr166ejar">
1364 >    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1365 >  </target>
1366 >
1367 >  <target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1368 >    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1369 >  </target>
1370 >
1371 >
1372 > <!-- Find buglets that can be detected by static build tools -->
1373 >
1374 >  <target name="lint">
1375 >    <antcall target="dists">
1376 >      <param name="build.javadoc.access" value="public"/>
1377 >    </antcall>
1378 >  </target>
1379 >
1380 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1381 >  <target name="lint-private">
1382 >    <antcall target="dist">
1383 >      <param name="build.javadoc.access" value="private"/>
1384 >    </antcall>
1385 >  </target>
1386 >
1387 >
1388 > <!-- ==============================================================
1389 >  Experimental errorprone support - http://errorprone.info
1390 > =================================================================== -->
1391 >  <property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1392 >  <property name="errorprone.jsr166.user.flags" value=""/>
1393 >  <property name="errorprone.jsr166.flags"
1394 >            value="-Xep:HashtableContains:OFF
1395 >                   -Xep:JdkObsolete:OFF
1396 >                   -Xep:MissingOverride:OFF
1397 >                   -Xep:MissingFail:OFF
1398 >                   -Xep:MixedArrayDimensions:ERROR
1399 >                   -Xep:RemoveUnusedImports:ERROR
1400 >                   -Xep:EmptyIf:ERROR
1401 >                   -Xep:MultipleTopLevelClasses:ERROR
1402 >                   -Xep:ClassName:ERROR
1403 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
1404 >                   -Xep:RedundantThrows:ERROR
1405 >                   -Xep:IdentityBinaryExpression:WARN
1406 >                   -Xep:MethodCanBeStatic:WARN
1407 >                   ${errorprone.jsr166.user.flags}"/>
1408 >  <!-- -Xep:WildcardImport:ERROR -->
1409 >  <property name="errorprone.jsr166.test.flags"
1410 >            value="-Xep:StringSplitter:OFF
1411 >                   -Xep:BoxedPrimitiveConstructor:OFF
1412 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
1413 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1414 >  <target name="errorprone"
1415 >          depends="clean, configure-compiler"
1416 >          description="Run errorprone over jsr166 source code (experimental)">
1417 >
1418 >    <local name="destdir"/>
1419 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
1420 >    <mkdir dir="${destdir}"/>
1421  
1422 <    </javadoc>
1422 >    <javac srcdir="${src.dir}"
1423 >           destdir="${destdir}"
1424 >           debug="${build.debug}"
1425 >           debuglevel="${build.debuglevel}"
1426 >           deprecation="${build.deprecation}"
1427 >           classpath=""
1428 >           includeAntRuntime="false"
1429 >           includeJavaRuntime="false"
1430 >           encoding="ASCII"
1431 >           executable="${build.main.javac}"
1432 >           fork="true">
1433  
1434 <  </target>
1434 >      <include name="**/*.java"/>
1435 >      <compilerarg value="-XDcompilePolicy=simple"/>
1436 >      <compilerarg line="-processorpath ${errorprone.jar}"/>
1437 >      <compilerarg value="-Xplugin:ErrorProne
1438 >                          ${errorprone.jsr166.flags}"/>
1439 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
1440 >      <compilerarg value="-Xprefer:source"/>
1441 >      <compilerarg value="-XDignore.symbol.file=true"/>
1442 >      <compilerarg value="-Xlint:all"/>
1443 >      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
1444 >      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1445 >      <compilerarg line="${build.args}"/>
1446 >    </javac>
1447  
1448 <  <target name="jsr166xdist-jar"
1449 <          depends="jsr166xclean, jsr166xjar">
1448 >    <jar destfile="${product.jar}">
1449 >      <fileset dir="${destdir}"/>
1450 >    </jar>
1451  
1452 <    <copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1452 >    <run-tck-tests
1453 >      target="${build.main.java.version}"
1454 >      workdir="${build.dir}"
1455 >      classes="${product.jar}">
1456 >      <javac-elements>
1457 >        <compilerarg value="-XDcompilePolicy=simple"/>
1458 >        <compilerarg line="-processorpath ${errorprone.jar}"/>
1459 >        <compilerarg value="-Xplugin:ErrorProne
1460 >                            ${errorprone.jsr166.flags}
1461 >                            ${errorprone.jsr166.test.flags}"/>
1462 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1463 >      </javac-elements>
1464 >    </run-tck-tests>
1465 >  </target>
1466 >
1467 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1468 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1469 >  <target name="errorprone-jtreg"
1470 >          depends="jar"
1471 >          description="Run errorprone over jtreg tests (experimental)">
1472 >
1473 >    <run-jtreg-tests
1474 >       target="${build.main.java.version}"
1475 >       workdir="${build.dir}"
1476 >       classes="${product.jar}"
1477 >       verbose="all">
1478 >      <jtreg-elements>
1479 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
1480 >        <arg value="-javacoption:-processorpath"/>
1481 >        <arg value="-javacoption:${errorprone.jar}"/>
1482 >        <arg value="-javacoption:-Xplugin:ErrorProne
1483 >                            ${errorprone.jsr166.flags}
1484 >                            ${errorprone.jsr166.test.flags}
1485 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
1486 >      </jtreg-elements>
1487 >    </run-jtreg-tests>
1488 >  </target>
1489 >
1490 >
1491 > <!-- ==============================================================
1492 >  Running guava tests against jsr166 code
1493 > =================================================================== -->
1494 >
1495 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
1496 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
1497 > <!-- <property name="guava.version" value="21.0"/> -->
1498 >
1499 > <!-- HOWTO debug print a path id -->
1500 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
1501 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
1502 >
1503 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
1504 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
1505 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
1506 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
1507 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
1508 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
1509 >
1510 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
1511 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
1512 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
1513 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
1514 >
1515 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
1516 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
1517 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
1518 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
1519 >
1520 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
1521 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
1522 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
1523 >
1524 >  <target name="init-ivy">
1525 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
1526 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
1527 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
1528 >             classpath="${build.dir}/ivy.jar"/>
1529 >  </target>
1530 >
1531 >  <target name="guava-tests" depends="jar, init-ivy"
1532 >          description="Guava tests run against jsr166 collections">
1533 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
1534 >    <mkdir dir="${guava.dir}"/>
1535 >    <ivy:retrieve pathid="guava.testlib.classpath"
1536 >      type="jar,bundle" inline="true" conf="default,master"
1537 >      pattern="${guava.dir}/[artifact].[ext]"
1538 >      organisation="com.google.guava" module="guava-testlib"/>
1539 >    <property name="guava.version" value="21.0"/>
1540 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1541 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1542 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
1543 >           jvm="${build.main.java}" fork="true">
1544 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1545 >      <formatter type="brief"/>
1546 >      <classpath>
1547 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
1548 >        <path refid="guava.testlib.classpath"/>
1549 >      </classpath>
1550  
1551 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
1552 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
1553 +    </junit>
1554    </target>
1555  
1556   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines