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.62 by tim, Wed Dec 10 01:51:11 2003 UTC vs.
Revision 1.326 by jsr166, Fri Nov 25 19:33:39 2022 UTC

# Line 1 | Line 1
1 < <project name="jsr166" default="usage">
1 > <project name="jsr166" default="usage"
2 >  xmlns:if="ant:if"
3 >  xmlns:unless="ant:unless"
4 >  xmlns:ivy="antlib:org.apache.ivy.ant">
5  
6    <description>
7   ------------------------------------------------------------------------------
# Line 6 | Line 9
9  
10    Usage: ant [target]
11  
12 +  See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
13 +  more details.
14 +
15    User-specific settings are read from user.properties.
16    See user.properties.sample for an explanation of some useful settings.
17 +
18 +  The repository contains all dependencies except for ant and the JDK
19 +  itself.  Because the JDK version matters and because different
20 +  targets require different JDKs, we assume that users have created a
21 +  hierarchy containing:
22 +  $HOME/jdk/jdk17
23 +  $HOME/jdk/jdk19
24 +  where each of the above is a JDK or a symlink to same, and
25 +  $HOME/jdk/src/jdk17
26 +  where each of the above is a JDK source tree or a symlink to same.
27 +
28 +  Alternatively, define ant variables thus:
29 +  ant -Djdk$N.home=... -Djdk$N.src.home=...
30 +  for $N in 17 .. 19 ...
31 +
32 +  As of 2016-03, the sources in src/main are for jdk9+ only.
33 +  As of 2019-08, the sources in src/main are for jdk11+ only.
34 +  As of 2019-10, compatibility support for jdk8 is dropped entirely.
35 +  As of 2022-02, the sources in src/main are for jdk17+ only.
36   ------------------------------------------------------------------------------
37    </description>
38  
39 <  <target name="usage" description="Advises user to run with -projecthelp">
40 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
39 >  <!-- Run 'ant -projecthelp' (default target) -->
40 >  <target name="usage">
41 >    <java classname="org.apache.tools.ant.Main">
42 >      <arg value="-projecthelp" />
43 >    </java>
44    </target>
45  
46 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
47  
48    <!-- User-specific settings -->
49    <property file="user.properties"/>
50  
51  
52    <!-- Compilation options -->
24  <property name="build.sourcelevel"    value="1.5"/>
53    <property name="build.debug"          value="true"/>
54    <property name="build.debuglevel"     value="source,lines,vars"/>
55    <property name="build.deprecation"    value="false"/>
56 +  <property name="build.javadoc.access" value="protected"/>
57  
58    <!-- Build locations -->
59 <  <property name="build.dir"            location="build"/>
60 <  <property name="build.classes.dir"    location="${build.dir}/classes"/>
61 <  <property name="build.testcases.dir"  location="${build.dir}/testcases"/>
62 <  <property name="build.lib.dir"        location="${build.dir}/lib"/>
63 <  <property name="build.ant.dir"        location="${build.dir}/ant"/>
64 <  <property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
65 <  <property name="build.reports.dir"    location="${build.dir}/reports"/>
66 <  <property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
67 <  <property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
68 <  <property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
69 <  <property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
59 >  <property name="build.dir"                   location="build"/>
60 >  <property name="build.classes.dir"           location="${build.dir}/classes"/>
61 >  <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62 >  <property name="build.loops.dir"             location="${build.dir}/loops"/>
63 >
64 >  <!-- JDK locations -->
65 >  <property name="jdks.home"  location="${user.home}/jdk"/>
66 >
67 >  <macrodef name="defjdklocations">
68 >    <attribute name="v"/>
69 >    <sequential>
70 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
71 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
72 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
73 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
74 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
75 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
76 >    </sequential>
77 >  </macrodef>
78 >
79 >  <macrodef name="mirror-dir">
80 >    <attribute name="src"/>
81 >    <attribute name="dst"/>
82 >    <sequential>
83 >    <delete dir="@{dst}"/>
84 >    <mkdir dir="@{dst}"/>
85 >    <copy todir="@{dst}" preservelastmodified="true">
86 >      <fileset dir="@{src}"/>
87 >    </copy>
88 >    </sequential>
89 >  </macrodef>
90 >
91 >  <defjdklocations v="17"/>
92 >  <defjdklocations v="18"/>
93 >  <defjdklocations v="19"/>
94  
95    <!-- Source locations -->
96    <property name="src.dir"              location="${basedir}/src/main"/>
97    <property name="test.src.dir"         location="${basedir}/src/test"/>
98 +  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
99    <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
100 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
101 <  <property name="ant.src.dir"          location="${basedir}/etc/ant"/>
102 <  <property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
100 >  <property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
101 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
102 >  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
103 >  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
104    <property name="lib.dir"              location="${basedir}/lib"/>
105    <property name="dist.dir"             location="${basedir}/dist"/>
106 +  <property name="topsrc.dir"           location="${basedir}/src"/>
107  
108 <  <!-- Distribution locations -->
109 <  <property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
108 >  <!-- Javadoc locations -->
109 >  <property name="docs.dir"          location="${build.dir}/docs"/>
110 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
111  
112    <!-- Jar locations -->
113 <  <property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
114 <  <property name="junit.jar"            location="${lib.dir}/junit.jar"/>
58 <  
59 <  <!-- Bootclasspath argument -->
60 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
61 <
62 <  <!-- Test classpath -->
63 <  <path id="test.classpath">
64 <    <pathelement location="${build.testcases.dir}"/>
65 <    <pathelement location="${junit.jar}"/>
66 <  </path>
113 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
114 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
115  
116 +  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
117 +  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
118 +  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
119 +  <property name="java18.docroot.url" value="https://download.java.net/java/early_access/jdk18/docs"/>
120 +  <property name="java19.docroot.url" value="https://download.java.net/java/early_access/jdk19/docs"/>
121 +  <!-- Default jdk doc location (latest stable LTS release seems best) -->
122 +  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
123 +
124 +  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
125 +  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
126 +  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
127 +  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
128 +  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
129 +
130 +  <!-- Define the "jtreg" task -->
131 +  <!-- See the docs in "jtreg -onlineHelp" -->
132 +  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
133 +           classpath="${lib.dir}/jtreg.jar" />
134 +
135 +  <!-- Tck configuration options; see JSR166TestCase.java
136 +   To profile a single tck test class:
137 +   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
138 +   To stress test a single tck test class:
139 +   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
140 +   To stress test a single tck test method:
141 +   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
142 +  -->
143 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
144 +  <macrodef name="run-tck-tests">
145 +    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
146 +    <attribute name="target"/>
147 +    <attribute name="compile-target" default="@{target}"/>
148 +    <attribute name="workdir"/>
149 +    <attribute name="classes"/>
150 +    <!--
151 +        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
152 +    -->
153 +        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
154 +    <element name="javac-elements" optional="true"/>
155  
156 +    <sequential>
157  
158 <  <!-- Main targets -->
71 <
72 <
73 <  <target name="compile"
74 <          depends="init, configure-compiler"
75 <          description="Compiles main sources to build folder">
76 <
77 <    <mkdir dir="${build.classes.dir}"/>
78 <
79 <    <javac srcdir="${src.dir}"
80 <          destdir="${build.classes.dir}"
81 <            debug="${build.debug}"
82 <       debuglevel="${build.debuglevel}"
83 <      deprecation="${build.deprecation}"
84 <           source="${build.sourcelevel}"
85 <             fork="true">
158 >    <mkdir dir="@{workdir}/tck-classes"/>
159  
160 +    <javac srcdir="@{tck.src.dir}"
161 +           destdir="@{workdir}/tck-classes"
162 +           debug="${build.debug}"
163 +           debuglevel="${build.debuglevel}"
164 +           deprecation="${build.deprecation}"
165 +           source="@{compile-target}"
166 +           target="@{compile-target}"
167 +           classpath="${junit.jar}"
168 +           includeAntRuntime="false"
169 +           includeJavaRuntime="false"
170 +           encoding="ASCII"
171 +           executable="${javac@{compile-target}}"
172 +           fork="true">
173 +
174 +      <include name="*.java"/>
175 +      <compilerarg value="-XDignore.symbol.file=true"/>
176 +      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
177 +      <compilerarg value="-Xdoclint:reference/private"/>
178 +      <compilerarg value="--patch-module=java.base=@{classes}"/>
179        <compilerarg line="${build.args}"/>
180 +      <javac-elements/>
181  
182      </javac>
183  
184 <  </target>
185 <
186 <
187 <
188 <  <target name="jar"
189 <          depends="compile"
190 <          description="Builds library jar from compiled sources">
191 <
192 <    <mkdir dir="${build.lib.dir}"/>
193 <
194 <    <jar destfile="${product.jar}">
195 <      <fileset dir="${build.classes.dir}"/>
196 <    </jar>
197 <
198 <  </target>
184 >    <java classname="${jsr166.tckTestClass}"
185 >          failonerror="true"
186 >          jvm="${java@{target}}"
187 >          fork="true">
188 >        <jvmarg value="--patch-module=java.base=@{classes}"/>
189 >        <jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED"/>
190 >        <jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED"/>
191 >        <jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED"/>
192 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED"/>
193 >        <jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED"/>
194 >        <jvmarg line="@{jvmflags}"/>
195 >        <!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
196 >        <jvmarg line="${vmoptions}" if:set="vmoptions"/>
197 >
198 >        <!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
199 >        <syspropertyset id="system-properties-used-by-tck">
200 >          <propertyref prefix="java.util.concurrent.ForkJoinPool"/>
201 >          <propertyref prefix="jsr166."/>
202 >          <propertyref name="test.timeout.factor"/>
203 >        </syspropertyset>
204 >
205 >        <classpath>
206 >          <pathelement location="${junit.jar}"/>
207 >          <pathelement location="@{workdir}/tck-classes"/>
208 >        </classpath>
209 >    </java>
210  
211 +    </sequential>
212 +  </macrodef>
213  
214 +  <!-- Define jtreg test sets for different jdk versions -->
215 +  <!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
216 +  <!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
217 +  <property name="jtreg.test.pattern" value="**/*.java"/>
218 +  <macrodef name="defjtregtests">
219 +    <attribute name="v"/>
220 +    <sequential>
221 +      <fileset dir="${jtreg@{v}.src.dir}">
222 +        <patternset id="jdk@{v}.jtreg.tests">
223 +          <include name="${jtreg.test.pattern}"/>
224 +        </patternset>
225 +      </fileset>
226 +    </sequential>
227 +  </macrodef>
228  
229 <  <target name="test"
230 <          depends="init, configure-tests, report-tests"
231 <          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
229 >  <defjtregtests v="17"/>
230 >  <defjtregtests v="18"/>
231 >  <defjtregtests v="19"/>
232 >
233 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
234 >  <property name="jtreg.flags" value=""/>
235 >
236 >  <macrodef name="run-jtreg-tests">
237 >    <attribute name="target"/>
238 >    <attribute name="workdir"/>
239 >    <attribute name="classes"/>
240 >    <attribute name="verbose" default="${jtreg.verbose}"/>
241 >    <attribute name="jtregflags" default=""/>
242 >    <element name="jtreg-elements" optional="true"/>
243 >
244 >    <sequential>
245 >
246 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
247 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
248 >
249 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
250 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
251 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
252 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
253 >    <property name="jtreg.concurrency" value="3"/>
254 >
255 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
256 >    <jtreg dir="${jtreg@{target}.src.dir}"
257 >           jdk="${jdk@{target}.home}"
258 >           workDir="@{workdir}/JTwork">
259 >      <patternset refid="jdk@{target}.jtreg.tests"/>
260 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
261 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
262 >      <arg value="-vmoption:-Xmx256m"/>
263 >      <arg value="-concurrency:${jtreg.concurrency}"/>
264 >      <arg value="-vmoptions:-esa -ea"/>
265 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
266 >      <arg value="-agentvm"/>
267 >      <arg value="-noreport"/>
268 >      <arg value="-verbose:@{verbose}"/>
269 >      <arg value="-automatic"/>
270 >      <arg value="-k:!ignore"/>
271 >      <arg line="@{jtregflags}"/>
272 >      <arg line="${jtreg.flags}"/>
273 >      <jtreg-elements/>
274 >    </jtreg>
275 >    </sequential>
276 >  </macrodef>
277 >
278 >  <!-- ALoops classpath -->
279 >  <path id="loops.classpath">
280 >    <pathelement location="${build.loops.dir}"/>
281 >  </path>
282  
283 +  <!-- Support @jls tag, used in jdk8+ javadoc -->
284 +  <!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc -->
285 +  <property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
286 +  <property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
287  
288 +  <!-- Main targets -->
289  
290 <  <target name="docs"
291 <          description="Builds javadocs with custom tags to build folder">
290 >  <!-- Default values: may seem strange ... -->
291 >  <!-- At runtime, target latest, but build for current LTS -->
292 >  <property name="java.runtime.target" value="19"/>
293 >  <property name="build.main.java" value="${java17}"/>
294 >  <property name="build.main.javac" value="${javac17}"/>
295 >  <property name="build.main.javadoc" value="${javadoc19}"/>
296 >  <property name="build.main.javadoc.source" value="${java.runtime.target}"/>
297  
298 <    <delete dir="${build.javadocs.dir}"/>
299 <    <mkdir dir="${build.javadocs.dir}"/>
298 >  <target name="dists"
299 >          depends="dist"
300 >          description="Builds all public jars and docs"/>
301  
302 <    <javadoc destdir="${build.javadocs.dir}"
303 <                link="http://java.sun.com/j2se/1.4.1/docs/api"
304 <            overview="${src.dir}/intro.html"
124 <              source="${build.sourcelevel}">
302 >  <target name="compile"
303 >          depends="configure-compiler"
304 >          description="Compiles src/main sources to build dir">
305  
306 <      <tag name="revised" description="Last revised:"/>
307 <      <tag name="spec"    description="Specified by:"/>
306 >    <local name="destdir"/>
307 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
308  
309 <      <packageset dir="${src.dir}"/>
130 <
131 <    </javadoc>
309 >    <mkdir dir="${destdir}"/>
310  
311 +    <javac srcdir="${src.dir}"
312 +           destdir="${destdir}"
313 +           debug="${build.debug}"
314 +           debuglevel="${build.debuglevel}"
315 +           deprecation="${build.deprecation}"
316 +           classpath=""
317 +           includeAntRuntime="false"
318 +           includeJavaRuntime="false"
319 +           encoding="ASCII"
320 +           executable="${build.main.javac}"
321 +           fork="true">
322 +
323 +      <include name="**/*.java"/>
324 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
325 +      <compilerarg value="-Xprefer:source"/>
326 +      <compilerarg value="-XDignore.symbol.file=true"/>
327 +      <compilerarg value="-Xlint:all"/>
328 +      <compilerarg value="-Xdoclint:all/protected"/>
329 +      <compilerarg value="-Xdoclint/package:java.util.*"/>
330 +      <compilerarg value="-Werror"/>
331 +      <compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
332 +      <compilerarg line="${build.args}"/>
333 +    </javac>
334    </target>
335  
336 <
337 <
338 <  <target name="doccheck"
339 <          depends="filter-doccheck"
340 <          description="Reports on javadoc style errors">
341 <
342 <    <delete dir="${build.doccheck.dir}"/>
343 <    <mkdir dir="${build.doccheck.dir}"/>
344 <
345 <    <javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
346 <         docletpath="${lib.dir}/doccheck.jar"
347 <            destdir="${build.doccheck.dir}">
147 <      <packageset dir="${build.dc-filter.dir}"/>
148 <    </javadoc>
149 <
150 <    <echo>DocCheck output is in ${build.doccheck.dir}</echo>
151 <
336 >  <target name="jar"
337 >          depends="compile"
338 >          description="Builds library jar for src/main from compiled sources">
339 >    <local name="subdir"/>
340 >    <available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
341 >    <jar destfile="${product.jar}">
342 >      <fileset dir="${build.classes.dir}${subdir}"/>
343 >      <manifest>
344 >        <attribute name="Built-By" value="${user.name}"/>
345 >        <attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
346 >      </manifest>
347 >    </jar>
348    </target>
349  
350  
351 <
352 <  <target name="checkstyle"
353 <          depends="filter-src"
354 <          description="Reports on style errors in Java source (verbose, mostly chaff)">
355 <
356 <    <taskdef resource="checkstyletask.properties"
357 <            classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
358 <
359 <    <mkdir dir="${build.checkstyle.dir}"/>
360 <    
361 <    <checkstyle config="etc/checkstyle/sun_checks.xml"
362 <       failOnViolation="false">
363 <      <formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
364 <      <fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
365 <    </checkstyle>
366 <    
367 <    <style in="${build.checkstyle.dir}/checkstyle-report.xml"
368 <          out="${build.checkstyle.dir}/checkstyle-report.html"
369 <        style="${stylesheet.dir}/checkstyle-frames.xsl"/>
370 <
351 >  <target name="docs"
352 >          description="Builds javadocs for src/main to dist dir">
353 >    <delete dir="${docs.dir}" quiet="true"/>
354 >    <mkdir dir="${docs.dir}"/>
355 >    <javadoc destdir="${docs.dir}"
356 >             packagenames="none"
357 >             link="${java.api.url}"
358 >             overview="${src.dir}/intro.html"
359 >             access="${build.javadoc.access}"
360 >             sourcepath="${src.dir}"
361 >             classpath=""
362 >             source="${build.main.javadoc.source}"
363 >             executable="${build.main.javadoc}">
364 >      <fileset dir="${src.dir}" defaultexcludes="yes">
365 >        <include name="java/**/*.java"/>
366 >      </fileset>
367 >      <arg line="-Xdocrootparent ${java.docroot.url}"/>
368 >      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
369 >      <arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
370 >      <arg value="-quiet"/>
371 >      <arg value="-XDignore.symbol.file=true"/>
372 >      <arg value="-html5"/>
373 >      <arg value="-Xdoclint:all,-missing"/>
374 >      <arg value="--patch-module=java.base=${src.dir}"/>
375 >      <arg value="--frames" if:set="use-frames"/>
376 >      <arg value="--override-methods=summary"/>
377 >      <arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
378 >      <arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
379 >      <arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
380 >      <arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
381 >    </javadoc>
382    </target>
383  
177  
178
384    <target name="dist"
385 <          depends="init, dist-clean, dist-jar, dist-docs"
385 >          depends="dist-clean, dist-jar, dist-docs"
386            description="Puts all distributable products in single hierarchy"/>
387  
183
184
185  <target name="release"
186          depends="dist"
187          description="Puts entire CVS tree, plus distribution productions, in a jar">
188
189    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
190
191    <jar basedir="${basedir}" destfile="${release.jar}">
192      <!-- <exclude name="build/**"/> -->
193      <exclude name="${release.jar}"/>
194      <exclude name="user.properties"/>
195      <exclude name="etc/notes/**"/>
196      <exclude name="src/emulation/**"/>
197      <exclude name="**/SyntaxTest.java"/>
198      <exclude name="**/SuperfluousAbstract.java"/>
199    </jar>
200
201  </target>
202
203
204
388    <target name="clean"
389            description="Removes all build products">
207
390      <delete dir="${build.dir}"/>
209    <delete dir="${build.classes.dir}"/>
210    <delete dir="${build.lib.dir}"/>
211
391    </target>
392  
214
215
393    <target name="dist-clean"
394            description="Removes all build and distribution products">
395 <
395 >    <delete dir="${build.dir}"/>
396      <delete dir="${dist.dir}"/>
220
397    </target>
398  
223
224
225  <target name="dist-docs"
226          description="Builds javadocs without custom tags to dist folder">
227
228    <delete dir="${dist.javadocs.dir}"/>
229    <mkdir dir="${dist.javadocs.dir}"/>
230
231    <javadoc destdir="${dist.javadocs.dir}"
232                link="http://java.sun.com/j2se/1.4.2/docs/api"
233            overview="${src.dir}/intro.html"
234              source="${build.sourcelevel}">
235
236      <packageset dir="${src.dir}"/>
237
238    </javadoc>
239
240  </target>
241
242
243
244  <!-- Internal targets -->
245
246
247  <target name="init">
248
249    <!-- Version is kept in a separate file -->
250    <loadfile property="version" srcFile="version.properties"/>
251    <echo>Building JSR-166 version ${version}</echo>
252    <echo>java.home is ${java.home}</echo>
253
254  </target>
255  
256  
399    <target name="dist-jar"
400            depends="clean, jar">
259
401      <copy file="${product.jar}" todir="${dist.dir}"/>
261
262  </target>
263
264
265  <target name="compile-ant-filter"
266          depends="init">
267
268    <mkdir dir="${build.ant.dir}"/>
269
270    <javac srcdir="${ant.src.dir}"
271          destdir="${build.ant.dir}"
272           source="1.4"
273    />
274
275  </target>
276
277
278  <target name="filter-src"
279          depends="compile-ant-filter">
280
281    <mkdir dir="${build.filter.src.dir}"/>
282
283    <copy todir="${build.filter.src.dir}">
284      <fileset dir="${src.dir}">
285        <include name="**/*.html"/>
286      </fileset>
287    </copy>
288
289    <copy todir="${build.filter.src.dir}">
290      <fileset dir="${src.dir}">
291        <exclude name="**/*.html"/>
292        <!-- Files excluded from dist-docs -->
293        <exclude name="java/util/Random.*"/>
294        <exclude name="sun/misc/Unsafe.*"/>
295      </fileset>
296      <!--
297      <filterchain>
298      -->
299
300        <!--
301         # This filter gets rid of angle-bracketed type parameters
302         # so that javadoc can run on the result. The following
303         # heuristic seems to work:
304         #
305         # For all lines not starting with space(s)-asterisk-space(s),
306         #   replace <something> with a space, where there may be more
307         #   than one right angle bracket at the end, and "something"
308         #   must not contain parens or pipes. (This may need some
309         #   tweaking.)
310         -->
311
312        <!--
313        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
314                      classpath="${build.ant.dir}">
315          <param name="notmatching" value="^\s+\*\s.*$"/>
316          <param name="pattern"     value="&lt;[^|>()]+?>+"/>
317          <param name="replacement" value=" "/>
318        </filterreader>
319        -->
320
321      <!--
322      </filterchain>
323      -->
324    </copy>
325
326  </target>
327
328
329  <target name="filter-doccheck"
330          depends="filter-src">
331
332    <mkdir dir="${build.dc-filter.dir}"/>
333
334    <copy todir="${build.dc-filter.dir}">
335      <fileset dir="${build.filter.src.dir}">
336        <include name="**/*.html"/>
337      </fileset>
338    </copy>
339
340    <property name="generic.declarations"
341             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 {}"
342    />
343
344    <copy todir="${build.dc-filter.dir}">
345      <fileset dir="${build.filter.src.dir}">
346        <exclude name="**/*.html"/>
347      </fileset>
348      <filterchain>
349        <!--
350         # These two filters try to make the source look like
351         # something that doccheck can process. The first removes
352         # -source 1.4 assertions and the second adds in a bunch
353         # of single letter public nested marker interfaces so that
354         # the generic type parameters are recognized.
355         -->
356
357        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
358                      classpath="${build.ant.dir}">
359          <param name="matching"    value="^\s*assert[\s ].*$"/>
360          <param name="pattern"     value="assert"/>
361          <param name="replacement" value="//assert"/>
362        </filterreader>
363
364        <filterreader classname="jsr166.ant.filters.ReplaceFilter"
365                      classpath="${build.ant.dir}">
366          <param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
367          <param name="pattern"     value="$"/>
368          <param name="replacement" value=" ${generic.declarations}"/>
369        </filterreader>
370
371      </filterchain>
372    </copy>
373
402    </target>
403  
404 <
405 <  <target name="compile-tests"
406 <          depends="jar">
379 <
380 <    <mkdir dir="${build.testcases.dir}"/>
381 <
382 <    <javac srcdir="${tck.src.dir}"
383 <          destdir="${build.testcases.dir}"
384 <            debug="${build.debug}"
385 <       debuglevel="${build.debuglevel}"
386 <      deprecation="${build.deprecation}"
387 <           source="${build.sourcelevel}"
388 <             fork="true">
389 <
390 <      <compilerarg value="${bootclasspath.args}"/>
391 <      <compilerarg line="${build.args}"/>
392 <      
393 <      <classpath refid="test.classpath"/>
394 <
395 <    </javac>
396 <
397 <    <javac srcdir="${test.src.dir}"
398 <          destdir="${build.testcases.dir}"
399 <            debug="${build.debug}"
400 <       debuglevel="${build.debuglevel}"
401 <      deprecation="${build.deprecation}"
402 <           source="${build.sourcelevel}"
403 <             fork="true">
404 <
405 <      <include name="jsr166/test/**"/>
406 <      
407 <      <compilerarg value="${bootclasspath.args}"/>
408 <      <compilerarg line="${build.args}"/>
409 <      
410 <      <classpath refid="test.classpath"/>
411 <
412 <    </javac>
413 <
414 < <!--
415 <    <javac srcdir="${jtreg.src.dir}"
416 <          destdir="${build.testcases.dir}"
417 <            debug="${build.debug}"
418 <       debuglevel="${build.debuglevel}"
419 <      deprecation="${build.deprecation}"
420 <           source="${build.sourcelevel}"
421 <             fork="true">
422 <
423 <      <compilerarg value="${bootclasspath.args}"/>
424 <      <compilerarg line="${build.args}"/>
425 <      
426 <      <classpath refid="test.classpath"/>
427 <
428 <    </javac>
429 < -->
430 <
404 >  <target name="dist-docs"
405 >          depends="clean, docs">
406 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
407    </target>
408  
409 <
410 <  <target name="run-tests"
411 <          depends="compile-tests">
412 <
413 <    <!-- May be overridden by user.properties -->
414 <    <property name="testcase" value="*"/>
415 <
416 <    <mkdir dir="${build.reports.dir}"/>
417 <
418 <    <junit printsummary="true"
419 <             showoutput="true"
420 <          errorProperty="junit.failed"
421 <        failureProperty="junit.failed"
422 <                    dir="${build.reports.dir}"
423 <                   fork="true">
424 <
425 <      <jvmarg value="${bootclasspath.args}"/>
426 <      
427 <      <classpath refid="test.classpath"/>
428 <
429 <      <formatter type="xml"/>
430 <
431 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
432 <        <fileset dir="${tck.src.dir}">
433 <          <include name="**/${testcase}Test.java"/>
434 <        </fileset>
435 <      </batchtest>
436 <      
437 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
438 <        <fileset dir="${test.src.dir}">
439 <          <include name="jsr166/test/**/${testcase}Test.java"/>
440 <        </fileset>
441 <      </batchtest>
442 <
443 < <!--      
444 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
445 <        <fileset dir="${jtreg.src.dir}">
446 <          <include name="**/${testcase}Test.java"/>
447 <        </fileset>
448 <      </batchtest>
449 < -->
474 <
475 <    </junit>
476 <
409 >  <target name="tck"
410 >          depends="jar"
411 >          description="Runs tck tests for src/main directly">
412 >    <run-tck-tests
413 >      target="${java.runtime.target}"
414 >      workdir="${build.dir}"
415 >      classes="${product.jar}">
416 >      <javac-elements>
417 >        <!-- <compilerarg value="-Werror"/> -->
418 >      </javac-elements>
419 >    </run-tck-tests>
420 >  </target>
421 >
422 >  <target name="tck-parallelism-1"
423 >          description="Runs tck with common pool parallelism 1">
424 >    <antcall target="tck">
425 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
426 >    </antcall>
427 >  </target>
428 >
429 >  <target name="tck-parallelism-0"
430 >          description="Runs tck with common pool parallelism 0">
431 >    <antcall target="tck">
432 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
433 >    </antcall>
434 >  </target>
435 >
436 >  <target name="tck-security-manager"
437 >          description="Runs tck with a security manager">
438 >    <antcall target="tck">
439 >      <param name="jsr166.useSecurityManager" value="true"/>
440 >    </antcall>
441 >  </target>
442 >
443 >  <target name="jtreg"
444 >          depends="jar"
445 >          description="Runs jtreg tests for src/main using the jtreg ant task">
446 >    <run-jtreg-tests
447 >       target="${java.runtime.target}"
448 >       workdir="${build.dir}"
449 >       classes="${product.jar}"/>
450    </target>
451  
452 +  <target name="test"
453 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
454 +          description="Runs tck and jtreg tests for src/main"/>
455  
456 <  <target name="report-tests"
457 <          depends="run-tests">
458 <
459 <    <!-- Sets junit.report.format to frames if redirection is present,
460 <         otherwise sets it to noframes. -->
461 <    <available property="junit.report.format"
462 <                  value="frames"
463 <              classname="org.apache.xalan.lib.Redirect"
464 <    />
465 <    <property name="junit.report.format" value="noframes"/>
466 <
467 <    <junitreport todir="${build.reports.dir}">
468 <      <fileset dir="${build.reports.dir}">
469 <        <include name="TEST-*.xml"/>
470 <      </fileset>
471 <      <report styledir="${stylesheet.dir}"
472 <                format="${junit.report.format}"
473 <                 todir="${build.reports.dir}"
474 <      />
475 <    </junitreport>
476 <
477 <    <fail message="Test Cases Failed" if="junit.failed"/>
478 <
456 >  <target name="test-version-permutations"
457 >          depends="test17, test19, clean, test, docs"
458 >          description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
459 >
460 >
461 >  <target name="test17">
462 >    <antcall>
463 >      <param name="java.runtime.target" value="17"/>
464 >      <param name="build.main.javac" value="${javac17}"/>
465 >      <param name="build.main.javadoc" value="${javadoc17}"/>
466 >      <param name="build.main.javadoc.source" value="17"/>
467 >      <target name="clean"/>
468 >      <target name="test"/>
469 >      <target name="docs"/>
470 >    </antcall>
471 >  </target>
472 >  <target name="test19">
473 >    <antcall>
474 >      <param name="java.runtime.target" value="19"/>
475 >      <param name="build.main.javac" value="${javac19}"/>
476 >      <param name="build.main.javadoc" value="${javadoc19}"/>
477 >      <param name="build.main.javadoc.source" value="19"/>
478 >      <target name="clean"/>
479 >      <target name="test"/>
480 >      <target name="docs"/>
481 >    </antcall>
482    </target>
483  
484  
485    <target name="configure-compiler">
486 +    <fail message="ant version too old">
487 +      <condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
488 +    </fail>
489  
490      <property name="unchecked.option" value="-Xlint:unchecked"/>
491  
# Line 520 | Line 502
502    </target>
503  
504  
505 <  <target name="configure-tests"
506 <       depends="configure-compiler">
525 <
526 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
527 <    <available property="junit.available"
528 <               classname="junit.framework.Protectable"/>
529 <
530 <    <!-- Xalan -->
531 <    <available property="xalan.available"
532 <               classname="org.apache.xalan.Version"/>
533 <
534 <              
535 <    <!-- Ant 1.6beta and later don't need or want this check -->
536 <    <!--    
537 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
538 <          unless="junit.available"/>
539 <
540 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
541 <          unless="xalan.available"/>
542 <    -->
543 <
544 <  </target>
545 <
546 <
547 <
548 <  <!-- Anthill targets -->
549 <
550 <  <target name="anthill-build">
551 <  
552 <    <!-- Override this in user.properties -->
553 <    <property name="tiger.home" location="e:/j2sdk1.5.0"/>
554 <    
555 <    <exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
556 <      <arg value="-Xmx256000000"/>
557 <      <!-- classpath of new JVM -->
558 <      <arg value="-classpath"/> <arg path="${java.class.path}"/>
559 <      <!-- location of Ant home directory -->
560 <      <arg value="-Dant.home=${ant.home}"/>
561 <      <!-- the Ant main class -->
562 <      <arg value="org.apache.tools.ant.Main"/>
563 <      <!-- The build file -->
564 <      <arg value="-buildfile"/>  <arg value="build.xml"/>
565 <      <!-- the target to build on the new Ant instance -->
566 <      <arg value="-DJAVA_HOME=${tiger.home}"/>
567 <      <arg value="do-anthill-build"/>
568 <    </exec>
569 <  </target>
570 <  
571 <  <target name="do-anthill-build"
572 <          depends="jar, test, docs, dist-docs"/>
573 <
574 <  <target name="anthill-publish">
505 >  <target name="compile-test-loops" depends="jar"
506 >          description="Compiles all the perf tests in src/test/loops">
507  
508 <    <copy todir="${deployDir}/docs/private">
577 <      <fileset dir="${build.javadocs.dir}"/>
578 <    </copy>
579 <
580 <    <copy todir="${deployDir}/docs/public">
581 <      <fileset dir="${dist.javadocs.dir}"/>
582 <    </copy>
583 <
584 <    <copy tofile="${deployDir}/index.html"
585 <          file="${basedir}/etc/anthill-index.html"/>
586 <
587 <    <copy todir="${deployDir}/notes">
588 <      <fileset dir="${basedir}/etc/notes"/>
589 <    </copy>
508 >    <mkdir dir="${build.dir}/test/loops"/>
509  
510 <  </target>
511 <
512 <
513 <  <!-- Standalone sample program -->
514 <  
515 <  <target name="sample" depends="jar">
516 <  
517 <    <mkdir dir="${build.testcases.dir}"/>
518 <    
519 <    <javac srcdir="${test.src.dir}"
520 <          destdir="${build.testcases.dir}"
521 <            debug="${build.debug}"
522 <       debuglevel="${build.debuglevel}"
523 <      deprecation="${build.deprecation}"
524 <           source="${build.sourcelevel}"
606 <             fork="true">
607 <            
608 <      <compilerarg value="${bootclasspath.args}"/>
510 >    <javac srcdir="${basedir}/src/test/loops"
511 >           destdir="${build.dir}/test/loops"
512 >           debug="${build.debug}"
513 >           debuglevel="${build.debuglevel}"
514 >           deprecation="${build.deprecation}"
515 >           includeAntRuntime="false"
516 >           includeJavaRuntime="false"
517 >           encoding="ASCII"
518 >           executable="${build.main.javac}"
519 >           fork="true">
520 >
521 >      <include name="*.java"/>
522 >      <compilerarg value="-XDignore.symbol.file=true"/>
523 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
524 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
525        <compilerarg line="${build.args}"/>
610      
611      <classpath refid="test.classpath"/>
612      
613      <include name="jsr166/test/Sample.java"/>
614      
526      </javac>
616    
617            
618    <java classname="jsr166.test.Sample" fork="true">
619      <jvmarg value="${bootclasspath.args}"/>
620      <classpath refid="test.classpath"/>
621    </java>
527    </target>
528  
529  
530 <
531 <  <!-- Backward compatibility, work in progress (some files not checked in) -->
532 <
530 >  <!-- old branches no longer maintained.  build support deleted -->
531 >  <!-- jsr166 4jdk8; (no longer maintained as of 2019-10) -->
532 >  <!-- jsr166 4jdk7 (no longer maintained) -->
533 >  <!-- jsr166x (no longer maintained) -->
534 >  <!-- jsr166y (no longer maintained) -->
535 >  <!-- extra166y (no longer maintained) -->
536 >  <!-- jsr166e (no longer maintained) -->
537 >
538 > <!-- Find buglets that can be detected by static build tools -->
539 >
540 > <!--   <target name="lint"> -->
541 > <!--     <antcall target="dists"> -->
542 > <!--       <param name="build.javadoc.access" value="protected"/> -->
543 > <!--     </antcall> -->
544 > <!--   </target> -->
545 >
546 > <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
547 >  <target name="doclint-private">
548 >    <antcall target="dist">
549 >      <param name="build.javadoc.access" value="private"/>
550 >    </antcall>
551 >  </target>
552  
553  
554 <  <property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
555 <  <property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
556 <  <property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
557 <  <property name="pretiger.sourcelevel" value="1.4"/>
558 <  
559 <  <target name="defang"
560 <       depends="init"
561 <   description="Generates pre-Tiger compatible source">
562 <  
563 <    <delete dir="${pretiger.src.dir}"/>
564 <    <mkdir dir="${pretiger.src.dir}"/>
565 <  
566 <    <exec executable="perl">
567 <      <arg file="etc/defang.pl"/>
568 <      <!-- <arg value="-v"/> -->
569 <      <arg value="-s"/> <arg file="${src.dir}"/>
570 <      <arg value="-t"/> <arg file="${pretiger.src.dir}"/>
571 <    </exec>
572 <    
573 <  </target>
574 <
575 <  <target name="compile-pretiger"
576 <          depends="init, configure-compiler, defang"
577 <          description="Compiles pre-Tiger sources to build folder">
578 <
579 <    <mkdir dir="${build.pretiger.dir}"/>
580 <
581 <    <javac srcdir="${pretiger.src.dir}"
582 <          destdir="${build.pretiger.dir}"
583 <            debug="${build.debug}"
584 <       debuglevel="${build.debuglevel}"
585 <      deprecation="${build.deprecation}"
586 <           source="${pretiger.sourcelevel}"
587 <             fork="true">
554 > <!-- ==============================================================
555 >  Experimental errorprone support
556 >  https://errorprone.info
557 >  https://errorprone.info/docs/installation
558 >  https://github.com/google/error-prone/issues/1143
559 > =================================================================== -->
560 >  <path id="errorprone.processorpath.path">
561 >    <pathelement location="${lib.dir}/error_prone_core-2.3.4-with-dependencies.jar"/>
562 >    <pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
563 >    <pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
564 >    <pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
565 >    <pathelement location="${lib.dir}/caffeine-2.8.0.jar"/>
566 >  </path>
567 >  <property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
568 >  <property name="errorprone.jsr166.user.flags" value=""/>
569 >  <property name="errorprone.jsr166.flags"
570 >            value="-Xep:HashtableContains:OFF
571 >                   -Xep:PreferJavaTimeOverload:OFF
572 >                   -Xep:JdkObsolete:OFF
573 >                   -Xep:MissingOverride:OFF
574 >                   -Xep:MissingFail:OFF
575 >                   -Xep:ThreadPriorityCheck:OFF
576 >                   -Xep:MixedArrayDimensions:ERROR
577 >                   -Xep:RemoveUnusedImports:ERROR
578 >                   -Xep:EmptyIf:ERROR
579 >                   -Xep:MultipleTopLevelClasses:ERROR
580 >                   -Xep:ClassName:ERROR
581 >                   -Xep:LongLiteralLowerCaseSuffix:ERROR
582 >                   -Xep:RedundantThrows:ERROR
583 >                   -Xep:IdentityBinaryExpression:WARN
584 >                   -Xep:ConstructorInvokesOverridable:WARN
585 >                   -Xep:MethodCanBeStatic:WARN
586 >                   ${errorprone.jsr166.user.flags}"/>
587 >  <!-- -Xep:WildcardImport:ERROR -->
588 >  <property name="errorprone.jsr166.test.flags"
589 >            value="-Xep:StringSplitter:OFF
590 >                   -Xep:BoxedPrimitiveConstructor:OFF
591 >                   -Xep:UnnecessaryParentheses:OFF
592 >                   -Xep:ModifyingCollectionWithItself:OFF"/>
593 >  <!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
594 >  <target name="errorprone"
595 >          depends="clean, configure-compiler"
596 >          description="Run errorprone over jsr166 source code (experimental)">
597 >
598 >    <local name="destdir"/>
599 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
600 >    <mkdir dir="${destdir}"/>
601  
602 +    <javac srcdir="${src.dir}"
603 +           destdir="${destdir}"
604 +           debug="${build.debug}"
605 +           debuglevel="${build.debuglevel}"
606 +           deprecation="${build.deprecation}"
607 +           classpath=""
608 +           includeAntRuntime="false"
609 +           includeJavaRuntime="false"
610 +           encoding="ASCII"
611 +           executable="${build.main.javac}"
612 +           fork="true">
613 +
614 +      <include name="**/*.java"/>
615 +      <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
616 +      <compilerarg value="-J--illegal-access=permit"/>
617 +      <compilerarg value="-XDcompilePolicy=simple"/>
618 +      <compilerarg value="-processorpath"/>
619 +      <compilerarg pathref="errorprone.processorpath.path"/>
620 +      <compilerarg value="-Xplugin:ErrorProne
621 +                          ${errorprone.jsr166.flags}"/>
622 +      <compilerarg value="--patch-module=java.base=${src.dir}"/>
623 +      <compilerarg value="-Xprefer:source"/>
624 +      <compilerarg value="-XDignore.symbol.file=true"/>
625 +      <compilerarg value="-Xlint:all"/>
626 +      <compilerarg value="-Xdoclint:all/protected,reference/private"/>
627 +      <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
628 +      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
629        <compilerarg line="${build.args}"/>
666      <exclude name="**/Thread.java"/>
667
630      </javac>
631  
632 <  </target>
633 <  
672 <  <target name="pretiger" depends="compile-pretiger">
673 <
674 <    <mkdir dir="${build.lib.dir}"/>
675 <    
676 <    <jar destfile="${pretiger.jar}">
677 <      <fileset dir="${build.pretiger.dir}">
678 <      </fileset>
632 >    <jar destfile="${product.jar}">
633 >      <fileset dir="${destdir}"/>
634      </jar>
635 <    
635 >
636 >    <run-tck-tests
637 >      target="${java.runtime.target}"
638 >      workdir="${build.dir}"
639 >      classes="${product.jar}">
640 >      <javac-elements>
641 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
642 >        <compilerarg value="-J--illegal-access=permit"/>
643 >        <compilerarg value="-XDcompilePolicy=simple"/>
644 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
645 >        <compilerarg value="-Xplugin:ErrorProne
646 >                            ${errorprone.jsr166.flags}
647 >                            ${errorprone.jsr166.test.flags}"/>
648 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
649 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
650 >      </javac-elements>
651 >    </run-tck-tests>
652 >  </target>
653 >
654 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
655 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
656 >  <target name="errorprone-jtreg"
657 >          depends="jar"
658 >          description="Run errorprone over jtreg tests (experimental)">
659 >
660 >    <run-jtreg-tests
661 >       target="${java.runtime.target}"
662 >       workdir="${build.dir}"
663 >       classes="${product.jar}"
664 >       verbose="all">
665 >      <jtreg-elements>
666 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
667 >        <arg value="-javacoption:-processorpath"/>
668 >        <arg value="-javacoption:${errorprone.processorpath}"/>
669 >        <arg value="-javacoption:-Xplugin:ErrorProne
670 >                            ${errorprone.jsr166.flags}
671 >                            ${errorprone.jsr166.test.flags}
672 >                            -Xep:MultipleTopLevelClasses:WARN
673 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
674 >      </jtreg-elements>
675 >    </run-jtreg-tests>
676 >  </target>
677 >
678 >
679 > <!-- ==============================================================
680 >  Running guava tests against jsr166 code
681 > =================================================================== -->
682 >
683 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
684 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
685 > <!-- <property name="guava.version" value="21.0"/> -->
686 >
687 > <!-- HOWTO debug print a path id -->
688 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
689 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
690 >
691 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
692 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
693 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
694 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
695 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
696 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
697 >
698 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
699 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
700 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
701 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
702 >
703 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
704 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
705 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
706 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
707 >
708 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
709 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
710 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
711 >
712 >  <target name="init-ivy">
713 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
714 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
715 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
716 >             classpath="${build.dir}/ivy.jar"/>
717 >  </target>
718 >
719 >  <target name="guava-tests" depends="jar, init-ivy"
720 >          description="Guava tests run against jsr166 collections">
721 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
722 >    <mkdir dir="${guava.dir}"/>
723 >    <ivy:retrieve pathid="guava.testlib.classpath"
724 >      type="jar,bundle" inline="true" conf="default,master"
725 >      pattern="${guava.dir}/[artifact].[ext]"
726 >      organisation="com.google.guava" module="guava-testlib"/>
727 >    <property name="guava.version" value="21.0"/>
728 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
729 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
730 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
731 >           jvm="${build.main.java}" fork="true">
732 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
733 >      <formatter type="brief"/>
734 >      <classpath>
735 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
736 >        <path refid="guava.testlib.classpath"/>
737 >      </classpath>
738 >
739 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
740 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
741 >    </junit>
742    </target>
743  
744   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines