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.143 by dl, Wed Jul 10 17:09:45 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.
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 >  <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"/>
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"/>
111  
112    <!-- Javadoc locations -->
113    <property name="docs.dir"          location="${build.dir}/docs"/>
114 <  <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"/>
114 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
115  
116    <!-- Jar locations -->
117    <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"/>
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}"/>
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 197 | Line 173 | As of 2013-02, the very latest lambda 8
173             source="@{compile-target}"
174             target="@{compile-target}"
175             classpath="${junit.jar}"
200           bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
176             includeAntRuntime="false"
177             includeJavaRuntime="false"
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  
# Line 215 | Line 193 | As of 2013-02, the very latest lambda 8
193            failonerror="true"
194            jvm="${java@{target}}"
195            fork="true">
196 <        <jvmarg value="-Xbootclasspath/p:@{classes}"/>
197 <        <jvmarg line="@{jvmflags}"/>
198 <        <sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
199 <        <sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
200 <        <sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
201 <        <classpath>
202 <          <pathelement location="${junit.jar}"/>
203 <          <pathelement location="@{workdir}/tck-classes"/>
204 <        </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">
233    <attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
234    <attribute name="source" default="7"/>
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>
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">
255  
256 <      <arg value="-Xbootclasspath/p:@{classes}"/>
257 <      <arg value="-agentvm"/>
258 <      <arg value="-v:nopass,fail"/>
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>
# Line 263 | Line 291 | As of 2013-02, the very latest lambda 8
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}"/>
297
343      </javac>
344    </target>
345  
301
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  
361    <target name="docs"
362            description="Builds javadocs for src/main to dist dir">
363 <
315 <    <delete dir="${docs.dir}"/>
363 >    <delete dir="${docs.dir}" quiet="true"/>
364      <mkdir dir="${docs.dir}"/>
317
318    <!-- the packagenames="none" hack below prevents scanning the -->
319    <!-- sourcepath for packages -->
320
365      <javadoc destdir="${docs.dir}"
366               packagenames="none"
367 <             link="${jdkapi8docs.url}"
367 >             link="${java.api.url}"
368               overview="${src.dir}/intro.html"
369               access="${build.javadoc.access}"
370 <             sourcepath="${src.dir}:${jdk8src.dir}"
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}"/>
384 <      <arg value="-tag"/>
385 <      <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
386 <      <arg value="-tag"/>
387 <      <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
388 <      <arg value="-tag"/>
389 <      <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
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  
344
394    <target name="dist"
395            depends="dist-clean, dist-jar, dist-docs"
396            description="Puts all distributable products in single hierarchy"/>
397  
349
350  <target name="release"
351          depends="dist"
352          description="Puts entire CVS tree, plus distribution productions, in a jar">
353
354    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
355
356    <jar basedir="${basedir}" destfile="${release.jar}">
357      <!-- <exclude name="build/**"/> -->
358      <exclude name="${release.jar}"/>
359      <exclude name="user.properties"/>
360      <exclude name="etc/notes/**"/>
361      <exclude name="src/emulation/**"/>
362      <exclude name="**/SyntaxTest.java"/>
363      <exclude name="**/SuperfluousAbstract.java"/>
364    </jar>
365  </target>
366
367
398    <target name="clean"
399            description="Removes all build products">
370
400      <delete dir="${build.dir}"/>
372
401    </target>
402  
375
403    <target name="dist-clean"
404            description="Removes all build and distribution products">
405 <
405 >    <delete dir="${build.dir}"/>
406      <delete dir="${dist.dir}"/>
380
407    </target>
408  
383
409    <target name="dist-jar"
410            depends="clean, jar">
411      <copy file="${product.jar}" todir="${dist.dir}"/>
# Line 391 | Line 416 | As of 2013-02, the very latest lambda 8
416      <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
417    </target>
418  
419 <
420 <  <target name="test-tck"
421 <          depends="jar"
397 <          description="Runs tck tests for main directly">
398 <
419 >  <target name="tck"
420 >          depends="jar"
421 >          description="Runs tck tests for src/main directly">
422      <run-tck-tests
423 <      target="8"
423 >      target="${java.runtime.target}"
424        workdir="${build.dir}"
425 <      classes="${product.jar}"/>
425 >      classes="${product.jar}">
426 >      <javac-elements>
427 >        <!-- <compilerarg value="-Werror"/> -->
428 >      </javac-elements>
429 >    </run-tck-tests>
430    </target>
431  
432 <  <target name="test-jtreg"
433 <          depends="jar"
434 <          description="Runs jtreg tests for main using the jtreg ant task">
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="8"
457 >       target="${java.runtime.target}"
458         workdir="${build.dir}"
459         classes="${product.jar}"/>
460    </target>
461  
462    <target name="test"
463 <          depends="test-tck, test-jtreg"
464 <          description="Runs tck and jtreg tests for main">
417 <  </target>
463 >          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
464 >          description="Runs tck and jtreg tests for src/main"/>
465  
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 435 | Line 512 | As of 2013-02, the very latest lambda 8
512    </target>
513  
514  
515 +  <target name="compile-test-loops" depends="jar"
516 +          description="Compiles all the perf tests in src/test/loops">
517  
518 <  <!-- Various demos and test programs -->
440 <
441 <
442 <  <target name="loops" depends="configure-compiler"
443 <          description="Benchmark from Doug Lea's AQS paper">
444 <
445 <    <mkdir dir="${build.loops.dir}"/>
446 <
447 <    <javac srcdir="${loops.src.dir}"
448 <          destdir="${build.loops.dir}"
449 <            debug="${build.debug}"
450 <       debuglevel="${build.debuglevel}"
451 <      deprecation="${build.deprecation}"
452 <           source="${build.sourcelevel}"
453 <             fork="true">
454 <
455 <      <compilerarg line="${build.args}"/>
456 <      <classpath refid="loops.classpath"/>
457 <      <compilerarg value="-XDignore.symbol.file=true"/>
458 <
459 <    </javac>
460 <
461 <    <java classname="ALoops" fork="true">
462 <      <classpath refid="loops.classpath"/>
463 <    </java>
464 <
465 <  </target>
466 <
467 <
468 <  <!-- jsr166 4jdk7 -->
469 <
470 <  <target name="4jdk7compile"
471 <          depends="configure-compiler"
472 <          description="Compiles src/jdk7 sources, targeting jdk7">
473 <
474 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
475 <
476 <    <javac srcdir="${4jdk7src.dir}"
477 <           destdir="${build.4jdk7.classes.dir}"
478 <           debug="${build.debug}"
479 <           debuglevel="${build.debuglevel}"
480 <           deprecation="${build.deprecation}"
481 <           source="6"
482 <           classpath=""
483 <           bootclasspath="${bootclasspath6}"
484 <           includeAntRuntime="false"
485 <           includeJavaRuntime="false"
486 <           executable="${javac7}"
487 <           fork="true">
488 <
489 <      <include name="**/*.java"/>
490 <      <compilerarg value="-Xprefer:source"/>
491 <      <compilerarg value="-XDignore.symbol.file=true"/>
492 <      <compilerarg value="-Xlint:all"/>
493 <      <compilerarg line="${build.args}"/>
494 <
495 <    </javac>
496 <  </target>
497 <
498 <
499 <  <target name="4jdk7jar"
500 <          depends="4jdk7compile"
501 <          description="Builds library jar from compiled sources">
502 <
503 <    <jar destfile="${4jdk7product.jar}">
504 <      <fileset dir="${build.4jdk7.classes.dir}"/>
505 <    </jar>
506 <
507 <  </target>
508 <
509 <
510 <  <target name="4jdk7-test-tck"
511 <          depends="4jdk7jar"
512 <          description="Runs tck tests for jsr166-4jdk7 directly">
513 <
514 <    <run-tck-tests
515 <      target="7"
516 <      workdir="${build.4jdk7.dir}"
517 <      classes="${4jdk7product.jar}">
518 <      <javac-elements>
519 <        <!-- JDK8+ test classes -->
520 <        <exclude name="*8Test.java"/>
521 <        <exclude name="DoubleAccumulatorTest.java"/>
522 <        <exclude name="DoubleAdderTest.java"/>
523 <        <exclude name="LongAccumulatorTest.java"/>
524 <        <exclude name="LongAdderTest.java"/>
525 <        <exclude name="CompletableFutureTest.java"/>
526 <        <exclude name="StampedLockTest.java"/>
527 <      </javac-elements>
528 <    </run-tck-tests>
529 <  </target>
530 <
531 <
532 <  <target name="4jdk7-test-tck-junit"
533 <          depends="4jdk7compile"
534 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
535 <
536 <    <junit printsummary="true"
537 <           showoutput="true"
538 <           errorProperty="junit.failed"
539 <           failureProperty="junit.failed"
540 <           includeantruntime="true"
541 <           jvm="${java7}"
542 <           fork="true">
543 <
544 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
545 <      <jvmarg value="-server"/>
546 <
547 <      <classpath>
548 <        <pathelement location="${junit.jar}"/>
549 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
550 <      </classpath>
551 <
552 <      <formatter type="brief"/>
553 <
554 <      <test name="${jsr166.tckTestClass}" haltonfailure="no">
555 <      </test>
556 <
557 <    </junit>
558 <  </target>
559 <
560 <  <target name="4jdk7-test-jtreg"
561 <          depends="4jdk7jar"
562 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
563 <    <run-jtreg-tests
564 <       target="7"
565 <       workdir="${build.4jdk7.dir}"
566 <       classes="${4jdk7product.jar}"
567 <       jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
568 <  </target>
569 <
570 <
571 <  <target name="4jdk7-test"
572 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
573 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
574 <  </target>
575 <
576 <
577 <  <target name="4jdk7docs"
578 <          description="Builds javadocs for src/jdk7 to dist dir">
579 <
580 <    <delete dir="${4jdk7docs.dir}"/>
581 <    <mkdir dir="${4jdk7docs.dir}"/>
582 <
583 <    <javadoc destdir="${4jdk7docs.dir}"
584 <             packagenames="none"
585 <             link="${jdkapi7docs.url}"
586 <             overview="${4jdk7src.dir}/intro.html"
587 <             access="${build.javadoc.access}"
588 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
589 <             classpath=""
590 <             executable="${javadoc7}">
591 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
592 <        <include name="**/*.java"/>
593 <      </fileset>
594 <      <arg value="-XDignore.symbol.file=true"/>
595 <    </javadoc>
596 <  </target>
597 <
598 <
599 <  <target name="4jdk7dist"
600 <          depends="4jdk7dist-jar, 4jdk7dist-docs"
601 <          description="Puts all distributable products in single hierarchy"/>
602 <
603 <
604 <  <target name="4jdk7clean"
605 <          description="Removes all 4jdk7 build products">
606 <
607 <    <delete dir="${build.4jdk7.dir}"/>
608 <
609 <  </target>
610 <
611 <
612 <  <target name="4jdk7dist-clean"
613 <          description="Removes all build and distribution products">
614 <
615 <  </target>
616 <
617 <  <target name="4jdk7dist-jar"
618 <          depends="4jdk7clean, 4jdk7jar">
619 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
620 <  </target>
621 <
622 <
623 <  <target name="4jdk7dist-docs"
624 <          depends="4jdk7clean, 4jdk7docs">
625 <    <mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
626 <  </target>
627 <
628 <
629 <  <!-- jsr166x -->
630 <
631 <  <target name="jsr166xcompile"
632 <          depends="configure-compiler"
633 <          description="Compiles jsr166x sources to build dir">
634 <
635 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
636 <
637 <    <javac srcdir="${topsrc.dir}"
638 <           destdir="${build.jsr166x.classes.dir}"
639 <           debug="${build.debug}"
640 <           debuglevel="${build.debuglevel}"
641 <           deprecation="${build.deprecation}"
642 <           classpath=""
643 <           bootclasspath="${bootclasspath6}"
644 <           source="5"
645 <           includeAntRuntime="false"
646 <           includeJavaRuntime="false"
647 <           executable="${javac7}"
648 <           fork="true">
649 <
650 <      <include name="jsr166x/**/*.java"/>
651 <      <compilerarg value="-XDignore.symbol.file=true"/>
652 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
653 <      <compilerarg line="${build.args}"/>
654 <
655 <    </javac>
656 <  </target>
657 <
658 <
659 <  <target name="jsr166xjar"
660 <          depends="jsr166xcompile"
661 <          description="Builds library jar from compiled sources">
662 <
663 <    <jar destfile="${jsr166x.jar}">
664 <      <fileset dir="${build.jsr166x.classes.dir}"/>
665 <    </jar>
666 <
667 <  </target>
668 <
669 <
670 <  <target name="jsr166xdocs"
671 <          description="Builds javadocs to dist dir">
672 <
673 <    <delete dir="${jsr166xdocs.dir}"/>
674 <    <mkdir dir="${jsr166xdocs.dir}"/>
675 <
676 <    <javadoc destdir="${jsr166xdocs.dir}"
677 <             packagenames="jsr166x.*"
678 <             link="${jdkapidocs.url}"
679 <             access="${build.javadoc.access}"
680 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
681 <             bootclasspath="${bootclasspath6}"
682 <             source="5"
683 <             executable="${javadoc7}">
684 <      <arg value="-XDignore.symbol.file=true"/>
685 <
686 <    </javadoc>
687 <  </target>
688 <
689 <
690 <  <target name="jsr166xdist"
691 <          depends="jsr166xdist-jar, jsr166xdist-docs"
692 <          description="Puts all distributable products in single hierarchy"/>
693 <
694 <
695 <  <target name="jsr166xclean"
696 <          description="Removes all jsr166x build products">
697 <
698 <    <delete dir="${build.jsr166x.dir}"/>
699 <
700 <  </target>
701 <
702 <
703 <  <target name="jsr166xdist-clean"
704 <          description="Removes all build and distribution products">
705 <
706 <  </target>
707 <
708 <
709 <  <target name="jsr166xdist-jar"
710 <          depends="jsr166xclean, jsr166xjar">
711 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
712 <  </target>
713 <
714 <  <target name="jsr166xdist-docs"
715 <          depends="jsr166xclean, jsr166xdocs">
716 <    <mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
717 <  </target>
718 <
719 <  <!-- jsr166y -->
720 <
721 <
722 <  <target name="jsr166ycompile"
723 <          depends="configure-compiler"
724 <          description="Compiles jsr166y sources">
725 <
726 <    <mkdir dir="${build.jsr166y.classes.dir}"/>
727 <
728 <    <javac srcdir="${topsrc.dir}"
729 <           destdir="${build.jsr166y.classes.dir}"
730 <           debug="${build.debug}"
731 <           debuglevel="${build.debuglevel}"
732 <           deprecation="${build.deprecation}"
733 <           source="6"
734 <           classpath=""
735 <           bootclasspath="${bootclasspath6}"
736 <           includeAntRuntime="false"
737 <           includeJavaRuntime="false"
738 <           executable="${javac7}"
739 <           fork="true">
740 <
741 <      <include name="jsr166y/**/*.java"/>
742 <      <compilerarg value="-XDignore.symbol.file=true"/>
743 <      <compilerarg value="-Xlint:all"/>
744 <      <compilerarg line="${build.args}"/>
745 <
746 <    </javac>
747 <  </target>
748 <
749 <
750 <  <target name="jsr166yjar"
751 <          depends="jsr166ycompile"
752 <          description="Builds library jar from compiled sources">
753 <
754 <    <jar destfile="${jsr166y.jar}" index="true">
755 <      <fileset dir="${build.jsr166y.classes.dir}"/>
756 <    </jar>
757 <
758 <  </target>
759 <
760 <
761 <  <target name="jsr166ydocs"
762 <          description="Builds javadocs to dist dir">
763 <
764 <    <delete dir="${jsr166ydocs.dir}"/>
765 <    <mkdir dir="${jsr166ydocs.dir}"/>
766 <
767 <    <javadoc destdir="${jsr166ydocs.dir}"
768 <             packagenames="jsr166y.*"
769 <             link="${jdkapidocs.url}"
770 <             access="${build.javadoc.access}"
771 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
772 <             bootclasspath="${bootclasspath6}"
773 <             source="6"
774 <             executable="${javadoc7}">
775 <      <arg value="-XDignore.symbol.file=true"/>
776 <
777 <    </javadoc>
778 <  </target>
779 <
780 <
781 <  <target name="jsr166ydist"
782 <          depends="jsr166ydist-jar, jsr166ydist-docs"
783 <          description="Puts all distributable products in single hierarchy"/>
784 <
785 <
786 <  <target name="jsr166yclean"
787 <          description="Removes all jsr166y build products">
788 <
789 <    <delete dir="${build.jsr166y.dir}"/>
790 <
791 <  </target>
792 <
793 <
794 <  <target name="jsr166ydist-clean"
795 <          description="Removes all build and distribution products">
796 <
797 <  </target>
798 <
799 <  <target name="jsr166ydist-jar"
800 <          depends="jsr166yclean, jsr166yjar">
801 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
802 <  </target>
803 <
804 <  <target name="jsr166ydist-docs"
805 <          depends="jsr166yclean, jsr166ydocs">
806 <    <mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
807 <  </target>
808 <
809 <
810 <  <!-- extra166y -->
811 <
812 <
813 <  <target name="extra166ycompile"
814 <          depends="configure-compiler, jsr166yjar"
815 <          description="Compiles extra166y sources">
518 >    <mkdir dir="${build.dir}/test/loops"/>
519  
520 <    <mkdir dir="${build.extra166y.classes.dir}"/>
521 <
819 <    <javac srcdir="${topsrc.dir}"
820 <           destdir="${build.extra166y.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}"
824           bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
825           classpath=""
826           source="6"
525             includeAntRuntime="false"
526             includeJavaRuntime="false"
527 <           executable="${javac7}"
527 >           encoding="ASCII"
528 >           executable="${build.main.javac}"
529             fork="true">
530  
531 <      <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}"/>
836
536      </javac>
537    </target>
538  
539  
540 <  <target name="extra166yjar"
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>
848 <
849 <  </target>
850 <
851 <
852 <  <target name="extra166ydocs"
853 <          description="Builds javadocs to build dir">
854 <
855 <    <delete dir="${extra166ydocs.dir}"/>
856 <    <mkdir dir="${extra166ydocs.dir}"/>
857 <
858 <    <javadoc destdir="${extra166ydocs.dir}"
859 <             packagenames="extra166y.*"
860 <             link="${jdkapidocs.url}"
861 <             access="${build.javadoc.access}"
862 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
863 <             bootclasspath="${bootclasspath6}"
864 <             source="6"
865 <             executable="${javadoc7}">
866 <      <arg value="-XDignore.symbol.file=true"/>
867 <
868 <    </javadoc>
869 <  </target>
870 <
871 <
872 <  <target name="extra166ydist"
873 <          depends="extra166ydist-jar, extra166ydist-docs"
874 <          description="Puts all distributable products in single hierarchy"/>
875 <
876 <
877 <  <target name="extra166yclean"
878 <          description="Removes all extra166y build products">
879 <
880 <    <delete dir="${build.extra166y.dir}"/>
881 <
882 <  </target>
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 + <!-- Find buglets that can be detected by static build tools -->
549  
550 <  <target name="extra166ydist-clean"
551 <          description="Removes all build and distribution products">
552 <
553 <  </target>
554 <
555 <  <target name="extra166ydist-jar"
556 <          depends="extra166yclean, extra166yjar">
557 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
558 <  </target>
559 <
560 <  <target name="extra166ydist-docs"
896 <          depends="extra166yclean, extra166ydocs">
897 <    <mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.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  
900  <!-- jsr166e -->
563  
564 <  <target name="jsr166ecompile"
565 <          depends="configure-compiler"
566 <          description="Compiles jsr166e sources">
567 <
568 <    <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}"
913           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}"/>
924
640      </javac>
926  </target>
641  
642 <
643 <  <target name="jsr166ejar"
930 <          depends="jsr166ecompile"
931 <          description="Builds library jar from compiled sources">
932 <
933 <    <jar destfile="${jsr166e.jar}" index="true">
934 <      <fileset dir="${build.jsr166e.classes.dir}"/>
642 >    <jar destfile="${product.jar}">
643 >      <fileset dir="${destdir}"/>
644      </jar>
645  
937  </target>
938
939
940  <target name="jsr166edocs"
941          description="Builds javadocs to build dir">
942
943    <delete dir="${jsr166edocs.dir}"/>
944    <mkdir dir="${jsr166edocs.dir}"/>
945
946    <javadoc destdir="${jsr166edocs.dir}"
947             packagenames="jsr166e.*"
948             link="${jdkapidocs.url}"
949             access="${build.javadoc.access}"
950             sourcepath="${topsrc.dir}:${jdk7src.dir}"
951             source="7"
952             executable="${javadoc7}">
953      <arg value="-XDignore.symbol.file=true"/>
954
955    </javadoc>
956  </target>
957
958
959  <target name="jsr166e-test-tck"
960          depends="jsr166ejar"
961          description="Runs tck tests for jsr166e">
962
646      <run-tck-tests
647 <      tck.src.dir="${test.src.dir}/tck-jsr166e"
648 <      target="7"
649 <      workdir="${build.jsr166e.dir}"
650 <      classes="${jsr166e.jar}"/>
651 <  </target>
652 <
653 <
654 <  <target name="jsr166edist"
655 <          depends="jsr166edist-jar, jsr166edist-docs"
656 <          description="Puts all distributable products in single hierarchy"/>
657 <
658 <
659 <  <target name="jsr166eclean"
660 <          description="Removes all jsr166e build products">
661 <    <delete dir="${build.jsr166e.dir}"/>
979 <  </target>
980 <
981 <
982 <  <target name="jsr166edist-clean"
983 <          description="Removes all build and distribution products">
984 <
985 <  </target>
986 <
987 <  <target name="jsr166edist-jar"
988 <          depends="jsr166eclean, jsr166ejar">
989 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
990 <  </target>
991 <
992 <  <target name="jsr166edist-docs"
993 <          depends="jsr166eclean, jsr166edocs">
994 <    <mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.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 < <!-- Find buglets that can be detected by static build tools -->
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 <  <target name="lint">
750 <    <antcall target="dists">
751 <      <param name="build.javadoc.access" value="private"/>
1003 <    </antcall>
749 >      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
750 >      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
751 >    </junit>
752    </target>
753  
1006
754   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines