1 |
< |
<project name="jsr166" default="usage"> |
1 |
> |
<project name="jsr166" default="usage" |
2 |
> |
xmlns:if="ant:if" xmlns:unless="ant:unless"> |
3 |
|
|
4 |
|
<description> |
5 |
|
------------------------------------------------------------------------------ |
29 |
|
Alternatively, define ant variables thus: |
30 |
|
ant -Djdk$N.home=... |
31 |
|
for $N in 6 7 8 9 ... |
32 |
+ |
|
33 |
+ |
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.dir="$HOME/jdk/src/jigsaw" clean test dist |
36 |
+ |
"docs" target is still broken. |
37 |
|
------------------------------------------------------------------------------ |
38 |
|
</description> |
39 |
|
|
44 |
|
</java> |
45 |
|
</target> |
46 |
|
|
47 |
+ |
<!-- HOWTO printf debug: <echo message="prop=${prop}"/> --> |
48 |
|
|
49 |
|
<!-- User-specific settings --> |
50 |
|
<property file="user.properties"/> |
57 |
|
<property name="build.deprecation" value="false"/> |
58 |
|
<property name="build.javadoc.access" value="protected"/> |
59 |
|
|
53 |
– |
<!-- Tck options; see JSR166TestCase.java |
54 |
– |
To profile a single tck test class: |
55 |
– |
ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck |
56 |
– |
To stress test a single tck test class: |
57 |
– |
ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck |
58 |
– |
--> |
59 |
– |
<property name="jsr166.profileTests" value="false"/> |
60 |
– |
<property name="jsr166.profileThreshold" value="100"/> |
61 |
– |
<property name="jsr166.runsPerTest" value="1"/> |
62 |
– |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
63 |
– |
|
60 |
|
<!-- Build locations --> |
61 |
|
<property name="build.dir" location="build"/> |
62 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
89 |
|
<property name="java@{v}" location="${jdk@{v}.home}/bin/java"/> |
90 |
|
<property name="javac@{v}" location="${jdk@{v}.home}/bin/javac"/> |
91 |
|
<property name="javadoc@{v}" location="${jdk@{v}.home}/bin/javadoc"/> |
92 |
< |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/> |
92 |
> |
<local name="have.java.base"/> |
93 |
> |
<available property="have.java.base" |
94 |
> |
file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/> |
95 |
> |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" |
96 |
> |
if:set="have.java.base"/> |
97 |
> |
<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes" |
98 |
> |
unless:set="have.java.base"/> |
99 |
> |
<local name="modules"/> |
100 |
> |
<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/> |
101 |
|
<local name="boot.jar.dir"/> |
102 |
< |
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib"/> |
103 |
< |
<path id="bootclasspath@{v}"> |
102 |
> |
<property name="boot.jar.dir" location="${jdk@{v}.home}/jre/lib" unless:set="modules"/> |
103 |
> |
<path id="bootclasspath@{v}" unless:set="modules"> |
104 |
|
<pathelement path="${boot.jar.dir}/resources.jar"/> |
105 |
|
<pathelement path="${boot.jar.dir}/rt.jar"/> |
106 |
|
<pathelement path="${boot.jar.dir}/jsse.jar"/> |
107 |
|
<pathelement path="${boot.jar.dir}/jce.jar"/> |
108 |
|
<pathelement path="${boot.jar.dir}/charsets.jar"/> |
109 |
|
</path> |
110 |
< |
<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/> |
110 |
> |
<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/> |
111 |
|
</sequential> |
112 |
|
</macrodef> |
113 |
|
|
133 |
|
<property name="test.src.dir" location="${basedir}/src/test"/> |
134 |
|
<property name="loops.src.dir" location="${basedir}/src/loops"/> |
135 |
|
<property name="tck.src.dir" location="${test.src.dir}/tck"/> |
136 |
< |
<property name="jtreg.src.dir" location="${test.src.dir}/jtreg"/> |
136 |
> |
<property name="jtreg7.src.dir" location="${test.src.dir}/jtreg-jdk7"/> |
137 |
> |
<property name="jtreg8.src.dir" location="${test.src.dir}/jtreg"/> |
138 |
> |
<property name="jtreg9.src.dir" location="${test.src.dir}/jtreg"/> |
139 |
> |
<property name="jtreg.src.dir" location="${jtreg9.src.dir}"/> |
140 |
|
<property name="lib.dir" location="${basedir}/lib"/> |
141 |
|
<property name="dist.dir" location="${basedir}/dist"/> |
142 |
|
<property name="topsrc.dir" location="${basedir}/src"/> |
175 |
|
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
176 |
|
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
177 |
|
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
178 |
< |
<!-- The expected canonical location does not yet exist as of 2014-07 --> |
178 |
> |
<!-- The expected canonical location does not yet exist as of 2015-11 --> |
179 |
|
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
180 |
|
<property name="java9.docroot.url" value="http://download.java.net/jdk9/docs"/> |
181 |
|
<!-- Default jdk doc location (latest stable release seems best) --> |
194 |
|
<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant" |
195 |
|
classpath="${lib.dir}/jtreg.jar" /> |
196 |
|
|
197 |
< |
<!-- Test classpath --> |
198 |
< |
<path id="test.classpath"> |
199 |
< |
<pathelement location="${build.testcases.dir}"/> |
200 |
< |
<pathelement location="${junit.jar}"/> |
201 |
< |
</path> |
202 |
< |
|
197 |
> |
<!-- Tck options; see JSR166TestCase.java |
198 |
> |
To profile a single tck test class: |
199 |
> |
ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck |
200 |
> |
To stress test a single tck test class: |
201 |
> |
ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck |
202 |
> |
To stress test a single tck test method: |
203 |
> |
ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck |
204 |
> |
--> |
205 |
> |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
206 |
|
<macrodef name="run-tck-tests"> |
207 |
|
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
208 |
|
<attribute name="target"/> |
211 |
|
<attribute name="classes"/> |
212 |
|
<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/> |
213 |
|
<element name="javac-elements" optional="true"/> |
214 |
+ |
|
215 |
|
<sequential> |
216 |
|
|
217 |
+ |
<local name="modules"/> |
218 |
+ |
<condition property="modules"> |
219 |
+ |
<available file="${jdk@{compile-target}.home}/jmods" type="dir"/> |
220 |
+ |
</condition> |
221 |
+ |
|
222 |
|
<mkdir dir="@{workdir}/tck-classes"/> |
223 |
|
|
224 |
|
<javac srcdir="@{tck.src.dir}" |
229 |
|
source="@{compile-target}" |
230 |
|
target="@{compile-target}" |
231 |
|
classpath="${junit.jar}" |
216 |
– |
bootclasspath="@{classes}:${bootclasspath@{compile-target}}" |
232 |
|
includeAntRuntime="false" |
233 |
|
includeJavaRuntime="false" |
234 |
|
executable="${javac@{compile-target}}" |
236 |
|
|
237 |
|
<include name="*.java"/> |
238 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
239 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
239 |
> |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/> |
240 |
> |
<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
241 |
> |
<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
242 |
|
<compilerarg line="${build.args}"/> |
243 |
|
<javac-elements/> |
244 |
|
|
248 |
|
failonerror="true" |
249 |
|
jvm="${java@{target}}" |
250 |
|
fork="true"> |
251 |
< |
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
251 |
> |
<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
252 |
> |
<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
253 |
|
<jvmarg line="@{jvmflags}"/> |
254 |
|
|
255 |
< |
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck --> |
256 |
< |
<syspropertyset id="java.util.concurrent.ForkJoinPool-properties"> |
255 |
> |
<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck --> |
256 |
> |
<syspropertyset id="system-properties-used-by-tck"> |
257 |
|
<propertyref prefix="java.util.concurrent.ForkJoinPool"/> |
258 |
+ |
<propertyref prefix="jsr166."/> |
259 |
|
</syspropertyset> |
260 |
|
|
242 |
– |
<sysproperty key="jsr166.profileTests" value="${jsr166.profileTests}"/> |
243 |
– |
<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/> |
244 |
– |
<sysproperty key="jsr166.runsPerTest" value="${jsr166.runsPerTest}"/> |
261 |
|
<classpath> |
262 |
|
<pathelement location="${junit.jar}"/> |
263 |
|
<pathelement location="@{workdir}/tck-classes"/> |
267 |
|
</sequential> |
268 |
|
</macrodef> |
269 |
|
|
270 |
+ |
<!-- Define jtreg test sets for different jdk versions --> |
271 |
+ |
<fileset dir="${jtreg9.src.dir}"> |
272 |
+ |
<patternset id="jdk9.jtreg.tests"> |
273 |
+ |
<include name="**/*.java"/> |
274 |
+ |
</patternset> |
275 |
+ |
</fileset> |
276 |
+ |
|
277 |
+ |
<fileset dir="${jtreg8.src.dir}"> |
278 |
+ |
<patternset id="jdk8.jtreg.tests"> |
279 |
+ |
<include name="**/*.java"/> |
280 |
+ |
<exclude name="**/SpliteratorCharacteristics.java"/> |
281 |
+ |
<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 --> |
282 |
+ |
<exclude name="**/GCDuringIteration.java"/> |
283 |
+ |
</patternset> |
284 |
+ |
</fileset> |
285 |
+ |
|
286 |
+ |
<fileset dir="${jtreg7.src.dir}"> |
287 |
+ |
<patternset id="jdk7.jtreg.tests"> |
288 |
+ |
<include name="**/*.java"/> |
289 |
+ |
</patternset> |
290 |
+ |
</fileset> |
291 |
+ |
|
292 |
+ |
<!-- ant -Djtreg.flags=-timeoutFactor:4 --> |
293 |
+ |
<property name="jtreg.flags" value=""/> |
294 |
+ |
|
295 |
|
<macrodef name="run-jtreg-tests"> |
296 |
< |
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
256 |
< |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
296 |
> |
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
297 |
|
<attribute name="source" default="7"/> |
298 |
|
<attribute name="target"/> |
299 |
|
<attribute name="workdir"/> |
300 |
|
<attribute name="classes"/> |
301 |
|
<attribute name="jtregflags" default=""/> |
302 |
+ |
|
303 |
|
<sequential> |
304 |
+ |
|
305 |
+ |
<!-- ant -Djtreg.verbose=time,fail,error jtreg --> |
306 |
+ |
<property name="jtreg.verbose" value="nopass,fail,error"/> |
307 |
+ |
|
308 |
+ |
<local name="modules"/> |
309 |
+ |
<condition property="modules"> |
310 |
+ |
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
311 |
+ |
</condition> |
312 |
+ |
|
313 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
314 |
|
<delete dir="@{workdir}/JTreport" quiet="true"/> |
315 |
|
<mkdir dir="@{workdir}/JTwork/scratch"/> |
316 |
< |
<mkdir dir="@{workdir}/JTreport"/> |
317 |
< |
<jtreg dir="@{jtreg.src.dir}" |
316 |
> |
<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 --> |
317 |
> |
<mkdir dir="@{workdir}/JTreport/html"/> |
318 |
> |
<mkdir dir="@{workdir}/JTreport/text"/> |
319 |
> |
<jtreg dir="${jtreg@{target}.src.dir}" |
320 |
|
jdk="${jdk@{target}.home}" |
321 |
|
workDir="@{workdir}/JTwork" |
322 |
|
reportDir="@{workdir}/JTreport"> |
323 |
< |
|
324 |
< |
<arg value="-Xbootclasspath/p:@{classes}"/> |
323 |
> |
<patternset refid="jdk@{target}.jtreg.tests"/> |
324 |
> |
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
325 |
> |
<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/> |
326 |
|
<arg value="-agentvm"/> |
327 |
< |
<arg value="-v:nopass,fail"/> |
327 |
> |
<arg value="-verbose:${jtreg.verbose}"/> |
328 |
|
<arg value="-vmoptions:-esa -ea"/> |
329 |
|
<arg value="-automatic"/> |
330 |
|
<arg value="-k:!ignore"/> |
331 |
|
<arg line="@{jtregflags}"/> |
332 |
+ |
<arg line="${jtreg.flags}"/> |
333 |
|
</jtreg> |
334 |
|
</sequential> |
335 |
|
</macrodef> |
356 |
|
depends="configure-compiler" |
357 |
|
description="Compiles src/main sources to build dir"> |
358 |
|
|
359 |
< |
<mkdir dir="${build.classes.dir}"/> |
359 |
> |
<local name="modules"/> |
360 |
> |
<condition property="modules"> |
361 |
> |
<and> |
362 |
> |
<available file="${jdk9.home}/jmods" type="dir"/> |
363 |
> |
<equals arg1="9" arg2="${build.main.java.version}"/> |
364 |
> |
</and> |
365 |
> |
</condition> |
366 |
> |
|
367 |
> |
<local name="destdir"/> |
368 |
> |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
369 |
> |
<property name="destdir" value="${build.classes.dir}" unless:set="modules"/> |
370 |
> |
|
371 |
> |
<mkdir dir="${destdir}"/> |
372 |
|
|
373 |
|
<javac srcdir="${src.dir}" |
374 |
< |
destdir="${build.classes.dir}" |
374 |
> |
destdir="${destdir}" |
375 |
|
debug="${build.debug}" |
376 |
|
debuglevel="${build.debuglevel}" |
377 |
|
deprecation="${build.deprecation}" |
382 |
|
fork="true"> |
383 |
|
|
384 |
|
<include name="**/*.java"/> |
385 |
+ |
<compilerarg value="-Xmodule:java.base" if:set="modules"/> |
386 |
|
<compilerarg value="-Xprefer:source"/> |
387 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
388 |
|
<compilerarg value="-Xlint:all"/> |
389 |
+ |
<compilerarg value="-Werror"/> |
390 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
391 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
392 |
|
<compilerarg line="${build.args}"/> |
393 |
|
|
394 |
|
</javac> |
395 |
+ |
|
396 |
+ |
<!-- We need jdk9's Contended annotation, but at compile time only --> |
397 |
+ |
<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/> |
398 |
|
</target> |
399 |
|
|
400 |
|
|
404 |
|
|
405 |
|
<jar destfile="${product.jar}"> |
406 |
|
<fileset dir="${build.classes.dir}"/> |
407 |
+ |
<manifest> |
408 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
409 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
410 |
+ |
</manifest> |
411 |
|
</jar> |
412 |
|
</target> |
413 |
|
|
435 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
436 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
437 |
|
<arg value="-XDignore.symbol.file=true"/> |
438 |
+ |
<!-- TODO <arg value="-Xmodule:java.base"/> --> |
439 |
|
<arg value="-tag"/> |
440 |
|
<arg value="${javadoc.jls.option}"/> |
441 |
|
<arg value="-tag"/> |
467 |
|
<exclude name="src/emulation/**"/> |
468 |
|
<exclude name="**/SyntaxTest.java"/> |
469 |
|
<exclude name="**/SuperfluousAbstract.java"/> |
470 |
+ |
<manifest> |
471 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
472 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
473 |
+ |
</manifest> |
474 |
|
</jar> |
475 |
|
</target> |
476 |
|
|
502 |
|
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
503 |
|
</target> |
504 |
|
|
505 |
< |
|
426 |
< |
<target name="test-tck" |
505 |
> |
<target name="tck" |
506 |
|
depends="jar" |
507 |
|
description="Runs tck tests for main directly"> |
508 |
|
|
512 |
|
classes="${product.jar}"/> |
513 |
|
</target> |
514 |
|
|
515 |
< |
<target name="test-tck-parallelism-1" |
516 |
< |
description="Runs test-tck with given common pool parallelism"> |
517 |
< |
<antcall target="test-tck"> |
515 |
> |
<target name="tck-parallelism-1" |
516 |
> |
description="Runs tck with given common pool parallelism"> |
517 |
> |
<antcall target="tck"> |
518 |
|
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/> |
519 |
|
</antcall> |
520 |
|
</target> |
521 |
|
|
522 |
< |
<target name="test-tck-parallelism-0" |
523 |
< |
description="Runs test-tck with given common pool parallelism"> |
524 |
< |
<antcall target="test-tck"> |
522 |
> |
<target name="tck-parallelism-0" |
523 |
> |
description="Runs tck with given common pool parallelism"> |
524 |
> |
<antcall target="tck"> |
525 |
|
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/> |
526 |
|
</antcall> |
527 |
|
</target> |
528 |
|
|
529 |
< |
<target name="test-jtreg" |
529 |
> |
<target name="jtreg" |
530 |
|
depends="jar" |
531 |
|
description="Runs jtreg tests for main using the jtreg ant task"> |
532 |
|
<run-jtreg-tests |
536 |
|
</target> |
537 |
|
|
538 |
|
<target name="test" |
539 |
< |
depends="test-tck, test-tck-parallelism-1, test-jtreg" |
539 |
> |
depends="tck, tck-parallelism-1, jtreg" |
540 |
|
description="Runs tck and jtreg tests for main"> |
541 |
|
</target> |
542 |
|
|
543 |
+ |
<target name="jtreg8" description="Runs jtreg tests with jdk8"> |
544 |
+ |
|
545 |
+ |
<antcall target="jtreg"> |
546 |
+ |
<param name="build.main.java.version" value="8"/> |
547 |
+ |
<param name="build.main.javac" value="${javac8}"/> |
548 |
+ |
</antcall> |
549 |
+ |
|
550 |
+ |
</target> |
551 |
+ |
|
552 |
|
<target name="test89" |
553 |
|
description="Runs tck and jtreg tests for main for multiple java versions"> |
554 |
|
|
569 |
|
|
570 |
|
|
571 |
|
<target name="configure-compiler"> |
572 |
+ |
<fail message="ant version too old"> |
573 |
+ |
<condition> |
574 |
+ |
<not> <antversion atleast="1.9.1"/> </not> |
575 |
+ |
</condition> |
576 |
+ |
</fail> |
577 |
|
|
578 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
579 |
|
|
605 |
|
debuglevel="${build.debuglevel}" |
606 |
|
deprecation="${build.deprecation}" |
607 |
|
source="${build.sourcelevel}" |
608 |
+ |
target="${build.sourcelevel}" |
609 |
|
fork="true"> |
610 |
|
|
611 |
|
<compilerarg line="${build.args}"/> |
621 |
|
</target> |
622 |
|
|
623 |
|
|
624 |
+ |
<target name="compile-test-loops" depends="jar" |
625 |
+ |
description="compile all the perf tests in src/test/loops"> |
626 |
+ |
|
627 |
+ |
<mkdir dir="${build.dir}/test/loops"/> |
628 |
+ |
|
629 |
+ |
<javac srcdir="${basedir}/src/test/loops" |
630 |
+ |
destdir="${build.dir}/test/loops" |
631 |
+ |
debug="${build.debug}" |
632 |
+ |
debuglevel="${build.debuglevel}" |
633 |
+ |
deprecation="${build.deprecation}" |
634 |
+ |
includeAntRuntime="false" |
635 |
+ |
includeJavaRuntime="false" |
636 |
+ |
executable="${javac9}" |
637 |
+ |
fork="true"> |
638 |
+ |
|
639 |
+ |
<include name="*.java"/> |
640 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
641 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
642 |
+ |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
643 |
+ |
<compilerarg line="${build.args}"/> |
644 |
+ |
|
645 |
+ |
</javac> |
646 |
+ |
|
647 |
+ |
</target> |
648 |
+ |
|
649 |
+ |
|
650 |
|
<!-- jsr166 4jdk7 --> |
651 |
|
|
652 |
|
<target name="4jdk7compile" |
661 |
|
debuglevel="${build.debuglevel}" |
662 |
|
deprecation="${build.deprecation}" |
663 |
|
source="6" |
664 |
+ |
target="6" |
665 |
|
classpath="" |
666 |
|
bootclasspath="${bootclasspath6}" |
667 |
|
includeAntRuntime="false" |
673 |
|
<compilerarg value="-Xprefer:source"/> |
674 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
675 |
|
<compilerarg value="-Xlint:all"/> |
676 |
+ |
<compilerarg value="-Werror"/> |
677 |
|
<compilerarg line="${build.args}"/> |
678 |
|
|
679 |
|
</javac> |
691 |
|
debuglevel="${build.debuglevel}" |
692 |
|
deprecation="${build.deprecation}" |
693 |
|
source="6" |
694 |
+ |
target="6" |
695 |
|
classpath="" |
696 |
< |
bootclasspath="${bootclasspath7}" |
696 |
> |
bootclasspath="${bootclasspath6}" |
697 |
|
includeAntRuntime="false" |
698 |
|
includeJavaRuntime="false" |
699 |
|
executable="${javac8}" |
716 |
|
|
717 |
|
<jar destfile="${4jdk7product.jar}"> |
718 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
719 |
+ |
<manifest> |
720 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
721 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
722 |
+ |
</manifest> |
723 |
|
</jar> |
724 |
|
|
725 |
|
</target> |
726 |
|
|
727 |
|
|
728 |
< |
<target name="4jdk7-test-tck" |
728 |
> |
<target name="4jdk7-tck" |
729 |
|
depends="4jdk7jar" |
730 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
731 |
|
|
737 |
|
<!-- JDK8+ test classes --> |
738 |
|
<exclude name="*8Test.java"/> |
739 |
|
<exclude name="*9Test.java"/> |
740 |
+ |
<exclude name="*10Test.java"/> |
741 |
|
<exclude name="DoubleAccumulatorTest.java"/> |
742 |
|
<exclude name="DoubleAdderTest.java"/> |
743 |
|
<exclude name="LongAccumulatorTest.java"/> |
745 |
|
<exclude name="CompletableFutureTest.java"/> |
746 |
|
<exclude name="SplittableRandomTest.java"/> |
747 |
|
<exclude name="StampedLockTest.java"/> |
748 |
+ |
<exclude name="SubmissionPublisherTest.java"/> |
749 |
|
</javac-elements> |
750 |
|
</run-tck-tests> |
751 |
|
</target> |
752 |
|
|
753 |
|
|
754 |
< |
<target name="4jdk7-test-tck-junit" |
754 |
> |
<target name="4jdk7-tck-junit" |
755 |
|
depends="4jdk7compile" |
756 |
|
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
757 |
|
|
779 |
|
</junit> |
780 |
|
</target> |
781 |
|
|
782 |
< |
<target name="4jdk7-test-jtreg" |
782 |
> |
<target name="4jdk7-jtreg" |
783 |
|
depends="4jdk7jar" |
784 |
|
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
785 |
|
<run-jtreg-tests |
786 |
|
target="7" |
787 |
|
workdir="${build.4jdk7.dir}" |
788 |
< |
classes="${4jdk7product.jar}" |
660 |
< |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
788 |
> |
classes="${4jdk7product.jar}"/> |
789 |
|
</target> |
790 |
|
|
791 |
|
|
792 |
|
<target name="4jdk7-test" |
793 |
< |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
793 |
> |
depends="4jdk7-tck, 4jdk7-jtreg" |
794 |
|
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
795 |
|
</target> |
796 |
|
|
859 |
|
classpath="" |
860 |
|
bootclasspath="${bootclasspath6}" |
861 |
|
source="5" |
862 |
+ |
target="5" |
863 |
|
includeAntRuntime="false" |
864 |
|
includeJavaRuntime="false" |
865 |
|
executable="${javac7}" |
868 |
|
<include name="jsr166x/**/*.java"/> |
869 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
870 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
871 |
+ |
<compilerarg value="-Werror"/> |
872 |
|
<compilerarg line="${build.args}"/> |
873 |
|
|
874 |
|
</javac> |
881 |
|
|
882 |
|
<jar destfile="${jsr166x.jar}"> |
883 |
|
<fileset dir="${build.jsr166x.classes.dir}"/> |
884 |
+ |
<manifest> |
885 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
886 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
887 |
+ |
</manifest> |
888 |
|
</jar> |
889 |
|
|
890 |
|
</target> |
949 |
|
debuglevel="${build.debuglevel}" |
950 |
|
deprecation="${build.deprecation}" |
951 |
|
source="6" |
952 |
+ |
target="6" |
953 |
|
classpath="" |
954 |
|
bootclasspath="${bootclasspath6}" |
955 |
|
includeAntRuntime="false" |
960 |
|
<include name="jsr166y/**/*.java"/> |
961 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
962 |
|
<compilerarg value="-Xlint:all"/> |
963 |
+ |
<compilerarg value="-Werror"/> |
964 |
|
<compilerarg line="${build.args}"/> |
965 |
|
|
966 |
|
</javac> |
973 |
|
|
974 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
975 |
|
<fileset dir="${build.jsr166y.classes.dir}"/> |
976 |
+ |
<manifest> |
977 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
978 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
979 |
+ |
</manifest> |
980 |
|
</jar> |
981 |
|
|
982 |
|
</target> |
1044 |
|
bootclasspath="@{jsr166y.jar}:${bootclasspath6}" |
1045 |
|
classpath="" |
1046 |
|
source="6" |
1047 |
+ |
target="6" |
1048 |
|
includeAntRuntime="false" |
1049 |
|
includeJavaRuntime="false" |
1050 |
|
executable="${javac7}" |
1053 |
|
<include name="extra166y/**/*.java"/> |
1054 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1055 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
1056 |
+ |
<compilerarg value="-Werror"/> |
1057 |
|
<compilerarg line="${build.args}"/> |
1058 |
|
|
1059 |
|
</javac> |
1066 |
|
|
1067 |
|
<jar destfile="${extra166y.jar}" index="true"> |
1068 |
|
<fileset dir="${build.extra166y.classes.dir}"/> |
1069 |
+ |
<manifest> |
1070 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
1071 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1072 |
+ |
</manifest> |
1073 |
|
</jar> |
1074 |
|
|
1075 |
|
</target> |
1136 |
|
debuglevel="${build.debuglevel}" |
1137 |
|
deprecation="${build.deprecation}" |
1138 |
|
source="${build.jsr166e.java.version}" |
1139 |
+ |
target="${build.jsr166e.java.version}" |
1140 |
|
classpath="" |
1141 |
|
includeAntRuntime="false" |
1142 |
|
includeJavaRuntime="false" |
1146 |
|
<include name="jsr166e/**/*.java"/> |
1147 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1148 |
|
<compilerarg value="-Xlint:all"/> |
1149 |
+ |
<compilerarg value="-Werror"/> |
1150 |
|
<compilerarg line="${build.args}"/> |
1151 |
|
|
1152 |
|
</javac> |
1163 |
|
debuglevel="${build.debuglevel}" |
1164 |
|
deprecation="${build.deprecation}" |
1165 |
|
source="${build.jsr166e.java.version}" |
1166 |
+ |
target="${build.jsr166e.java.version}" |
1167 |
|
classpath="" |
1168 |
< |
bootclasspath="${bootclasspath7}" |
1168 |
> |
bootclasspath="${bootclasspath6}" |
1169 |
|
includeAntRuntime="false" |
1170 |
|
includeJavaRuntime="false" |
1171 |
|
executable="${javac8}" |
1174 |
|
<include name="jsr166e/**/*.java"/> |
1175 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1176 |
|
<compilerarg value="-Xlint:all"/> |
1177 |
+ |
<compilerarg value="-Werror"/> |
1178 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1179 |
|
|
1180 |
|
</javac> |
1187 |
|
|
1188 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1189 |
|
<fileset dir="${build.jsr166e.classes.dir}"/> |
1190 |
+ |
<manifest> |
1191 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
1192 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1193 |
+ |
</manifest> |
1194 |
|
</jar> |
1195 |
|
|
1196 |
|
</target> |
1216 |
|
</target> |
1217 |
|
|
1218 |
|
|
1219 |
< |
<target name="jsr166e-test-tck-one-java-version" |
1219 |
> |
<target name="jsr166e-tck-one-java-version" |
1220 |
|
depends="jsr166ejar"> |
1221 |
|
|
1222 |
|
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1228 |
|
classes="${jsr166e.jar}"/> |
1229 |
|
</target> |
1230 |
|
|
1231 |
< |
<target name="jsr166e-test-tck" |
1231 |
> |
<target name="jsr166e-tck" |
1232 |
|
description="Runs tck tests for jsr166e for multiple java versions"> |
1233 |
|
|
1234 |
|
<!-- <antcall target="clean"/> --> |
1235 |
< |
<!-- <antcall target="jsr166e-test-tck-one-java-version"> --> |
1235 |
> |
<!-- <antcall target="jsr166e-tck-one-java-version"> --> |
1236 |
|
<!-- <param name="build.jsr166e.java.version" value="8"/> --> |
1237 |
|
<!-- <param name="build.jsr166e.javac" value="${javac8}"/> --> |
1238 |
|
<!-- </antcall> --> |
1239 |
|
|
1240 |
|
<antcall target="clean"/> |
1241 |
< |
<antcall target="jsr166e-test-tck-one-java-version"> |
1241 |
> |
<antcall target="jsr166e-tck-one-java-version"> |
1242 |
|
<param name="build.jsr166e.java.version" value="7"/> |
1243 |
|
<param name="build.jsr166e.javac" value="${javac7}"/> |
1244 |
|
</antcall> |
1245 |
|
|
1246 |
|
<antcall target="clean"/> |
1247 |
< |
<antcall target="jsr166e-test-tck-one-java-version"> |
1247 |
> |
<antcall target="jsr166e-tck-one-java-version"> |
1248 |
|
<param name="build.jsr166e.java.version" value="6"/> |
1249 |
|
<param name="build.jsr166e.javac" value="${javac6}"/> |
1250 |
|
</antcall> |
1252 |
|
|
1253 |
|
|
1254 |
|
<target name="jsr166e-test" |
1255 |
< |
depends="jsr166e-test-tck" |
1255 |
> |
depends="jsr166e-tck" |
1256 |
|
description="Runs all tests for jsr166e"> |
1257 |
|
</target> |
1258 |
|
|
1282 |
|
|
1283 |
|
<target name="lint"> |
1284 |
|
<antcall target="dists"> |
1285 |
+ |
<param name="build.javadoc.access" value="public"/> |
1286 |
+ |
</antcall> |
1287 |
+ |
</target> |
1288 |
+ |
|
1289 |
+ |
<!-- Generates all doclint warnings, even for private methods (rarely useful) --> |
1290 |
+ |
<target name="lint-private"> |
1291 |
+ |
<antcall target="dist"> |
1292 |
|
<param name="build.javadoc.access" value="private"/> |
1293 |
|
</antcall> |
1294 |
|
</target> |