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.146 by jsr166, Thu Jul 18 18:27:55 2013 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  
# 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.
30 < As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
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="Display main targets by running 'ant -projecthelp'">
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 -->
41  <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  
47  <!-- Tck options; see JSR166TestCase.java -->
48  <!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49  <property name="jsr166.profileTests"     value="false"/>
50  <property name="jsr166.profileThreshold" value="100"/>
51  <property name="jsr166.runsPerTest"      value="1"/>
52  <!-- Allow running an individual tck test class -->
53  <!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55
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"/>
61  <property name="build.reports.dir"           location="${build.dir}/reports"/>
62
63  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
64  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
65  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
66  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
67
68  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
69  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
70  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
71  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
72
73  <property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
74  <property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
75  <property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
76  <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 81 | Line 67 | As of 2013-02, the very latest lambda 8
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"/>
90 <    <property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
91 <    <path id="bootclasspath@{v}">
92 <      <pathelement path="${boot.jar.dir}/resources.jar"/>
93 <      <pathelement path="${boot.jar.dir}/rt.jar"/>
94 <      <pathelement path="${boot.jar.dir}/jsse.jar"/>
95 <      <pathelement path="${boot.jar.dir}/jce.jar"/>
96 <      <pathelement path="${boot.jar.dir}/charsets.jar"/>
97 <    </path>
98 <    <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  
# Line 111 | Line 88 | As of 2013-02, the very latest lambda 8
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="6"/>
92 <  <defjdklocations v="7"/>
93 <  <defjdklocations v="8"/>
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"/>
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"/>
127  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
128  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
129  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
130  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
131  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
107  
108    <!-- Javadoc locations -->
109    <property name="docs.dir"          location="${build.dir}/docs"/>
110 <  <property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
136 <  <property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137 <  <property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138 <  <property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139 <  <property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
140 <
141 <  <property name="dist.docs.dir"          location="${dist.dir}/docs"/>
142 <  <property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143 <  <property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144 <  <property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145 <  <property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
146 <  <property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
110 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
111  
112    <!-- Jar locations -->
113    <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
150  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
151  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
152  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
153  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
154  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
114    <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
115  
116 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
117 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
118 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
119 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
120 <
121 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
122 <  <!-- The below does not yet exist as of 2013-01 -->
164 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
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 <  <!-- Default jdk api doc location (latest stable release seems best) -->
125 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
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 <  <!-- Test classpath -->
136 <  <path id="test.classpath">
137 <    <pathelement location="${build.testcases.dir}"/>
138 <    <pathelement location="${junit.jar}"/>
139 <  </path>
140 <
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 <    <attribute name="jvmflags" default=""/>
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      <mkdir dir="@{workdir}/tck-classes"/>
# Line 197 | Line 165 | As of 2013-02, the very latest lambda 8
165             source="@{compile-target}"
166             target="@{compile-target}"
167             classpath="${junit.jar}"
200           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
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"/>
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  
# Line 215 | Line 185 | As of 2013-02, the very latest lambda 8
185            failonerror="true"
186            jvm="${java@{target}}"
187            fork="true">
188 <        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
189 <        <jvmarg line="@{jvmflags}"/>
190 <        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
191 <        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
192 <        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
193 <        <classpath>
194 <          <pathelement location="${junit.jar}"/>
195 <          <pathelement location="@{workdir}/tck-classes"/>
196 <        </classpath>
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 +  <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">
233    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
234    <attribute name="source" default="7"/>
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>
240    <delete dir="@{workdir}/JTwork"   quiet="true"/>
241    <delete dir="@{workdir}/JTreport" quiet="true"/>
242    <mkdir dir="@{workdir}/JTwork/scratch"/>
243    <mkdir dir="@{workdir}/JTreport"/>
244    <jtreg dir="@{jtreg.src.dir}"
245           jdk="${jdk@{target}.home}"
246           workDir="@{workdir}/JTwork"
247           reportDir="@{workdir}/JTreport">
245  
246 <      <arg value="-Xbootclasspath/p:@{classes}"/>
247 <      <arg value="-agentvm"/>
248 <      <arg value="-v:nopass,fail"/>
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>
# Line 263 | Line 281 | As of 2013-02, the very latest lambda 8
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 +  <!-- 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    <target name="dists"
299 <          depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
299 >          depends="dist"
300            description="Builds all public jars and docs"/>
301  
302    <target name="compile"
303            depends="configure-compiler"
304            description="Compiles src/main sources to build dir">
305  
306 <    <mkdir dir="${build.classes.dir}"/>
306 >    <local name="destdir"/>
307 >    <property name="destdir" value="${build.classes.dir}/java.base"/>
308 >
309 >    <mkdir dir="${destdir}"/>
310  
311      <javac srcdir="${src.dir}"
312 <           destdir="${build.classes.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 <           executable="${javac8}"
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}"/>
299
333      </javac>
334    </target>
335  
303
336    <target name="jar"
337            depends="compile"
338 <          description="Builds library jar from compiled sources">
339 <
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}"/>
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    <target name="docs"
352            description="Builds javadocs for src/main to dist dir">
353 <
317 <    <delete dir="${docs.dir}"/>
353 >    <delete dir="${docs.dir}" quiet="true"/>
354      <mkdir dir="${docs.dir}"/>
319
320    <!-- the packagenames="none" hack below prevents scanning the -->
321    <!-- sourcepath for packages -->
322
355      <javadoc destdir="${docs.dir}"
356               packagenames="none"
357 <             link="${jdkapi8docs.url}"
357 >             link="${java.api.url}"
358               overview="${src.dir}/intro.html"
359               access="${build.javadoc.access}"
360 <             sourcepath="${src.dir}:${jdk8src.dir}"
360 >             sourcepath="${src.dir}"
361               classpath=""
362 <             executable="${javadoc8}">
362 >             source="${build.main.javadoc.source}"
363 >             executable="${build.main.javadoc}">
364        <fileset dir="${src.dir}" defaultexcludes="yes">
365 <        <include name="**/*.java"/>
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="-tag"/>
373 <      <arg value="${javadoc.jls.option}"/>
374 <      <arg value="-tag"/>
375 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
376 <      <arg value="-tag"/>
377 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
378 <      <arg value="-tag"/>
379 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
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  
347
384    <target name="dist"
385            depends="dist-clean, dist-jar, dist-docs"
386            description="Puts all distributable products in single hierarchy"/>
387  
352
353  <target name="release"
354          depends="dist"
355          description="Puts entire CVS tree, plus distribution productions, in a jar">
356
357    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
358
359    <jar basedir="${basedir}" destfile="${release.jar}">
360      <!-- <exclude name="build/**"/> -->
361      <exclude name="${release.jar}"/>
362      <exclude name="user.properties"/>
363      <exclude name="etc/notes/**"/>
364      <exclude name="src/emulation/**"/>
365      <exclude name="**/SyntaxTest.java"/>
366      <exclude name="**/SuperfluousAbstract.java"/>
367    </jar>
368  </target>
369
370
388    <target name="clean"
389            description="Removes all build products">
373
390      <delete dir="${build.dir}"/>
375
391    </target>
392  
378
393    <target name="dist-clean"
394            description="Removes all build and distribution products">
395 <
395 >    <delete dir="${build.dir}"/>
396      <delete dir="${dist.dir}"/>
383
397    </target>
398  
386
399    <target name="dist-jar"
400            depends="clean, jar">
401      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 394 | Line 406 | As of 2013-02, the very latest lambda 8
406      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
407    </target>
408  
409 <
410 <  <target name="test-tck"
411 <          depends="jar"
400 <          description="Runs tck tests for main directly">
401 <
409 >  <target name="tck"
410 >          depends="jar"
411 >          description="Runs tck tests for src/main directly">
412      <run-tck-tests
413 <      target="8"
413 >      target="${java.runtime.target}"
414        workdir="${build.dir}"
415 <      classes="${product.jar}"/>
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="test-jtreg"
444 <          depends="jar"
445 <          description="Runs jtreg tests for main using the jtreg ant task">
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="8"
447 >       target="${java.runtime.target}"
448         workdir="${build.dir}"
449         classes="${product.jar}"/>
450    </target>
451  
452    <target name="test"
453 <          depends="test-tck, test-jtreg"
454 <          description="Runs tck and jtreg tests for main">
420 <  </target>
453 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
454 >          description="Runs tck and jtreg tests for src/main"/>
455  
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 438 | Line 502 | As of 2013-02, the very latest lambda 8
502    </target>
503  
504  
505 +  <target name="compile-test-loops" depends="jar"
506 +          description="Compiles all the perf tests in src/test/loops">
507  
508 <  <!-- Various demos and test programs -->
508 >    <mkdir dir="${build.dir}/test/loops"/>
509  
510 <
511 <  <target name="loops" depends="configure-compiler"
446 <          description="Benchmark from Doug Lea's AQS paper">
447 <
448 <    <mkdir dir="${build.loops.dir}"/>
449 <
450 <    <javac srcdir="${loops.src.dir}"
451 <          destdir="${build.loops.dir}"
452 <            debug="${build.debug}"
453 <       debuglevel="${build.debuglevel}"
454 <      deprecation="${build.deprecation}"
455 <           source="${build.sourcelevel}"
456 <             fork="true">
457 <
458 <      <compilerarg line="${build.args}"/>
459 <      <classpath refid="loops.classpath"/>
460 <      <compilerarg value="-XDignore.symbol.file=true"/>
461 <
462 <    </javac>
463 <
464 <    <java classname="ALoops" fork="true">
465 <      <classpath refid="loops.classpath"/>
466 <    </java>
467 <
468 <  </target>
469 <
470 <
471 <  <!-- jsr166 4jdk7 -->
472 <
473 <  <target name="4jdk7compile"
474 <          depends="configure-compiler"
475 <          description="Compiles src/jdk7 sources, targeting jdk7">
476 <
477 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
478 <
479 <    <javac srcdir="${4jdk7src.dir}"
480 <           destdir="${build.4jdk7.classes.dir}"
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}"
484           source="6"
485           classpath=""
486           bootclasspath="${bootclasspath6}"
515             includeAntRuntime="false"
516             includeJavaRuntime="false"
517 <           executable="${javac7}"
517 >           encoding="ASCII"
518 >           executable="${build.main.javac}"
519             fork="true">
520  
521 <      <include name="**/*.java"/>
493 <      <compilerarg value="-Xprefer:source"/>
494 <      <compilerarg value="-XDignore.symbol.file=true"/>
495 <      <compilerarg value="-Xlint:all"/>
496 <      <compilerarg line="${build.args}"/>
497 <
498 <    </javac>
499 <  </target>
500 <
501 <
502 <  <target name="4jdk7jar"
503 <          depends="4jdk7compile"
504 <          description="Builds library jar from compiled sources">
505 <
506 <    <jar destfile="${4jdk7product.jar}">
507 <      <fileset dir="${build.4jdk7.classes.dir}"/>
508 <    </jar>
509 <
510 <  </target>
511 <
512 <
513 <  <target name="4jdk7-test-tck"
514 <          depends="4jdk7jar"
515 <          description="Runs tck tests for jsr166-4jdk7 directly">
516 <
517 <    <run-tck-tests
518 <      target="7"
519 <      workdir="${build.4jdk7.dir}"
520 <      classes="${4jdk7product.jar}">
521 <      <javac-elements>
522 <        <!-- JDK8+ test classes -->
523 <        <exclude name="*8Test.java"/>
524 <        <exclude name="DoubleAccumulatorTest.java"/>
525 <        <exclude name="DoubleAdderTest.java"/>
526 <        <exclude name="LongAccumulatorTest.java"/>
527 <        <exclude name="LongAdderTest.java"/>
528 <        <exclude name="CompletableFutureTest.java"/>
529 <        <exclude name="SplittableRandomTest.java"/>
530 <        <exclude name="StampedLockTest.java"/>
531 <      </javac-elements>
532 <    </run-tck-tests>
533 <  </target>
534 <
535 <
536 <  <target name="4jdk7-test-tck-junit"
537 <          depends="4jdk7compile"
538 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
539 <
540 <    <junit printsummary="true"
541 <           showoutput="true"
542 <           errorProperty="junit.failed"
543 <           failureProperty="junit.failed"
544 <           includeantruntime="true"
545 <           jvm="${java7}"
546 <           fork="true">
547 <
548 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
549 <      <jvmarg value="-server"/>
550 <
551 <      <classpath>
552 <        <pathelement location="${junit.jar}"/>
553 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
554 <      </classpath>
555 <
556 <      <formatter type="brief"/>
557 <
558 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
559 <      </test>
560 <
561 <    </junit>
562 <  </target>
563 <
564 <  <target name="4jdk7-test-jtreg"
565 <          depends="4jdk7jar"
566 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
567 <    <run-jtreg-tests
568 <       target="7"
569 <       workdir="${build.4jdk7.dir}"
570 <       classes="${4jdk7product.jar}"
571 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
572 <  </target>
573 <
574 <
575 <  <target name="4jdk7-test"
576 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
577 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
578 <  </target>
579 <
580 <
581 <  <target name="4jdk7docs"
582 <          description="Builds javadocs for src/jdk7 to dist dir">
583 <
584 <    <delete dir="${4jdk7docs.dir}"/>
585 <    <mkdir dir="${4jdk7docs.dir}"/>
586 <
587 <    <javadoc destdir="${4jdk7docs.dir}"
588 <             packagenames="none"
589 <             link="${jdkapi7docs.url}"
590 <             overview="${4jdk7src.dir}/intro.html"
591 <             access="${build.javadoc.access}"
592 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
593 <             classpath=""
594 <             executable="${javadoc7}">
595 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
596 <        <include name="**/*.java"/>
597 <      </fileset>
598 <      <arg value="-XDignore.symbol.file=true"/>
599 <    </javadoc>
600 <  </target>
601 <
602 <
603 <  <target name="4jdk7dist"
604 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
605 <          description="Puts all distributable products in single hierarchy"/>
606 <
607 <
608 <  <target name="4jdk7clean"
609 <          description="Removes all 4jdk7 build products">
610 <
611 <    <delete dir="${build.4jdk7.dir}"/>
612 <
613 <  </target>
614 <
615 <
616 <  <target name="4jdk7dist-clean"
617 <          description="Removes all build and distribution products">
618 <
619 <  </target>
620 <
621 <  <target name="4jdk7dist-jar"
622 <          depends="4jdk7clean, 4jdk7jar">
623 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
624 <  </target>
625 <
626 <
627 <  <target name="4jdk7dist-docs"
628 <          depends="4jdk7clean, 4jdk7docs">
629 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
630 <  </target>
631 <
632 <
633 <  <!-- jsr166x -->
634 <
635 <  <target name="jsr166xcompile"
636 <          depends="configure-compiler"
637 <          description="Compiles jsr166x sources to build dir">
638 <
639 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
640 <
641 <    <javac srcdir="${topsrc.dir}"
642 <           destdir="${build.jsr166x.classes.dir}"
643 <           debug="${build.debug}"
644 <           debuglevel="${build.debuglevel}"
645 <           deprecation="${build.deprecation}"
646 <           classpath=""
647 <           bootclasspath="${bootclasspath6}"
648 <           source="5"
649 <           includeAntRuntime="false"
650 <           includeJavaRuntime="false"
651 <           executable="${javac7}"
652 <           fork="true">
653 <
654 <      <include name="jsr166x/**/*.java"/>
655 <      <compilerarg value="-XDignore.symbol.file=true"/>
656 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
657 <      <compilerarg line="${build.args}"/>
658 <
659 <    </javac>
660 <  </target>
661 <
662 <
663 <  <target name="jsr166xjar"
664 <          depends="jsr166xcompile"
665 <          description="Builds library jar from compiled sources">
666 <
667 <    <jar destfile="${jsr166x.jar}">
668 <      <fileset dir="${build.jsr166x.classes.dir}"/>
669 <    </jar>
670 <
671 <  </target>
672 <
673 <
674 <  <target name="jsr166xdocs"
675 <          description="Builds javadocs to dist dir">
676 <
677 <    <delete dir="${jsr166xdocs.dir}"/>
678 <    <mkdir dir="${jsr166xdocs.dir}"/>
679 <
680 <    <javadoc destdir="${jsr166xdocs.dir}"
681 <             packagenames="jsr166x.*"
682 <             link="${jdkapidocs.url}"
683 <             access="${build.javadoc.access}"
684 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
685 <             bootclasspath="${bootclasspath6}"
686 <             source="5"
687 <             executable="${javadoc7}">
688 <      <arg value="-XDignore.symbol.file=true"/>
689 <
690 <    </javadoc>
691 <  </target>
692 <
693 <
694 <  <target name="jsr166xdist"
695 <          depends="jsr166xdist-jar, jsr166xdist-docs"
696 <          description="Puts all distributable products in single hierarchy"/>
697 <
698 <
699 <  <target name="jsr166xclean"
700 <          description="Removes all jsr166x build products">
701 <
702 <    <delete dir="${build.jsr166x.dir}"/>
703 <
704 <  </target>
705 <
706 <
707 <  <target name="jsr166xdist-clean"
708 <          description="Removes all build and distribution products">
709 <
710 <  </target>
711 <
712 <
713 <  <target name="jsr166xdist-jar"
714 <          depends="jsr166xclean, jsr166xjar">
715 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
716 <  </target>
717 <
718 <  <target name="jsr166xdist-docs"
719 <          depends="jsr166xclean, jsr166xdocs">
720 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
721 <  </target>
722 <
723 <  <!-- jsr166y -->
724 <
725 <
726 <  <target name="jsr166ycompile"
727 <          depends="configure-compiler"
728 <          description="Compiles jsr166y sources">
729 <
730 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
731 <
732 <    <javac srcdir="${topsrc.dir}"
733 <           destdir="${build.jsr166y.classes.dir}"
734 <           debug="${build.debug}"
735 <           debuglevel="${build.debuglevel}"
736 <           deprecation="${build.deprecation}"
737 <           source="6"
738 <           classpath=""
739 <           bootclasspath="${bootclasspath6}"
740 <           includeAntRuntime="false"
741 <           includeJavaRuntime="false"
742 <           executable="${javac7}"
743 <           fork="true">
744 <
745 <      <include name="jsr166y/**/*.java"/>
746 <      <compilerarg value="-XDignore.symbol.file=true"/>
747 <      <compilerarg value="-Xlint:all"/>
748 <      <compilerarg line="${build.args}"/>
749 <
750 <    </javac>
751 <  </target>
752 <
753 <
754 <  <target name="jsr166yjar"
755 <          depends="jsr166ycompile"
756 <          description="Builds library jar from compiled sources">
757 <
758 <    <jar destfile="${jsr166y.jar}" index="true">
759 <      <fileset dir="${build.jsr166y.classes.dir}"/>
760 <    </jar>
761 <
762 <  </target>
763 <
764 <
765 <  <target name="jsr166ydocs"
766 <          description="Builds javadocs to dist dir">
767 <
768 <    <delete dir="${jsr166ydocs.dir}"/>
769 <    <mkdir dir="${jsr166ydocs.dir}"/>
770 <
771 <    <javadoc destdir="${jsr166ydocs.dir}"
772 <             packagenames="jsr166y.*"
773 <             link="${jdkapidocs.url}"
774 <             access="${build.javadoc.access}"
775 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
776 <             bootclasspath="${bootclasspath6}"
777 <             source="6"
778 <             executable="${javadoc7}">
779 <      <arg value="-XDignore.symbol.file=true"/>
780 <
781 <    </javadoc>
782 <  </target>
783 <
784 <
785 <  <target name="jsr166ydist"
786 <          depends="jsr166ydist-jar, jsr166ydist-docs"
787 <          description="Puts all distributable products in single hierarchy"/>
788 <
789 <
790 <  <target name="jsr166yclean"
791 <          description="Removes all jsr166y build products">
792 <
793 <    <delete dir="${build.jsr166y.dir}"/>
794 <
795 <  </target>
796 <
797 <
798 <  <target name="jsr166ydist-clean"
799 <          description="Removes all build and distribution products">
800 <
801 <  </target>
802 <
803 <  <target name="jsr166ydist-jar"
804 <          depends="jsr166yclean, jsr166yjar">
805 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
806 <  </target>
807 <
808 <  <target name="jsr166ydist-docs"
809 <          depends="jsr166yclean, jsr166ydocs">
810 <    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
811 <  </target>
812 <
813 <
814 <  <!-- extra166y -->
815 <
816 <
817 <  <target name="extra166ycompile"
818 <          depends="configure-compiler, jsr166yjar"
819 <          description="Compiles extra166y sources">
820 <
821 <    <mkdir dir="${build.extra166y.classes.dir}"/>
822 <
823 <    <javac srcdir="${topsrc.dir}"
824 <           destdir="${build.extra166y.classes.dir}"
825 <           debug="${build.debug}"
826 <           debuglevel="${build.debuglevel}"
827 <           deprecation="${build.deprecation}"
828 <           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
829 <           classpath=""
830 <           source="6"
831 <           includeAntRuntime="false"
832 <           includeJavaRuntime="false"
833 <           executable="${javac7}"
834 <           fork="true">
835 <
836 <      <include name="extra166y/**/*.java"/>
521 >      <include name="*.java"/>
522        <compilerarg value="-XDignore.symbol.file=true"/>
523 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
523 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
524 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
525        <compilerarg line="${build.args}"/>
840
526      </javac>
527    </target>
528  
529  
530 <  <target name="extra166yjar"
531 <          depends="extra166ycompile"
532 <          description="Builds library jar from compiled sources">
533 <
534 <    <jar destfile="${extra166y.jar}" index="true">
535 <      <fileset dir="${build.extra166y.classes.dir}"/>
536 <    </jar>
852 <
853 <  </target>
854 <
855 <
856 <  <target name="extra166ydocs"
857 <          description="Builds javadocs to build dir">
858 <
859 <    <delete dir="${extra166ydocs.dir}"/>
860 <    <mkdir dir="${extra166ydocs.dir}"/>
861 <
862 <    <javadoc destdir="${extra166ydocs.dir}"
863 <             packagenames="extra166y.*"
864 <             link="${jdkapidocs.url}"
865 <             access="${build.javadoc.access}"
866 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
867 <             bootclasspath="${bootclasspath6}"
868 <             source="6"
869 <             executable="${javadoc7}">
870 <      <arg value="-XDignore.symbol.file=true"/>
871 <
872 <    </javadoc>
873 <  </target>
874 <
875 <
876 <  <target name="extra166ydist"
877 <          depends="extra166ydist-jar, extra166ydist-docs"
878 <          description="Puts all distributable products in single hierarchy"/>
879 <
880 <
881 <  <target name="extra166yclean"
882 <          description="Removes all extra166y build products">
883 <
884 <    <delete dir="${build.extra166y.dir}"/>
885 <
886 <  </target>
887 <
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 <  <target name="extra166ydist-clean"
890 <          description="Removes all build and distribution products">
891 <
892 <  </target>
538 > <!-- Find buglets that can be detected by static build tools -->
539  
540 <  <target name="extra166ydist-jar"
541 <          depends="extra166yclean, extra166yjar">
542 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
543 <  </target>
540 > <!--   <target name="lint"> -->
541 > <!--     <antcall target="dists"> -->
542 > <!--       <param name="build.javadoc.access" value="protected"/> -->
543 > <!--     </antcall> -->
544 > <!--   </target> -->
545  
546 <  <target name="extra166ydist-docs"
547 <          depends="extra166yclean, extra166ydocs">
548 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
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  
904  <!-- jsr166e -->
905
906  <property name="build.jsr166e.java.version" value="6"/>
907  <property name="build.jsr166e.javac" value="${javac6}"/>
908
909  <target name="jsr166ecompile"
910          depends="configure-compiler"
911          description="Compiles jsr166e sources">
553  
554 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
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="${topsrc.dir}"
603 <           destdir="${build.jsr166e.classes.dir}"
602 >    <javac srcdir="${src.dir}"
603 >           destdir="${destdir}"
604             debug="${build.debug}"
605             debuglevel="${build.debuglevel}"
606             deprecation="${build.deprecation}"
920           source="${build.jsr166e.java.version}"
607             classpath=""
608             includeAntRuntime="false"
609             includeJavaRuntime="false"
610 <           executable="${build.jsr166e.javac}"
610 >           encoding="ASCII"
611 >           executable="${build.main.javac}"
612             fork="true">
613  
614 <      <include name="jsr166e/**/*.java"/>
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}"/>
931
630      </javac>
933  </target>
934
935
936  <target name="jsr166ejar"
937          depends="jsr166ecompile"
938          description="Builds library jar from compiled sources">
631  
632 <    <jar destfile="${jsr166e.jar}" index="true">
633 <      <fileset dir="${build.jsr166e.classes.dir}"/>
632 >    <jar destfile="${product.jar}">
633 >      <fileset dir="${destdir}"/>
634      </jar>
635  
944  </target>
945
946
947  <target name="jsr166edocs"
948          description="Builds javadocs to build dir">
949
950    <delete dir="${jsr166edocs.dir}"/>
951    <mkdir dir="${jsr166edocs.dir}"/>
952
953    <javadoc destdir="${jsr166edocs.dir}"
954             packagenames="jsr166e.*"
955             link="${jdkapidocs.url}"
956             access="${build.javadoc.access}"
957             sourcepath="${topsrc.dir}:${jdk6src.dir}"
958             source="${build.jsr166e.java.version}"
959             executable="${javadoc7}">
960      <arg value="-XDignore.symbol.file=true"/>
961
962    </javadoc>
963  </target>
964
965
966  <target name="jsr166e-test-tck-one-java-version"
967          depends="jsr166ejar"
968          description="Runs tck tests for jsr166e">
969
970    <echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
971
636      <run-tck-tests
637 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
638 <      target="${build.jsr166e.java.version}"
639 <      workdir="${build.jsr166e.dir}"
640 <      classes="${jsr166e.jar}"/>
641 <  </target>
642 <
643 <  <target name="jsr166e-test-tck"
644 <          description="Runs tck tests for jsr166e for multiple java versions">
645 <
646 < <!--     <antcall target="clean"/> -->
647 < <!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
648 < <!--       <param name="build.jsr166e.java.version" value="8"/> -->
649 < <!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
650 < <!--     </antcall> -->
651 <
988 <    <antcall target="clean"/>
989 <    <antcall target="jsr166e-test-tck-one-java-version">
990 <      <param name="build.jsr166e.java.version" value="7"/>
991 <      <param name="build.jsr166e.javac" value="${javac7}"/>
992 <    </antcall>
993 <
994 <    <antcall target="clean"/>
995 <    <antcall target="jsr166e-test-tck-one-java-version">
996 <      <param name="build.jsr166e.java.version" value="6"/>
997 <      <param name="build.jsr166e.javac" value="${javac6}"/>
998 <    </antcall>
999 <  </target>
1000 <
1001 <
1002 <  <target name="jsr166edist"
1003 <          depends="jsr166edist-jar, jsr166edist-docs"
1004 <          description="Puts all distributable products in single hierarchy"/>
1005 <
1006 <
1007 <  <target name="jsr166eclean"
1008 <          description="Removes all jsr166e build products">
1009 <    <delete dir="${build.jsr166e.dir}"/>
1010 <  </target>
1011 <
1012 <
1013 <  <target name="jsr166edist-clean"
1014 <          description="Removes all build and distribution products">
1015 <
1016 <  </target>
1017 <
1018 <  <target name="jsr166edist-jar"
1019 <          depends="jsr166eclean, jsr166ejar">
1020 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1021 <  </target>
1022 <
1023 <  <target name="jsr166edist-docs"
1024 <          depends="jsr166eclean, jsr166edocs">
1025 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
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 < <!-- Find buglets that can be detected by static build tools -->
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 <  <target name="lint">
740 <    <antcall target="dists">
741 <      <param name="build.javadoc.access" value="private"/>
1034 <    </antcall>
739 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
740 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
741 >    </junit>
742    </target>
743  
1037
744   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines