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 |
|
------------------------------------------------------------------------------ |
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 |
|
|
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: |
17 |
– |
$HOME/jdk/jdk6 |
18 |
– |
$HOME/jdk/jdk7 |
22 |
|
$HOME/jdk/jdk8 |
23 |
|
$HOME/jdk/jdk9 |
24 |
+ |
$HOME/jdk/jdk10 |
25 |
+ |
$HOME/jdk/jdk11 |
26 |
+ |
$HOME/jdk/jdk12 |
27 |
+ |
$HOME/jdk/jdk13 |
28 |
+ |
$HOME/jdk/jdk14 |
29 |
|
where each of the above is a JDK or a symlink to same, and |
22 |
– |
$HOME/jdk/src/jdk6 |
23 |
– |
$HOME/jdk/src/jdk7 |
30 |
|
$HOME/jdk/src/jdk8 |
31 |
|
$HOME/jdk/src/jdk9 |
32 |
+ |
$HOME/jdk/src/jdk10 |
33 |
+ |
$HOME/jdk/src/jdk11 |
34 |
+ |
$HOME/jdk/src/jdk12 |
35 |
+ |
$HOME/jdk/src/jdk13 |
36 |
+ |
$HOME/jdk/src/jdk14 |
37 |
|
where each of the above is a complete JDK source tree |
38 |
|
(e.g. mercurial forest) or a symlink to same. |
39 |
|
|
40 |
|
Alternatively, define ant variables thus: |
41 |
|
ant -Djdk$N.home=... -Djdk$N.src.home=... |
42 |
< |
for $N in 6 7 8 9 ... |
42 |
> |
for $N in 8 .. 14 ... |
43 |
|
|
44 |
< |
As of 2015-09, there is incomplete hacky support for jigsaw |
34 |
< |
Build for jigsaw using something like: |
35 |
< |
ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist |
36 |
< |
"docs" target is still broken. |
44 |
> |
As of 2016-03, the sources in src/main are for jdk9+ only. |
45 |
|
------------------------------------------------------------------------------ |
46 |
|
</description> |
47 |
|
|
48 |
< |
<!-- Display main targets by running 'ant -projecthelp' --> |
48 |
> |
<!-- Run 'ant -projecthelp' (default target) --> |
49 |
|
<target name="usage"> |
50 |
|
<java classname="org.apache.tools.ant.Main"> |
51 |
|
<arg value="-projecthelp" /> |
59 |
|
|
60 |
|
|
61 |
|
<!-- Compilation options --> |
54 |
– |
<property name="build.sourcelevel" value="6"/> |
62 |
|
<property name="build.debug" value="true"/> |
63 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
64 |
|
<property name="build.deprecation" value="false"/> |
69 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
70 |
|
<property name="build.testcases.dir" location="${build.dir}/testcases"/> |
71 |
|
<property name="build.loops.dir" location="${build.dir}/loops"/> |
65 |
– |
<property name="build.reports.dir" location="${build.dir}/reports"/> |
72 |
|
|
73 |
|
<property name="build.4jdk7.dir" location="${build.dir}/jsr166-4jdk7"/> |
74 |
|
<property name="build.4jdk7.classes.dir" location="${build.4jdk7.dir}/classes"/> |
109 |
|
<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes" |
110 |
|
unless:set="have.java.base"/> |
111 |
|
<local name="modules"/> |
112 |
< |
<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/> |
112 |
> |
<available property="modules" file="${jdk@{v}.home}/lib/modules" type="file"/> |
113 |
|
<local name="boot.jar.dir"/> |
114 |
|
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib" unless:set="modules"/> |
115 |
|
<path id="bootclasspath@{v}" unless:set="modules"> |
139 |
|
<defjdklocations v="7"/> |
140 |
|
<defjdklocations v="8"/> |
141 |
|
<defjdklocations v="9"/> |
142 |
+ |
<defjdklocations v="10"/> |
143 |
+ |
<defjdklocations v="11"/> |
144 |
+ |
<defjdklocations v="12"/> |
145 |
+ |
<defjdklocations v="13"/> |
146 |
+ |
<defjdklocations v="14"/> |
147 |
|
|
148 |
|
<!-- Source locations --> |
149 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
153 |
|
<property name="jtreg7.src.dir" location="${test.src.dir}/jtreg-jdk7"/> |
154 |
|
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg-jdk8"/> |
155 |
|
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
156 |
+ |
<property name="jtreg10.src.dir" location="${test.src.dir}/jtreg"/> |
157 |
+ |
<property name="jtreg11.src.dir" location="${test.src.dir}/jtreg"/> |
158 |
+ |
<property name="jtreg12.src.dir" location="${test.src.dir}/jtreg"/> |
159 |
+ |
<property name="jtreg13.src.dir" location="${test.src.dir}/jtreg"/> |
160 |
+ |
<property name="jtreg14.src.dir" location="${test.src.dir}/jtreg"/> |
161 |
|
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
162 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
163 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
197 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
198 |
|
|
199 |
|
<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag --> |
200 |
< |
<property name="java5.docroot.url" value="http://docs.oracle.com/javase/1.5.0/docs"/> |
201 |
< |
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
202 |
< |
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
203 |
< |
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
204 |
< |
<!-- The expected canonical location does not yet exist as of 2016-03 --> |
205 |
< |
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
206 |
< |
<property name="java9.docroot.url" value="http://download.java.net/jdk9/docs"/> |
207 |
< |
<!-- Default jdk doc location (latest stable release seems best) --> |
208 |
< |
<property name="java.docroot.url" value="${java8.docroot.url}"/> |
200 |
> |
<!-- Switched to https: in 2017-10 - JDK-8190312 --> |
201 |
> |
<property name="java5.docroot.url" value="https://docs.oracle.com/javase/1.5.0/docs"/> |
202 |
> |
<property name="java6.docroot.url" value="https://docs.oracle.com/javase/6/docs"/> |
203 |
> |
<property name="java7.docroot.url" value="https://docs.oracle.com/javase/7/docs"/> |
204 |
> |
<property name="java8.docroot.url" value="https://docs.oracle.com/javase/8/docs"/> |
205 |
> |
<property name="java9.docroot.url" value="https://docs.oracle.com/javase/9/docs"/> |
206 |
> |
<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/> |
207 |
> |
<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/> |
208 |
> |
<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/> |
209 |
> |
<!-- The location of jdk early access docs (RIP) --> |
210 |
> |
<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> --> |
211 |
> |
<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> --> |
212 |
> |
<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> --> |
213 |
> |
<!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> --> |
214 |
> |
<property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> |
215 |
> |
<property name="java14.docroot.url" value="https://download.java.net/java/early_access/jdk14/docs"/> |
216 |
> |
<!-- Default jdk doc location (latest stable LTS release seems best) --> |
217 |
> |
<property name="java.docroot.url" value="${java11.docroot.url}"/> |
218 |
|
|
219 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
220 |
|
<property name="java5.api.url" value="${java5.docroot.url}/api/"/> |
222 |
|
<property name="java7.api.url" value="${java7.docroot.url}/api/"/> |
223 |
|
<property name="java8.api.url" value="${java8.docroot.url}/api/"/> |
224 |
|
<property name="java9.api.url" value="${java9.docroot.url}/api/"/> |
225 |
+ |
<property name="java10.api.url" value="${java10.docroot.url}/api/"/> |
226 |
+ |
<property name="java11.api.url" value="${java11.docroot.url}/api/"/> |
227 |
+ |
<property name="java12.api.url" value="${java12.docroot.url}/api/"/> |
228 |
+ |
<property name="java13.api.url" value="${java13.docroot.url}/api/"/> |
229 |
+ |
<property name="java14.api.url" value="${java14.docroot.url}/api/"/> |
230 |
|
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
231 |
|
|
232 |
|
<!-- Define the "jtreg" task --> |
249 |
|
<attribute name="compile-target" default="@{target}"/> |
250 |
|
<attribute name="workdir"/> |
251 |
|
<attribute name="classes"/> |
252 |
< |
<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/> |
252 |
> |
<!-- |
253 |
> |
<attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/> |
254 |
> |
--> |
255 |
> |
<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/> |
256 |
|
<element name="javac-elements" optional="true"/> |
257 |
|
|
258 |
|
<sequential> |
259 |
|
|
260 |
|
<local name="modules"/> |
261 |
|
<condition property="modules"> |
262 |
< |
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
262 |
> |
<available file="${jdk@{compile-target}.home}/lib/modules" type="file"/> |
263 |
> |
</condition> |
264 |
> |
|
265 |
> |
<local name="use-doclint"/> |
266 |
> |
<condition property="use-doclint"> |
267 |
> |
<not> <equals arg1="@{target}" arg2="7"/> </not> |
268 |
|
</condition> |
269 |
|
|
270 |
|
<mkdir dir="@{workdir}/tck-classes"/> |
279 |
|
classpath="${junit.jar}" |
280 |
|
includeAntRuntime="false" |
281 |
|
includeJavaRuntime="false" |
282 |
+ |
encoding="ASCII" |
283 |
|
executable="${javac@{compile-target}}" |
284 |
|
fork="true"> |
285 |
|
|
286 |
|
<include name="*.java"/> |
287 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
288 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/> |
289 |
+ |
<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/> |
290 |
|
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
291 |
< |
<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
291 |
> |
<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/> |
292 |
|
<compilerarg line="${build.args}"/> |
293 |
|
<javac-elements/> |
294 |
|
|
299 |
|
jvm="${java@{target}}" |
300 |
|
fork="true"> |
301 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
302 |
< |
<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
302 |
> |
<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/> |
303 |
> |
<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/> |
304 |
> |
<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/> |
305 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/> |
306 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/> |
307 |
> |
<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/> |
308 |
|
<jvmarg line="@{jvmflags}"/> |
309 |
+ |
<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck --> |
310 |
+ |
<jvmarg line="${vmoptions}" if:set="vmoptions"/> |
311 |
|
|
312 |
< |
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
312 |
> |
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
313 |
|
<syspropertyset id="system-properties-used-by-tck"> |
314 |
|
<propertyref prefix="java.util.concurrent.ForkJoinPool"/> |
315 |
|
<propertyref prefix="jsr166."/> |
326 |
|
</macrodef> |
327 |
|
|
328 |
|
<!-- Define jtreg test sets for different jdk versions --> |
329 |
< |
<fileset dir="${jtreg9.src.dir}"> |
330 |
< |
<patternset id="jdk9.jtreg.tests"> |
331 |
< |
<include name="**/*.java"/> |
332 |
< |
</patternset> |
333 |
< |
</fileset> |
334 |
< |
|
335 |
< |
<fileset dir="${jtreg8.src.dir}"> |
336 |
< |
<patternset id="jdk8.jtreg.tests"> |
337 |
< |
<include name="**/*.java"/> |
338 |
< |
<exclude name="**/SpliteratorCharacteristics.java"/> |
339 |
< |
<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 --> |
340 |
< |
<exclude name="**/GCDuringIteration.java"/> |
341 |
< |
</patternset> |
295 |
< |
</fileset> |
329 |
> |
<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" --> |
330 |
> |
<!-- ant -Djtreg.test.pattern="**/ToArray.java" --> |
331 |
> |
<property name="jtreg.test.pattern" value="**/*.java"/> |
332 |
> |
<macrodef name="defjtregtests"> |
333 |
> |
<attribute name="v"/> |
334 |
> |
<sequential> |
335 |
> |
<fileset dir="${jtreg@{v}.src.dir}"> |
336 |
> |
<patternset id="jdk@{v}.jtreg.tests"> |
337 |
> |
<include name="${jtreg.test.pattern}"/> |
338 |
> |
</patternset> |
339 |
> |
</fileset> |
340 |
> |
</sequential> |
341 |
> |
</macrodef> |
342 |
|
|
343 |
< |
<fileset dir="${jtreg7.src.dir}"> |
344 |
< |
<patternset id="jdk7.jtreg.tests"> |
345 |
< |
<include name="**/*.java"/> |
346 |
< |
</patternset> |
347 |
< |
</fileset> |
343 |
> |
<defjtregtests v="14"/> |
344 |
> |
<defjtregtests v="13"/> |
345 |
> |
<defjtregtests v="12"/> |
346 |
> |
<defjtregtests v="11"/> |
347 |
> |
<defjtregtests v="10"/> |
348 |
> |
<defjtregtests v="9"/> |
349 |
> |
<defjtregtests v="8"/> |
350 |
> |
<defjtregtests v="7"/> |
351 |
|
|
352 |
|
<!-- ant -Djtreg.flags=-timeoutFactor:4 --> |
353 |
|
<property name="jtreg.flags" value=""/> |
354 |
|
|
355 |
|
<macrodef name="run-jtreg-tests"> |
356 |
< |
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
308 |
< |
<attribute name="source" default="7"/> |
356 |
> |
<!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
357 |
|
<attribute name="target"/> |
358 |
|
<attribute name="workdir"/> |
359 |
|
<attribute name="classes"/> |
360 |
+ |
<attribute name="verbose" default="${jtreg.verbose}"/> |
361 |
|
<attribute name="jtregflags" default=""/> |
362 |
+ |
<element name="jtreg-elements" optional="true"/> |
363 |
|
|
364 |
|
<sequential> |
365 |
|
|
368 |
|
|
369 |
|
<local name="modules"/> |
370 |
|
<condition property="modules"> |
371 |
< |
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
371 |
> |
<available file="${jdk@{target}.home}/lib/modules" type="file"/> |
372 |
|
</condition> |
373 |
|
|
374 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
325 |
– |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
326 |
– |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
327 |
– |
<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 --> |
328 |
– |
<mkdir dir="@{workdir}/JTreport/html"/> |
329 |
– |
<mkdir dir="@{workdir}/JTreport/text"/> |
375 |
|
<jtreg dir="${jtreg@{target}.src.dir}" |
376 |
|
jdk="${jdk@{target}.home}" |
377 |
< |
workDir="@{workdir}/JTwork" |
333 |
< |
reportDir="@{workdir}/JTreport"> |
377 |
> |
workDir="@{workdir}/JTwork"> |
378 |
|
<patternset refid="jdk@{target}.jtreg.tests"/> |
379 |
|
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
380 |
< |
<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
380 |
> |
<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
381 |
> |
<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/> |
382 |
|
<arg value="-agentvm"/> |
383 |
< |
<arg value="-verbose:${jtreg.verbose}"/> |
383 |
> |
<arg value="-noreport"/> |
384 |
> |
<arg value="-verbose:@{verbose}"/> |
385 |
|
<arg value="-vmoptions:-esa -ea"/> |
386 |
|
<arg value="-automatic"/> |
387 |
|
<arg value="-k:!ignore"/> |
388 |
|
<arg line="@{jtregflags}"/> |
389 |
|
<arg line="${jtreg.flags}"/> |
390 |
+ |
<jtreg-elements/> |
391 |
|
</jtreg> |
392 |
|
</sequential> |
393 |
|
</macrodef> |
398 |
|
</path> |
399 |
|
|
400 |
|
<!-- Support @jls tag, used in jdk8+ javadoc --> |
401 |
+ |
<!-- TODO: switch to @jls taglet, as supported by jdk14+ javadoc --> |
402 |
|
<property name="javadoc.jls.cite" value="The Java&trade; Language Specification"/> |
403 |
|
<property name="javadoc.jls.option" value="jls:a:See <cite>${javadoc.jls.cite}</cite>:"/> |
404 |
|
|
405 |
|
<!-- Main targets --> |
406 |
|
|
407 |
< |
<property name="build.main.java.version" value="9"/> |
407 |
> |
<!-- Default values: may seem strange ... --> |
408 |
> |
<!-- At runtime, target latest LTS, i.e. jdk11 --> |
409 |
> |
<!-- But at build time, target jdk9, for maximal binary portability --> |
410 |
> |
<!-- Use javadoc12 (but -link to jdk11 api docs!), to get: |
411 |
> |
o override-methods=summary |
412 |
> |
o {@systemProperty ...} |
413 |
> |
o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation) |
414 |
> |
o 8202628: javadoc generates bad links in TestModules.java |
415 |
> |
--> |
416 |
> |
<property name="java.runtime.target" value="11"/> |
417 |
> |
<property name="build.main.java" value="${java11}"/> |
418 |
|
<property name="build.main.javac" value="${javac9}"/> |
419 |
+ |
<property name="build.main.javadoc" value="${javadoc12}"/> |
420 |
+ |
<property name="build.main.javadoc.source" value="${java.runtime.target}"/> |
421 |
|
|
422 |
|
<target name="dists" |
423 |
< |
depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
423 |
> |
depends="dist, 4jdk8dist" |
424 |
|
description="Builds all public jars and docs"/> |
425 |
+ |
<!-- no longer supported: 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist --> |
426 |
|
|
427 |
|
<target name="compile" |
428 |
|
depends="configure-compiler" |
429 |
|
description="Compiles src/main sources to build dir"> |
430 |
|
|
370 |
– |
<local name="modules"/> |
371 |
– |
<condition property="modules"> |
372 |
– |
<and> |
373 |
– |
<available file="${jdk9.home}/jmods" type="dir"/> |
374 |
– |
<equals arg1="9" arg2="${build.main.java.version}"/> |
375 |
– |
</and> |
376 |
– |
</condition> |
377 |
– |
|
431 |
|
<local name="destdir"/> |
432 |
< |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
380 |
< |
<property name="destdir" value="${build.classes.dir}" unless:set="modules"/> |
432 |
> |
<property name="destdir" value="${build.classes.dir}/java.base"/> |
433 |
|
|
434 |
|
<mkdir dir="${destdir}"/> |
435 |
|
|
441 |
|
classpath="" |
442 |
|
includeAntRuntime="false" |
443 |
|
includeJavaRuntime="false" |
444 |
+ |
encoding="ASCII" |
445 |
|
executable="${build.main.javac}" |
446 |
|
fork="true"> |
447 |
|
|
448 |
|
<include name="**/*.java"/> |
449 |
< |
<compilerarg value="-Xmodule:java.base" if:set="modules"/> |
449 |
> |
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
450 |
|
<compilerarg value="-Xprefer:source"/> |
451 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
452 |
< |
<compilerarg value="-Xlint:all"/> |
452 |
> |
<compilerarg value="-Xlint:all,-removal"/> |
453 |
> |
<compilerarg line="--doclint-format html5"/> |
454 |
> |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
455 |
> |
<compilerarg value="-Xdoclint/package:java.util.*"/> |
456 |
|
<compilerarg value="-Werror"/> |
401 |
– |
<compilerarg value="-Xdoclint:all/protected"/> |
457 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
458 |
|
<compilerarg line="${build.args}"/> |
459 |
|
|
460 |
|
</javac> |
406 |
– |
|
407 |
– |
<!-- We need jdk9's Contended annotation, but at compile time only --> |
408 |
– |
<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/> |
461 |
|
</target> |
462 |
|
|
463 |
|
|
464 |
|
<target name="jar" |
465 |
|
depends="compile" |
466 |
< |
description="Builds library jar from compiled sources"> |
467 |
< |
|
466 |
> |
description="Builds library jar for src/main from compiled sources"> |
467 |
> |
<local name="subdir"/> |
468 |
> |
<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/> |
469 |
|
<jar destfile="${product.jar}"> |
470 |
< |
<fileset dir="${build.classes.dir}"/> |
470 |
> |
<fileset dir="${build.classes.dir}${subdir}"/> |
471 |
|
<manifest> |
472 |
|
<attribute name="Built-By" value="${user.name}"/> |
473 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
485 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
486 |
|
<!-- sourcepath for packages --> |
487 |
|
|
488 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" --> |
489 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" --> |
490 |
+ |
<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" --> |
491 |
+ |
<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> --> |
492 |
+ |
<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> --> |
493 |
|
<javadoc destdir="${docs.dir}" |
494 |
|
packagenames="none" |
495 |
< |
link="${java9.api.url}" |
495 |
> |
link="${java.api.url}" |
496 |
|
overview="${src.dir}/intro.html" |
497 |
|
access="${build.javadoc.access}" |
498 |
< |
sourcepath="${src.dir}:${jdk9.src.dir}" |
498 |
> |
sourcepath="${src.dir}" |
499 |
|
classpath="" |
500 |
< |
executable="${javadoc9}"> |
500 |
> |
source="${build.main.javadoc.source}" |
501 |
> |
executable="${build.main.javadoc}"> |
502 |
> |
<!-- TODO: JDK-8214571 failonerror = "true" --> |
503 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
504 |
|
<include name="**/*.java"/> |
505 |
|
</fileset> |
506 |
< |
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
506 |
> |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
507 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
508 |
|
<arg value="-XDignore.symbol.file=true"/> |
509 |
< |
<!-- TODO <arg value="-Xmodule:java.base"/> --> |
510 |
< |
<arg value="-tag"/> |
511 |
< |
<arg value="${javadoc.jls.option}"/> |
512 |
< |
<arg value="-tag"/> |
513 |
< |
<arg value="apiNote:a:<em>API Note:</em>"/> |
514 |
< |
<arg value="-tag"/> |
515 |
< |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
516 |
< |
<arg value="-tag"/> |
517 |
< |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
518 |
< |
<!-- tags added in jdk9 --> |
519 |
< |
<arg value="-tag"/> |
520 |
< |
<arg value="revised:X"/> |
521 |
< |
<arg value="-tag"/> |
462 |
< |
<arg value="spec:X"/> |
509 |
> |
<arg value="-html5"/> |
510 |
> |
<arg value="--patch-module=java.base=${src.dir}"/> |
511 |
> |
<!-- old school frames via docs/index.html?overview-summary.html --> |
512 |
> |
<!-- TODO: - -frames no longer a supported option in jdk13+ --> |
513 |
> |
<arg value="--frames"/> |
514 |
> |
<arg value="--override-methods=summary"/> |
515 |
> |
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
516 |
> |
<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/> |
517 |
> |
<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/> |
518 |
> |
<arg value="-tag"/> <arg value="apiNote:a:API Note:"/> |
519 |
> |
<!-- tags added in jdk9: currently unused --> |
520 |
> |
<!-- <arg value="-tag"/> <arg value="revised:X"/> --> |
521 |
> |
<!-- <arg value="-tag"/> <arg value="spec:X"/> --> |
522 |
|
</javadoc> |
523 |
|
</target> |
524 |
|
|
528 |
|
description="Puts all distributable products in single hierarchy"/> |
529 |
|
|
530 |
|
|
472 |
– |
<target name="release" |
473 |
– |
depends="dist" |
474 |
– |
description="Puts entire CVS tree, plus distribution productions, in a jar"> |
475 |
– |
|
476 |
– |
<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/> |
477 |
– |
|
478 |
– |
<jar basedir="${basedir}" destfile="${release.jar}"> |
479 |
– |
<!-- <exclude name="build/**"/> --> |
480 |
– |
<exclude name="${release.jar}"/> |
481 |
– |
<exclude name="user.properties"/> |
482 |
– |
<exclude name="etc/notes/**"/> |
483 |
– |
<exclude name="src/emulation/**"/> |
484 |
– |
<exclude name="**/SyntaxTest.java"/> |
485 |
– |
<exclude name="**/SuperfluousAbstract.java"/> |
486 |
– |
<manifest> |
487 |
– |
<attribute name="Built-By" value="${user.name}"/> |
488 |
– |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
489 |
– |
</manifest> |
490 |
– |
</jar> |
491 |
– |
</target> |
492 |
– |
|
493 |
– |
|
531 |
|
<target name="clean" |
532 |
|
description="Removes all build products"> |
496 |
– |
|
533 |
|
<delete dir="${build.dir}"/> |
498 |
– |
|
534 |
|
</target> |
535 |
|
|
536 |
|
|
537 |
|
<target name="dist-clean" |
538 |
|
description="Removes all build and distribution products"> |
504 |
– |
|
539 |
|
<delete dir="${build.dir}"/> |
540 |
|
<delete dir="${dist.dir}"/> |
507 |
– |
|
541 |
|
</target> |
542 |
|
|
543 |
|
|
553 |
|
|
554 |
|
<target name="tck" |
555 |
|
depends="jar" |
556 |
< |
description="Runs tck tests for main directly"> |
556 |
> |
description="Runs tck tests for src/main directly"> |
557 |
|
|
558 |
|
<run-tck-tests |
559 |
< |
target="${build.main.java.version}" |
559 |
> |
target="${java.runtime.target}" |
560 |
|
workdir="${build.dir}" |
561 |
< |
classes="${product.jar}"/> |
561 |
> |
classes="${product.jar}"> |
562 |
> |
<javac-elements> |
563 |
> |
<compilerarg value="-Werror"/> |
564 |
> |
</javac-elements> |
565 |
> |
</run-tck-tests> |
566 |
|
</target> |
567 |
|
|
568 |
|
<target name="tck-parallelism-1" |
569 |
< |
description="Runs tck with given common pool parallelism"> |
569 |
> |
description="Runs tck with common pool parallelism 1"> |
570 |
|
<antcall target="tck"> |
571 |
|
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/> |
572 |
|
</antcall> |
573 |
|
</target> |
574 |
|
|
575 |
|
<target name="tck-parallelism-0" |
576 |
< |
description="Runs tck with given common pool parallelism"> |
576 |
> |
description="Runs tck with common pool parallelism 0"> |
577 |
|
<antcall target="tck"> |
578 |
|
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/> |
579 |
|
</antcall> |
580 |
|
</target> |
581 |
|
|
582 |
+ |
<target name="tck-security-manager" |
583 |
+ |
description="Runs tck with a security manager"> |
584 |
+ |
<antcall target="tck"> |
585 |
+ |
<param name="jsr166.useSecurityManager" value="true"/> |
586 |
+ |
</antcall> |
587 |
+ |
</target> |
588 |
+ |
|
589 |
|
<target name="jtreg" |
590 |
|
depends="jar" |
591 |
< |
description="Runs jtreg tests for main using the jtreg ant task"> |
591 |
> |
description="Runs jtreg tests for src/main using the jtreg ant task"> |
592 |
|
<run-jtreg-tests |
593 |
< |
target="${build.main.java.version}" |
593 |
> |
target="${java.runtime.target}" |
594 |
|
workdir="${build.dir}" |
595 |
|
classes="${product.jar}"/> |
596 |
|
</target> |
597 |
|
|
598 |
|
<target name="test" |
599 |
< |
depends="tck, tck-parallelism-1, jtreg" |
600 |
< |
description="Runs tck and jtreg tests for main"> |
599 |
> |
depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg" |
600 |
> |
description="Runs tck and jtreg tests for src/main"/> |
601 |
> |
|
602 |
> |
<target name="test-version-permutations" |
603 |
> |
depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs"> |
604 |
|
</target> |
605 |
|
|
606 |
< |
<target name="jtreg8" description="Runs jtreg tests with jdk8"> |
606 |
> |
<target name="test9"> |
607 |
> |
<antcall target="clean"/> |
608 |
> |
<antcall> |
609 |
> |
<param name="java.runtime.target" value="9"/> |
610 |
> |
<param name="build.main.javac" value="${javac9}"/> |
611 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
612 |
> |
<param name="build.main.javadoc.source" value="9"/> |
613 |
> |
<target name="test"/> |
614 |
> |
<target name="docs"/> |
615 |
> |
</antcall> |
616 |
> |
</target> |
617 |
|
|
618 |
< |
<antcall target="jtreg"> |
619 |
< |
<param name="build.main.java.version" value="8"/> |
620 |
< |
<param name="build.main.javac" value="${javac8}"/> |
618 |
> |
<target name="test10"> |
619 |
> |
<antcall target="clean"/> |
620 |
> |
<antcall> |
621 |
> |
<param name="java.runtime.target" value="10"/> |
622 |
> |
<param name="build.main.javac" value="${javac10}"/> |
623 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
624 |
> |
<param name="build.main.javadoc.source" value="10"/> |
625 |
> |
<target name="test"/> |
626 |
> |
<target name="docs"/> |
627 |
> |
</antcall> |
628 |
> |
</target> |
629 |
> |
|
630 |
> |
<target name="test11"> |
631 |
> |
<antcall target="clean"/> |
632 |
> |
<antcall> |
633 |
> |
<param name="java.runtime.target" value="11"/> |
634 |
> |
<param name="build.main.javac" value="${javac11}"/> |
635 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
636 |
> |
<param name="build.main.javadoc.source" value="11"/> |
637 |
> |
<target name="test"/> |
638 |
> |
<target name="docs"/> |
639 |
|
</antcall> |
640 |
+ |
</target> |
641 |
|
|
642 |
+ |
<target name="test12"> |
643 |
+ |
<antcall target="clean"/> |
644 |
+ |
<antcall> |
645 |
+ |
<param name="java.runtime.target" value="12"/> |
646 |
+ |
<param name="build.main.javac" value="${javac12}"/> |
647 |
+ |
<param name="build.main.javadoc" value="${javadoc12}"/> |
648 |
+ |
<param name="build.main.javadoc.source" value="12"/> |
649 |
+ |
<target name="test"/> |
650 |
+ |
<target name="docs"/> |
651 |
+ |
</antcall> |
652 |
|
</target> |
653 |
|
|
654 |
< |
<target name="test89" |
655 |
< |
description="Runs tck and jtreg tests for main for multiple java versions"> |
654 |
> |
<target name="test13"> |
655 |
> |
<antcall target="clean"/> |
656 |
> |
<antcall> |
657 |
> |
<param name="java.runtime.target" value="13"/> |
658 |
> |
<param name="build.main.javac" value="${javac13}"/> |
659 |
> |
<param name="build.main.javadoc" value="${javadoc13}"/> |
660 |
> |
<param name="build.main.javadoc.source" value="13"/> |
661 |
> |
<target name="test"/> |
662 |
> |
<target name="docs"/> |
663 |
> |
</antcall> |
664 |
> |
</target> |
665 |
> |
|
666 |
> |
<target name="test14"> |
667 |
> |
<antcall target="clean"/> |
668 |
> |
<antcall> |
669 |
> |
<param name="java.runtime.target" value="14"/> |
670 |
> |
<param name="build.main.javac" value="${javac14}"/> |
671 |
> |
<param name="build.main.javadoc" value="${javadoc14}"/> |
672 |
> |
<param name="build.main.javadoc.source" value="14"/> |
673 |
> |
<target name="test"/> |
674 |
> |
<target name="docs"/> |
675 |
> |
</antcall> |
676 |
> |
</target> |
677 |
|
|
678 |
+ |
<target name="test9-11"> |
679 |
|
<antcall target="clean"/> |
680 |
< |
<antcall target="test"> |
681 |
< |
<param name="build.main.java.version" value="8"/> |
682 |
< |
<param name="build.main.javac" value="${javac8}"/> |
680 |
> |
<antcall> |
681 |
> |
<param name="java.runtime.target" value="11"/> |
682 |
> |
<param name="build.main.javac" value="${javac9}"/> |
683 |
> |
<param name="build.main.javadoc" value="${javadoc12}"/> |
684 |
> |
<param name="build.main.javadoc.source" value="9"/> |
685 |
> |
<target name="test"/> |
686 |
> |
<target name="docs"/> |
687 |
|
</antcall> |
688 |
+ |
</target> |
689 |
|
|
690 |
+ |
<target name="test9-12"> |
691 |
|
<antcall target="clean"/> |
692 |
< |
<antcall target="test"> |
693 |
< |
<param name="build.main.java.version" value="9"/> |
692 |
> |
<antcall> |
693 |
> |
<param name="java.runtime.target" value="12"/> |
694 |
|
<param name="build.main.javac" value="${javac9}"/> |
695 |
+ |
<param name="build.main.javadoc" value="${javadoc12}"/> |
696 |
+ |
<param name="build.main.javadoc.source" value="9"/> |
697 |
+ |
<target name="test"/> |
698 |
+ |
<target name="docs"/> |
699 |
|
</antcall> |
700 |
+ |
</target> |
701 |
|
|
702 |
+ |
<target name="test9-13"> |
703 |
+ |
<antcall target="clean"/> |
704 |
+ |
<antcall> |
705 |
+ |
<param name="java.runtime.target" value="13"/> |
706 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
707 |
+ |
<param name="build.main.javadoc" value="${javadoc13}"/> |
708 |
+ |
<param name="build.main.javadoc.source" value="9"/> |
709 |
+ |
<target name="test"/> |
710 |
+ |
<target name="docs"/> |
711 |
+ |
</antcall> |
712 |
|
</target> |
713 |
|
|
714 |
+ |
<target name="test9-14"> |
715 |
+ |
<antcall target="clean"/> |
716 |
+ |
<antcall> |
717 |
+ |
<param name="java.runtime.target" value="14"/> |
718 |
+ |
<param name="build.main.javac" value="${javac9}"/> |
719 |
+ |
<param name="build.main.javadoc" value="${javadoc14}"/> |
720 |
+ |
<param name="build.main.javadoc.source" value="9"/> |
721 |
+ |
<target name="test"/> |
722 |
+ |
<target name="docs"/> |
723 |
+ |
</antcall> |
724 |
+ |
</target> |
725 |
|
|
726 |
|
|
727 |
|
<target name="configure-compiler"> |
728 |
|
<fail message="ant version too old"> |
729 |
< |
<condition> |
590 |
< |
<not> <antversion atleast="1.9.1"/> </not> |
591 |
< |
</condition> |
729 |
> |
<condition> <not> <antversion atleast="1.9.1"/> </not> </condition> |
730 |
|
</fail> |
731 |
|
|
732 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
744 |
|
</target> |
745 |
|
|
746 |
|
|
609 |
– |
|
610 |
– |
<!-- Various demos and test programs --> |
611 |
– |
|
612 |
– |
|
613 |
– |
<target name="loops" depends="configure-compiler" |
614 |
– |
description="Benchmark from Doug Lea's AQS paper"> |
615 |
– |
|
616 |
– |
<mkdir dir="${build.loops.dir}"/> |
617 |
– |
|
618 |
– |
<javac srcdir="${loops.src.dir}" |
619 |
– |
destdir="${build.loops.dir}" |
620 |
– |
debug="${build.debug}" |
621 |
– |
debuglevel="${build.debuglevel}" |
622 |
– |
deprecation="${build.deprecation}" |
623 |
– |
source="${build.sourcelevel}" |
624 |
– |
target="${build.sourcelevel}" |
625 |
– |
fork="true"> |
626 |
– |
|
627 |
– |
<compilerarg line="${build.args}"/> |
628 |
– |
<classpath refid="loops.classpath"/> |
629 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
630 |
– |
|
631 |
– |
</javac> |
632 |
– |
|
633 |
– |
<java classname="ALoops" fork="true"> |
634 |
– |
<classpath refid="loops.classpath"/> |
635 |
– |
</java> |
636 |
– |
|
637 |
– |
</target> |
638 |
– |
|
639 |
– |
|
747 |
|
<target name="compile-test-loops" depends="jar" |
748 |
< |
description="compile all the perf tests in src/test/loops"> |
748 |
> |
description="Compiles all the perf tests in src/test/loops"> |
749 |
|
|
750 |
|
<mkdir dir="${build.dir}/test/loops"/> |
751 |
|
|
756 |
|
deprecation="${build.deprecation}" |
757 |
|
includeAntRuntime="false" |
758 |
|
includeJavaRuntime="false" |
759 |
< |
executable="${javac9}" |
759 |
> |
encoding="ASCII" |
760 |
> |
executable="${build.main.javac}" |
761 |
|
fork="true"> |
762 |
|
|
763 |
|
<include name="*.java"/> |
765 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
766 |
|
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
767 |
|
<compilerarg line="${build.args}"/> |
660 |
– |
|
768 |
|
</javac> |
662 |
– |
|
769 |
|
</target> |
770 |
|
|
771 |
|
|
788 |
|
bootclasspath="${bootclasspath8}" |
789 |
|
includeAntRuntime="false" |
790 |
|
includeJavaRuntime="false" |
791 |
+ |
encoding="ASCII" |
792 |
|
executable="${javac8}" |
793 |
|
fork="true"> |
687 |
– |
|
794 |
|
<include name="**/*.java"/> |
795 |
|
<compilerarg value="-Xprefer:source"/> |
796 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
797 |
|
<compilerarg value="-Xlint:all"/> |
798 |
|
<compilerarg value="-Werror"/> |
799 |
|
<compilerarg line="${build.args}"/> |
694 |
– |
|
800 |
|
</javac> |
801 |
|
</target> |
802 |
|
|
817 |
|
bootclasspath="${bootclasspath8}" |
818 |
|
includeAntRuntime="false" |
819 |
|
includeJavaRuntime="false" |
820 |
+ |
encoding="ASCII" |
821 |
|
executable="${javac8}" |
822 |
|
fork="true"> |
717 |
– |
|
823 |
|
<include name="**/*.java"/> |
824 |
|
<compilerarg value="-Xprefer:source"/> |
825 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
826 |
|
<compilerarg value="-Xlint:all"/> |
827 |
< |
<compilerarg value="-Xdoclint:all/protected"/> |
827 |
> |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
828 |
|
<compilerarg line="${build.args}"/> |
724 |
– |
|
829 |
|
</javac> |
830 |
|
</target> |
831 |
|
|
841 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
842 |
|
</manifest> |
843 |
|
</jar> |
740 |
– |
|
844 |
|
</target> |
845 |
|
|
846 |
|
|
856 |
|
<!-- JDK9+ test classes --> |
857 |
|
<exclude name="*9Test.java"/> |
858 |
|
<exclude name="*10Test.java"/> |
859 |
+ |
<compilerarg value="-Werror"/> |
860 |
|
</javac-elements> |
861 |
|
</run-tck-tests> |
862 |
|
</target> |
874 |
|
|
875 |
|
<target name="4jdk8-test" |
876 |
|
depends="4jdk8-tck, 4jdk8-jtreg" |
877 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk8"> |
774 |
< |
</target> |
877 |
> |
description="Runs tck and jtreg tests for jsr166-4jdk8"/> |
878 |
|
|
879 |
|
|
880 |
|
<target name="4jdk8docs" |
890 |
|
access="${build.javadoc.access}" |
891 |
|
sourcepath="${4jdk8src.dir}:${jdk8.src.dir}" |
892 |
|
classpath="" |
893 |
< |
executable="${javadoc8}"> |
893 |
> |
source="8" |
894 |
> |
executable="${javadoc8}" |
895 |
> |
failonerror = "true"> |
896 |
|
<fileset dir="${4jdk8src.dir}" defaultexcludes="yes"> |
897 |
|
<include name="**/*.java"/> |
898 |
|
</fileset> |
899 |
|
<arg line="-Xdocrootparent ${java8.docroot.url}"/> |
900 |
|
<arg value="-XDignore.symbol.file=true"/> |
901 |
< |
<arg value="-tag"/> |
902 |
< |
<arg value="${javadoc.jls.option}"/> |
903 |
< |
<arg value="-tag"/> |
904 |
< |
<arg value="apiNote:a:<em>API Note:</em>"/> |
905 |
< |
<arg value="-tag"/> |
801 |
< |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
802 |
< |
<arg value="-tag"/> |
803 |
< |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
901 |
> |
<arg value="-tag"/> <arg value="${javadoc.jls.option}"/> |
902 |
> |
<arg value="-tag"/> <arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
903 |
> |
<arg value="-tag"/> <arg value="implNote:a:<em>Implementation Note:</em>"/> |
904 |
> |
<!-- @apiNote tag currently unused --> |
905 |
> |
<!-- <arg value="-tag"/> <arg value="apiNote:a:<em>API Note:</em>"/> --> |
906 |
|
</javadoc> |
907 |
|
</target> |
908 |
|
|
914 |
|
|
915 |
|
<target name="4jdk8clean" |
916 |
|
description="Removes all 4jdk8 build products"> |
815 |
– |
|
917 |
|
<delete dir="${build.4jdk8.dir}"/> |
817 |
– |
|
918 |
|
</target> |
919 |
|
|
920 |
|
|
930 |
|
</target> |
931 |
|
|
932 |
|
|
933 |
+ |
<!-- jsr166 4jdk7 (no longer maintained) --> |
934 |
|
|
935 |
< |
<!-- jsr166 4jdk7 --> |
835 |
< |
|
836 |
< |
<target name="4jdk7compile" |
837 |
< |
depends="configure-compiler" |
838 |
< |
description="Compiles src/jdk7 sources, targeting jdk7"> |
839 |
< |
|
935 |
> |
<target name="4jdk7compile" depends="configure-compiler"> |
936 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
937 |
|
|
938 |
|
<javac srcdir="${4jdk7src.dir}" |
946 |
|
bootclasspath="${bootclasspath6}" |
947 |
|
includeAntRuntime="false" |
948 |
|
includeJavaRuntime="false" |
949 |
+ |
encoding="ASCII" |
950 |
|
executable="${javac7}" |
951 |
|
fork="true"> |
952 |
|
|
956 |
|
<compilerarg value="-Xlint:all"/> |
957 |
|
<compilerarg value="-Werror"/> |
958 |
|
<compilerarg line="${build.args}"/> |
862 |
– |
|
959 |
|
</javac> |
960 |
|
</target> |
961 |
|
|
962 |
< |
<target name="4jdk7doclint" |
867 |
< |
depends="configure-compiler" |
868 |
< |
description="Finds doclint warnings"> |
869 |
< |
|
962 |
> |
<target name="4jdk7doclint" depends="configure-compiler"> |
963 |
|
<mkdir dir="${build.4jdk7.classes.dir}"/> |
964 |
|
|
965 |
|
<javac srcdir="${4jdk7src.dir}" |
973 |
|
bootclasspath="${bootclasspath6}" |
974 |
|
includeAntRuntime="false" |
975 |
|
includeJavaRuntime="false" |
976 |
+ |
encoding="ASCII" |
977 |
|
executable="${javac8}" |
978 |
|
fork="true"> |
979 |
|
|
983 |
|
<compilerarg value="-Xlint:all"/> |
984 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
985 |
|
<compilerarg line="${build.args}"/> |
892 |
– |
|
986 |
|
</javac> |
987 |
|
</target> |
988 |
|
|
989 |
< |
|
897 |
< |
<target name="4jdk7jar" |
898 |
< |
depends="4jdk7compile" |
899 |
< |
description="Builds library jar from compiled sources"> |
900 |
< |
|
989 |
> |
<target name="4jdk7jar" depends="4jdk7compile"> |
990 |
|
<jar destfile="${4jdk7product.jar}"> |
991 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
992 |
|
<manifest> |
994 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
995 |
|
</manifest> |
996 |
|
</jar> |
908 |
– |
|
997 |
|
</target> |
998 |
|
|
999 |
< |
|
912 |
< |
<target name="4jdk7-tck" |
913 |
< |
depends="4jdk7jar" |
914 |
< |
description="Runs tck tests for jsr166-4jdk7 directly"> |
915 |
< |
|
999 |
> |
<target name="4jdk7-tck" depends="4jdk7jar"> |
1000 |
|
<run-tck-tests |
1001 |
|
target="7" |
1002 |
|
workdir="${build.4jdk7.dir}" |
1014 |
|
<exclude name="SplittableRandomTest.java"/> |
1015 |
|
<exclude name="StampedLockTest.java"/> |
1016 |
|
<exclude name="SubmissionPublisherTest.java"/> |
1017 |
+ |
<compilerarg value="-Werror"/> |
1018 |
|
</javac-elements> |
1019 |
|
</run-tck-tests> |
1020 |
|
</target> |
1021 |
|
|
1022 |
< |
|
1023 |
< |
<target name="4jdk7-tck-junit" |
939 |
< |
depends="4jdk7compile" |
940 |
< |
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
1022 |
> |
<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) --> |
1023 |
> |
<target name="4jdk7-tck-junit" depends="4jdk7compile"> |
1024 |
|
|
1025 |
|
<junit printsummary="true" |
1026 |
|
showoutput="true" |
1042 |
|
|
1043 |
|
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
1044 |
|
</test> |
962 |
– |
|
1045 |
|
</junit> |
1046 |
|
</target> |
1047 |
|
|
1048 |
< |
<target name="4jdk7-jtreg" |
967 |
< |
depends="4jdk7jar" |
968 |
< |
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
1048 |
> |
<target name="4jdk7-jtreg" depends="4jdk7jar"> |
1049 |
|
<run-jtreg-tests |
1050 |
|
target="7" |
1051 |
|
workdir="${build.4jdk7.dir}" |
1052 |
|
classes="${4jdk7product.jar}"/> |
1053 |
|
</target> |
1054 |
|
|
1055 |
+ |
<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/> |
1056 |
|
|
1057 |
< |
<target name="4jdk7-test" |
977 |
< |
depends="4jdk7-tck, 4jdk7-jtreg" |
978 |
< |
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
979 |
< |
</target> |
980 |
< |
|
981 |
< |
|
982 |
< |
<target name="4jdk7docs" |
983 |
< |
description="Builds javadocs for src/jdk7 to dist dir"> |
984 |
< |
|
1057 |
> |
<target name="4jdk7docs"> |
1058 |
|
<delete dir="${4jdk7docs.dir}"/> |
1059 |
|
<mkdir dir="${4jdk7docs.dir}"/> |
1060 |
|
|
1065 |
|
access="${build.javadoc.access}" |
1066 |
|
sourcepath="${4jdk7src.dir}:${jdk7.src.dir}" |
1067 |
|
classpath="" |
1068 |
< |
executable="${javadoc7}"> |
1068 |
> |
executable="${javadoc7}" |
1069 |
> |
failonerror = "true"> |
1070 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
1071 |
|
<include name="**/*.java"/> |
1072 |
|
</fileset> |
1075 |
|
</javadoc> |
1076 |
|
</target> |
1077 |
|
|
1078 |
+ |
<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/> |
1079 |
|
|
1080 |
< |
<target name="4jdk7dist" |
1006 |
< |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
1007 |
< |
description="Puts all distributable products in single hierarchy"/> |
1008 |
< |
|
1009 |
< |
|
1010 |
< |
<target name="4jdk7clean" |
1011 |
< |
description="Removes all 4jdk7 build products"> |
1012 |
< |
|
1080 |
> |
<target name="4jdk7clean"> |
1081 |
|
<delete dir="${build.4jdk7.dir}"/> |
1014 |
– |
|
1082 |
|
</target> |
1083 |
|
|
1084 |
< |
|
1018 |
< |
<target name="4jdk7dist-jar" |
1019 |
< |
depends="4jdk7clean, 4jdk7jar"> |
1084 |
> |
<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar"> |
1085 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
1086 |
|
</target> |
1087 |
|
|
1088 |
< |
|
1024 |
< |
<target name="4jdk7dist-docs" |
1025 |
< |
depends="4jdk7clean, 4jdk7docs"> |
1088 |
> |
<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs"> |
1089 |
|
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
1090 |
|
</target> |
1091 |
|
|
1092 |
|
|
1093 |
< |
<!-- jsr166x --> |
1031 |
< |
|
1032 |
< |
<target name="jsr166xcompile" |
1033 |
< |
depends="configure-compiler" |
1034 |
< |
description="Compiles jsr166x sources to build dir"> |
1093 |
> |
<!-- jsr166x (no longer maintained) --> |
1094 |
|
|
1095 |
+ |
<target name="jsr166xcompile" depends="configure-compiler"> |
1096 |
|
<mkdir dir="${build.jsr166x.classes.dir}"/> |
1097 |
|
|
1098 |
|
<javac srcdir="${topsrc.dir}" |
1106 |
|
target="5" |
1107 |
|
includeAntRuntime="false" |
1108 |
|
includeJavaRuntime="false" |
1109 |
+ |
encoding="ASCII" |
1110 |
|
executable="${javac7}" |
1111 |
|
fork="true"> |
1051 |
– |
|
1112 |
|
<include name="jsr166x/**/*.java"/> |
1113 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1114 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
1115 |
|
<compilerarg value="-Werror"/> |
1116 |
|
<compilerarg line="${build.args}"/> |
1057 |
– |
|
1117 |
|
</javac> |
1118 |
|
</target> |
1119 |
|
|
1120 |
< |
|
1062 |
< |
<target name="jsr166xjar" |
1063 |
< |
depends="jsr166xcompile" |
1064 |
< |
description="Builds library jar from compiled sources"> |
1065 |
< |
|
1120 |
> |
<target name="jsr166xjar" depends="jsr166xcompile"> |
1121 |
|
<jar destfile="${jsr166x.jar}"> |
1122 |
|
<fileset dir="${build.jsr166x.classes.dir}"/> |
1123 |
|
<manifest> |
1125 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1126 |
|
</manifest> |
1127 |
|
</jar> |
1073 |
– |
|
1128 |
|
</target> |
1129 |
|
|
1130 |
< |
|
1077 |
< |
<target name="jsr166xdocs" |
1078 |
< |
description="Builds javadocs to dist dir"> |
1079 |
< |
|
1130 |
> |
<target name="jsr166xdocs"> |
1131 |
|
<delete dir="${jsr166xdocs.dir}"/> |
1132 |
|
<mkdir dir="${jsr166xdocs.dir}"/> |
1133 |
|
|
1138 |
|
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
1139 |
|
bootclasspath="${bootclasspath6}" |
1140 |
|
source="5" |
1141 |
< |
executable="${javadoc7}"> |
1141 |
> |
executable="${javadoc7}" |
1142 |
> |
failonerror = "true"> |
1143 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1144 |
|
<arg value="-XDignore.symbol.file=true"/> |
1093 |
– |
|
1145 |
|
</javadoc> |
1146 |
|
</target> |
1147 |
|
|
1148 |
+ |
<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/> |
1149 |
|
|
1150 |
< |
<target name="jsr166xdist" |
1099 |
< |
depends="jsr166xdist-jar, jsr166xdist-docs" |
1100 |
< |
description="Puts all distributable products in single hierarchy"/> |
1101 |
< |
|
1102 |
< |
|
1103 |
< |
<target name="jsr166xclean" |
1104 |
< |
description="Removes all jsr166x build products"> |
1105 |
< |
|
1150 |
> |
<target name="jsr166xclean"> |
1151 |
|
<delete dir="${build.jsr166x.dir}"/> |
1107 |
– |
|
1152 |
|
</target> |
1153 |
|
|
1154 |
< |
|
1111 |
< |
<target name="jsr166xdist-jar" |
1112 |
< |
depends="jsr166xclean, jsr166xjar"> |
1154 |
> |
<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar"> |
1155 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
1156 |
|
</target> |
1157 |
|
|
1158 |
< |
<target name="jsr166xdist-docs" |
1117 |
< |
depends="jsr166xclean, jsr166xdocs"> |
1158 |
> |
<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs"> |
1159 |
|
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
1160 |
|
</target> |
1161 |
|
|
1121 |
– |
<!-- jsr166y --> |
1162 |
|
|
1163 |
+ |
<!-- jsr166y (no longer maintained) --> |
1164 |
|
|
1165 |
< |
<target name="jsr166ycompile" |
1125 |
< |
depends="configure-compiler" |
1126 |
< |
description="Compiles jsr166y sources"> |
1127 |
< |
|
1165 |
> |
<target name="jsr166ycompile" depends="configure-compiler"> |
1166 |
|
<mkdir dir="${build.jsr166y.classes.dir}"/> |
1167 |
|
|
1168 |
|
<javac srcdir="${topsrc.dir}" |
1176 |
|
bootclasspath="${bootclasspath6}" |
1177 |
|
includeAntRuntime="false" |
1178 |
|
includeJavaRuntime="false" |
1179 |
+ |
encoding="ASCII" |
1180 |
|
executable="${javac7}" |
1181 |
|
fork="true"> |
1182 |
|
|
1185 |
|
<compilerarg value="-Xlint:all"/> |
1186 |
|
<compilerarg value="-Werror"/> |
1187 |
|
<compilerarg line="${build.args}"/> |
1149 |
– |
|
1188 |
|
</javac> |
1189 |
|
</target> |
1190 |
|
|
1191 |
< |
|
1154 |
< |
<target name="jsr166yjar" |
1155 |
< |
depends="jsr166ycompile" |
1156 |
< |
description="Builds library jar from compiled sources"> |
1157 |
< |
|
1191 |
> |
<target name="jsr166yjar" depends="jsr166ycompile"> |
1192 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
1193 |
|
<fileset dir="${build.jsr166y.classes.dir}"/> |
1194 |
|
<manifest> |
1196 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1197 |
|
</manifest> |
1198 |
|
</jar> |
1165 |
– |
|
1199 |
|
</target> |
1200 |
|
|
1201 |
< |
|
1169 |
< |
<target name="jsr166ydocs" |
1170 |
< |
description="Builds javadocs to dist dir"> |
1171 |
< |
|
1201 |
> |
<target name="jsr166ydocs"> |
1202 |
|
<delete dir="${jsr166ydocs.dir}"/> |
1203 |
|
<mkdir dir="${jsr166ydocs.dir}"/> |
1204 |
|
|
1209 |
|
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
1210 |
|
bootclasspath="${bootclasspath6}" |
1211 |
|
source="6" |
1212 |
< |
executable="${javadoc7}"> |
1212 |
> |
executable="${javadoc7}" |
1213 |
> |
failonerror = "true"> |
1214 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1215 |
|
<arg value="-XDignore.symbol.file=true"/> |
1185 |
– |
|
1216 |
|
</javadoc> |
1217 |
|
</target> |
1218 |
|
|
1219 |
+ |
<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/> |
1220 |
|
|
1221 |
< |
<target name="jsr166ydist" |
1191 |
< |
depends="jsr166ydist-jar, jsr166ydist-docs" |
1192 |
< |
description="Puts all distributable products in single hierarchy"/> |
1193 |
< |
|
1194 |
< |
|
1195 |
< |
<target name="jsr166yclean" |
1196 |
< |
description="Removes all jsr166y build products"> |
1197 |
< |
|
1221 |
> |
<target name="jsr166yclean"> |
1222 |
|
<delete dir="${build.jsr166y.dir}"/> |
1199 |
– |
|
1223 |
|
</target> |
1224 |
|
|
1225 |
< |
|
1203 |
< |
<target name="jsr166ydist-jar" |
1204 |
< |
depends="jsr166yclean, jsr166yjar"> |
1225 |
> |
<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar"> |
1226 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
1227 |
|
</target> |
1228 |
|
|
1229 |
< |
<target name="jsr166ydist-docs" |
1209 |
< |
depends="jsr166yclean, jsr166ydocs"> |
1229 |
> |
<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs"> |
1230 |
|
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
1231 |
|
</target> |
1232 |
|
|
1233 |
|
|
1234 |
< |
<!-- extra166y --> |
1215 |
< |
|
1216 |
< |
|
1217 |
< |
<target name="extra166ycompile" |
1218 |
< |
depends="configure-compiler, jsr166yjar" |
1219 |
< |
description="Compiles extra166y sources"> |
1234 |
> |
<!-- extra166y (no longer maintained) --> |
1235 |
|
|
1236 |
+ |
<target name="extra166ycompile" depends="configure-compiler, jsr166yjar"> |
1237 |
|
<mkdir dir="${build.extra166y.classes.dir}"/> |
1238 |
|
|
1239 |
|
<javac srcdir="${topsrc.dir}" |
1247 |
|
target="6" |
1248 |
|
includeAntRuntime="false" |
1249 |
|
includeJavaRuntime="false" |
1250 |
+ |
encoding="ASCII" |
1251 |
|
executable="${javac7}" |
1252 |
|
fork="true"> |
1253 |
|
|
1256 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
1257 |
|
<compilerarg value="-Werror"/> |
1258 |
|
<compilerarg line="${build.args}"/> |
1242 |
– |
|
1259 |
|
</javac> |
1260 |
|
</target> |
1261 |
|
|
1262 |
< |
|
1247 |
< |
<target name="extra166yjar" |
1248 |
< |
depends="extra166ycompile" |
1249 |
< |
description="Builds library jar from compiled sources"> |
1250 |
< |
|
1262 |
> |
<target name="extra166yjar" depends="extra166ycompile"> |
1263 |
|
<jar destfile="${extra166y.jar}" index="true"> |
1264 |
|
<fileset dir="${build.extra166y.classes.dir}"/> |
1265 |
|
<manifest> |
1267 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1268 |
|
</manifest> |
1269 |
|
</jar> |
1258 |
– |
|
1270 |
|
</target> |
1271 |
|
|
1272 |
< |
|
1262 |
< |
<target name="extra166ydocs" |
1263 |
< |
description="Builds javadocs to build dir"> |
1264 |
< |
|
1272 |
> |
<target name="extra166ydocs"> |
1273 |
|
<delete dir="${extra166ydocs.dir}"/> |
1274 |
|
<mkdir dir="${extra166ydocs.dir}"/> |
1275 |
|
|
1283 |
|
executable="${javadoc7}"> |
1284 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1285 |
|
<arg value="-XDignore.symbol.file=true"/> |
1278 |
– |
|
1286 |
|
</javadoc> |
1287 |
|
</target> |
1288 |
|
|
1289 |
+ |
<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/> |
1290 |
|
|
1291 |
< |
<target name="extra166ydist" |
1284 |
< |
depends="extra166ydist-jar, extra166ydist-docs" |
1285 |
< |
description="Puts all distributable products in single hierarchy"/> |
1286 |
< |
|
1287 |
< |
|
1288 |
< |
<target name="extra166yclean" |
1289 |
< |
description="Removes all extra166y build products"> |
1290 |
< |
|
1291 |
> |
<target name="extra166yclean"> |
1292 |
|
<delete dir="${build.extra166y.dir}"/> |
1292 |
– |
|
1293 |
|
</target> |
1294 |
|
|
1295 |
< |
|
1296 |
< |
<target name="extra166ydist-jar" |
1297 |
< |
depends="extra166yclean, extra166yjar"> |
1295 |
> |
<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar"> |
1296 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
1297 |
|
</target> |
1298 |
|
|
1299 |
< |
<target name="extra166ydist-docs" |
1302 |
< |
depends="extra166yclean, extra166ydocs"> |
1299 |
> |
<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs"> |
1300 |
|
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
1301 |
|
</target> |
1302 |
|
|
1303 |
< |
<!-- jsr166e --> |
1303 |
> |
|
1304 |
> |
<!-- jsr166e (no longer maintained) --> |
1305 |
|
|
1306 |
|
<property name="build.jsr166e.java.version" value="6"/> |
1307 |
|
<property name="build.jsr166e.javac" value="${javac6}"/> |
1308 |
|
|
1309 |
< |
<target name="jsr166ecompile" |
1312 |
< |
depends="configure-compiler" |
1313 |
< |
description="Compiles jsr166e sources"> |
1314 |
< |
|
1309 |
> |
<target name="jsr166ecompile" depends="configure-compiler"> |
1310 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1311 |
|
|
1312 |
|
<javac srcdir="${topsrc.dir}" |
1327 |
|
<compilerarg value="-Xlint:all"/> |
1328 |
|
<compilerarg value="-Werror"/> |
1329 |
|
<compilerarg line="${build.args}"/> |
1335 |
– |
|
1330 |
|
</javac> |
1331 |
|
</target> |
1332 |
|
|
1339 |
– |
<!-- jsr166e: find doclint errors --> |
1333 |
|
<target name="jsr166edoclint"> |
1341 |
– |
|
1334 |
|
<mkdir dir="${build.jsr166e.classes.dir}"/> |
1335 |
|
|
1336 |
|
<javac srcdir="${topsrc.dir}" |
1352 |
|
<compilerarg value="-Xlint:all"/> |
1353 |
|
<compilerarg value="-Werror"/> |
1354 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1363 |
– |
|
1355 |
|
</javac> |
1356 |
|
</target> |
1357 |
|
|
1358 |
< |
|
1368 |
< |
<target name="jsr166ejar" |
1369 |
< |
depends="jsr166ecompile" |
1370 |
< |
description="Builds library jar from compiled sources"> |
1371 |
< |
|
1358 |
> |
<target name="jsr166ejar" depends="jsr166ecompile"> |
1359 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1360 |
|
<fileset dir="${build.jsr166e.classes.dir}"/> |
1361 |
|
<manifest> |
1363 |
|
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1364 |
|
</manifest> |
1365 |
|
</jar> |
1379 |
– |
|
1366 |
|
</target> |
1367 |
|
|
1368 |
< |
|
1383 |
< |
<target name="jsr166edocs" |
1384 |
< |
description="Builds javadocs to build dir"> |
1385 |
< |
|
1368 |
> |
<target name="jsr166edocs"> |
1369 |
|
<delete dir="${jsr166edocs.dir}"/> |
1370 |
|
<mkdir dir="${jsr166edocs.dir}"/> |
1371 |
|
|
1375 |
|
access="${build.javadoc.access}" |
1376 |
|
sourcepath="${topsrc.dir}:${jdk6.src.dir}" |
1377 |
|
source="${build.jsr166e.java.version}" |
1378 |
< |
executable="${javadoc7}"> |
1378 |
> |
executable="${javadoc7}" |
1379 |
> |
failonerror = "true"> |
1380 |
|
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1381 |
|
<arg value="-XDignore.symbol.file=true"/> |
1398 |
– |
|
1382 |
|
</javadoc> |
1383 |
|
</target> |
1384 |
|
|
1385 |
< |
|
1403 |
< |
<target name="jsr166e-tck-one-java-version" |
1404 |
< |
depends="jsr166ejar"> |
1405 |
< |
|
1385 |
> |
<target name="jsr166e-tck-one-java-version" depends="jsr166ejar"> |
1386 |
|
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1407 |
– |
|
1387 |
|
<run-tck-tests |
1388 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1389 |
|
target="${build.jsr166e.java.version}" |
1391 |
|
classes="${jsr166e.jar}"/> |
1392 |
|
</target> |
1393 |
|
|
1394 |
< |
<target name="jsr166e-tck" |
1416 |
< |
description="Runs tck tests for jsr166e for multiple java versions"> |
1394 |
> |
<target name="jsr166e-tck"> |
1395 |
|
|
1396 |
|
<!-- <antcall target="clean"/> --> |
1397 |
|
<!-- <antcall target="jsr166e-tck-one-java-version"> --> |
1412 |
|
</antcall> |
1413 |
|
</target> |
1414 |
|
|
1415 |
+ |
<target name="jsr166e-test" depends="jsr166e-tck"/> |
1416 |
|
|
1417 |
< |
<target name="jsr166e-test" |
1439 |
< |
depends="jsr166e-tck" |
1440 |
< |
description="Runs all tests for jsr166e"> |
1441 |
< |
</target> |
1442 |
< |
|
1443 |
< |
<target name="jsr166edist" |
1444 |
< |
depends="jsr166edist-jar, jsr166edist-docs" |
1445 |
< |
description="Puts all distributable products in single hierarchy"/> |
1446 |
< |
|
1417 |
> |
<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/> |
1418 |
|
|
1419 |
< |
<target name="jsr166eclean" |
1449 |
< |
description="Removes all jsr166e build products"> |
1419 |
> |
<target name="jsr166eclean"> |
1420 |
|
<delete dir="${build.jsr166e.dir}"/> |
1421 |
|
</target> |
1422 |
|
|
1453 |
– |
|
1423 |
|
<target name="jsr166edist-jar" |
1424 |
|
depends="jsr166eclean, jsr166ejar"> |
1425 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1426 |
|
</target> |
1427 |
|
|
1428 |
< |
<target name="jsr166edist-docs" |
1460 |
< |
depends="jsr166eclean, jsr166edocs"> |
1428 |
> |
<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs"> |
1429 |
|
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1430 |
|
</target> |
1431 |
|
|
1432 |
|
|
1433 |
|
<!-- Find buglets that can be detected by static build tools --> |
1434 |
|
|
1435 |
< |
<target name="lint"> |
1436 |
< |
<antcall target="dists"> |
1437 |
< |
<param name="build.javadoc.access" value="public"/> |
1438 |
< |
</antcall> |
1439 |
< |
</target> |
1435 |
> |
<!-- <target name="lint"> --> |
1436 |
> |
<!-- <antcall target="dists"> --> |
1437 |
> |
<!-- <param name="build.javadoc.access" value="protected"/> --> |
1438 |
> |
<!-- </antcall> --> |
1439 |
> |
<!-- </target> --> |
1440 |
|
|
1441 |
|
<!-- Generates all doclint warnings, even for private methods (rarely useful) --> |
1442 |
< |
<target name="lint-private"> |
1442 |
> |
<target name="doclint-private"> |
1443 |
|
<antcall target="dist"> |
1444 |
|
<param name="build.javadoc.access" value="private"/> |
1445 |
|
</antcall> |
1446 |
|
</target> |
1447 |
|
|
1448 |
|
|
1449 |
+ |
<!-- ============================================================== |
1450 |
+ |
Experimental errorprone support |
1451 |
+ |
https://errorprone.info |
1452 |
+ |
https://errorprone.info/docs/installation |
1453 |
+ |
https://github.com/google/error-prone/issues/1143 |
1454 |
+ |
=================================================================== --> |
1455 |
+ |
<path id="errorprone.processorpath.path"> |
1456 |
+ |
<pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/> |
1457 |
+ |
<pathelement location="${lib.dir}/dataflow-2.5.7.jar"/> |
1458 |
+ |
<pathelement location="${lib.dir}/javacutil-2.5.7.jar"/> |
1459 |
+ |
<pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/> |
1460 |
+ |
</path> |
1461 |
+ |
<property name="errorprone.processorpath" refid="errorprone.processorpath.path" /> |
1462 |
+ |
<property name="errorprone.jsr166.user.flags" value=""/> |
1463 |
+ |
<property name="errorprone.jsr166.flags" |
1464 |
+ |
value="-Xep:HashtableContains:OFF |
1465 |
+ |
-Xep:JdkObsolete:OFF |
1466 |
+ |
-Xep:MissingOverride:OFF |
1467 |
+ |
-Xep:MissingFail:OFF |
1468 |
+ |
-Xep:ThreadPriorityCheck:OFF |
1469 |
+ |
-Xep:MixedArrayDimensions:ERROR |
1470 |
+ |
-Xep:RemoveUnusedImports:ERROR |
1471 |
+ |
-Xep:EmptyIf:ERROR |
1472 |
+ |
-Xep:MultipleTopLevelClasses:ERROR |
1473 |
+ |
-Xep:ClassName:ERROR |
1474 |
+ |
-Xep:LongLiteralLowerCaseSuffix:ERROR |
1475 |
+ |
-Xep:RedundantThrows:ERROR |
1476 |
+ |
-Xep:IdentityBinaryExpression:WARN |
1477 |
+ |
-Xep:ConstructorInvokesOverridable:WARN |
1478 |
+ |
-Xep:MethodCanBeStatic:WARN |
1479 |
+ |
${errorprone.jsr166.user.flags}"/> |
1480 |
+ |
<!-- -Xep:WildcardImport:ERROR --> |
1481 |
+ |
<property name="errorprone.jsr166.test.flags" |
1482 |
+ |
value="-Xep:StringSplitter:OFF |
1483 |
+ |
-Xep:BoxedPrimitiveConstructor:OFF |
1484 |
+ |
-Xep:ModifyingCollectionWithItself:OFF"/> |
1485 |
+ |
<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' --> |
1486 |
+ |
<target name="errorprone" |
1487 |
+ |
depends="clean, configure-compiler" |
1488 |
+ |
description="Run errorprone over jsr166 source code (experimental)"> |
1489 |
+ |
|
1490 |
+ |
<local name="destdir"/> |
1491 |
+ |
<property name="destdir" value="${build.classes.dir}/java.base"/> |
1492 |
+ |
<mkdir dir="${destdir}"/> |
1493 |
+ |
|
1494 |
+ |
<javac srcdir="${src.dir}" |
1495 |
+ |
destdir="${destdir}" |
1496 |
+ |
debug="${build.debug}" |
1497 |
+ |
debuglevel="${build.debuglevel}" |
1498 |
+ |
deprecation="${build.deprecation}" |
1499 |
+ |
classpath="" |
1500 |
+ |
includeAntRuntime="false" |
1501 |
+ |
includeJavaRuntime="false" |
1502 |
+ |
encoding="ASCII" |
1503 |
+ |
executable="${build.main.javac}" |
1504 |
+ |
fork="true"> |
1505 |
+ |
|
1506 |
+ |
<include name="**/*.java"/> |
1507 |
+ |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1508 |
+ |
<compilerarg value="-J--illegal-access=permit"/> |
1509 |
+ |
<compilerarg value="-XDcompilePolicy=simple"/> |
1510 |
+ |
<compilerarg value="-processorpath"/> |
1511 |
+ |
<compilerarg pathref="errorprone.processorpath.path"/> |
1512 |
+ |
<compilerarg value="-Xplugin:ErrorProne |
1513 |
+ |
${errorprone.jsr166.flags}"/> |
1514 |
+ |
<compilerarg value="--patch-module=java.base=${src.dir}"/> |
1515 |
+ |
<compilerarg value="-Xprefer:source"/> |
1516 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
1517 |
+ |
<compilerarg value="-Xlint:all"/> |
1518 |
+ |
<compilerarg value="-Xdoclint:all/protected,reference/private"/> |
1519 |
+ |
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1520 |
+ |
<compilerarg line="${build.args}"/> |
1521 |
+ |
</javac> |
1522 |
+ |
|
1523 |
+ |
<jar destfile="${product.jar}"> |
1524 |
+ |
<fileset dir="${destdir}"/> |
1525 |
+ |
</jar> |
1526 |
+ |
|
1527 |
+ |
<run-tck-tests |
1528 |
+ |
target="${java.runtime.target}" |
1529 |
+ |
workdir="${build.dir}" |
1530 |
+ |
classes="${product.jar}"> |
1531 |
+ |
<javac-elements> |
1532 |
+ |
<!-- Needed to silence -Xep:FutureReturnValueIgnored --> |
1533 |
+ |
<compilerarg value="-J--illegal-access=permit"/> |
1534 |
+ |
<compilerarg value="-XDcompilePolicy=simple"/> |
1535 |
+ |
<compilerarg line="-processorpath ${errorprone.processorpath}"/> |
1536 |
+ |
<compilerarg value="-Xplugin:ErrorProne |
1537 |
+ |
${errorprone.jsr166.flags} |
1538 |
+ |
${errorprone.jsr166.test.flags}"/> |
1539 |
+ |
<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> |
1540 |
+ |
</javac-elements> |
1541 |
+ |
</run-tck-tests> |
1542 |
+ |
</target> |
1543 |
+ |
|
1544 |
+ |
<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' --> |
1545 |
+ |
<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports --> |
1546 |
+ |
<target name="errorprone-jtreg" |
1547 |
+ |
depends="jar" |
1548 |
+ |
description="Run errorprone over jtreg tests (experimental)"> |
1549 |
+ |
|
1550 |
+ |
<run-jtreg-tests |
1551 |
+ |
target="${java.runtime.target}" |
1552 |
+ |
workdir="${build.dir}" |
1553 |
+ |
classes="${product.jar}" |
1554 |
+ |
verbose="all"> |
1555 |
+ |
<jtreg-elements> |
1556 |
+ |
<arg value="-javacoption:-XDcompilePolicy=simple"/> |
1557 |
+ |
<arg value="-javacoption:-processorpath"/> |
1558 |
+ |
<arg value="-javacoption:${errorprone.processorpath}"/> |
1559 |
+ |
<arg value="-javacoption:-Xplugin:ErrorProne |
1560 |
+ |
${errorprone.jsr166.flags} |
1561 |
+ |
${errorprone.jsr166.test.flags} |
1562 |
+ |
-Xep:MultipleTopLevelClasses:WARN |
1563 |
+ |
-Xep:NonAtomicVolatileUpdate:OFF"/> |
1564 |
+ |
</jtreg-elements> |
1565 |
+ |
</run-jtreg-tests> |
1566 |
+ |
</target> |
1567 |
+ |
|
1568 |
+ |
|
1569 |
+ |
<!-- ============================================================== |
1570 |
+ |
Running guava tests against jsr166 code |
1571 |
+ |
=================================================================== --> |
1572 |
+ |
|
1573 |
+ |
<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" --> |
1574 |
+ |
<!-- organisation="com.google.guava" module="guava-testlib" revision="21.0"/> --> |
1575 |
+ |
<!-- <property name="guava.version" value="21.0"/> --> |
1576 |
+ |
|
1577 |
+ |
<!-- HOWTO debug print a path id --> |
1578 |
+ |
<!-- <pathconvert property="guava.testlib.classpath" refid="guava.testlib.classpath" /> --> |
1579 |
+ |
<!-- <echo message="guava.testlib.classpath=${guava.testlib.classpath}"/> --> |
1580 |
+ |
|
1581 |
+ |
<!-- <ivy:retrieve pathid="guava.tests.classpath" type="jar" inline="true" conf="*" pattern="${lib.dir}/[type]/[artifact].[ext]" --> |
1582 |
+ |
<!-- organisation="com.google.guava" module="guava-tests"/> --> |
1583 |
+ |
<!-- <get src="http://repo2.maven.org/maven2/com/google/guava/guava-tests/${guava.version}/guava-tests-${guava.version}-tests.jar" --> |
1584 |
+ |
<!-- dest="${lib.dir}/jar/guava-tests-tests.jar" usetimestamp="true"/> --> |
1585 |
+ |
<!-- <ivy:cachepath pathid="lib.path.id" inline="true" conf="*" type="*" --> |
1586 |
+ |
<!-- organisation="com.google.guava" module="guava-testlib" revision="${guava.version}"/> --> |
1587 |
+ |
|
1588 |
+ |
<!-- <test name="com.google.common.collect.testing.TestsForQueuesInJavaUtil"/> --> |
1589 |
+ |
<!-- <test name="com.google.common.collect.testing.TestsForListsInJavaUtil"/> --> |
1590 |
+ |
<!-- <test name="com.google.common.collect.testing.TestsForSetsInJavaUtil"/> --> |
1591 |
+ |
<!-- <test name="com.google.common.collect.testing.TestsForMapsInJavaUtil"/> --> |
1592 |
+ |
|
1593 |
+ |
<!-- <ivy:retrieve pathid="guava.testlib.classpath" --> |
1594 |
+ |
<!-- type="*" inline="true" conf="*(private),*(public)" --> |
1595 |
+ |
<!-- pattern="${guava.dir}/[artifact].[ext]" --> |
1596 |
+ |
<!-- organisation="com.google.guava" module="guava-testlib"/> --> |
1597 |
+ |
|
1598 |
+ |
<!-- Work around bug below by downloading guava-testlib-tests.jar "by hand": --> |
1599 |
+ |
<!-- https://issues.apache.org/jira/browse/IVY-1444 --> |
1600 |
+ |
<!-- maven tests artifacts cannot be downloaded because they are mapped to private configurations --> |
1601 |
+ |
|
1602 |
+ |
<target name="init-ivy"> |
1603 |
+ |
<get src="http://repo2.maven.org/maven2/org/apache/ivy/ivy/2.4.0/ivy-2.4.0.jar" |
1604 |
+ |
dest="${build.dir}/ivy.jar" usetimestamp="true" skipexisting="true"/> |
1605 |
+ |
<taskdef resource="org/apache/ivy/ant/antlib.xml" uri="antlib:org.apache.ivy.ant" |
1606 |
+ |
classpath="${build.dir}/ivy.jar"/> |
1607 |
+ |
</target> |
1608 |
+ |
|
1609 |
+ |
<target name="guava-tests" depends="jar, init-ivy" |
1610 |
+ |
description="Guava tests run against jsr166 collections"> |
1611 |
+ |
<property name="guava.dir" value="${build.dir}/guava-testlib"/> |
1612 |
+ |
<mkdir dir="${guava.dir}"/> |
1613 |
+ |
<ivy:retrieve pathid="guava.testlib.classpath" |
1614 |
+ |
type="jar,bundle" inline="true" conf="default,master" |
1615 |
+ |
pattern="${guava.dir}/[artifact].[ext]" |
1616 |
+ |
organisation="com.google.guava" module="guava-testlib"/> |
1617 |
+ |
<property name="guava.version" value="21.0"/> |
1618 |
+ |
<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar" |
1619 |
+ |
dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/> |
1620 |
+ |
<junit printsummary="true" showoutput="true" haltonfailure="true" |
1621 |
+ |
jvm="${build.main.java}" fork="true"> |
1622 |
+ |
<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/> |
1623 |
+ |
<formatter type="brief"/> |
1624 |
+ |
<classpath> |
1625 |
+ |
<pathelement location="${guava.dir}/guava-testlib-tests.jar"/> |
1626 |
+ |
<path refid="guava.testlib.classpath"/> |
1627 |
+ |
</classpath> |
1628 |
+ |
|
1629 |
+ |
<!-- "6" in "OpenJdk6Tests" misleadingly means "6+" --> |
1630 |
+ |
<test name="com.google.common.collect.testing.OpenJdk6Tests"/> |
1631 |
+ |
</junit> |
1632 |
+ |
</target> |
1633 |
+ |
|
1634 |
|
</project> |