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.91 by jsr166, Sun Nov 18 06:21:11 2012 UTC vs.
Revision 1.315 by jsr166, Fri Jun 5 00:59:33 2020 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines