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.117 by jsr166, Sun Jan 20 07:43:30 2013 UTC vs.
Revision 1.325 by dl, Tue Mar 22 21:28:02 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.
25 >  $HOME/jdk/src/jdk17
26 >  where each of the above is a JDK source tree or a symlink to same.
27 >
28 >  Alternatively, define ant variables thus:
29 >  ant -Djdk$N.home=... -Djdk$N.src.home=...
30 >  for $N in 17 .. 19 ...
31 >
32 >  As of 2016-03, the sources in src/main are for jdk9+ only.
33 >  As of 2019-08, the sources in src/main are for jdk11+ only.
34 >  As of 2019-10, compatibility support for jdk8 is dropped entirely.
35 >  As of 2022-02, the sources in src/main are for jdk17+ only.
36   ------------------------------------------------------------------------------
37    </description>
38  
39 <  <target name="usage" description="Advises user to run with -projecthelp">
40 <    <echo>Run "ant -projecthelp" for full usage information.</echo>
39 >  <!-- Run 'ant -projecthelp' (default target) -->
40 >  <target name="usage">
41 >    <java classname="org.apache.tools.ant.Main">
42 >      <arg value="-projecthelp" />
43 >    </java>
44    </target>
45  
46 +  <!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
47  
48    <!-- User-specific settings -->
49    <property file="user.properties"/>
50  
51  
52    <!-- Compilation options -->
38  <property name="build.sourcelevel"    value="6"/>
53    <property name="build.debug"          value="true"/>
54    <property name="build.debuglevel"     value="source,lines,vars"/>
55    <property name="build.deprecation"    value="false"/>
56 +  <property name="build.javadoc.access" value="protected"/>
57  
58    <!-- Build locations -->
59    <property name="build.dir"                   location="build"/>
60    <property name="build.classes.dir"           location="${build.dir}/classes"/>
61    <property name="build.testcases.dir"         location="${build.dir}/testcases"/>
62    <property name="build.loops.dir"             location="${build.dir}/loops"/>
48  <property name="build.reports.dir"           location="${build.dir}/reports"/>
49
50  <property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51  <property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52  <property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53  <property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54
55  <property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
56  <property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
57  <property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58  <property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59
60  <property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61  <property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62  <property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63  <property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
63  
64 <  <!-- JDK binary locations -->
64 >  <!-- JDK locations -->
65    <property name="jdks.home"  location="${user.home}/jdk"/>
66  
67    <macrodef name="defjdklocations">
68      <attribute name="v"/>
69      <sequential>
70 <    <property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
71 <    <property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
72 <    <property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
73 <    <property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
74 <    <property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
75 <    <property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
76 <    <property name="bootclasspath@{v}"
77 <     value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
70 >    <property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
71 >    <property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
72 >    <property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
73 >    <property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
74 >    <property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
75 >    <property name="jdk@{v}.src.dir"  location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"/>
76 >    </sequential>
77 >  </macrodef>
78 >
79 >  <macrodef name="mirror-dir">
80 >    <attribute name="src"/>
81 >    <attribute name="dst"/>
82 >    <sequential>
83 >    <delete dir="@{dst}"/>
84 >    <mkdir dir="@{dst}"/>
85 >    <copy todir="@{dst}" preservelastmodified="true">
86 >      <fileset dir="@{src}"/>
87 >    </copy>
88      </sequential>
89    </macrodef>
90  
91 <  <defjdklocations v="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="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
101 >  <property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
102 >  <property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
103 >  <property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
104 >  <property name="lib.dir"              location="${basedir}/lib"/>
105 >  <property name="dist.dir"             location="${basedir}/dist"/>
106 >  <property name="topsrc.dir"           location="${basedir}/src"/>
107 >
108 >  <!-- Javadoc locations -->
109 >  <property name="docs.dir"          location="${build.dir}/docs"/>
110 >  <property name="dist.docs.dir"     location="${dist.dir}/docs"/>
111 >
112 >  <!-- Jar locations -->
113 >  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
114 >  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
115 >
116 >  <!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
117 >  <!-- Switched to https: in 2017-10 - JDK-8190312 -->
118 >  <property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
119 >  <property name="java18.docroot.url" value="https://download.java.net/java/early_access/jdk18/docs"/>
120 >  <property name="java19.docroot.url" value="https://download.java.net/java/early_access/jdk19/docs"/>
121 >  <!-- Default jdk doc location (latest stable LTS release seems best) -->
122 >  <property name="java.docroot.url"   value="${java17.docroot.url}"/>
123 >
124 >  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
125 >  <property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
126 >  <property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
127 >  <property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
128 >  <property name="java.api.url"       value="${java.docroot.url}/api/"/>
129 >
130 >  <!-- Define the "jtreg" task -->
131 >  <!-- See the docs in "jtreg -onlineHelp" -->
132 >  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
133 >           classpath="${lib.dir}/jtreg.jar" />
134  
135 +  <!-- Tck configuration options; see JSR166TestCase.java
136 +   To profile a single tck test class:
137 +   ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
138 +   To stress test a single tck test class:
139 +   ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
140 +   To stress test a single tck test method:
141 +   ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
142 +  -->
143 +  <property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
144    <macrodef name="run-tck-tests">
145 +    <attribute name="tck.src.dir" default="${tck.src.dir}"/>
146      <attribute name="target"/>
147 +    <attribute name="compile-target" default="@{target}"/>
148      <attribute name="workdir"/>
149 <    <attribute name="product.jar" default="${product.jar}"/>
150 <    <attribute name="jvmflags" default=""/>
149 >    <attribute name="classes"/>
150 >    <!--
151 >        <attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
152 >    -->
153 >        <attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
154 >    <element name="javac-elements" optional="true"/>
155 >
156      <sequential>
157  
158      <mkdir dir="@{workdir}/tck-classes"/>
159  
160 <    <javac srcdir="${tck.src.dir}"
160 >    <javac srcdir="@{tck.src.dir}"
161             destdir="@{workdir}/tck-classes"
162             debug="${build.debug}"
163             debuglevel="${build.debuglevel}"
164             deprecation="${build.deprecation}"
165 <           source="6"
165 >           source="@{compile-target}"
166 >           target="@{compile-target}"
167             classpath="${junit.jar}"
102           bootclasspath="@{product.jar}:${bootclasspath6}"
168             includeAntRuntime="false"
169             includeJavaRuntime="false"
170 <           executable="${javac@{target}}"
170 >           encoding="ASCII"
171 >           executable="${javac@{compile-target}}"
172             fork="true">
173  
174 <      <include name="**/*.java"/>
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 +
182      </javac>
183  
184 <    <java classname="JSR166TestCase"
184 >    <java classname="${jsr166.tckTestClass}"
185            failonerror="true"
186            jvm="${java@{target}}"
187            fork="true">
188 <        <jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
189 <        <jvmarg line="@{jvmflags}"/>
190 <        <classpath>
191 <          <pathelement location="${junit.jar}"/>
192 <          <pathelement location="@{workdir}/tck-classes"/>
193 <        </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 <  <!-- Source locations -->
215 <  <property name="src.dir"              location="${basedir}/src/main"/>
216 <  <property name="test.src.dir"         location="${basedir}/src/test"/>
217 <  <property name="loops.src.dir"        location="${basedir}/src/loops"/>
218 <  <property name="tck.src.dir"          location="${test.src.dir}/tck"/>
219 <  <property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
220 <  <property name="lib.dir"              location="${basedir}/lib"/>
221 <  <property name="dist.dir"             location="${basedir}/dist"/>
222 <  <property name="topsrc.dir"           location="${basedir}/src"/>
223 <  <property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
224 <  <property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
225 <  <property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
226 <  <property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
227 <  <property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
143 <
144 <  <!-- Distribution locations -->
145 <  <property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
146 <  <property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
147 <  <property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
148 <  <property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
149 <  <property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
150 <  <property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
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 <  <!-- Jar locations -->
230 <  <property name="product.jar"      location="${build.dir}/jsr166.jar"/>
231 <  <property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
155 <  <property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
156 <  <property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
157 <  <property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
158 <  <property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
159 <  <property name="junit.jar"        location="${lib.dir}/junit.jar"/>
229 >  <defjtregtests v="19"/>
230 >  <defjtregtests v="17"/>
231 >  <defjtregtests v="17"/>
232  
233 <  <!-- Bootclasspath argument -->
234 <  <property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
233 >  <!-- ant -Djtreg.flags=-timeoutFactor:4 -->
234 >  <property name="jtreg.flags" value=""/>
235  
236 <  <!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
237 <  <property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
238 <  <property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
239 <  <property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
240 <
241 <  <property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
242 <  <!-- The below does not yet exist as of 2012-11 -->
171 <  <!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
236 >  <macrodef name="run-jtreg-tests">
237 >    <attribute name="target"/>
238 >    <attribute name="workdir"/>
239 >    <attribute name="classes"/>
240 >    <attribute name="verbose" default="${jtreg.verbose}"/>
241 >    <attribute name="jtregflags" default=""/>
242 >    <element name="jtreg-elements" optional="true"/>
243  
244 <  <!-- Default jdk api doc location (latest stable release seems best) -->
174 <  <property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
244 >    <sequential>
245  
246 <  <!-- Define the "jtreg" task -->
247 <  <!-- See the docs in "jtreg -onlineHelp" -->
178 <  <taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
179 <           classpath="${lib.dir}/jtreg.jar" />
246 >    <!-- ant -Djtreg.verbose=time,fail,error jtreg -->
247 >    <property name="jtreg.verbose" value="nopass,fail,error"/>
248  
249 <  <!-- Test classpath -->
250 <  <path id="test.classpath">
251 <    <pathelement location="${build.testcases.dir}"/>
252 <    <pathelement location="${junit.jar}"/>
253 <  </path>
249 >    <!-- concurrency > 1 mitigates slowness of some jtreg tests -->
250 >    <!-- BUT concurrency:auto starts "too many" VMs; just 1 free core each -->
251 >    <!-- In 2020 concurrency:3 seems like a sweet spot -->
252 >    <!-- Override using:  ant -Djtreg.concurrency="N" jtreg -->
253 >    <property name="jtreg.concurrency" value="3"/>
254 >
255 >    <delete dir="@{workdir}/JTwork" quiet="true"/>
256 >    <jtreg dir="${jtreg@{target}.src.dir}"
257 >           jdk="${jdk@{target}.home}"
258 >           workDir="@{workdir}/JTwork">
259 >      <patternset refid="jdk@{target}.jtreg.tests"/>
260 >      <arg value="-javacoption:--patch-module=java.base=@{classes}"/>
261 >      <arg value="-vmoption:--patch-module=java.base=@{classes}"/>
262 >      <arg value="-vmoption:-Xmx256m"/>
263 >      <arg value="-concurrency:${jtreg.concurrency}"/>
264 >      <arg value="-vmoptions:-esa -ea"/>
265 >      <arg value="-vmoptions:${vmoptions}" if:set="vmoptions"/>
266 >      <arg value="-agentvm"/>
267 >      <arg value="-noreport"/>
268 >      <arg value="-verbose:@{verbose}"/>
269 >      <arg value="-automatic"/>
270 >      <arg value="-k:!ignore"/>
271 >      <arg line="@{jtregflags}"/>
272 >      <arg line="${jtreg.flags}"/>
273 >      <jtreg-elements/>
274 >    </jtreg>
275 >    </sequential>
276 >  </macrodef>
277  
278    <!-- ALoops classpath -->
279    <path id="loops.classpath">
# Line 190 | Line 281
281    </path>
282  
283    <!-- Support @jls tag, used in jdk8+ javadoc -->
284 <  <!-- TODO: How do we get &trade to work? -->
285 <  <!-- TODO: Why isn't @jls a "standard" tag? -->
195 <  <!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
196 <  <property name="javadoc.jls.cite" value="The Java Language Specification"/>
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 line="${build.args}"/>
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 <
329 < <!--
330 <      <exclude name="java/lang/**"/>
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}"/>
230      <compilerarg line="-Xlint -Xmaxwarns 1000"/>
231 -->
232
333      </javac>
234
334    </target>
335  
237
238
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>
246
348    </target>
349  
350  
250
251  <target name="test"
252          depends="configure-tests, report-tests"
253          description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
254
255
256
351    <target name="docs"
352            description="Builds javadocs for src/main to dist dir">
353 <
354 <    <delete dir="${dist.javadocs.dir}"/>
355 <    <mkdir dir="${dist.javadocs.dir}"/>
262 <
263 <    <!-- the packagenames="none" hack below prevents scanning the -->
264 <    <!-- sourcepath for packages -->
265 <
266 <    <javadoc destdir="${dist.javadocs.dir}"
353 >    <delete dir="${docs.dir}" quiet="true"/>
354 >    <mkdir dir="${docs.dir}"/>
355 >    <javadoc destdir="${docs.dir}"
356               packagenames="none"
357 <             link="${jdkapi8docs.url}"
357 >             link="${java.api.url}"
358               overview="${src.dir}/intro.html"
359 <             sourcepath="${src.dir}:${jdk8src.dir}"
359 >             access="${build.javadoc.access}"
360 >             sourcepath="${src.dir}"
361               classpath=""
362 <             executable="${javadoc8}">
363 <      <arg value="-XDignore.symbol.file=true"/>
274 <      <arg value="-tag"/>
275 <      <arg value="${javadoc.jls.option}"/>
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="-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>
280
382    </target>
383  
283
284
384    <target name="dist"
385 <          depends="dist-clean, dist-jar, docs"
385 >          depends="dist-clean, dist-jar, dist-docs"
386            description="Puts all distributable products in single hierarchy"/>
387  
289
290  <target name="release"
291          depends="dist"
292          description="Puts entire CVS tree, plus distribution productions, in a jar">
293
294    <property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
295
296    <jar basedir="${basedir}" destfile="${release.jar}">
297      <!-- <exclude name="build/**"/> -->
298      <exclude name="${release.jar}"/>
299      <exclude name="user.properties"/>
300      <exclude name="etc/notes/**"/>
301      <exclude name="src/emulation/**"/>
302      <exclude name="**/SyntaxTest.java"/>
303      <exclude name="**/SuperfluousAbstract.java"/>
304    </jar>
305
306  </target>
307
308
309
388    <target name="clean"
389            description="Removes all build products">
312
390      <delete dir="${build.dir}"/>
314
391    </target>
392  
317
318
393    <target name="dist-clean"
394            description="Removes all build and distribution products">
395 <
395 >    <delete dir="${build.dir}"/>
396      <delete dir="${dist.dir}"/>
323
397    </target>
398  
326
327
328  <!-- Internal targets -->
329
330
399    <target name="dist-jar"
400            depends="clean, jar">
333
401      <copy file="${product.jar}" todir="${dist.dir}"/>
335
402    </target>
403  
404 <
405 <  <target name="compile-tests"
406 <          depends="jar">
341 <
342 <    <mkdir dir="${build.testcases.dir}"/>
343 <
344 <    <javac srcdir="${tck.src.dir}"
345 <           destdir="${build.testcases.dir}"
346 <           debug="${build.debug}"
347 <           debuglevel="${build.debuglevel}"
348 <           deprecation="${build.deprecation}"
349 <           source="6"
350 <           classpath="${junit.jar}"
351 <           bootclasspath="${product.jar}:${bootclasspath6}"
352 <           includeAntRuntime="false"
353 <           includeJavaRuntime="false"
354 <           executable="${javac8}"
355 <           fork="true">
356 <
357 <      <include name="**/*.java"/>
358 <      <compilerarg line="${build.args}"/>
359 <      <compilerarg value="-XDignore.symbol.file=true"/>
360 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
361 <
362 <    </javac>
363 <
364 <    <javac srcdir="${test.src.dir}"
365 <           destdir="${build.testcases.dir}"
366 <           debug="${build.debug}"
367 <           debuglevel="${build.debuglevel}"
368 <           deprecation="${build.deprecation}"
369 <           source="6"
370 <           classpath=""
371 <           bootclasspath="${product.jar}:${bootclasspath6}"
372 <           includeAntRuntime="false"
373 <           includeJavaRuntime="false"
374 <           executable="${javac8}"
375 <           fork="true">
376 <
377 <      <include name="jsr166/test/**/*.java"/>
378 <
379 <      <compilerarg line="${build.args}"/>
380 <      <compilerarg value="-XDignore.symbol.file=true"/>
381 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
382 <
383 <    </javac>
384 <
385 < <!--
386 <    <javac srcdir="${jtreg.src.dir}"
387 <          destdir="${build.testcases.dir}"
388 <            debug="${build.debug}"
389 <       debuglevel="${build.debuglevel}"
390 <      deprecation="${build.deprecation}"
391 <           source="${build.sourcelevel}"
392 <             fork="true">
393 <
394 <      <compilerarg value="${bootclasspath.args}"/>
395 <      <compilerarg line="${build.args}"/>
396 <      <compilerarg value="-XDignore.symbol.file=true"/>
397 <
398 <    </javac>
399 < -->
400 <
404 >  <target name="dist-docs"
405 >          depends="clean, docs">
406 >    <mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
407    </target>
408  
409 <
410 <  <target name="run-tests"
411 <          depends="compile-tests">
412 <
413 <    <!-- May be overridden by user.properties -->
414 <    <property name="testcase" value="*"/>
415 <
416 <    <mkdir dir="${build.reports.dir}"/>
417 <
418 <    <junit printsummary="true"
419 <             showoutput="true"
420 <          errorProperty="junit.failed"
421 <        failureProperty="junit.failed"
422 <                    dir="${build.reports.dir}"
423 <                    jvm="${java8}"
424 <                   fork="true">
425 <
426 <      <jvmarg value="-Xbootclasspath/p:${product.jar}"/>
427 <      <jvmarg value="-server"/>
428 <      <jvmarg value="-showversion"/>
429 <
430 <      <classpath refid="test.classpath"/>
431 <
432 <      <formatter type="xml"/>
433 <
434 <      <batchtest todir="${build.reports.dir}" unless="no.test.tck">
435 <        <fileset dir="${tck.src.dir}">
436 <          <include name="**/${testcase}Test.java"/>
437 <        </fileset>
438 <      </batchtest>
439 <
440 <      <batchtest todir="${build.reports.dir}" if="do.test.old">
441 <        <fileset dir="${test.src.dir}">
442 <          <include name="jsr166/test/**/${testcase}Test.java"/>
443 <        </fileset>
444 <      </batchtest>
445 <
446 < <!--
447 <      <batchtest todir="${build.reports.dir}" if="do.test.jtreg">
448 <        <fileset dir="${jtreg.src.dir}">
449 <          <include name="**/${testcase}Test.java"/>
444 <        </fileset>
445 <      </batchtest>
446 < -->
447 <
448 <    </junit>
449 <
409 >  <target name="tck"
410 >          depends="jar"
411 >          description="Runs tck tests for src/main directly">
412 >    <run-tck-tests
413 >      target="${java.runtime.target}"
414 >      workdir="${build.dir}"
415 >      classes="${product.jar}">
416 >      <javac-elements>
417 >        <!-- <compilerarg value="-Werror"/> -->
418 >      </javac-elements>
419 >    </run-tck-tests>
420 >  </target>
421 >
422 >  <target name="tck-parallelism-1"
423 >          description="Runs tck with common pool parallelism 1">
424 >    <antcall target="tck">
425 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
426 >    </antcall>
427 >  </target>
428 >
429 >  <target name="tck-parallelism-0"
430 >          description="Runs tck with common pool parallelism 0">
431 >    <antcall target="tck">
432 >      <param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
433 >    </antcall>
434 >  </target>
435 >
436 >  <target name="tck-security-manager"
437 >          description="Runs tck with a security manager">
438 >    <antcall target="tck">
439 >      <param name="jsr166.useSecurityManager" value="true"/>
440 >    </antcall>
441 >  </target>
442 >
443 >  <target name="jtreg"
444 >          depends="jar"
445 >          description="Runs jtreg tests for src/main using the jtreg ant task">
446 >    <run-jtreg-tests
447 >       target="${java.runtime.target}"
448 >       workdir="${build.dir}"
449 >       classes="${product.jar}"/>
450    </target>
451  
452 +  <target name="test"
453 +          depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
454 +          description="Runs tck and jtreg tests for src/main"/>
455  
456 <  <target name="report-tests"
457 <          depends="run-tests">
458 <
459 <    <!-- Sets junit.report.format to frames if redirection is present,
460 <         otherwise sets it to noframes. -->
461 <    <available property="junit.report.format"
462 <                  value="frames"
463 <              classname="org.apache.xalan.lib.Redirect"
464 <    />
465 <    <property name="junit.report.format" value="noframes"/>
466 <
467 <    <junitreport todir="${build.reports.dir}">
468 <      <fileset dir="${build.reports.dir}">
469 <        <include name="TEST-*.xml"/>
470 <      </fileset>
471 <      <report format="${junit.report.format}" todir="${build.reports.dir}"
472 <      />
473 <    </junitreport>
474 <
475 <    <fail message="Test Cases Failed" if="junit.failed"/>
476 <
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 491 | Line 502
502    </target>
503  
504  
505 <  <target name="configure-tests"
506 <       depends="configure-compiler">
496 <
497 <    <!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
498 <    <available property="junit.available"
499 <               classname="junit.framework.Protectable"/>
500 <
501 <    <!-- Xalan -->
502 <    <available property="xalan.available"
503 <               classname="org.apache.xalan.Version"/>
504 <
505 <
506 <    <!-- Ant 1.6beta and later don't need or want this check -->
507 <    <!--
508 <    <fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
509 <          unless="junit.available"/>
510 <
511 <    <fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
512 <          unless="xalan.available"/>
513 <    -->
514 <
515 <  </target>
516 <
517 <
518 <  <!-- Various demos and test programs -->
519 <
520 <
521 <  <target name="loops" depends="configure-compiler"
522 <          description="Benchmark from Doug Lea's AQS paper">
523 <
524 <    <mkdir dir="${build.loops.dir}"/>
505 >  <target name="compile-test-loops" depends="jar"
506 >          description="Compiles all the perf tests in src/test/loops">
507  
508 <    <javac srcdir="${loops.src.dir}"
527 <          destdir="${build.loops.dir}"
528 <            debug="${build.debug}"
529 <       debuglevel="${build.debuglevel}"
530 <      deprecation="${build.deprecation}"
531 <           source="${build.sourcelevel}"
532 <             fork="true">
533 <
534 <      <compilerarg line="${build.args}"/>
535 <      <classpath refid="loops.classpath"/>
536 <      <compilerarg value="-XDignore.symbol.file=true"/>
508 >    <mkdir dir="${build.dir}/test/loops"/>
509  
510 <    </javac>
511 <
540 <    <java classname="ALoops" fork="true">
541 <      <classpath refid="loops.classpath"/>
542 <    </java>
543 <
544 <  </target>
545 <
546 <
547 <  <!-- jsr166 4jdk7 -->
548 <
549 <
550 <  <target name="4jdk7compile"
551 <          depends="configure-compiler"
552 <          description="Compiles src/jdk7 sources, targeting jdk7">
553 <
554 <    <mkdir dir="${build.4jdk7.classes.dir}"/>
555 <
556 <    <javac srcdir="${4jdk7src.dir}"
557 <           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}"
561           source="6"
562           classpath=""
563           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"/>
570 <      <compilerarg line="${build.args}"/>
521 >      <include name="*.java"/>
522        <compilerarg value="-XDignore.symbol.file=true"/>
523 <      <compilerarg value="-Xlint:all"/>
524 <
574 <    </javac>
575 <
576 <  </target>
577 <
578 <  <target name="4jdk7-jar"
579 <          depends="4jdk7compile"
580 <          description="Builds library jar from compiled sources">
581 <
582 <    <jar destfile="${4jdk7product.jar}">
583 <      <fileset dir="${build.4jdk7.classes.dir}"/>
584 <    </jar>
585 <
586 <  </target>
587 <
588 <
589 <  <target name="4jdk7-test-tck"
590 <          depends="4jdk7-jar"
591 <          description="Runs tck tests for jsr166-4jdk7 directly">
592 <
593 <    <run-tck-tests
594 <      target="7"
595 <      workdir="${build.4jdk7.dir}"
596 <      product.jar="${4jdk7product.jar}"/>
597 <  </target>
598 <
599 <
600 <  <target name="4jdk7-test-tck-junit"
601 <          depends="4jdk7compile"
602 <          description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
603 <
604 <    <junit printsummary="true"
605 <           showoutput="true"
606 <           errorProperty="junit.failed"
607 <           failureProperty="junit.failed"
608 <           includeantruntime="true"
609 <           jvm="${java7}"
610 <           fork="true">
611 <
612 <      <jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
613 <      <jvmarg value="-server"/>
614 <
615 <      <classpath>
616 <        <pathelement location="${junit.jar}"/>
617 <        <pathelement location="${build.4jdk7.tck.classes.dir}"/>
618 <      </classpath>
619 <
620 <      <formatter type="brief"/>
621 <
622 <      <test name="JSR166TestCase" haltonfailure="no">
623 <      </test>
624 <
625 <    </junit>
626 <  </target>
627 <
628 <  <target name="4jdk7-test-jtreg"
629 <          depends="4jdk7compile"
630 <          description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
631 <    <delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
632 <    <delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
633 <    <mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
634 <    <mkdir dir="${build.4jdk7.dir}/JTreport"/>
635 <    <jtreg dir="${jtreg.src.dir}"
636 <           jdk="${jdk7.home}"
637 <           workDir="${build.4jdk7.dir}/JTwork"
638 <           reportDir="${build.4jdk7.dir}/JTreport">
639 <
640 <      <arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
641 <      <arg value="-agentvm"/>
642 <      <arg value="-v:nopass,fail"/>
643 <      <arg value="-vmoptions:-esa -ea"/>
644 <      <arg value="-automatic"/>
645 <      <arg value="-k:!ignore"/>
646 <    </jtreg>
647 <  </target>
648 <
649 <
650 <  <target name="4jdk7-test"
651 <          depends="4jdk7-test-tck, 4jdk7-test-jtreg"
652 <          description="Runs tck and jtreg tests for jsr166-4jdk7">
653 <  </target>
654 <
655 <
656 <  <target name="4jdk7docs"
657 <          description="Builds javadocs for src/jdk7 to dist dir">
658 <
659 <    <delete dir="${dist.4jdk7.docs.dir}"/>
660 <    <mkdir dir="${dist.4jdk7.docs.dir}"/>
661 <
662 <    <javadoc destdir="${dist.4jdk7.docs.dir}"
663 <             packagenames="none"
664 <             link="${jdkapi7docs.url}"
665 <             overview="${4jdk7src.dir}/intro.html"
666 <             sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
667 <             classpath=""
668 <             executable="${javadoc7}">
669 <      <arg value="-XDignore.symbol.file=true"/>
670 <      <fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
671 <        <include name="**/*.java"/>
672 <      </fileset>
673 <    </javadoc>
674 <
675 <  </target>
676 <
677 <
678 <  <target name="4jdk7dist"
679 <          depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
680 <          description="Puts all distributable products in single hierarchy"/>
681 <
682 <
683 <
684 <  <target name="4jdk7clean"
685 <          description="Removes all 4jdk7 build products">
686 <
687 <    <delete dir="${build.4jdk7.dir}"/>
688 <
689 <  </target>
690 <
691 <
692 <
693 <  <target name="4jdk7dist-clean"
694 <          description="Removes all build and distribution products">
695 <
696 <  </target>
697 <
698 <  <target name="4jdk7dist-jar"
699 <          depends="4jdk7clean, 4jdk7compile">
700 <
701 <    <copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
702 <
703 <  </target>
704 <
705 <
706 <  <!-- jsr166x -->
707 <
708 <  <target name="jsr166xcompile"
709 <          depends="configure-compiler"
710 <          description="Compiles jsr166x sources to build dir">
711 <
712 <    <mkdir dir="${build.jsr166x.classes.dir}"/>
713 <
714 <    <javac srcdir="${topsrc.dir}"
715 <           destdir="${build.jsr166x.classes.dir}"
716 <           debug="${build.debug}"
717 <           debuglevel="${build.debuglevel}"
718 <           deprecation="${build.deprecation}"
719 <           classpath=""
720 <           source="5"
721 <           bootclasspath="${bootclasspath6}"
722 <           includeAntRuntime="false"
723 <           includeJavaRuntime="false"
724 <           executable="${javac7}"
725 <           fork="true">
726 <
727 <      <include name="jsr166x/**/*.java"/>
523 >      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
524 >      <compilerarg value="--patch-module=java.base=${src.dir}"/>
525        <compilerarg line="${build.args}"/>
729      <compilerarg value="-XDignore.symbol.file=true"/>
730      <compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
731
526      </javac>
733
527    </target>
528  
529  
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="jsr166xjar"
739 <          depends="jsr166xcompile"
740 <          description="Builds library jar from compiled sources">
538 > <!-- Find buglets that can be detected by static build tools -->
539  
540 <    <jar destfile="${jsr166x.jar}">
541 <      <fileset dir="${build.jsr166x.classes.dir}"/>
542 <    </jar>
543 <
544 <  </target>
747 <
748 <
749 <
750 <  <target name="jsr166xdocs"
751 <          description="Builds javadocs to dist dir">
752 <
753 <    <delete dir="${dist.jsr166xjavadocs.dir}"/>
754 <    <mkdir dir="${dist.jsr166xjavadocs.dir}"/>
755 <
756 <    <javadoc destdir="${dist.jsr166xjavadocs.dir}"
757 <             packagenames="jsr166x.*"
758 <             link="${jdkapidocs.url}"
759 <             source="5"
760 <             bootclasspath="${bootclasspath6}"
761 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
762 <             executable="${javadoc7}"
763 <             additionalparam="-XDignore.symbol.file=true"/>
540 > <!--   <target name="lint"> -->
541 > <!--     <antcall target="dists"> -->
542 > <!--       <param name="build.javadoc.access" value="protected"/> -->
543 > <!--     </antcall> -->
544 > <!--   </target> -->
545  
546 + <!-- Generates all doclint warnings, even for private methods (rarely useful) -->
547 +  <target name="doclint-private">
548 +    <antcall target="dist">
549 +      <param name="build.javadoc.access" value="private"/>
550 +    </antcall>
551    </target>
552  
553  
554 <  <target name="jsr166xdist"
555 <          depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
556 <          description="Puts all distributable products in single hierarchy"/>
557 <
558 <
559 <
560 <  <target name="jsr166xclean"
561 <          description="Removes all jsr166x build products">
562 <
563 <    <delete dir="${build.jsr166x.dir}"/>
564 <
565 <  </target>
566 <
567 <
568 <
569 <  <target name="jsr166xdist-clean"
570 <          description="Removes all build and distribution products">
571 <
572 <  </target>
573 <
574 <
575 <  <target name="jsr166xdist-jar"
576 <          depends="jsr166xclean, jsr166xjar">
577 <
578 <    <copy file="${jsr166x.jar}" todir="${dist.dir}"/>
579 <
580 <  </target>
581 <
582 <  <!-- jsr166y -->
583 <
584 <
585 <  <target name="jsr166ycompile"
586 <          depends="configure-compiler"
587 <          description="Compiles jsr166y sources">
588 <
589 <    <mkdir dir="${build.jsr166y.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.jsr166y.classes.dir}"
602 >    <javac srcdir="${src.dir}"
603 >           destdir="${destdir}"
604             debug="${build.debug}"
605             debuglevel="${build.debuglevel}"
606             deprecation="${build.deprecation}"
810           source="6"
607             classpath=""
812           bootclasspath="${bootclasspath6}"
608             includeAntRuntime="false"
609             includeJavaRuntime="false"
610 <           executable="${javac7}"
610 >           encoding="ASCII"
611 >           executable="${build.main.javac}"
612             fork="true">
613  
614 <      <include name="jsr166y/**/*.java"/>
615 <      <compilerarg line="${build.args}"/>
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 <    </javac>
627 <  </target>
628 <
825 <
826 <  <target name="jsr166yjar"
827 <          depends="jsr166ycompile"
828 <          description="Builds library jar from compiled sources">
829 <
830 <    <jar destfile="${jsr166y.jar}" index="true">
831 <      <fileset dir="${build.jsr166y.classes.dir}"/>
832 <    </jar>
833 <
834 <  </target>
835 <
836 <
837 <
838 <  <target name="jsr166ydocs"
839 <          description="Builds javadocs to dist dir">
840 <
841 <    <delete dir="${dist.jsr166yjavadocs.dir}"/>
842 <    <mkdir dir="${dist.jsr166yjavadocs.dir}"/>
843 <
844 <    <javadoc destdir="${dist.jsr166yjavadocs.dir}"
845 <             packagenames="jsr166y.*"
846 <             link="${jdkapidocs.url}"
847 <             source="6"
848 <             bootclasspath="${bootclasspath6}"
849 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
850 <             executable="${javadoc7}"
851 <             additionalparam="-XDignore.symbol.file=true"/>
852 <
853 <  </target>
854 <
855 <
856 <  <target name="jsr166ydist"
857 <          depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
858 <          description="Puts all distributable products in single hierarchy"/>
859 <
860 <
861 <
862 <  <target name="jsr166yclean"
863 <          description="Removes all jsr166y build products">
864 <
865 <    <delete dir="${build.jsr166y.dir}"/>
866 <
867 <  </target>
868 <
869 <
870 <
871 <  <target name="jsr166ydist-clean"
872 <          description="Removes all build and distribution products">
873 <
874 <  </target>
875 <
876 <  <target name="jsr166ydist-jar"
877 <          depends="jsr166yclean, jsr166yjar">
878 <
879 <    <copy file="${jsr166y.jar}" todir="${dist.dir}"/>
880 <
881 <  </target>
882 <
883 <
884 <  <!-- extra166y -->
885 <
886 <
887 <  <target name="extra166ycompile"
888 <          depends="configure-compiler, jsr166yjar"
889 <          description="Compiles extra166y sources">
890 <
891 <    <mkdir dir="${build.extra166y.classes.dir}"/>
892 <
893 <    <javac srcdir="${topsrc.dir}"
894 <           destdir="${build.extra166y.classes.dir}"
895 <           debug="${build.debug}"
896 <           debuglevel="${build.debuglevel}"
897 <           deprecation="${build.deprecation}"
898 <           classpath=""
899 <           source="6"
900 <           bootclasspath="${jsr166y.jar}:${bootclasspath6}"
901 <           includeAntRuntime="false"
902 <           includeJavaRuntime="false"
903 <           executable="${javac7}"
904 <           fork="true">
905 <
906 <      <include name="extra166y/**/*.java"/>
907 <      <compilerarg line="${build.args}"/>
908 <      <compilerarg value="-XDignore.symbol.file=true"/>
909 <      <compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
910 <
911 <    </javac>
912 <
913 <  </target>
914 <
915 <
916 <
917 <  <target name="extra166yjar"
918 <          depends="extra166ycompile"
919 <          description="Builds library jar from compiled sources">
920 <
921 <    <jar destfile="${extra166y.jar}" index="true">
922 <      <fileset dir="${build.extra166y.classes.dir}"/>
923 <    </jar>
924 <
925 <  </target>
926 <
927 <
928 <
929 <  <target name="extra166ydocs"
930 <          description="Builds javadocs to build dir">
931 <
932 <    <delete dir="${dist.extra166yjavadocs.dir}"/>
933 <    <mkdir dir="${dist.extra166yjavadocs.dir}"/>
934 <
935 <    <javadoc destdir="${dist.extra166yjavadocs.dir}"
936 <             packagenames="extra166y.*"
937 <             link="${jdkapidocs.url}"
938 <             source="6"
939 <             bootclasspath="${bootclasspath6}"
940 <             sourcepath="${topsrc.dir}:${jdk6src.dir}"
941 <             executable="${javadoc7}"
942 <             additionalparam="-XDignore.symbol.file=true"/>
943 <
944 <  </target>
945 <
946 <
947 <  <target name="extra166ydist"
948 <          depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
949 <          description="Puts all distributable products in single hierarchy"/>
950 <
951 <
952 <
953 <  <target name="extra166yclean"
954 <          description="Removes all extra166y build products">
955 <
956 <    <delete dir="${build.extra166y.dir}"/>
957 <
958 <  </target>
959 <
960 <
961 <
962 <  <target name="extra166ydist-clean"
963 <          description="Removes all build and distribution products">
964 <
965 <  </target>
966 <
967 <  <target name="extra166ydist-jar"
968 <          depends="extra166yclean, extra166yjar">
969 <
970 <    <copy file="${extra166y.jar}" todir="${dist.dir}"/>
971 <
972 <  </target>
973 <
974 <  <!-- jsr166e -->
975 <
976 <  <target name="jsr166ecompile"
977 <          depends="configure-compiler"
978 <          description="Compiles jsr166e sources">
979 <
980 <    <mkdir dir="${build.jsr166e.classes.dir}"/>
981 <
982 <    <javac srcdir="${topsrc.dir}"
983 <           destdir="${build.jsr166e.classes.dir}"
984 <           debug="${build.debug}"
985 <           debuglevel="${build.debuglevel}"
986 <           deprecation="${build.deprecation}"
987 <           source="7"
988 <           classpath=""
989 <           includeAntRuntime="false"
990 <           includeJavaRuntime="false"
991 <           executable="${javac7}"
992 <           fork="true">
993 <
994 <      <include name="jsr166e/**/*.java"/>
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}"/>
996      <compilerarg value="-XDignore.symbol.file=true"/>
997      <compilerarg value="-Xlint:all"/>
998
630      </javac>
631  
632 <  </target>
633 <
1003 <
1004 <
1005 <  <target name="jsr166ejar"
1006 <          depends="jsr166ecompile"
1007 <          description="Builds library jar from compiled sources">
1008 <
1009 <    <jar destfile="${jsr166e.jar}" index="true">
1010 <      <fileset dir="${build.jsr166e.classes.dir}"/>
632 >    <jar destfile="${product.jar}">
633 >      <fileset dir="${destdir}"/>
634      </jar>
635  
636 <  </target>
637 <
638 <
639 <
640 <  <target name="jsr166edocs"
641 <          description="Builds javadocs to build dir">
642 <
643 <    <delete dir="${dist.jsr166ejavadocs.dir}"/>
644 <    <mkdir dir="${dist.jsr166ejavadocs.dir}"/>
645 <
646 <    <javadoc destdir="${dist.jsr166ejavadocs.dir}"
647 <             packagenames="jsr166e.*"
648 <             link="${jdkapidocs.url}"
649 <             source="7"
650 <             sourcepath="${topsrc.dir}:${jdk7src.dir}"
651 <             executable="${javadoc7}"
652 <             additionalparam="-XDignore.symbol.file=true" >
653 <    </javadoc>
654 <
655 <  </target>
656 <
657 <
658 <  <target name="jsr166edist"
659 <          depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
660 <          description="Puts all distributable products in single hierarchy"/>
661 <
662 <
663 <
664 <  <target name="jsr166eclean"
665 <          description="Removes all jsr166e build products">
666 <
667 <    <delete dir="${build.jsr166e.dir}"/>
668 <
669 <  </target>
670 <
671 <
672 <  <target name="jsr166edist-clean"
673 <          description="Removes all build and distribution products">
674 <
675 <  </target>
676 <
677 <  <target name="jsr166edist-jar"
678 <          depends="jsr166eclean, jsr166ejar">
679 <
680 <    <copy file="${jsr166e.jar}" todir="${dist.dir}"/>
636 >    <run-tck-tests
637 >      target="${java.runtime.target}"
638 >      workdir="${build.dir}"
639 >      classes="${product.jar}">
640 >      <javac-elements>
641 >        <!-- Needed to silence -Xep:FutureReturnValueIgnored -->
642 >        <compilerarg value="-J--illegal-access=permit"/>
643 >        <compilerarg value="-XDcompilePolicy=simple"/>
644 >        <compilerarg line="-processorpath ${errorprone.processorpath}"/>
645 >        <compilerarg value="-Xplugin:ErrorProne
646 >                            ${errorprone.jsr166.flags}
647 >                            ${errorprone.jsr166.test.flags}"/>
648 >        <!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
649 >        <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
650 >      </javac-elements>
651 >    </run-tck-tests>
652 >  </target>
653 >
654 >  <!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
655 >  <!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
656 >  <target name="errorprone-jtreg"
657 >          depends="jar"
658 >          description="Run errorprone over jtreg tests (experimental)">
659 >
660 >    <run-jtreg-tests
661 >       target="${java.runtime.target}"
662 >       workdir="${build.dir}"
663 >       classes="${product.jar}"
664 >       verbose="all">
665 >      <jtreg-elements>
666 >        <arg value="-javacoption:-XDcompilePolicy=simple"/>
667 >        <arg value="-javacoption:-processorpath"/>
668 >        <arg value="-javacoption:${errorprone.processorpath}"/>
669 >        <arg value="-javacoption:-Xplugin:ErrorProne
670 >                            ${errorprone.jsr166.flags}
671 >                            ${errorprone.jsr166.test.flags}
672 >                            -Xep:MultipleTopLevelClasses:WARN
673 >                            -Xep:NonAtomicVolatileUpdate:OFF"/>
674 >      </jtreg-elements>
675 >    </run-jtreg-tests>
676 >  </target>
677 >
678 >
679 > <!-- ==============================================================
680 >  Running guava tests against jsr166 code
681 > =================================================================== -->
682 >
683 > <!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" -->
684 > <!--   organisation="com.google.guava" module="guava-testlib" revision="21.0"/> -->
685 > <!-- <property name="guava.version" value="21.0"/> -->
686 >
687 > <!-- HOWTO debug print a path id -->
688 > <!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> -->
689 > <!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> -->
690 >
691 > <!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" -->
692 > <!--   organisation="com.google.guava" module="guava-tests"/> -->
693 > <!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" -->
694 > <!--   dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> -->
695 > <!--     <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" -->
696 > <!--       organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> -->
697 >
698 > <!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> -->
699 > <!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> -->
700 > <!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> -->
701 > <!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> -->
702 >
703 > <!-- <ivy:retrieve pathid="guava.testlib.classpath" -->
704 > <!--   type="*" inline="true" conf="*(private),*(public)" -->
705 > <!--   pattern="${guava.dir}/[artifact].[ext]" -->
706 > <!--   organisation="com.google.guava" module="guava-testlib"/> -->
707 >
708 > <!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": -->
709 > <!-- https://issues.apache.org/jira/browse/IVY-1444 -->
710 > <!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations -->
711 >
712 >  <target name="init-ivy">
713 >    <get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar"
714 >         dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/>
715 >    <taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant"
716 >             classpath="${build.dir}/ivy.jar"/>
717 >  </target>
718 >
719 >  <target name="guava-tests" depends="jar, init-ivy"
720 >          description="Guava tests run against jsr166 collections">
721 >    <property name="guava.dir" value="${build.dir}/guava-testlib"/>
722 >    <mkdir dir="${guava.dir}"/>
723 >    <ivy:retrieve pathid="guava.testlib.classpath"
724 >      type="jar,bundle" inline="true" conf="default,master"
725 >      pattern="${guava.dir}/[artifact].[ext]"
726 >      organisation="com.google.guava" module="guava-testlib"/>
727 >    <property name="guava.version" value="21.0"/>
728 >    <get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
729 >         dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
730 >    <junit printsummary="true" showoutput="true" haltonfailure="true"
731 >           jvm="${build.main.java}" fork="true">
732 >      <jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
733 >      <formatter type="brief"/>
734 >      <classpath>
735 >        <pathelement location="${guava.dir}/guava-testlib-tests.jar"/>
736 >        <path refid="guava.testlib.classpath"/>
737 >      </classpath>
738  
739 +      <!-- "6" in "OpenJdk6Tests" misleadingly means "6+" -->
740 +      <test name="com.google.common.collect.testing.OpenJdk6Tests"/>
741 +    </junit>
742    </target>
743  
744   </project>

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines