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.124 by jsr166, Tue Jan 22 21:22:57 2013 UTC vs.
Revision 1.328 by jsr166, Sat Jan 7 16:30:33 2023 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines