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 |
|
------------------------------------------------------------------------------ |
25 |
|
$HOME/jdk/src/jdk9 |
26 |
|
where each of the above is a complete JDK source tree |
27 |
|
(e.g. mercurial forest) or a symlink to same. |
28 |
+ |
|
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 |
|
|
49 |
– |
<!-- Tck options; see JSR166TestCase.java --> |
50 |
– |
<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck --> |
51 |
– |
<property name="jsr166.profileTests" value="false"/> |
52 |
– |
<property name="jsr166.profileThreshold" value="100"/> |
53 |
– |
<property name="jsr166.runsPerTest" value="1"/> |
54 |
– |
<!-- Allow running an individual tck test class --> |
55 |
– |
<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck --> |
56 |
– |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
57 |
– |
|
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"/> |
174 |
|
<property name="java5.docroot.url" value="http://docs.oracle.com/javase/1.5.0/docs"/> |
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 |
< |
<!-- The expected canonical location does not yet exist as of 2014-02 --> |
178 |
< |
<!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> --> |
166 |
< |
<property name="java8.docroot.url" value="http://download.java.net/jdk8/docs"/> |
167 |
< |
<!-- No published jdk9 docs exist as of 2014-02 --> |
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 2015-11 --> |
179 |
|
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
180 |
< |
<property name="java9.docroot.url" value="${java8.docroot.url}"/> |
180 |
> |
<property name="java9.docroot.url" value="http://download.java.net/jdk9/docs"/> |
181 |
|
<!-- Default jdk doc location (latest stable release seems best) --> |
182 |
< |
<property name="java.docroot.url" value="${java7.docroot.url}"/> |
182 |
> |
<property name="java.docroot.url" value="${java8.docroot.url}"/> |
183 |
|
|
184 |
|
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
185 |
|
<property name="java5.api.url" value="${java5.docroot.url}/api/"/> |
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"/> |
209 |
|
<attribute name="compile-target" default="@{target}"/> |
210 |
|
<attribute name="workdir"/> |
211 |
|
<attribute name="classes"/> |
212 |
< |
<attribute name="jvmflags" default=""/> |
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}" |
212 |
– |
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="-Xoverride:${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="-Xoverride:${build.classes.dir}" if:set="modules"/> |
253 |
|
<jvmarg line="@{jvmflags}"/> |
254 |
< |
<sysproperty key="jsr166.profileTests" value="${jsr166.profileTests}"/> |
255 |
< |
<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/> |
256 |
< |
<sysproperty key="jsr166.runsPerTest" value="${jsr166.runsPerTest}"/> |
254 |
> |
|
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 |
> |
|
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 |
|
<macrodef name="run-jtreg-tests"> |
293 |
< |
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
246 |
< |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
293 |
> |
<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg --> |
294 |
|
<attribute name="source" default="7"/> |
295 |
|
<attribute name="target"/> |
296 |
|
<attribute name="workdir"/> |
297 |
|
<attribute name="classes"/> |
298 |
|
<attribute name="jtregflags" default=""/> |
299 |
+ |
|
300 |
|
<sequential> |
301 |
+ |
|
302 |
+ |
<!-- ant -Djtreg.verbose=time,fail,error jtreg --> |
303 |
+ |
<property name="jtreg.verbose" value="nopass,fail,error"/> |
304 |
+ |
|
305 |
+ |
<local name="modules"/> |
306 |
+ |
<condition property="modules"> |
307 |
+ |
<available file="${jdk@{target}.home}/jmods" type="dir"/> |
308 |
+ |
</condition> |
309 |
+ |
|
310 |
|
<delete dir="@{workdir}/JTwork" quiet="true"/> |
311 |
|
<delete dir="@{workdir}/JTreport" quiet="true"/> |
312 |
|
<mkdir dir="@{workdir}/JTwork/scratch"/> |
313 |
< |
<mkdir dir="@{workdir}/JTreport"/> |
314 |
< |
<jtreg dir="@{jtreg.src.dir}" |
313 |
> |
<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 --> |
314 |
> |
<mkdir dir="@{workdir}/JTreport/html"/> |
315 |
> |
<mkdir dir="@{workdir}/JTreport/text"/> |
316 |
> |
<jtreg dir="${jtreg@{target}.src.dir}" |
317 |
|
jdk="${jdk@{target}.home}" |
318 |
|
workDir="@{workdir}/JTwork" |
319 |
|
reportDir="@{workdir}/JTreport"> |
320 |
< |
|
321 |
< |
<arg value="-Xbootclasspath/p:@{classes}"/> |
320 |
> |
<patternset refid="jdk@{target}.jtreg.tests"/> |
321 |
> |
<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/> |
322 |
> |
<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/> |
323 |
|
<arg value="-agentvm"/> |
324 |
< |
<arg value="-v:nopass,fail"/> |
324 |
> |
<arg value="-verbose:${jtreg.verbose}"/> |
325 |
|
<arg value="-vmoptions:-esa -ea"/> |
326 |
|
<arg value="-automatic"/> |
327 |
|
<arg value="-k:!ignore"/> |
352 |
|
depends="configure-compiler" |
353 |
|
description="Compiles src/main sources to build dir"> |
354 |
|
|
355 |
< |
<mkdir dir="${build.classes.dir}"/> |
355 |
> |
<local name="modules"/> |
356 |
> |
<condition property="modules"> |
357 |
> |
<and> |
358 |
> |
<available file="${jdk9.home}/jmods" type="dir"/> |
359 |
> |
<equals arg1="9" arg2="${build.main.java.version}"/> |
360 |
> |
</and> |
361 |
> |
</condition> |
362 |
> |
|
363 |
> |
<local name="destdir"/> |
364 |
> |
<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/> |
365 |
> |
<property name="destdir" value="${build.classes.dir}" unless:set="modules"/> |
366 |
> |
|
367 |
> |
<mkdir dir="${destdir}"/> |
368 |
|
|
369 |
|
<javac srcdir="${src.dir}" |
370 |
< |
destdir="${build.classes.dir}" |
370 |
> |
destdir="${destdir}" |
371 |
|
debug="${build.debug}" |
372 |
|
debuglevel="${build.debuglevel}" |
373 |
|
deprecation="${build.deprecation}" |
378 |
|
fork="true"> |
379 |
|
|
380 |
|
<include name="**/*.java"/> |
381 |
+ |
<compilerarg value="-Xmodule:java.base" if:set="modules"/> |
382 |
|
<compilerarg value="-Xprefer:source"/> |
383 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
384 |
|
<compilerarg value="-Xlint:all"/> |
385 |
+ |
<compilerarg value="-Werror"/> |
386 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
387 |
|
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
388 |
|
<compilerarg line="${build.args}"/> |
397 |
|
|
398 |
|
<jar destfile="${product.jar}"> |
399 |
|
<fileset dir="${build.classes.dir}"/> |
400 |
+ |
<manifest> |
401 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
402 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
403 |
+ |
</manifest> |
404 |
|
</jar> |
405 |
|
</target> |
406 |
|
|
428 |
|
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
429 |
|
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
430 |
|
<arg value="-XDignore.symbol.file=true"/> |
431 |
+ |
<!-- TODO <arg value="-Xmodule:java.base"/> --> |
432 |
|
<arg value="-tag"/> |
433 |
|
<arg value="${javadoc.jls.option}"/> |
434 |
|
<arg value="-tag"/> |
460 |
|
<exclude name="src/emulation/**"/> |
461 |
|
<exclude name="**/SyntaxTest.java"/> |
462 |
|
<exclude name="**/SuperfluousAbstract.java"/> |
463 |
+ |
<manifest> |
464 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
465 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
466 |
+ |
</manifest> |
467 |
|
</jar> |
468 |
|
</target> |
469 |
|
|
495 |
|
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
496 |
|
</target> |
497 |
|
|
498 |
< |
|
416 |
< |
<target name="test-tck" |
498 |
> |
<target name="tck" |
499 |
|
depends="jar" |
500 |
|
description="Runs tck tests for main directly"> |
501 |
|
|
505 |
|
classes="${product.jar}"/> |
506 |
|
</target> |
507 |
|
|
508 |
< |
<target name="test-jtreg" |
508 |
> |
<target name="tck-parallelism-1" |
509 |
> |
description="Runs tck with given common pool parallelism"> |
510 |
> |
<antcall target="tck"> |
511 |
> |
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/> |
512 |
> |
</antcall> |
513 |
> |
</target> |
514 |
> |
|
515 |
> |
<target name="tck-parallelism-0" |
516 |
> |
description="Runs tck with given common pool parallelism"> |
517 |
> |
<antcall target="tck"> |
518 |
> |
<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/> |
519 |
> |
</antcall> |
520 |
> |
</target> |
521 |
> |
|
522 |
> |
<target name="jtreg" |
523 |
|
depends="jar" |
524 |
|
description="Runs jtreg tests for main using the jtreg ant task"> |
525 |
|
<run-jtreg-tests |
529 |
|
</target> |
530 |
|
|
531 |
|
<target name="test" |
532 |
< |
depends="test-tck, test-jtreg" |
532 |
> |
depends="tck, tck-parallelism-1, jtreg" |
533 |
|
description="Runs tck and jtreg tests for main"> |
534 |
|
</target> |
535 |
|
|
536 |
+ |
<target name="jtreg8" description="Runs jtreg tests with jdk8"> |
537 |
+ |
|
538 |
+ |
<antcall target="jtreg"> |
539 |
+ |
<param name="build.main.java.version" value="8"/> |
540 |
+ |
<param name="build.main.javac" value="${javac8}"/> |
541 |
+ |
</antcall> |
542 |
+ |
|
543 |
+ |
</target> |
544 |
+ |
|
545 |
|
<target name="test89" |
546 |
|
description="Runs tck and jtreg tests for main for multiple java versions"> |
547 |
|
|
562 |
|
|
563 |
|
|
564 |
|
<target name="configure-compiler"> |
565 |
+ |
<fail message="ant version too old"> |
566 |
+ |
<condition> |
567 |
+ |
<not> <antversion atleast="1.9.1"/> </not> |
568 |
+ |
</condition> |
569 |
+ |
</fail> |
570 |
|
|
571 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
572 |
|
|
598 |
|
debuglevel="${build.debuglevel}" |
599 |
|
deprecation="${build.deprecation}" |
600 |
|
source="${build.sourcelevel}" |
601 |
+ |
target="${build.sourcelevel}" |
602 |
|
fork="true"> |
603 |
|
|
604 |
|
<compilerarg line="${build.args}"/> |
614 |
|
</target> |
615 |
|
|
616 |
|
|
617 |
+ |
<target name="compile-test-loops" depends="jar" |
618 |
+ |
description="compile all the perf tests in src/test/loops"> |
619 |
+ |
|
620 |
+ |
<mkdir dir="${build.dir}/test/loops"/> |
621 |
+ |
|
622 |
+ |
<javac srcdir="${basedir}/src/test/loops" |
623 |
+ |
destdir="${build.dir}/test/loops" |
624 |
+ |
debug="${build.debug}" |
625 |
+ |
debuglevel="${build.debuglevel}" |
626 |
+ |
deprecation="${build.deprecation}" |
627 |
+ |
includeAntRuntime="false" |
628 |
+ |
includeJavaRuntime="false" |
629 |
+ |
executable="${javac9}" |
630 |
+ |
fork="true"> |
631 |
+ |
|
632 |
+ |
<include name="*.java"/> |
633 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
634 |
+ |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
635 |
+ |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
636 |
+ |
<compilerarg line="${build.args}"/> |
637 |
+ |
|
638 |
+ |
</javac> |
639 |
+ |
|
640 |
+ |
</target> |
641 |
+ |
|
642 |
+ |
|
643 |
|
<!-- jsr166 4jdk7 --> |
644 |
|
|
645 |
|
<target name="4jdk7compile" |
654 |
|
debuglevel="${build.debuglevel}" |
655 |
|
deprecation="${build.deprecation}" |
656 |
|
source="6" |
657 |
+ |
target="6" |
658 |
|
classpath="" |
659 |
|
bootclasspath="${bootclasspath6}" |
660 |
|
includeAntRuntime="false" |
666 |
|
<compilerarg value="-Xprefer:source"/> |
667 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
668 |
|
<compilerarg value="-Xlint:all"/> |
669 |
+ |
<compilerarg value="-Werror"/> |
670 |
|
<compilerarg line="${build.args}"/> |
671 |
|
|
672 |
|
</javac> |
684 |
|
debuglevel="${build.debuglevel}" |
685 |
|
deprecation="${build.deprecation}" |
686 |
|
source="6" |
687 |
+ |
target="6" |
688 |
|
classpath="" |
689 |
< |
bootclasspath="${bootclasspath7}" |
689 |
> |
bootclasspath="${bootclasspath6}" |
690 |
|
includeAntRuntime="false" |
691 |
|
includeJavaRuntime="false" |
692 |
|
executable="${javac8}" |
709 |
|
|
710 |
|
<jar destfile="${4jdk7product.jar}"> |
711 |
|
<fileset dir="${build.4jdk7.classes.dir}"/> |
712 |
+ |
<manifest> |
713 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
714 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
715 |
+ |
</manifest> |
716 |
|
</jar> |
717 |
|
|
718 |
|
</target> |
719 |
|
|
720 |
|
|
721 |
< |
<target name="4jdk7-test-tck" |
721 |
> |
<target name="4jdk7-tck" |
722 |
|
depends="4jdk7jar" |
723 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
724 |
|
|
730 |
|
<!-- JDK8+ test classes --> |
731 |
|
<exclude name="*8Test.java"/> |
732 |
|
<exclude name="*9Test.java"/> |
733 |
+ |
<exclude name="*10Test.java"/> |
734 |
|
<exclude name="DoubleAccumulatorTest.java"/> |
735 |
|
<exclude name="DoubleAdderTest.java"/> |
736 |
|
<exclude name="LongAccumulatorTest.java"/> |
738 |
|
<exclude name="CompletableFutureTest.java"/> |
739 |
|
<exclude name="SplittableRandomTest.java"/> |
740 |
|
<exclude name="StampedLockTest.java"/> |
741 |
+ |
<exclude name="SubmissionPublisherTest.java"/> |
742 |
|
</javac-elements> |
743 |
|
</run-tck-tests> |
744 |
|
</target> |
745 |
|
|
746 |
|
|
747 |
< |
<target name="4jdk7-test-tck-junit" |
747 |
> |
<target name="4jdk7-tck-junit" |
748 |
|
depends="4jdk7compile" |
749 |
|
description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)"> |
750 |
|
|
772 |
|
</junit> |
773 |
|
</target> |
774 |
|
|
775 |
< |
<target name="4jdk7-test-jtreg" |
775 |
> |
<target name="4jdk7-jtreg" |
776 |
|
depends="4jdk7jar" |
777 |
|
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
778 |
|
<run-jtreg-tests |
779 |
|
target="7" |
780 |
|
workdir="${build.4jdk7.dir}" |
781 |
< |
classes="${4jdk7product.jar}" |
636 |
< |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
781 |
> |
classes="${4jdk7product.jar}"/> |
782 |
|
</target> |
783 |
|
|
784 |
|
|
785 |
|
<target name="4jdk7-test" |
786 |
< |
depends="4jdk7-test-tck, 4jdk7-test-jtreg" |
786 |
> |
depends="4jdk7-tck, 4jdk7-jtreg" |
787 |
|
description="Runs tck and jtreg tests for jsr166-4jdk7"> |
788 |
|
</target> |
789 |
|
|
852 |
|
classpath="" |
853 |
|
bootclasspath="${bootclasspath6}" |
854 |
|
source="5" |
855 |
+ |
target="5" |
856 |
|
includeAntRuntime="false" |
857 |
|
includeJavaRuntime="false" |
858 |
|
executable="${javac7}" |
861 |
|
<include name="jsr166x/**/*.java"/> |
862 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
863 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/> |
864 |
+ |
<compilerarg value="-Werror"/> |
865 |
|
<compilerarg line="${build.args}"/> |
866 |
|
|
867 |
|
</javac> |
874 |
|
|
875 |
|
<jar destfile="${jsr166x.jar}"> |
876 |
|
<fileset dir="${build.jsr166x.classes.dir}"/> |
877 |
+ |
<manifest> |
878 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
879 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
880 |
+ |
</manifest> |
881 |
|
</jar> |
882 |
|
|
883 |
|
</target> |
942 |
|
debuglevel="${build.debuglevel}" |
943 |
|
deprecation="${build.deprecation}" |
944 |
|
source="6" |
945 |
+ |
target="6" |
946 |
|
classpath="" |
947 |
|
bootclasspath="${bootclasspath6}" |
948 |
|
includeAntRuntime="false" |
953 |
|
<include name="jsr166y/**/*.java"/> |
954 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
955 |
|
<compilerarg value="-Xlint:all"/> |
956 |
+ |
<compilerarg value="-Werror"/> |
957 |
|
<compilerarg line="${build.args}"/> |
958 |
|
|
959 |
|
</javac> |
966 |
|
|
967 |
|
<jar destfile="${jsr166y.jar}" index="true"> |
968 |
|
<fileset dir="${build.jsr166y.classes.dir}"/> |
969 |
+ |
<manifest> |
970 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
971 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
972 |
+ |
</manifest> |
973 |
|
</jar> |
974 |
|
|
975 |
|
</target> |
1037 |
|
bootclasspath="@{jsr166y.jar}:${bootclasspath6}" |
1038 |
|
classpath="" |
1039 |
|
source="6" |
1040 |
+ |
target="6" |
1041 |
|
includeAntRuntime="false" |
1042 |
|
includeJavaRuntime="false" |
1043 |
|
executable="${javac7}" |
1046 |
|
<include name="extra166y/**/*.java"/> |
1047 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1048 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/> |
1049 |
+ |
<compilerarg value="-Werror"/> |
1050 |
|
<compilerarg line="${build.args}"/> |
1051 |
|
|
1052 |
|
</javac> |
1059 |
|
|
1060 |
|
<jar destfile="${extra166y.jar}" index="true"> |
1061 |
|
<fileset dir="${build.extra166y.classes.dir}"/> |
1062 |
+ |
<manifest> |
1063 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
1064 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1065 |
+ |
</manifest> |
1066 |
|
</jar> |
1067 |
|
|
1068 |
|
</target> |
1129 |
|
debuglevel="${build.debuglevel}" |
1130 |
|
deprecation="${build.deprecation}" |
1131 |
|
source="${build.jsr166e.java.version}" |
1132 |
+ |
target="${build.jsr166e.java.version}" |
1133 |
|
classpath="" |
1134 |
|
includeAntRuntime="false" |
1135 |
|
includeJavaRuntime="false" |
1139 |
|
<include name="jsr166e/**/*.java"/> |
1140 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1141 |
|
<compilerarg value="-Xlint:all"/> |
1142 |
+ |
<compilerarg value="-Werror"/> |
1143 |
|
<compilerarg line="${build.args}"/> |
1144 |
|
|
1145 |
|
</javac> |
1156 |
|
debuglevel="${build.debuglevel}" |
1157 |
|
deprecation="${build.deprecation}" |
1158 |
|
source="${build.jsr166e.java.version}" |
1159 |
+ |
target="${build.jsr166e.java.version}" |
1160 |
|
classpath="" |
1161 |
< |
bootclasspath="${bootclasspath7}" |
1161 |
> |
bootclasspath="${bootclasspath6}" |
1162 |
|
includeAntRuntime="false" |
1163 |
|
includeJavaRuntime="false" |
1164 |
|
executable="${javac8}" |
1167 |
|
<include name="jsr166e/**/*.java"/> |
1168 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
1169 |
|
<compilerarg value="-Xlint:all"/> |
1170 |
+ |
<compilerarg value="-Werror"/> |
1171 |
|
<compilerarg value="-Xdoclint:all/protected"/> |
1172 |
|
|
1173 |
|
</javac> |
1180 |
|
|
1181 |
|
<jar destfile="${jsr166e.jar}" index="true"> |
1182 |
|
<fileset dir="${build.jsr166e.classes.dir}"/> |
1183 |
+ |
<manifest> |
1184 |
+ |
<attribute name="Built-By" value="${user.name}"/> |
1185 |
+ |
<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/> |
1186 |
+ |
</manifest> |
1187 |
|
</jar> |
1188 |
|
|
1189 |
|
</target> |
1209 |
|
</target> |
1210 |
|
|
1211 |
|
|
1212 |
< |
<target name="jsr166e-test-tck-one-java-version" |
1212 |
> |
<target name="jsr166e-tck-one-java-version" |
1213 |
|
depends="jsr166ejar"> |
1214 |
|
|
1215 |
|
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1221 |
|
classes="${jsr166e.jar}"/> |
1222 |
|
</target> |
1223 |
|
|
1224 |
< |
<target name="jsr166e-test-tck" |
1224 |
> |
<target name="jsr166e-tck" |
1225 |
|
description="Runs tck tests for jsr166e for multiple java versions"> |
1226 |
|
|
1227 |
|
<!-- <antcall target="clean"/> --> |
1228 |
< |
<!-- <antcall target="jsr166e-test-tck-one-java-version"> --> |
1228 |
> |
<!-- <antcall target="jsr166e-tck-one-java-version"> --> |
1229 |
|
<!-- <param name="build.jsr166e.java.version" value="8"/> --> |
1230 |
|
<!-- <param name="build.jsr166e.javac" value="${javac8}"/> --> |
1231 |
|
<!-- </antcall> --> |
1232 |
|
|
1233 |
|
<antcall target="clean"/> |
1234 |
< |
<antcall target="jsr166e-test-tck-one-java-version"> |
1234 |
> |
<antcall target="jsr166e-tck-one-java-version"> |
1235 |
|
<param name="build.jsr166e.java.version" value="7"/> |
1236 |
|
<param name="build.jsr166e.javac" value="${javac7}"/> |
1237 |
|
</antcall> |
1238 |
|
|
1239 |
|
<antcall target="clean"/> |
1240 |
< |
<antcall target="jsr166e-test-tck-one-java-version"> |
1240 |
> |
<antcall target="jsr166e-tck-one-java-version"> |
1241 |
|
<param name="build.jsr166e.java.version" value="6"/> |
1242 |
|
<param name="build.jsr166e.javac" value="${javac6}"/> |
1243 |
|
</antcall> |
1245 |
|
|
1246 |
|
|
1247 |
|
<target name="jsr166e-test" |
1248 |
< |
depends="jsr166e-test-tck" |
1248 |
> |
depends="jsr166e-tck" |
1249 |
|
description="Runs all tests for jsr166e"> |
1250 |
|
</target> |
1251 |
|
|
1275 |
|
|
1276 |
|
<target name="lint"> |
1277 |
|
<antcall target="dists"> |
1278 |
+ |
<param name="build.javadoc.access" value="public"/> |
1279 |
+ |
</antcall> |
1280 |
+ |
</target> |
1281 |
+ |
|
1282 |
+ |
<!-- Generates all doclint warnings, even for private methods (rarely useful) --> |
1283 |
+ |
<target name="lint-private"> |
1284 |
+ |
<antcall target="dist"> |
1285 |
|
<param name="build.javadoc.access" value="private"/> |
1286 |
|
</antcall> |
1287 |
|
</target> |