1 |
|
<project name="jsr166" default="usage" |
2 |
< |
xmlns:if="ant:if" xmlns:unless="ant:unless"> |
2 |
> |
xmlns:if="ant:if" |
3 |
> |
xmlns:unless="ant:unless" |
4 |
> |
xmlns:ivy="antlib:org.apache.ivy.ant"> |
5 |
|
|
6 |
|
<description> |
7 |
|
------------------------------------------------------------------------------ |
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: |
20 |
– |
$HOME/jdk/jdk6 |
21 |
– |
$HOME/jdk/jdk7 |
22 |
|
$HOME/jdk/jdk8 |
23 |
< |
$HOME/jdk/jdk9 |
23 |
> |
$HOME/jdk/jdk11 |
24 |
> |
$HOME/jdk/jdk12 |
25 |
> |
$HOME/jdk/jdk13 |
26 |
> |
$HOME/jdk/jdk14 |
27 |
|
where each of the above is a JDK or a symlink to same, and |
25 |
– |
$HOME/jdk/src/jdk6 |
26 |
– |
$HOME/jdk/src/jdk7 |
28 |
|
$HOME/jdk/src/jdk8 |
29 |
< |
$HOME/jdk/src/jdk9 |
29 |
> |
$HOME/jdk/src/jdk11 |
30 |
> |
$HOME/jdk/src/jdk12 |
31 |
> |
$HOME/jdk/src/jdk13 |
32 |
> |
$HOME/jdk/src/jdk14 |
33 |
|
where each of the above is a complete JDK source tree |
34 |
|
(e.g. mercurial forest) or a symlink to same. |
35 |
|
|
36 |
|
Alternatively, define ant variables thus: |
37 |
|
ant -Djdk$N.home=... -Djdk$N.src.home=... |
38 |
< |
for $N in 6 7 8 9 ... |
38 |
> |
for $N in 8 .. 14 ... |
39 |
|
|
40 |
< |
As of 2016-03, the sources in src/main are for jdk9+ only. The "docs" |
41 |
< |
target is currently broken. |
40 |
> |
As of 2016-03, the sources in src/main are for jdk9+ only. |
41 |
> |
As of 2019-08, the sources in src/main are for jdk11+ only. |
42 |
|
------------------------------------------------------------------------------ |
43 |
|
</description> |
44 |
|
|
45 |
< |
<!-- Display main targets by running 'ant -projecthelp' --> |
45 |
> |
<!-- Run 'ant -projecthelp' (default target) --> |
46 |
|
<target name="usage"> |
47 |
|
<java classname="org.apache.tools.ant.Main"> |
48 |
|
<arg value="-projecthelp" /> |
56 |
|
|
57 |
|
|
58 |
|
<!-- Compilation options --> |
55 |
– |
<property name="build.sourcelevel" value="6"/> |
59 |
|
<property name="build.debug" value="true"/> |
60 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
61 |
|
<property name="build.deprecation" value="false"/> |
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"/> |
66 |
– |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
69 |
|
|
70 |
|
<property name="build.4jdk7.dir" location="${build.dir}/jsr166-4jdk7"/> |
71 |
|
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
106 |
|
<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes" |
107 |
|
unless:set="have.java.base"/> |
108 |
|
<local name="modules"/> |
109 |
< |
<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/> |
109 |
> |
<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/> |
110 |
|
<local name="boot.jar.dir"/> |
111 |
|
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib" unless:set="modules"/> |
112 |
|
<path id="bootclasspath@{v}" unless:set="modules"> |
132 |
|
</sequential> |
133 |
|
</macrodef> |
134 |
|
|
133 |
– |
<defjdklocations v="6"/> |
134 |
– |
<defjdklocations v="7"/> |
135 |
|
<defjdklocations v="8"/> |
136 |
< |
<defjdklocations v="9"/> |
136 |
> |
<defjdklocations v="11"/> |
137 |
> |
<defjdklocations v="12"/> |
138 |
> |
<defjdklocations v="13"/> |
139 |
> |
<defjdklocations v="14"/> |
140 |
|
|
141 |
|
<!-- Source locations --> |
142 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
143 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
144 |
|
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
145 |
|
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
143 |
– |
<property name="jtreg7.src.dir" location="${test.src.dir}/jtreg-jdk7"/> |
146 |
|
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg-jdk8"/> |
147 |
< |
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
148 |
< |
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
147 |
> |
<property name="jtreg11.src.dir" location="${test.src.dir}/jtreg"/> |
148 |
> |
<property name="jtreg12.src.dir" location="${test.src.dir}/jtreg"/> |
149 |
> |
<property name="jtreg13.src.dir" location="${test.src.dir}/jtreg"/> |
150 |
> |
<property name="jtreg14.src.dir" location="${test.src.dir}/jtreg"/> |
151 |
> |
<property name="jtreg.src.dir" location="${jtreg11.src.dir}"/> |
152 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
153 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
154 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
187 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
188 |
|
|
189 |
|
<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag --> |
190 |
< |
<property name="java5.docroot.url" value="http://docs.oracle.com/javase/1.5.0/docs"/> |
191 |
< |
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
192 |
< |
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
193 |
< |
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
194 |
< |
<!-- The expected canonical location does not yet exist as of 2016-03 --> |
195 |
< |
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
196 |
< |
<property name="java9.docroot.url" value="http://download.java.net/jdk9/docs"/> |
197 |
< |
<!-- Default jdk doc location (latest stable release seems best) --> |
198 |
< |
<property name="java.docroot.url" value="${java8.docroot.url}"/> |
190 |
> |
<!-- Switched to https: in 2017-10 - JDK-8190312 --> |
191 |
> |
<property name="java5.docroot.url" value="https://docs.oracle.com/javase/1.5.0/docs"/> |
192 |
> |
<property name="java6.docroot.url" value="https://docs.oracle.com/javase/6/docs"/> |
193 |
> |
<property name="java7.docroot.url" value="https://docs.oracle.com/javase/7/docs"/> |
194 |
> |
<property name="java8.docroot.url" value="https://docs.oracle.com/javase/8/docs"/> |
195 |
> |
<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/> |
196 |
> |
<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/> |
197 |
> |
<!-- The location of jdk early access docs (RIP) --> |
198 |
> |
<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> --> |
199 |
> |
<!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> --> |
200 |
> |
<property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> |
201 |
> |
<property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/> |
202 |
> |
<!-- Default jdk doc location (latest stable LTS release seems best) --> |
203 |
> |
<property name="java.docroot.url" value="${java11.docroot.url}"/> |
204 |
|
|
205 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
196 |
– |
<property name="java5.api.url" value="${java5.docroot.url}/api/"/> |
197 |
– |
<property name="java6.api.url" value="${java6.docroot.url}/api/"/> |
198 |
– |
<property name="java7.api.url" value="${java7.docroot.url}/api/"/> |
206 |
|
<property name="java8.api.url" value="${java8.docroot.url}/api/"/> |
207 |
< |
<property name="java9.api.url" value="${java9.docroot.url}/api/"/> |
207 |
> |
<property name="java11.api.url" value="${java11.docroot.url}/api/"/> |
208 |
> |
<property name="java12.api.url" value="${java12.docroot.url}/api/"/> |
209 |
> |
<property name="java13.api.url" value="${java13.docroot.url}/api/"/> |
210 |
> |
<property name="java14.api.url" value="${java14.docroot.url}/api/"/> |
211 |
|
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
212 |
|
|
213 |
|
<!-- Define the "jtreg" task --> |
240 |
|
|
241 |
|
<local name="modules"/> |
242 |
|
<condition property="modules"> |
243 |
< |
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
243 |
> |
<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/> |
244 |
> |
</condition> |
245 |
> |
|
246 |
> |
<local name="use-doclint"/> |
247 |
> |
<condition property="use-doclint"> |
248 |
> |
<not> <equals arg1="@{target}" arg2="7"/> </not> |
249 |
|
</condition> |
250 |
|
|
251 |
|
<mkdir dir="@{workdir}/tck-classes"/> |
260 |
|
classpath="${junit.jar}" |
261 |
|
includeAntRuntime="false" |
262 |
|
includeJavaRuntime="false" |
263 |
+ |
encoding="ASCII" |
264 |
|
executable="${javac@{compile-target}}" |
265 |
|
fork="true"> |
266 |
|
|
267 |
|
<include name="*.java"/> |
268 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
269 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/> |
270 |
+ |
<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/> |
271 |
|
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
272 |
< |
<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
272 |
> |
<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/> |
273 |
|
<compilerarg line="${build.args}"/> |
274 |
|
<javac-elements/> |
275 |
|
|
280 |
|
jvm="${java@{target}}" |
281 |
|
fork="true"> |
282 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
283 |
< |
<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
283 |
> |
<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/> |
284 |
> |
<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/> |
285 |
> |
<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/> |
286 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/> |
287 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/> |
288 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/> |
289 |
|
<jvmarg line="@{jvmflags}"/> |
290 |
+ |
<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck --> |
291 |
+ |
<jvmarg line="${vmoptions}" if:set="vmoptions"/> |
292 |
|
|
293 |
< |
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
293 |
> |
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
294 |
|
<syspropertyset id="system-properties-used-by-tck"> |
295 |
|
<propertyref prefix="java.util.concurrent.ForkJoinPool"/> |
296 |
|
<propertyref prefix="jsr166."/> |
307 |
|
</macrodef> |
308 |
|
|
309 |
|
<!-- Define jtreg test sets for different jdk versions --> |
310 |
< |
<fileset dir="${jtreg9.src.dir}"> |
311 |
< |
<patternset id="jdk9.jtreg.tests"> |
312 |
< |
<include name="**/*.java"/> |
313 |
< |
</patternset> |
314 |
< |
</fileset> |
315 |
< |
|
316 |
< |
<fileset dir="${jtreg8.src.dir}"> |
317 |
< |
<patternset id="jdk8.jtreg.tests"> |
318 |
< |
<include name="**/*.java"/> |
319 |
< |
<exclude name="**/SpliteratorCharacteristics.java"/> |
320 |
< |
<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 --> |
321 |
< |
<exclude name="**/GCDuringIteration.java"/> |
322 |
< |
</patternset> |
299 |
< |
</fileset> |
310 |
> |
<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" --> |
311 |
> |
<!-- ant -Djtreg.test.pattern="**/ToArray.java" --> |
312 |
> |
<property name="jtreg.test.pattern" value="**/*.java"/> |
313 |
> |
<macrodef name="defjtregtests"> |
314 |
> |
<attribute name="v"/> |
315 |
> |
<sequential> |
316 |
> |
<fileset dir="${jtreg@{v}.src.dir}"> |
317 |
> |
<patternset id="jdk@{v}.jtreg.tests"> |
318 |
> |
<include name="${jtreg.test.pattern}"/> |
319 |
> |
</patternset> |
320 |
> |
</fileset> |
321 |
> |
</sequential> |
322 |
> |
</macrodef> |
323 |
|
|
324 |
< |
<fileset dir="${jtreg7.src.dir}"> |
325 |
< |
<patternset id="jdk7.jtreg.tests"> |
326 |
< |
<include name="**/*.java"/> |
327 |
< |
</patternset> |
328 |
< |
</fileset> |
324 |
> |
<defjtregtests v="14"/> |
325 |
> |
<defjtregtests v="13"/> |
326 |
> |
<defjtregtests v="12"/> |
327 |
> |
<defjtregtests v="11"/> |
328 |
> |
<defjtregtests v="8"/> |
329 |
|
|
330 |
|
<!-- ant -Djtreg.flags=-timeoutFactor:4 --> |
331 |
|
<property name="jtreg.flags" value=""/> |
332 |
|
|
333 |
|
<macrodef name="run-jtreg-tests"> |
334 |
< |
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
312 |
< |
<attribute name="source" default="7"/> |
334 |
> |
<!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
335 |
|
<attribute name="target"/> |
336 |
|
<attribute name="workdir"/> |
337 |
|
<attribute name="classes"/> |
338 |
+ |
<attribute name="verbose" default="${jtreg.verbose}"/> |
339 |
|
<attribute name="jtregflags" default=""/> |
340 |
+ |
<element name="jtreg-elements" optional="true"/> |
341 |
|
|
342 |
|
<sequential> |
343 |
|
|
346 |
|
|
347 |
|
<local name="modules"/> |
348 |
|
<condition property="modules"> |
349 |
< |
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
349 |
> |
<available file="${jdk@{target}.home}/lib/modules" type="file"/> |
350 |
|
</condition> |
351 |
|
|
352 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
329 |
– |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
330 |
– |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
331 |
– |
<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 --> |
332 |
– |
<mkdir dir="@{workdir}/JTreport/html"/> |
333 |
– |
<mkdir dir="@{workdir}/JTreport/text"/> |
353 |
|
<jtreg dir="${jtreg@{target}.src.dir}" |
354 |
|
jdk="${jdk@{target}.home}" |
355 |
< |
workDir="@{workdir}/JTwork" |
337 |
< |
reportDir="@{workdir}/JTreport"> |
355 |
> |
workDir="@{workdir}/JTwork"> |
356 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
357 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
358 |
< |
<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
358 |
> |
<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
359 |
> |
<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
360 |
|
<arg value="-agentvm"/> |
361 |
< |
<arg value="-verbose:${jtreg.verbose}"/> |
361 |
> |
<arg value="-noreport"/> |
362 |
> |
<arg value="-verbose:@{verbose}"/> |
363 |
|
<arg value="-vmoptions:-esa -ea"/> |
364 |
|
<arg value="-automatic"/> |
365 |
|
<arg value="-k:!ignore"/> |
366 |
|
<arg line="@{jtregflags}"/> |
367 |
|
<arg line="${jtreg.flags}"/> |
368 |
+ |
<jtreg-elements/> |
369 |
|
</jtreg> |
370 |
|
</sequential> |
371 |
|
</macrodef> |
376 |
|
</path> |
377 |
|
|
378 |
|
<!-- Support @jls tag, used in jdk8+ javadoc --> |
379 |
+ |
<!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc --> |
380 |
|
<property name="javadoc.jls.cite" value="The Java&trade; Language Specification"/> |
381 |
|
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
382 |
|
|
383 |
|
<!-- Main targets --> |
384 |
|
|
385 |
< |
<property name="build.main.java.version" value="9"/> |
386 |
< |
<property name="build.main.javac" value="${javac9}"/> |
385 |
> |
<!-- Default values: may seem strange ... --> |
386 |
> |
<!-- At runtime, target latest LTS, i.e. jdk11 --> |
387 |
> |
<!-- But at build time, target jdk9, for maximal binary portability --> |
388 |
> |
<!-- ButButBut as of 2019-08, target jdk11 at build time --> |
389 |
> |
<!-- Use javadoc12 (but -link to jdk11 api docs!), to get: |
390 |
> |
o override-methods=summary |
391 |
> |
o {@systemProperty ...} |
392 |
> |
o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation) |
393 |
> |
o 8202628: javadoc generates bad links in TestModules.java |
394 |
> |
--> |
395 |
> |
<property name="java.runtime.target" value="11"/> |
396 |
> |
<property name="build.main.java" value="${java11}"/> |
397 |
> |
<property name="build.main.javac" value="${javac11}"/> |
398 |
> |
<property name="build.main.javadoc" value="${javadoc12}"/> |
399 |
> |
<property name="build.main.javadoc.source" value="${java.runtime.target}"/> |
400 |
|
|
401 |
|
<target name="dists" |
402 |
< |
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
402 |
> |
depends="dist, 4jdk8dist" |
403 |
|
description="Builds all public jars and docs"/> |
404 |
+ |
<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist --> |
405 |
|
|
406 |
|
<target name="compile" |
407 |
|
depends="configure-compiler" |
408 |
|
description="Compiles src/main sources to build dir"> |
409 |
|
|
374 |
– |
<local name="modules"/> |
375 |
– |
<condition property="modules"> |
376 |
– |
<and> |
377 |
– |
<available file="${jdk9.home}/jmods" type="dir"/> |
378 |
– |
<equals arg1="9" arg2="${build.main.java.version}"/> |
379 |
– |
</and> |
380 |
– |
</condition> |
381 |
– |
|
410 |
|
<local name="destdir"/> |
411 |
< |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
384 |
< |
<property name="destdir" value="${build.classes.dir}" unless:set="modules"/> |
411 |
> |
<property name="destdir" value="${build.classes.dir}/java.base"/> |
412 |
|
|
413 |
|
<mkdir dir="${destdir}"/> |
414 |
|
|
420 |
|
classpath="" |
421 |
|
includeAntRuntime="false" |
422 |
|
includeJavaRuntime="false" |
423 |
+ |
encoding="ASCII" |
424 |
|
executable="${build.main.javac}" |
425 |
|
fork="true"> |
426 |
|
|
427 |
|
<include name="**/*.java"/> |
428 |
< |
<compilerarg value="-Xmodule:java.base" if:set="modules"/> |
428 |
> |
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
429 |
|
<compilerarg value="-Xprefer:source"/> |
430 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
431 |
< |
<compilerarg value="-Xlint:all"/> |
431 |
> |
<!-- Xlint:-removal for jdk12 Unsafe Object -> Reference renaming --> |
432 |
> |
<compilerarg value="-Xlint:all,-removal"/> |
433 |
> |
<compilerarg line="--doclint-format html5"/> |
434 |
> |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
435 |
> |
<compilerarg value="-Xdoclint/package:java.util.*"/> |
436 |
|
<compilerarg value="-Werror"/> |
405 |
– |
<compilerarg value="-Xdoclint:all/protected"/> |
437 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
438 |
|
<compilerarg line="${build.args}"/> |
439 |
|
|
443 |
|
|
444 |
|
<target name="jar" |
445 |
|
depends="compile" |
446 |
< |
description="Builds library jar from compiled sources"> |
447 |
< |
|
446 |
> |
description="Builds library jar for src/main from compiled sources"> |
447 |
> |
<local name="subdir"/> |
448 |
> |
<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/> |
449 |
|
<jar destfile="${product.jar}"> |
450 |
< |
<fileset dir="${build.classes.dir}"/> |
450 |
> |
<fileset dir="${build.classes.dir}${subdir}"/> |
451 |
|
<manifest> |
452 |
|
<attribute name="Built-By" value="${user.name}"/> |
453 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
465 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
466 |
|
<!-- sourcepath for packages --> |
467 |
|
|
468 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" --> |
469 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" --> |
470 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" --> |
471 |
+ |
<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> --> |
472 |
+ |
<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> --> |
473 |
|
<javadoc destdir="${docs.dir}" |
474 |
|
packagenames="none" |
475 |
< |
link="${java9.api.url}" |
475 |
> |
link="${java.api.url}" |
476 |
|
overview="${src.dir}/intro.html" |
477 |
|
access="${build.javadoc.access}" |
478 |
< |
sourcepath="${src.dir}:${jdk9.src.dir}" |
478 |
> |
sourcepath="${src.dir}" |
479 |
|
classpath="" |
480 |
< |
executable="${javadoc9}"> |
480 |
> |
source="${build.main.javadoc.source}" |
481 |
> |
executable="${build.main.javadoc}"> |
482 |
> |
<!-- TODO: JDK-8214571 failonerror = "true" --> |
483 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
484 |
|
<include name="**/*.java"/> |
485 |
|
</fileset> |
486 |
< |
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
486 |
> |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
487 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
488 |
|
<arg value="-XDignore.symbol.file=true"/> |
489 |
< |
<!-- TODO <arg value="-Xmodule:java.base"/> --> |
490 |
< |
<arg value="-tag"/> |
491 |
< |
<arg value="${javadoc.jls.option}"/> |
492 |
< |
<arg value="-tag"/> |
493 |
< |
<arg value="apiNote:a:<em>API Note:</em>"/> |
494 |
< |
<arg value="-tag"/> |
495 |
< |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
496 |
< |
<arg value="-tag"/> |
497 |
< |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
498 |
< |
<!-- tags added in jdk9 --> |
499 |
< |
<arg value="-tag"/> |
500 |
< |
<arg value="revised:X"/> |
501 |
< |
<arg value="-tag"/> |
463 |
< |
<arg value="spec:X"/> |
489 |
> |
<arg value="-html5"/> |
490 |
> |
<arg value="--patch-module=java.base=${src.dir}"/> |
491 |
> |
<!-- old school frames via docs/index.html?overview-summary.html --> |
492 |
> |
<!-- TODO: - -frames no longer a supported option in jdk13+ --> |
493 |
> |
<arg value="--frames"/> |
494 |
> |
<arg value="--override-methods=summary"/> |
495 |
> |
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
496 |
> |
<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/> |
497 |
> |
<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/> |
498 |
> |
<arg value="-tag"/> <arg value="apiNote:a:API Note:"/> |
499 |
> |
<!-- tags added in jdk9: currently unused --> |
500 |
> |
<!-- <arg value="-tag"/> <arg value="revised:X"/> --> |
501 |
> |
<!-- <arg value="-tag"/> <arg value="spec:X"/> --> |
502 |
|
</javadoc> |
503 |
|
</target> |
504 |
|
|
508 |
|
description="Puts all distributable products in single hierarchy"/> |
509 |
|
|
510 |
|
|
473 |
– |
<target name="release" |
474 |
– |
depends="dist" |
475 |
– |
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
476 |
– |
|
477 |
– |
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
478 |
– |
|
479 |
– |
<jar basedir="${basedir}" destfile="${release.jar}"> |
480 |
– |
<!-- <exclude name="build/**"/> --> |
481 |
– |
<exclude name="${release.jar}"/> |
482 |
– |
<exclude name="user.properties"/> |
483 |
– |
<exclude name="etc/notes/**"/> |
484 |
– |
<exclude name="src/emulation/**"/> |
485 |
– |
<exclude name="**/SyntaxTest.java"/> |
486 |
– |
<exclude name="**/SuperfluousAbstract.java"/> |
487 |
– |
<manifest> |
488 |
– |
<attribute name="Built-By" value="${user.name}"/> |
489 |
– |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
490 |
– |
</manifest> |
491 |
– |
</jar> |
492 |
– |
</target> |
493 |
– |
|
494 |
– |
|
511 |
|
<target name="clean" |
512 |
|
description="Removes all build products"> |
497 |
– |
|
513 |
|
<delete dir="${build.dir}"/> |
499 |
– |
|
514 |
|
</target> |
515 |
|
|
516 |
|
|
517 |
|
<target name="dist-clean" |
518 |
|
description="Removes all build and distribution products"> |
505 |
– |
|
519 |
|
<delete dir="${build.dir}"/> |
520 |
|
<delete dir="${dist.dir}"/> |
508 |
– |
|
521 |
|
</target> |
522 |
|
|
523 |
|
|
533 |
|
|
534 |
|
<target name="tck" |
535 |
|
depends="jar" |
536 |
< |
description="Runs tck tests for main directly"> |
536 |
> |
description="Runs tck tests for src/main directly"> |
537 |
|
|
538 |
|
<run-tck-tests |
539 |
< |
target="${build.main.java.version}" |
539 |
> |
target="${java.runtime.target}" |
540 |
|
workdir="${build.dir}" |
541 |
< |
classes="${product.jar}"/> |
541 |
> |
classes="${product.jar}"> |
542 |
> |
<javac-elements> |
543 |
> |
<compilerarg value="-Werror"/> |
544 |
> |
</javac-elements> |
545 |
> |
</run-tck-tests> |
546 |
|
</target> |
547 |
|
|
548 |
|
<target name="tck-parallelism-1" |
549 |
< |
description="Runs tck with given common pool parallelism"> |
549 |
> |
description="Runs tck with common pool parallelism 1"> |
550 |
|
<antcall target="tck"> |
551 |
|
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/> |
552 |
|
</antcall> |
553 |
|
</target> |
554 |
|
|
555 |
|
<target name="tck-parallelism-0" |
556 |
< |
description="Runs tck with given common pool parallelism"> |
556 |
> |
description="Runs tck with common pool parallelism 0"> |
557 |
|
<antcall target="tck"> |
558 |
|
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/> |
559 |
|
</antcall> |
560 |
|
</target> |
561 |
|
|
562 |
+ |
<target name="tck-security-manager" |
563 |
+ |
description="Runs tck with a security manager"> |
564 |
+ |
<antcall target="tck"> |
565 |
+ |
<param name="jsr166.useSecurityManager" value="true"/> |
566 |
+ |
</antcall> |
567 |
+ |
</target> |
568 |
+ |
|
569 |
|
<target name="jtreg" |
570 |
|
depends="jar" |
571 |
< |
description="Runs jtreg tests for main using the jtreg ant task"> |
571 |
> |
description="Runs jtreg tests for src/main using the jtreg ant task"> |
572 |
|
<run-jtreg-tests |
573 |
< |
target="${build.main.java.version}" |
573 |
> |
target="${java.runtime.target}" |
574 |
|
workdir="${build.dir}" |
575 |
|
classes="${product.jar}"/> |
576 |
|
</target> |
577 |
|
|
578 |
|
<target name="test" |
579 |
< |
depends="tck, tck-parallelism-1, jtreg" |
580 |
< |
description="Runs tck and jtreg tests for main"> |
579 |
> |
depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg" |
580 |
> |
description="Runs tck and jtreg tests for src/main"/> |
581 |
> |
|
582 |
> |
<target name="test-version-permutations" |
583 |
> |
depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs"> |
584 |
|
</target> |
585 |
|
|
586 |
< |
<target name="jtreg8" description="Runs jtreg tests with jdk8"> |
586 |
> |
<!-- jdk9 is unsupported as of 2019-08 --> |
587 |
> |
<!-- <target name="test9"> --> |
588 |
> |
<!-- <antcall target="clean"/> --> |
589 |
> |
<!-- <antcall> --> |
590 |
> |
<!-- <param name="java.runtime.target" value="9"/> --> |
591 |
> |
<!-- <param name="build.main.javac" value="${javac9}"/> --> |
592 |
> |
<!-- <param name="build.main.javadoc" value="${javadoc12}"/> --> |
593 |
> |
<!-- <param name="build.main.javadoc.source" value="9"/> --> |
594 |
> |
<!-- <target name="test"/> --> |
595 |
> |
<!-- <target name="docs"/> --> |
596 |
> |
<!-- </antcall> --> |
597 |
> |
<!-- </target> --> |
598 |
|
|
599 |
< |
<antcall target="jtreg"> |
600 |
< |
<param name="build.main.java.version" value="8"/> |
601 |
< |
<param name="build.main.javac" value="${javac8}"/> |
599 |
> |
<!-- jdk10 is unsupported as of 2019-08 --> |
600 |
> |
<!-- <target name="test10"> --> |
601 |
> |
<!-- <antcall target="clean"/> --> |
602 |
> |
<!-- <antcall> --> |
603 |
> |
<!-- <param name="java.runtime.target" value="10"/> --> |
604 |
> |
<!-- <param name="build.main.javac" value="${javac10}"/> --> |
605 |
> |
<!-- <param name="build.main.javadoc" value="${javadoc12}"/> --> |
606 |
> |
<!-- <param name="build.main.javadoc.source" value="10"/> --> |
607 |
> |
<!-- <target name="test"/> --> |
608 |
> |
<!-- <target name="docs"/> --> |
609 |
> |
<!-- </antcall> --> |
610 |
> |
<!-- </target> --> |
611 |
> |
|
612 |
> |
<target name="test11"> |
613 |
> |
<antcall target="clean"/> |
614 |
> |
<antcall> |
615 |
> |
<param name="java.runtime.target" value="11"/> |
616 |
> |
<param name="build.main.javac" value="${javac11}"/> |
617 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
618 |
> |
<param name="build.main.javadoc.source" value="11"/> |
619 |
> |
<target name="test"/> |
620 |
> |
<target name="docs"/> |
621 |
|
</antcall> |
622 |
+ |
</target> |
623 |
|
|
624 |
+ |
<target name="test12"> |
625 |
+ |
<antcall target="clean"/> |
626 |
+ |
<antcall> |
627 |
+ |
<param name="java.runtime.target" value="12"/> |
628 |
+ |
<param name="build.main.javac" value="${javac12}"/> |
629 |
+ |
<param name="build.main.javadoc" value="${javadoc12}"/> |
630 |
+ |
<param name="build.main.javadoc.source" value="12"/> |
631 |
+ |
<target name="test"/> |
632 |
+ |
<target name="docs"/> |
633 |
+ |
</antcall> |
634 |
|
</target> |
635 |
|
|
636 |
< |
<target name="test89" |
637 |
< |
description="Runs tck and jtreg tests for main for multiple java versions"> |
636 |
> |
<target name="test13"> |
637 |
> |
<antcall target="clean"/> |
638 |
> |
<antcall> |
639 |
> |
<param name="java.runtime.target" value="13"/> |
640 |
> |
<param name="build.main.javac" value="${javac13}"/> |
641 |
> |
<param name="build.main.javadoc" value="${javadoc13}"/> |
642 |
> |
<param name="build.main.javadoc.source" value="13"/> |
643 |
> |
<target name="test"/> |
644 |
> |
<target name="docs"/> |
645 |
> |
</antcall> |
646 |
> |
</target> |
647 |
|
|
648 |
+ |
<target name="test14"> |
649 |
|
<antcall target="clean"/> |
650 |
< |
<antcall target="test"> |
651 |
< |
<param name="build.main.java.version" value="8"/> |
652 |
< |
<param name="build.main.javac" value="${javac8}"/> |
650 |
> |
<antcall> |
651 |
> |
<param name="java.runtime.target" value="14"/> |
652 |
> |
<param name="build.main.javac" value="${javac14}"/> |
653 |
> |
<param name="build.main.javadoc" value="${javadoc14}"/> |
654 |
> |
<param name="build.main.javadoc.source" value="14"/> |
655 |
> |
<target name="test"/> |
656 |
> |
<target name="docs"/> |
657 |
|
</antcall> |
658 |
+ |
</target> |
659 |
|
|
660 |
+ |
<target name="test11-12"> |
661 |
|
<antcall target="clean"/> |
662 |
< |
<antcall target="test"> |
663 |
< |
<param name="build.main.java.version" value="9"/> |
664 |
< |
<param name="build.main.javac" value="${javac9}"/> |
662 |
> |
<antcall> |
663 |
> |
<param name="java.runtime.target" value="12"/> |
664 |
> |
<param name="build.main.javac" value="${javac11}"/> |
665 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
666 |
> |
<param name="build.main.javadoc.source" value="11"/> |
667 |
> |
<target name="test"/> |
668 |
> |
<target name="docs"/> |
669 |
|
</antcall> |
670 |
+ |
</target> |
671 |
|
|
672 |
+ |
<target name="test11-13"> |
673 |
+ |
<antcall target="clean"/> |
674 |
+ |
<antcall> |
675 |
+ |
<param name="java.runtime.target" value="13"/> |
676 |
+ |
<param name="build.main.javac" value="${javac11}"/> |
677 |
+ |
<param name="build.main.javadoc" value="${javadoc13}"/> |
678 |
+ |
<param name="build.main.javadoc.source" value="11"/> |
679 |
+ |
<target name="test"/> |
680 |
+ |
<target name="docs"/> |
681 |
+ |
</antcall> |
682 |
|
</target> |
683 |
|
|
684 |
+ |
<target name="test11-14"> |
685 |
+ |
<antcall target="clean"/> |
686 |
+ |
<antcall> |
687 |
+ |
<param name="java.runtime.target" value="14"/> |
688 |
+ |
<param name="build.main.javac" value="${javac11}"/> |
689 |
+ |
<param name="build.main.javadoc" value="${javadoc14}"/> |
690 |
+ |
<param name="build.main.javadoc.source" value="11"/> |
691 |
+ |
<target name="test"/> |
692 |
+ |
<target name="docs"/> |
693 |
+ |
</antcall> |
694 |
+ |
</target> |
695 |
|
|
696 |
|
|
697 |
|
<target name="configure-compiler"> |
698 |
|
<fail message="ant version too old"> |
699 |
< |
<condition> |
591 |
< |
<not> <antversion atleast="1.9.1"/> </not> |
592 |
< |
</condition> |
699 |
> |
<condition> <not> <antversion atleast="1.9.1"/> </not> </condition> |
700 |
|
</fail> |
701 |
|
|
702 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
714 |
|
</target> |
715 |
|
|
716 |
|
|
610 |
– |
|
611 |
– |
<!-- Various demos and test programs --> |
612 |
– |
|
613 |
– |
|
614 |
– |
<!-- description="Benchmark from Doug Lea's AQS paper" --> |
615 |
– |
<target name="loops" depends="configure-compiler"> |
616 |
– |
|
617 |
– |
<mkdir dir="${build.loops.dir}"/> |
618 |
– |
|
619 |
– |
<javac srcdir="${loops.src.dir}" |
620 |
– |
destdir="${build.loops.dir}" |
621 |
– |
debug="${build.debug}" |
622 |
– |
debuglevel="${build.debuglevel}" |
623 |
– |
deprecation="${build.deprecation}" |
624 |
– |
source="${build.sourcelevel}" |
625 |
– |
target="${build.sourcelevel}" |
626 |
– |
fork="true"> |
627 |
– |
|
628 |
– |
<compilerarg line="${build.args}"/> |
629 |
– |
<classpath refid="loops.classpath"/> |
630 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
631 |
– |
|
632 |
– |
</javac> |
633 |
– |
|
634 |
– |
<java classname="ALoops" fork="true"> |
635 |
– |
<classpath refid="loops.classpath"/> |
636 |
– |
</java> |
637 |
– |
|
638 |
– |
</target> |
639 |
– |
|
640 |
– |
|
717 |
|
<target name="compile-test-loops" depends="jar" |
718 |
< |
description="compile all the perf tests in src/test/loops"> |
718 |
> |
description="Compiles all the perf tests in src/test/loops"> |
719 |
|
|
720 |
|
<mkdir dir="${build.dir}/test/loops"/> |
721 |
|
|
726 |
|
deprecation="${build.deprecation}" |
727 |
|
includeAntRuntime="false" |
728 |
|
includeJavaRuntime="false" |
729 |
< |
executable="${javac9}" |
729 |
> |
encoding="ASCII" |
730 |
> |
executable="${build.main.javac}" |
731 |
|
fork="true"> |
732 |
|
|
733 |
|
<include name="*.java"/> |
735 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
736 |
|
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
737 |
|
<compilerarg line="${build.args}"/> |
661 |
– |
|
738 |
|
</javac> |
663 |
– |
|
739 |
|
</target> |
740 |
|
|
741 |
|
|
758 |
|
bootclasspath="${bootclasspath8}" |
759 |
|
includeAntRuntime="false" |
760 |
|
includeJavaRuntime="false" |
761 |
+ |
encoding="ASCII" |
762 |
|
executable="${javac8}" |
763 |
|
fork="true"> |
688 |
– |
|
764 |
|
<include name="**/*.java"/> |
765 |
|
<compilerarg value="-Xprefer:source"/> |
766 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
767 |
|
<compilerarg value="-Xlint:all"/> |
768 |
|
<compilerarg value="-Werror"/> |
769 |
|
<compilerarg line="${build.args}"/> |
695 |
– |
|
770 |
|
</javac> |
771 |
|
</target> |
772 |
|
|
787 |
|
bootclasspath="${bootclasspath8}" |
788 |
|
includeAntRuntime="false" |
789 |
|
includeJavaRuntime="false" |
790 |
+ |
encoding="ASCII" |
791 |
|
executable="${javac8}" |
792 |
|
fork="true"> |
718 |
– |
|
793 |
|
<include name="**/*.java"/> |
794 |
|
<compilerarg value="-Xprefer:source"/> |
795 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
796 |
|
<compilerarg value="-Xlint:all"/> |
797 |
< |
<compilerarg value="-Xdoclint:all/protected"/> |
797 |
> |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
798 |
|
<compilerarg line="${build.args}"/> |
725 |
– |
|
799 |
|
</javac> |
800 |
|
</target> |
801 |
|
|
811 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
812 |
|
</manifest> |
813 |
|
</jar> |
741 |
– |
|
814 |
|
</target> |
815 |
|
|
816 |
|
|
826 |
|
<!-- JDK9+ test classes --> |
827 |
|
<exclude name="*9Test.java"/> |
828 |
|
<exclude name="*10Test.java"/> |
829 |
+ |
<compilerarg value="-Werror"/> |
830 |
|
</javac-elements> |
831 |
|
</run-tck-tests> |
832 |
|
</target> |
844 |
|
|
845 |
|
<target name="4jdk8-test" |
846 |
|
depends="4jdk8-tck, 4jdk8-jtreg" |
847 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk8"> |
775 |
< |
</target> |
847 |
> |
description="Runs tck and jtreg tests for jsr166-4jdk8"/> |
848 |
|
|
849 |
|
|
850 |
|
<target name="4jdk8docs" |
860 |
|
access="${build.javadoc.access}" |
861 |
|
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
862 |
|
classpath="" |
863 |
< |
executable="${javadoc8}"> |
863 |
> |
source="8" |
864 |
> |
executable="${javadoc8}" |
865 |
> |
failonerror = "true"> |
866 |
|
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
867 |
|
<include name="**/*.java"/> |
868 |
|
</fileset> |
869 |
|
<arg line="-Xdocrootparent ${java8.docroot.url}"/> |
870 |
|
<arg value="-XDignore.symbol.file=true"/> |
871 |
< |
<arg value="-tag"/> |
872 |
< |
<arg value="${javadoc.jls.option}"/> |
873 |
< |
<arg value="-tag"/> |
874 |
< |
<arg value="apiNote:a:<em>API Note:</em>"/> |
875 |
< |
<arg value="-tag"/> |
802 |
< |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
803 |
< |
<arg value="-tag"/> |
804 |
< |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
871 |
> |
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
872 |
> |
<arg value="-tag"/> <arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
873 |
> |
<arg value="-tag"/> <arg value="implNote:a:<em>Implementation Note:</em>"/> |
874 |
> |
<!-- @apiNote tag currently unused --> |
875 |
> |
<!-- <arg value="-tag"/> <arg value="apiNote:a:<em>API Note:</em>"/> --> |
876 |
|
</javadoc> |
877 |
|
</target> |
878 |
|
|
884 |
|
|
885 |
|
<target name="4jdk8clean" |
886 |
|
description="Removes all 4jdk8 build products"> |
816 |
– |
|
887 |
|
<delete dir="${build.4jdk8.dir}"/> |
818 |
– |
|
888 |
|
</target> |
889 |
|
|
890 |
|
|
900 |
|
</target> |
901 |
|
|
902 |
|
|
903 |
+ |
<!-- jsr166 4jdk7 (no longer maintained) --> |
904 |
|
|
905 |
< |
<!-- jsr166 4jdk7 --> |
836 |
< |
|
837 |
< |
<target name="4jdk7compile" |
838 |
< |
depends="configure-compiler" |
839 |
< |
description="Compiles src/jdk7 sources, targeting jdk7"> |
840 |
< |
|
905 |
> |
<target name="4jdk7compile" depends="configure-compiler"> |
906 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
907 |
|
|
908 |
|
<javac srcdir="${4jdk7src.dir}" |
916 |
|
bootclasspath="${bootclasspath6}" |
917 |
|
includeAntRuntime="false" |
918 |
|
includeJavaRuntime="false" |
919 |
+ |
encoding="ASCII" |
920 |
|
executable="${javac7}" |
921 |
|
fork="true"> |
922 |
|
|
926 |
|
<compilerarg value="-Xlint:all"/> |
927 |
|
<compilerarg value="-Werror"/> |
928 |
|
<compilerarg line="${build.args}"/> |
863 |
– |
|
929 |
|
</javac> |
930 |
|
</target> |
931 |
|
|
932 |
< |
<target name="4jdk7doclint" |
868 |
< |
depends="configure-compiler" |
869 |
< |
description="Finds doclint warnings"> |
870 |
< |
|
932 |
> |
<target name="4jdk7doclint" depends="configure-compiler"> |
933 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
934 |
|
|
935 |
|
<javac srcdir="${4jdk7src.dir}" |
943 |
|
bootclasspath="${bootclasspath6}" |
944 |
|
includeAntRuntime="false" |
945 |
|
includeJavaRuntime="false" |
946 |
+ |
encoding="ASCII" |
947 |
|
executable="${javac8}" |
948 |
|
fork="true"> |
949 |
|
|
953 |
|
<compilerarg value="-Xlint:all"/> |
954 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
955 |
|
<compilerarg line="${build.args}"/> |
893 |
– |
|
956 |
|
</javac> |
957 |
|
</target> |
958 |
|
|
959 |
< |
|
898 |
< |
<target name="4jdk7jar" |
899 |
< |
depends="4jdk7compile" |
900 |
< |
description="Builds library jar from compiled sources"> |
901 |
< |
|
959 |
> |
<target name="4jdk7jar" depends="4jdk7compile"> |
960 |
|
<jar destfile="${4jdk7product.jar}"> |
961 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
962 |
|
<manifest> |
964 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
965 |
|
</manifest> |
966 |
|
</jar> |
909 |
– |
|
967 |
|
</target> |
968 |
|
|
969 |
< |
|
913 |
< |
<target name="4jdk7-tck" |
914 |
< |
depends="4jdk7jar" |
915 |
< |
description="Runs tck tests for jsr166-4jdk7 directly"> |
916 |
< |
|
969 |
> |
<target name="4jdk7-tck" depends="4jdk7jar"> |
970 |
|
<run-tck-tests |
971 |
|
target="7" |
972 |
|
workdir="${build.4jdk7.dir}" |
984 |
|
<exclude name="SplittableRandomTest.java"/> |
985 |
|
<exclude name="StampedLockTest.java"/> |
986 |
|
<exclude name="SubmissionPublisherTest.java"/> |
987 |
+ |
<compilerarg value="-Werror"/> |
988 |
|
</javac-elements> |
989 |
|
</run-tck-tests> |
990 |
|
</target> |
991 |
|
|
938 |
– |
|
992 |
|
<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) --> |
993 |
< |
<target name="4jdk7-tck-junit" |
941 |
< |
depends="4jdk7compile"> |
993 |
> |
<target name="4jdk7-tck-junit" depends="4jdk7compile"> |
994 |
|
|
995 |
|
<junit printsummary="true" |
996 |
|
showoutput="true" |
1012 |
|
|
1013 |
|
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
1014 |
|
</test> |
963 |
– |
|
1015 |
|
</junit> |
1016 |
|
</target> |
1017 |
|
|
1018 |
< |
<target name="4jdk7-jtreg" |
968 |
< |
depends="4jdk7jar" |
969 |
< |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
1018 |
> |
<target name="4jdk7-jtreg" depends="4jdk7jar"> |
1019 |
|
<run-jtreg-tests |
1020 |
|
target="7" |
1021 |
|
workdir="${build.4jdk7.dir}" |
1022 |
|
classes="${4jdk7product.jar}"/> |
1023 |
|
</target> |
1024 |
|
|
1025 |
+ |
<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/> |
1026 |
|
|
1027 |
< |
<target name="4jdk7-test" |
978 |
< |
depends="4jdk7-tck, 4jdk7-jtreg" |
979 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
980 |
< |
</target> |
981 |
< |
|
982 |
< |
|
983 |
< |
<target name="4jdk7docs" |
984 |
< |
description="Builds javadocs for src/jdk7 to dist dir"> |
985 |
< |
|
1027 |
> |
<target name="4jdk7docs"> |
1028 |
|
<delete dir="${4jdk7docs.dir}"/> |
1029 |
|
<mkdir dir="${4jdk7docs.dir}"/> |
1030 |
|
|
1035 |
|
access="${build.javadoc.access}" |
1036 |
|
sourcepath="${4jdk7src.dir}:${jdk7.src.dir}" |
1037 |
|
classpath="" |
1038 |
< |
executable="${javadoc7}"> |
1038 |
> |
executable="${javadoc7}" |
1039 |
> |
failonerror = "true"> |
1040 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
1041 |
|
<include name="**/*.java"/> |
1042 |
|
</fileset> |
1045 |
|
</javadoc> |
1046 |
|
</target> |
1047 |
|
|
1048 |
+ |
<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/> |
1049 |
|
|
1050 |
< |
<target name="4jdk7dist" |
1007 |
< |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
1008 |
< |
description="Puts all distributable products in single hierarchy"/> |
1009 |
< |
|
1010 |
< |
|
1011 |
< |
<target name="4jdk7clean" |
1012 |
< |
description="Removes all 4jdk7 build products"> |
1013 |
< |
|
1050 |
> |
<target name="4jdk7clean"> |
1051 |
|
<delete dir="${build.4jdk7.dir}"/> |
1015 |
– |
|
1052 |
|
</target> |
1053 |
|
|
1054 |
< |
|
1019 |
< |
<target name="4jdk7dist-jar" |
1020 |
< |
depends="4jdk7clean, 4jdk7jar"> |
1054 |
> |
<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar"> |
1055 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
1056 |
|
</target> |
1057 |
|
|
1058 |
< |
|
1025 |
< |
<target name="4jdk7dist-docs" |
1026 |
< |
depends="4jdk7clean, 4jdk7docs"> |
1058 |
> |
<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs"> |
1059 |
|
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
1060 |
|
</target> |
1061 |
|
|
1062 |
|
|
1063 |
< |
<!-- jsr166x --> |
1032 |
< |
|
1033 |
< |
<target name="jsr166xcompile" |
1034 |
< |
depends="configure-compiler" |
1035 |
< |
description="Compiles jsr166x sources to build dir"> |
1063 |
> |
<!-- jsr166x (no longer maintained) --> |
1064 |
|
|
1065 |
+ |
<target name="jsr166xcompile" depends="configure-compiler"> |
1066 |
|
<mkdir dir="${build.jsr166x.classes.dir}"/> |
1067 |
|
|
1068 |
|
<javac srcdir="${topsrc.dir}" |
1076 |
|
target="5" |
1077 |
|
includeAntRuntime="false" |
1078 |
|
includeJavaRuntime="false" |
1079 |
+ |
encoding="ASCII" |
1080 |
|
executable="${javac7}" |
1081 |
|
fork="true"> |
1052 |
– |
|
1082 |
|
<include name="jsr166x/**/*.java"/> |
1083 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1084 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
1085 |
|
<compilerarg value="-Werror"/> |
1086 |
|
<compilerarg line="${build.args}"/> |
1058 |
– |
|
1087 |
|
</javac> |
1088 |
|
</target> |
1089 |
|
|
1090 |
< |
|
1063 |
< |
<target name="jsr166xjar" |
1064 |
< |
depends="jsr166xcompile" |
1065 |
< |
description="Builds library jar from compiled sources"> |
1066 |
< |
|
1090 |
> |
<target name="jsr166xjar" depends="jsr166xcompile"> |
1091 |
|
<jar destfile="${jsr166x.jar}"> |
1092 |
|
<fileset dir="${build.jsr166x.classes.dir}"/> |
1093 |
|
<manifest> |
1095 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1096 |
|
</manifest> |
1097 |
|
</jar> |
1074 |
– |
|
1098 |
|
</target> |
1099 |
|
|
1100 |
< |
|
1078 |
< |
<target name="jsr166xdocs" |
1079 |
< |
description="Builds javadocs to dist dir"> |
1080 |
< |
|
1100 |
> |
<target name="jsr166xdocs"> |
1101 |
|
<delete dir="${jsr166xdocs.dir}"/> |
1102 |
|
<mkdir dir="${jsr166xdocs.dir}"/> |
1103 |
|
|
1108 |
|
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
1109 |
|
bootclasspath="${bootclasspath6}" |
1110 |
|
source="5" |
1111 |
< |
executable="${javadoc7}"> |
1111 |
> |
executable="${javadoc7}" |
1112 |
> |
failonerror = "true"> |
1113 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1114 |
|
<arg value="-XDignore.symbol.file=true"/> |
1094 |
– |
|
1115 |
|
</javadoc> |
1116 |
|
</target> |
1117 |
|
|
1118 |
+ |
<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/> |
1119 |
|
|
1120 |
< |
<target name="jsr166xdist" |
1100 |
< |
depends="jsr166xdist-jar, jsr166xdist-docs" |
1101 |
< |
description="Puts all distributable products in single hierarchy"/> |
1102 |
< |
|
1103 |
< |
|
1104 |
< |
<target name="jsr166xclean" |
1105 |
< |
description="Removes all jsr166x build products"> |
1106 |
< |
|
1120 |
> |
<target name="jsr166xclean"> |
1121 |
|
<delete dir="${build.jsr166x.dir}"/> |
1108 |
– |
|
1122 |
|
</target> |
1123 |
|
|
1124 |
< |
|
1112 |
< |
<target name="jsr166xdist-jar" |
1113 |
< |
depends="jsr166xclean, jsr166xjar"> |
1124 |
> |
<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar"> |
1125 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
1126 |
|
</target> |
1127 |
|
|
1128 |
< |
<target name="jsr166xdist-docs" |
1118 |
< |
depends="jsr166xclean, jsr166xdocs"> |
1128 |
> |
<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs"> |
1129 |
|
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
1130 |
|
</target> |
1131 |
|
|
1122 |
– |
<!-- jsr166y --> |
1132 |
|
|
1133 |
+ |
<!-- jsr166y (no longer maintained) --> |
1134 |
|
|
1135 |
< |
<target name="jsr166ycompile" |
1126 |
< |
depends="configure-compiler" |
1127 |
< |
description="Compiles jsr166y sources"> |
1128 |
< |
|
1135 |
> |
<target name="jsr166ycompile" depends="configure-compiler"> |
1136 |
|
<mkdir dir="${build.jsr166y.classes.dir}"/> |
1137 |
|
|
1138 |
|
<javac srcdir="${topsrc.dir}" |
1146 |
|
bootclasspath="${bootclasspath6}" |
1147 |
|
includeAntRuntime="false" |
1148 |
|
includeJavaRuntime="false" |
1149 |
+ |
encoding="ASCII" |
1150 |
|
executable="${javac7}" |
1151 |
|
fork="true"> |
1152 |
|
|
1155 |
|
<compilerarg value="-Xlint:all"/> |
1156 |
|
<compilerarg value="-Werror"/> |
1157 |
|
<compilerarg line="${build.args}"/> |
1150 |
– |
|
1158 |
|
</javac> |
1159 |
|
</target> |
1160 |
|
|
1161 |
< |
|
1155 |
< |
<target name="jsr166yjar" |
1156 |
< |
depends="jsr166ycompile" |
1157 |
< |
description="Builds library jar from compiled sources"> |
1158 |
< |
|
1161 |
> |
<target name="jsr166yjar" depends="jsr166ycompile"> |
1162 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
1163 |
|
<fileset dir="${build.jsr166y.classes.dir}"/> |
1164 |
|
<manifest> |
1166 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1167 |
|
</manifest> |
1168 |
|
</jar> |
1166 |
– |
|
1169 |
|
</target> |
1170 |
|
|
1171 |
< |
|
1170 |
< |
<target name="jsr166ydocs" |
1171 |
< |
description="Builds javadocs to dist dir"> |
1172 |
< |
|
1171 |
> |
<target name="jsr166ydocs"> |
1172 |
|
<delete dir="${jsr166ydocs.dir}"/> |
1173 |
|
<mkdir dir="${jsr166ydocs.dir}"/> |
1174 |
|
|
1179 |
|
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
1180 |
|
bootclasspath="${bootclasspath6}" |
1181 |
|
source="6" |
1182 |
< |
executable="${javadoc7}"> |
1182 |
> |
executable="${javadoc7}" |
1183 |
> |
failonerror = "true"> |
1184 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1185 |
|
<arg value="-XDignore.symbol.file=true"/> |
1186 |
– |
|
1186 |
|
</javadoc> |
1187 |
|
</target> |
1188 |
|
|
1189 |
+ |
<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/> |
1190 |
|
|
1191 |
< |
<target name="jsr166ydist" |
1192 |
< |
depends="jsr166ydist-jar, jsr166ydist-docs" |
1193 |
< |
description="Puts all distributable products in single hierarchy"/> |
1194 |
< |
|
1195 |
< |
|
1196 |
< |
<target name="jsr166yclean" |
1197 |
< |
description="Removes all jsr166y build products"> |
1198 |
< |
|
1191 |
> |
<target name="jsr166yclean"> |
1192 |
|
<delete dir="${build.jsr166y.dir}"/> |
1200 |
– |
|
1193 |
|
</target> |
1194 |
|
|
1195 |
< |
|
1204 |
< |
<target name="jsr166ydist-jar" |
1205 |
< |
depends="jsr166yclean, jsr166yjar"> |
1195 |
> |
<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar"> |
1196 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
1197 |
|
</target> |
1198 |
|
|
1199 |
< |
<target name="jsr166ydist-docs" |
1210 |
< |
depends="jsr166yclean, jsr166ydocs"> |
1199 |
> |
<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs"> |
1200 |
|
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
1201 |
|
</target> |
1202 |
|
|
1203 |
|
|
1204 |
< |
<!-- extra166y --> |
1216 |
< |
|
1217 |
< |
|
1218 |
< |
<target name="extra166ycompile" |
1219 |
< |
depends="configure-compiler, jsr166yjar" |
1220 |
< |
description="Compiles extra166y sources"> |
1204 |
> |
<!-- extra166y (no longer maintained) --> |
1205 |
|
|
1206 |
+ |
<target name="extra166ycompile" depends="configure-compiler, jsr166yjar"> |
1207 |
|
<mkdir dir="${build.extra166y.classes.dir}"/> |
1208 |
|
|
1209 |
|
<javac srcdir="${topsrc.dir}" |
1217 |
|
target="6" |
1218 |
|
includeAntRuntime="false" |
1219 |
|
includeJavaRuntime="false" |
1220 |
+ |
encoding="ASCII" |
1221 |
|
executable="${javac7}" |
1222 |
|
fork="true"> |
1223 |
|
|
1226 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
1227 |
|
<compilerarg value="-Werror"/> |
1228 |
|
<compilerarg line="${build.args}"/> |
1243 |
– |
|
1229 |
|
</javac> |
1230 |
|
</target> |
1231 |
|
|
1232 |
< |
|
1248 |
< |
<target name="extra166yjar" |
1249 |
< |
depends="extra166ycompile" |
1250 |
< |
description="Builds library jar from compiled sources"> |
1251 |
< |
|
1232 |
> |
<target name="extra166yjar" depends="extra166ycompile"> |
1233 |
|
<jar destfile="${extra166y.jar}" index="true"> |
1234 |
|
<fileset dir="${build.extra166y.classes.dir}"/> |
1235 |
|
<manifest> |
1237 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1238 |
|
</manifest> |
1239 |
|
</jar> |
1259 |
– |
|
1240 |
|
</target> |
1241 |
|
|
1242 |
< |
|
1263 |
< |
<target name="extra166ydocs" |
1264 |
< |
description="Builds javadocs to build dir"> |
1265 |
< |
|
1242 |
> |
<target name="extra166ydocs"> |
1243 |
|
<delete dir="${extra166ydocs.dir}"/> |
1244 |
|
<mkdir dir="${extra166ydocs.dir}"/> |
1245 |
|
|
1253 |
|
executable="${javadoc7}"> |
1254 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1255 |
|
<arg value="-XDignore.symbol.file=true"/> |
1279 |
– |
|
1256 |
|
</javadoc> |
1257 |
|
</target> |
1258 |
|
|
1259 |
+ |
<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/> |
1260 |
|
|
1261 |
< |
<target name="extra166ydist" |
1285 |
< |
depends="extra166ydist-jar, extra166ydist-docs" |
1286 |
< |
description="Puts all distributable products in single hierarchy"/> |
1287 |
< |
|
1288 |
< |
|
1289 |
< |
<target name="extra166yclean" |
1290 |
< |
description="Removes all extra166y build products"> |
1291 |
< |
|
1261 |
> |
<target name="extra166yclean"> |
1262 |
|
<delete dir="${build.extra166y.dir}"/> |
1293 |
– |
|
1263 |
|
</target> |
1264 |
|
|
1265 |
< |
|
1297 |
< |
<target name="extra166ydist-jar" |
1298 |
< |
depends="extra166yclean, extra166yjar"> |
1265 |
> |
<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar"> |
1266 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
1267 |
|
</target> |
1268 |
|
|
1269 |
< |
<target name="extra166ydist-docs" |
1303 |
< |
depends="extra166yclean, extra166ydocs"> |
1269 |
> |
<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs"> |
1270 |
|
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
1271 |
|
</target> |
1272 |
|
|
1273 |
< |
<!-- jsr166e --> |
1273 |
> |
|
1274 |
> |
<!-- jsr166e (no longer maintained) --> |
1275 |
|
|
1276 |
|
<property name="build.jsr166e.java.version" value="6"/> |
1277 |
|
<property name="build.jsr166e.javac" value="${javac6}"/> |
1278 |
|
|
1279 |
< |
<target name="jsr166ecompile" |
1313 |
< |
depends="configure-compiler" |
1314 |
< |
description="Compiles jsr166e sources"> |
1315 |
< |
|
1279 |
> |
<target name="jsr166ecompile" depends="configure-compiler"> |
1280 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1281 |
|
|
1282 |
|
<javac srcdir="${topsrc.dir}" |
1297 |
|
<compilerarg value="-Xlint:all"/> |
1298 |
|
<compilerarg value="-Werror"/> |
1299 |
|
<compilerarg line="${build.args}"/> |
1336 |
– |
|
1300 |
|
</javac> |
1301 |
|
</target> |
1302 |
|
|
1340 |
– |
<!-- jsr166e: find doclint errors --> |
1303 |
|
<target name="jsr166edoclint"> |
1342 |
– |
|
1304 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1305 |
|
|
1306 |
|
<javac srcdir="${topsrc.dir}" |
1322 |
|
<compilerarg value="-Xlint:all"/> |
1323 |
|
<compilerarg value="-Werror"/> |
1324 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1364 |
– |
|
1325 |
|
</javac> |
1326 |
|
</target> |
1327 |
|
|
1328 |
< |
|
1369 |
< |
<target name="jsr166ejar" |
1370 |
< |
depends="jsr166ecompile" |
1371 |
< |
description="Builds library jar from compiled sources"> |
1372 |
< |
|
1328 |
> |
<target name="jsr166ejar" depends="jsr166ecompile"> |
1329 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1330 |
|
<fileset dir="${build.jsr166e.classes.dir}"/> |
1331 |
|
<manifest> |
1333 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1334 |
|
</manifest> |
1335 |
|
</jar> |
1380 |
– |
|
1336 |
|
</target> |
1337 |
|
|
1338 |
< |
|
1384 |
< |
<target name="jsr166edocs" |
1385 |
< |
description="Builds javadocs to build dir"> |
1386 |
< |
|
1338 |
> |
<target name="jsr166edocs"> |
1339 |
|
<delete dir="${jsr166edocs.dir}"/> |
1340 |
|
<mkdir dir="${jsr166edocs.dir}"/> |
1341 |
|
|
1345 |
|
access="${build.javadoc.access}" |
1346 |
|
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
1347 |
|
source="${build.jsr166e.java.version}" |
1348 |
< |
executable="${javadoc7}"> |
1348 |
> |
executable="${javadoc7}" |
1349 |
> |
failonerror = "true"> |
1350 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1351 |
|
<arg value="-XDignore.symbol.file=true"/> |
1399 |
– |
|
1352 |
|
</javadoc> |
1353 |
|
</target> |
1354 |
|
|
1355 |
< |
|
1404 |
< |
<target name="jsr166e-tck-one-java-version" |
1405 |
< |
depends="jsr166ejar"> |
1406 |
< |
|
1355 |
> |
<target name="jsr166e-tck-one-java-version" depends="jsr166ejar"> |
1356 |
|
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1408 |
– |
|
1357 |
|
<run-tck-tests |
1358 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1359 |
|
target="${build.jsr166e.java.version}" |
1361 |
|
classes="${jsr166e.jar}"/> |
1362 |
|
</target> |
1363 |
|
|
1364 |
< |
<target name="jsr166e-tck" |
1417 |
< |
description="Runs tck tests for jsr166e for multiple java versions"> |
1364 |
> |
<target name="jsr166e-tck"> |
1365 |
|
|
1366 |
|
<!-- <antcall target="clean"/> --> |
1367 |
|
<!-- <antcall target="jsr166e-tck-one-java-version"> --> |
1382 |
|
</antcall> |
1383 |
|
</target> |
1384 |
|
|
1385 |
+ |
<target name="jsr166e-test" depends="jsr166e-tck"/> |
1386 |
|
|
1387 |
< |
<target name="jsr166e-test" |
1440 |
< |
depends="jsr166e-tck" |
1441 |
< |
description="Runs all tests for jsr166e"> |
1442 |
< |
</target> |
1443 |
< |
|
1444 |
< |
<target name="jsr166edist" |
1445 |
< |
depends="jsr166edist-jar, jsr166edist-docs" |
1446 |
< |
description="Puts all distributable products in single hierarchy"/> |
1447 |
< |
|
1387 |
> |
<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/> |
1388 |
|
|
1389 |
< |
<target name="jsr166eclean" |
1450 |
< |
description="Removes all jsr166e build products"> |
1389 |
> |
<target name="jsr166eclean"> |
1390 |
|
<delete dir="${build.jsr166e.dir}"/> |
1391 |
|
</target> |
1392 |
|
|
1454 |
– |
|
1393 |
|
<target name="jsr166edist-jar" |
1394 |
|
depends="jsr166eclean, jsr166ejar"> |
1395 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1396 |
|
</target> |
1397 |
|
|
1398 |
< |
<target name="jsr166edist-docs" |
1461 |
< |
depends="jsr166eclean, jsr166edocs"> |
1398 |
> |
<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs"> |
1399 |
|
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1400 |
|
</target> |
1401 |
|
|
1402 |
|
|
1403 |
|
<!-- Find buglets that can be detected by static build tools --> |
1404 |
|
|
1405 |
< |
<target name="lint"> |
1406 |
< |
<antcall target="dists"> |
1407 |
< |
<param name="build.javadoc.access" value="public"/> |
1408 |
< |
</antcall> |
1409 |
< |
</target> |
1405 |
> |
<!-- <target name="lint"> --> |
1406 |
> |
<!-- <antcall target="dists"> --> |
1407 |
> |
<!-- <param name="build.javadoc.access" value="protected"/> --> |
1408 |
> |
<!-- </antcall> --> |
1409 |
> |
<!-- </target> --> |
1410 |
|
|
1411 |
|
<!-- Generates all doclint warnings, even for private methods (rarely useful) --> |
1412 |
< |
<target name="lint-private"> |
1412 |
> |
<target name="doclint-private"> |
1413 |
|
<antcall target="dist"> |
1414 |
|
<param name="build.javadoc.access" value="private"/> |
1415 |
|
</antcall> |
1416 |
|
</target> |
1417 |
|
|
1418 |
|
|
1419 |
+ |
<!-- ============================================================== |
1420 |
+ |
Experimental errorprone support |
1421 |
+ |
https://errorprone.info |
1422 |
+ |
https://errorprone.info/docs/installation |
1423 |
+ |
https://github.com/google/error-prone/issues/1143 |
1424 |
+ |
=================================================================== --> |
1425 |
+ |
<path id="errorprone.processorpath.path"> |
1426 |
+ |
<pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/> |
1427 |
+ |
<pathelement location="${lib.dir}/dataflow-2.5.7.jar"/> |
1428 |
+ |
<pathelement location="${lib.dir}/javacutil-2.5.7.jar"/> |
1429 |
+ |
<pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/> |
1430 |
+ |
</path> |
1431 |
+ |
<property name="errorprone.processorpath" refid="errorprone.processorpath.path" /> |
1432 |
+ |
<property name="errorprone.jsr166.user.flags" value=""/> |
1433 |
+ |
<property name="errorprone.jsr166.flags" |
1434 |
+ |
value="-Xep:HashtableContains:OFF |
1435 |
+ |
-Xep:JdkObsolete:OFF |
1436 |
+ |
-Xep:MissingOverride:OFF |
1437 |
+ |
-Xep:MissingFail:OFF |
1438 |
+ |
-Xep:ThreadPriorityCheck:OFF |
1439 |
+ |
-Xep:MixedArrayDimensions:ERROR |
1440 |
+ |
-Xep:RemoveUnusedImports:ERROR |
1441 |
+ |
-Xep:EmptyIf:ERROR |
1442 |
+ |
-Xep:MultipleTopLevelClasses:ERROR |
1443 |
+ |
-Xep:ClassName:ERROR |
1444 |
+ |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1445 |
+ |
-Xep:RedundantThrows:ERROR |
1446 |
+ |
-Xep:IdentityBinaryExpression:WARN |
1447 |
+ |
-Xep:ConstructorInvokesOverridable:WARN |
1448 |
+ |
-Xep:MethodCanBeStatic:WARN |
1449 |
+ |
${errorprone.jsr166.user.flags}"/> |
1450 |
+ |
<!-- -Xep:WildcardImport:ERROR --> |
1451 |
+ |
<property name="errorprone.jsr166.test.flags" |
1452 |
+ |
value="-Xep:StringSplitter:OFF |
1453 |
+ |
-Xep:BoxedPrimitiveConstructor:OFF |
1454 |
+ |
-Xep:ModifyingCollectionWithItself:OFF"/> |
1455 |
+ |
<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' --> |
1456 |
+ |
<target name="errorprone" |
1457 |
+ |
depends="clean, configure-compiler" |
1458 |
+ |
description="Run errorprone over jsr166 source code (experimental)"> |
1459 |
+ |
|
1460 |
+ |
<local name="destdir"/> |
1461 |
+ |
<property name="destdir" value="${build.classes.dir}/java.base"/> |
1462 |
+ |
<mkdir dir="${destdir}"/> |
1463 |
+ |
|
1464 |
+ |
<javac srcdir="${src.dir}" |
1465 |
+ |
destdir="${destdir}" |
1466 |
+ |
debug="${build.debug}" |
1467 |
+ |
debuglevel="${build.debuglevel}" |
1468 |
+ |
deprecation="${build.deprecation}" |
1469 |
+ |
classpath="" |
1470 |
+ |
includeAntRuntime="false" |
1471 |
+ |
includeJavaRuntime="false" |
1472 |
+ |
encoding="ASCII" |
1473 |
+ |
executable="${build.main.javac}" |
1474 |
+ |
fork="true"> |
1475 |
+ |
|
1476 |
+ |
<include name="**/*.java"/> |
1477 |
+ |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1478 |
+ |
<compilerarg value="-J--illegal-access=permit"/> |
1479 |
+ |
<compilerarg value="-XDcompilePolicy=simple"/> |
1480 |
+ |
<compilerarg value="-processorpath"/> |
1481 |
+ |
<compilerarg pathref="errorprone.processorpath.path"/> |
1482 |
+ |
<compilerarg value="-Xplugin:ErrorProne |
1483 |
+ |
${errorprone.jsr166.flags}"/> |
1484 |
+ |
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1485 |
+ |
<compilerarg value="-Xprefer:source"/> |
1486 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
1487 |
+ |
<compilerarg value="-Xlint:all"/> |
1488 |
+ |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
1489 |
+ |
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1490 |
+ |
<compilerarg line="${build.args}"/> |
1491 |
+ |
</javac> |
1492 |
+ |
|
1493 |
+ |
<jar destfile="${product.jar}"> |
1494 |
+ |
<fileset dir="${destdir}"/> |
1495 |
+ |
</jar> |
1496 |
+ |
|
1497 |
+ |
<run-tck-tests |
1498 |
+ |
target="${java.runtime.target}" |
1499 |
+ |
workdir="${build.dir}" |
1500 |
+ |
classes="${product.jar}"> |
1501 |
+ |
<javac-elements> |
1502 |
+ |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1503 |
+ |
<compilerarg value="-J--illegal-access=permit"/> |
1504 |
+ |
<compilerarg value="-XDcompilePolicy=simple"/> |
1505 |
+ |
<compilerarg line="-processorpath ${errorprone.processorpath}"/> |
1506 |
+ |
<compilerarg value="-Xplugin:ErrorProne |
1507 |
+ |
${errorprone.jsr166.flags} |
1508 |
+ |
${errorprone.jsr166.test.flags}"/> |
1509 |
+ |
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1510 |
+ |
</javac-elements> |
1511 |
+ |
</run-tck-tests> |
1512 |
+ |
</target> |
1513 |
+ |
|
1514 |
+ |
<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' --> |
1515 |
+ |
<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports --> |
1516 |
+ |
<target name="errorprone-jtreg" |
1517 |
+ |
depends="jar" |
1518 |
+ |
description="Run errorprone over jtreg tests (experimental)"> |
1519 |
+ |
|
1520 |
+ |
<run-jtreg-tests |
1521 |
+ |
target="${java.runtime.target}" |
1522 |
+ |
workdir="${build.dir}" |
1523 |
+ |
classes="${product.jar}" |
1524 |
+ |
verbose="all"> |
1525 |
+ |
<jtreg-elements> |
1526 |
+ |
<arg value="-javacoption:-XDcompilePolicy=simple"/> |
1527 |
+ |
<arg value="-javacoption:-processorpath"/> |
1528 |
+ |
<arg value="-javacoption:${errorprone.processorpath}"/> |
1529 |
+ |
<arg value="-javacoption:-Xplugin:ErrorProne |
1530 |
+ |
${errorprone.jsr166.flags} |
1531 |
+ |
${errorprone.jsr166.test.flags} |
1532 |
+ |
-Xep:MultipleTopLevelClasses:WARN |
1533 |
+ |
-Xep:NonAtomicVolatileUpdate:OFF"/> |
1534 |
+ |
</jtreg-elements> |
1535 |
+ |
</run-jtreg-tests> |
1536 |
+ |
</target> |
1537 |
+ |
|
1538 |
+ |
|
1539 |
+ |
<!-- ============================================================== |
1540 |
+ |
Running guava tests against jsr166 code |
1541 |
+ |
=================================================================== --> |
1542 |
+ |
|
1543 |
+ |
<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" --> |
1544 |
+ |
<!-- organisation="com.google.guava" module="guava-testlib" revision="21.0"/> --> |
1545 |
+ |
<!-- <property name="guava.version" value="21.0"/> --> |
1546 |
+ |
|
1547 |
+ |
<!-- HOWTO debug print a path id --> |
1548 |
+ |
<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> --> |
1549 |
+ |
<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> --> |
1550 |
+ |
|
1551 |
+ |
<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" --> |
1552 |
+ |
<!-- organisation="com.google.guava" module="guava-tests"/> --> |
1553 |
+ |
<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" --> |
1554 |
+ |
<!-- dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> --> |
1555 |
+ |
<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" --> |
1556 |
+ |
<!-- organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> --> |
1557 |
+ |
|
1558 |
+ |
<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> --> |
1559 |
+ |
<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> --> |
1560 |
+ |
<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> --> |
1561 |
+ |
<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> --> |
1562 |
+ |
|
1563 |
+ |
<!-- <ivy:retrieve pathid="guava.testlib.classpath" --> |
1564 |
+ |
<!-- type="*" inline="true" conf="*(private),*(public)" --> |
1565 |
+ |
<!-- pattern="${guava.dir}/[artifact].[ext]" --> |
1566 |
+ |
<!-- organisation="com.google.guava" module="guava-testlib"/> --> |
1567 |
+ |
|
1568 |
+ |
<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": --> |
1569 |
+ |
<!-- https://issues.apache.org/jira/browse/IVY-1444 --> |
1570 |
+ |
<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations --> |
1571 |
+ |
|
1572 |
+ |
<target name="init-ivy"> |
1573 |
+ |
<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar" |
1574 |
+ |
dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/> |
1575 |
+ |
<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" |
1576 |
+ |
classpath="${build.dir}/ivy.jar"/> |
1577 |
+ |
</target> |
1578 |
+ |
|
1579 |
+ |
<target name="guava-tests" depends="jar, init-ivy" |
1580 |
+ |
description="Guava tests run against jsr166 collections"> |
1581 |
+ |
<property name="guava.dir" value="${build.dir}/guava-testlib"/> |
1582 |
+ |
<mkdir dir="${guava.dir}"/> |
1583 |
+ |
<ivy:retrieve pathid="guava.testlib.classpath" |
1584 |
+ |
type="jar,bundle" inline="true" conf="default,master" |
1585 |
+ |
pattern="${guava.dir}/[artifact].[ext]" |
1586 |
+ |
organisation="com.google.guava" module="guava-testlib"/> |
1587 |
+ |
<property name="guava.version" value="21.0"/> |
1588 |
+ |
<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar" |
1589 |
+ |
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1590 |
+ |
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1591 |
+ |
jvm="${build.main.java}" fork="true"> |
1592 |
+ |
<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/> |
1593 |
+ |
<formatter type="brief"/> |
1594 |
+ |
<classpath> |
1595 |
+ |
<pathelement location="${guava.dir}/guava-testlib-tests.jar"/> |
1596 |
+ |
<path refid="guava.testlib.classpath"/> |
1597 |
+ |
</classpath> |
1598 |
+ |
|
1599 |
+ |
<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" --> |
1600 |
+ |
<test name="com.google.common.collect.testing.OpenJdk6Tests"/> |
1601 |
+ |
</junit> |
1602 |
+ |
</target> |
1603 |
+ |
|
1604 |
|
</project> |