16 |
|
$HOME/jdk/jdk6 |
17 |
|
$HOME/jdk/jdk7 |
18 |
|
$HOME/jdk/jdk8 |
19 |
+ |
$HOME/jdk/jdk9 |
20 |
|
where each of the above is a JDK or a symlink to same, and |
21 |
|
$HOME/jdk/src/jdk6 |
22 |
|
$HOME/jdk/src/jdk7 |
23 |
|
$HOME/jdk/src/jdk8 |
24 |
+ |
$HOME/jdk/src/jdk9 |
25 |
|
where each of the above is a complete JDK source tree |
26 |
|
(e.g. mercurial forest) or a symlink to same. |
27 |
< |
As of 2013-02, the very latest lambda 8 jdk is needed for jdk8. |
27 |
> |
|
28 |
> |
Alternatively, define ant variables thus: |
29 |
> |
ant -Djdk$N.home=... |
30 |
> |
for $N in 6 7 8 9 ... |
31 |
|
------------------------------------------------------------------------------ |
32 |
|
</description> |
33 |
|
|
34 |
< |
<target name="usage" description="Display main targets by running 'ant -projecthelp'"> |
34 |
> |
<!-- Display main targets by running 'ant -projecthelp' --> |
35 |
> |
<target name="usage"> |
36 |
|
<java classname="org.apache.tools.ant.Main"> |
37 |
|
<arg value="-projecthelp" /> |
38 |
|
</java> |
50 |
|
<property name="build.deprecation" value="false"/> |
51 |
|
<property name="build.javadoc.access" value="protected"/> |
52 |
|
|
53 |
< |
<!-- Tck options; see JSR166TestCase.java --> |
54 |
< |
<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck --> |
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"/> |
52 |
– |
<!-- Allow running an individual tck test class --> |
53 |
– |
<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck --> |
62 |
|
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
63 |
|
|
64 |
|
<!-- Build locations --> |
122 |
|
<defjdklocations v="6"/> |
123 |
|
<defjdklocations v="7"/> |
124 |
|
<defjdklocations v="8"/> |
125 |
+ |
<defjdklocations v="9"/> |
126 |
|
|
127 |
|
<!-- Source locations --> |
128 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
163 |
|
<property name="extra166y.jar" location="${build.extra166y.dir}/extra166y.jar"/> |
164 |
|
<property name="junit.jar" location="${lib.dir}/junit.jar"/> |
165 |
|
|
166 |
< |
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
167 |
< |
<property name="jdkapi5docs.url" value="http://docs.oracle.com/javase/1.5.0/docs/api/"/> |
168 |
< |
<property name="jdkapi6docs.url" value="http://docs.oracle.com/javase/6/docs/api/"/> |
169 |
< |
<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/> |
170 |
< |
|
171 |
< |
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
172 |
< |
<!-- The below does not yet exist as of 2013-01 --> |
173 |
< |
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
166 |
> |
<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag --> |
167 |
> |
<property name="java5.docroot.url" value="http://docs.oracle.com/javase/1.5.0/docs"/> |
168 |
> |
<property name="java6.docroot.url" value="http://docs.oracle.com/javase/6/docs"/> |
169 |
> |
<property name="java7.docroot.url" value="http://docs.oracle.com/javase/7/docs"/> |
170 |
> |
<property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> |
171 |
> |
<!-- The expected canonical location does not yet exist as of 2014-07 --> |
172 |
> |
<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> --> |
173 |
> |
<property name="java9.docroot.url" value="http://download.java.net/jdk9/docs"/> |
174 |
> |
<!-- Default jdk doc location (latest stable release seems best) --> |
175 |
> |
<property name="java.docroot.url" value="${java8.docroot.url}"/> |
176 |
|
|
177 |
< |
<!-- Default jdk api doc location (latest stable release seems best) --> |
178 |
< |
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
177 |
> |
<!-- Canonical location of jdk API docs, to use with javadoc link attribute --> |
178 |
> |
<property name="java5.api.url" value="${java5.docroot.url}/api/"/> |
179 |
> |
<property name="java6.api.url" value="${java6.docroot.url}/api/"/> |
180 |
> |
<property name="java7.api.url" value="${java7.docroot.url}/api/"/> |
181 |
> |
<property name="java8.api.url" value="${java8.docroot.url}/api/"/> |
182 |
> |
<property name="java9.api.url" value="${java9.docroot.url}/api/"/> |
183 |
> |
<property name="java.api.url" value="${java.docroot.url}/api/"/> |
184 |
|
|
185 |
|
<!-- Define the "jtreg" task --> |
186 |
|
<!-- See the docs in "jtreg -onlineHelp" --> |
199 |
|
<attribute name="compile-target" default="@{target}"/> |
200 |
|
<attribute name="workdir"/> |
201 |
|
<attribute name="classes"/> |
202 |
< |
<attribute name="jvmflags" default=""/> |
202 |
> |
<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/> |
203 |
|
<element name="javac-elements" optional="true"/> |
204 |
|
<sequential> |
205 |
|
|
246 |
|
</macrodef> |
247 |
|
|
248 |
|
<macrodef name="run-jtreg-tests"> |
249 |
+ |
<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg --> |
250 |
|
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
251 |
|
<attribute name="source" default="7"/> |
252 |
|
<attribute name="target"/> |
285 |
|
|
286 |
|
<!-- Main targets --> |
287 |
|
|
288 |
+ |
<property name="build.main.java.version" value="9"/> |
289 |
+ |
<property name="build.main.javac" value="${javac9}"/> |
290 |
+ |
|
291 |
|
<target name="dists" |
292 |
|
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
293 |
|
description="Builds all public jars and docs"/> |
306 |
|
classpath="" |
307 |
|
includeAntRuntime="false" |
308 |
|
includeJavaRuntime="false" |
309 |
< |
executable="${javac8}" |
309 |
> |
executable="${build.main.javac}" |
310 |
|
fork="true"> |
311 |
|
|
312 |
|
<include name="**/*.java"/> |
313 |
|
<compilerarg value="-Xprefer:source"/> |
314 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
315 |
|
<compilerarg value="-Xlint:all"/> |
316 |
+ |
<compilerarg value="-Xdoclint:all/protected"/> |
317 |
+ |
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
318 |
|
<compilerarg line="${build.args}"/> |
319 |
|
|
320 |
|
</javac> |
331 |
|
</target> |
332 |
|
|
333 |
|
|
312 |
– |
<target name="test" |
313 |
– |
depends="configure-tests, report-tests" |
314 |
– |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
315 |
– |
|
316 |
– |
|
334 |
|
<target name="docs" |
335 |
|
description="Builds javadocs for src/main to dist dir"> |
336 |
|
|
342 |
|
|
343 |
|
<javadoc destdir="${docs.dir}" |
344 |
|
packagenames="none" |
345 |
< |
link="${jdkapi8docs.url}" |
345 |
> |
link="${java9.api.url}" |
346 |
|
overview="${src.dir}/intro.html" |
347 |
|
access="${build.javadoc.access}" |
348 |
< |
sourcepath="${src.dir}:${jdk8src.dir}" |
348 |
> |
sourcepath="${src.dir}:${jdk9src.dir}" |
349 |
|
classpath="" |
350 |
< |
executable="${javadoc8}"> |
350 |
> |
executable="${javadoc9}"> |
351 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
352 |
|
<include name="**/*.java"/> |
353 |
|
</fileset> |
354 |
+ |
<arg line="-Xdocrootparent ${java9.docroot.url}"/> |
355 |
+ |
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
356 |
|
<arg value="-XDignore.symbol.file=true"/> |
357 |
|
<arg value="-tag"/> |
358 |
|
<arg value="${javadoc.jls.option}"/> |
359 |
+ |
<arg value="-tag"/> |
360 |
+ |
<arg value="apiNote:a:<em>API Note:</em>"/> |
361 |
+ |
<arg value="-tag"/> |
362 |
+ |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
363 |
+ |
<arg value="-tag"/> |
364 |
+ |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
365 |
|
</javadoc> |
366 |
|
</target> |
367 |
|
|
400 |
|
<target name="dist-clean" |
401 |
|
description="Removes all build and distribution products"> |
402 |
|
|
403 |
+ |
<delete dir="${build.dir}"/> |
404 |
|
<delete dir="${dist.dir}"/> |
405 |
|
|
406 |
|
</target> |
407 |
|
|
408 |
|
|
383 |
– |
<!-- Internal targets --> |
384 |
– |
|
385 |
– |
|
409 |
|
<target name="dist-jar" |
410 |
|
depends="clean, jar"> |
411 |
|
<copy file="${product.jar}" todir="${dist.dir}"/> |
417 |
|
</target> |
418 |
|
|
419 |
|
|
397 |
– |
<target name="compile-tests" |
398 |
– |
depends="jar"> |
399 |
– |
|
400 |
– |
<mkdir dir="${build.testcases.dir}"/> |
401 |
– |
|
402 |
– |
<javac srcdir="${tck.src.dir}" |
403 |
– |
destdir="${build.testcases.dir}" |
404 |
– |
debug="${build.debug}" |
405 |
– |
debuglevel="${build.debuglevel}" |
406 |
– |
deprecation="${build.deprecation}" |
407 |
– |
source="6" |
408 |
– |
classpath="${junit.jar}" |
409 |
– |
bootclasspath="@{product.jar}:${bootclasspath6}" |
410 |
– |
includeAntRuntime="false" |
411 |
– |
includeJavaRuntime="false" |
412 |
– |
executable="${javac8}" |
413 |
– |
fork="true"> |
414 |
– |
|
415 |
– |
<include name="**/*.java"/> |
416 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
417 |
– |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
418 |
– |
<compilerarg line="${build.args}"/> |
419 |
– |
|
420 |
– |
</javac> |
421 |
– |
|
422 |
– |
<javac srcdir="${test.src.dir}" |
423 |
– |
destdir="${build.testcases.dir}" |
424 |
– |
debug="${build.debug}" |
425 |
– |
debuglevel="${build.debuglevel}" |
426 |
– |
deprecation="${build.deprecation}" |
427 |
– |
source="6" |
428 |
– |
classpath="" |
429 |
– |
bootclasspath="@{product.jar}:${bootclasspath6}" |
430 |
– |
includeAntRuntime="false" |
431 |
– |
includeJavaRuntime="false" |
432 |
– |
executable="${javac8}" |
433 |
– |
fork="true"> |
434 |
– |
|
435 |
– |
<include name="jsr166/test/**/*.java"/> |
436 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
437 |
– |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
438 |
– |
<compilerarg line="${build.args}"/> |
439 |
– |
|
440 |
– |
</javac> |
441 |
– |
|
442 |
– |
<!-- |
443 |
– |
<javac srcdir="${jtreg.src.dir}" |
444 |
– |
destdir="${build.testcases.dir}" |
445 |
– |
debug="${build.debug}" |
446 |
– |
debuglevel="${build.debuglevel}" |
447 |
– |
deprecation="${build.deprecation}" |
448 |
– |
source="${build.sourcelevel}" |
449 |
– |
fork="true"> |
450 |
– |
|
451 |
– |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
452 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
453 |
– |
<compilerarg line="${build.args}"/> |
454 |
– |
|
455 |
– |
</javac> |
456 |
– |
--> |
457 |
– |
|
458 |
– |
</target> |
459 |
– |
|
420 |
|
<target name="test-tck" |
421 |
|
depends="jar" |
422 |
|
description="Runs tck tests for main directly"> |
423 |
|
|
424 |
|
<run-tck-tests |
425 |
< |
target="8" |
425 |
> |
target="${build.main.java.version}" |
426 |
|
workdir="${build.dir}" |
427 |
|
classes="${product.jar}"/> |
428 |
|
</target> |
431 |
|
depends="jar" |
432 |
|
description="Runs jtreg tests for main using the jtreg ant task"> |
433 |
|
<run-jtreg-tests |
434 |
< |
target="8" |
434 |
> |
target="${build.main.java.version}" |
435 |
|
workdir="${build.dir}" |
436 |
|
classes="${product.jar}"/> |
437 |
|
</target> |
438 |
|
|
439 |
< |
<target name="test-ng" |
439 |
> |
<target name="test" |
440 |
|
depends="test-tck, test-jtreg" |
441 |
|
description="Runs tck and jtreg tests for main"> |
442 |
|
</target> |
443 |
|
|
444 |
< |
<target name="run-tests" |
445 |
< |
depends="compile-tests"> |
486 |
< |
|
487 |
< |
<!-- May be overridden by user.properties --> |
488 |
< |
<property name="testcase" value="*"/> |
489 |
< |
|
490 |
< |
<mkdir dir="${build.reports.dir}"/> |
491 |
< |
|
492 |
< |
<junit printsummary="true" |
493 |
< |
showoutput="true" |
494 |
< |
errorProperty="junit.failed" |
495 |
< |
failureProperty="junit.failed" |
496 |
< |
dir="${build.reports.dir}" |
497 |
< |
jvm="${java8}" |
498 |
< |
fork="true"> |
499 |
< |
|
500 |
< |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
501 |
< |
<jvmarg value="-server"/> |
502 |
< |
<jvmarg value="-showversion"/> |
503 |
< |
|
504 |
< |
<classpath refid="test.classpath"/> |
505 |
< |
|
506 |
< |
<formatter type="xml"/> |
444 |
> |
<target name="test89" |
445 |
> |
description="Runs tck and jtreg tests for main for multiple java versions"> |
446 |
|
|
447 |
< |
<batchtest todir="${build.reports.dir}" unless="no.test.tck"> |
448 |
< |
<fileset dir="${tck.src.dir}"> |
449 |
< |
<include name="**/${testcase}Test.java"/> |
450 |
< |
</fileset> |
451 |
< |
</batchtest> |
452 |
< |
|
453 |
< |
<batchtest todir="${build.reports.dir}" if="do.test.old"> |
454 |
< |
<fileset dir="${test.src.dir}"> |
455 |
< |
<include name="jsr166/test/**/${testcase}Test.java"/> |
456 |
< |
</fileset> |
457 |
< |
</batchtest> |
519 |
< |
|
520 |
< |
<!-- |
521 |
< |
<batchtest todir="${build.reports.dir}" if="do.test.jtreg"> |
522 |
< |
<fileset dir="${jtreg.src.dir}"> |
523 |
< |
<include name="**/${testcase}Test.java"/> |
524 |
< |
</fileset> |
525 |
< |
</batchtest> |
526 |
< |
--> |
527 |
< |
|
528 |
< |
</junit> |
447 |
> |
<antcall target="clean"/> |
448 |
> |
<antcall target="test"> |
449 |
> |
<param name="build.main.java.version" value="8"/> |
450 |
> |
<param name="build.main.javac" value="${javac8}"/> |
451 |
> |
</antcall> |
452 |
> |
|
453 |
> |
<antcall target="clean"/> |
454 |
> |
<antcall target="test"> |
455 |
> |
<param name="build.main.java.version" value="9"/> |
456 |
> |
<param name="build.main.javac" value="${javac9}"/> |
457 |
> |
</antcall> |
458 |
|
|
459 |
|
</target> |
460 |
|
|
461 |
|
|
533 |
– |
<target name="report-tests" |
534 |
– |
depends="run-tests"> |
535 |
– |
|
536 |
– |
<!-- Sets junit.report.format to frames if redirection is present, |
537 |
– |
otherwise sets it to noframes. --> |
538 |
– |
<available property="junit.report.format" |
539 |
– |
value="frames" |
540 |
– |
classname="org.apache.xalan.lib.Redirect" |
541 |
– |
/> |
542 |
– |
<property name="junit.report.format" value="noframes"/> |
543 |
– |
|
544 |
– |
<junitreport todir="${build.reports.dir}"> |
545 |
– |
<fileset dir="${build.reports.dir}"> |
546 |
– |
<include name="TEST-*.xml"/> |
547 |
– |
</fileset> |
548 |
– |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
549 |
– |
/> |
550 |
– |
</junitreport> |
551 |
– |
|
552 |
– |
<fail message="Test Cases Failed" if="junit.failed"/> |
553 |
– |
|
554 |
– |
</target> |
555 |
– |
|
462 |
|
|
463 |
|
<target name="configure-compiler"> |
464 |
|
|
477 |
|
</target> |
478 |
|
|
479 |
|
|
574 |
– |
<target name="configure-tests" |
575 |
– |
depends="configure-compiler"> |
576 |
– |
|
577 |
– |
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
578 |
– |
<available property="junit.available" |
579 |
– |
classname="junit.framework.Protectable"/> |
580 |
– |
|
581 |
– |
<!-- Xalan --> |
582 |
– |
<available property="xalan.available" |
583 |
– |
classname="org.apache.xalan.Version"/> |
584 |
– |
|
585 |
– |
|
586 |
– |
<!-- Ant 1.6beta and later don't need or want this check --> |
587 |
– |
<!-- |
588 |
– |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
589 |
– |
unless="junit.available"/> |
590 |
– |
|
591 |
– |
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
592 |
– |
unless="xalan.available"/> |
593 |
– |
--> |
594 |
– |
|
595 |
– |
</target> |
596 |
– |
|
480 |
|
|
481 |
|
<!-- Various demos and test programs --> |
482 |
|
|
537 |
|
</javac> |
538 |
|
</target> |
539 |
|
|
540 |
+ |
<target name="4jdk7doclint" |
541 |
+ |
depends="configure-compiler" |
542 |
+ |
description="Finds doclint warnings"> |
543 |
+ |
|
544 |
+ |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
545 |
+ |
|
546 |
+ |
<javac srcdir="${4jdk7src.dir}" |
547 |
+ |
destdir="${build.4jdk7.classes.dir}" |
548 |
+ |
debug="${build.debug}" |
549 |
+ |
debuglevel="${build.debuglevel}" |
550 |
+ |
deprecation="${build.deprecation}" |
551 |
+ |
source="6" |
552 |
+ |
classpath="" |
553 |
+ |
bootclasspath="${bootclasspath7}" |
554 |
+ |
includeAntRuntime="false" |
555 |
+ |
includeJavaRuntime="false" |
556 |
+ |
executable="${javac8}" |
557 |
+ |
fork="true"> |
558 |
+ |
|
559 |
+ |
<include name="**/*.java"/> |
560 |
+ |
<compilerarg value="-Xprefer:source"/> |
561 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
562 |
+ |
<compilerarg value="-Xlint:all"/> |
563 |
+ |
<compilerarg value="-Xdoclint:all/protected"/> |
564 |
+ |
<compilerarg line="${build.args}"/> |
565 |
+ |
|
566 |
+ |
</javac> |
567 |
+ |
</target> |
568 |
+ |
|
569 |
|
|
570 |
|
<target name="4jdk7jar" |
571 |
|
depends="4jdk7compile" |
589 |
|
<javac-elements> |
590 |
|
<!-- JDK8+ test classes --> |
591 |
|
<exclude name="*8Test.java"/> |
592 |
+ |
<exclude name="*9Test.java"/> |
593 |
|
<exclude name="DoubleAccumulatorTest.java"/> |
594 |
|
<exclude name="DoubleAdderTest.java"/> |
595 |
|
<exclude name="LongAccumulatorTest.java"/> |
596 |
|
<exclude name="LongAdderTest.java"/> |
597 |
|
<exclude name="CompletableFutureTest.java"/> |
598 |
+ |
<exclude name="SplittableRandomTest.java"/> |
599 |
|
<exclude name="StampedLockTest.java"/> |
600 |
|
</javac-elements> |
601 |
|
</run-tck-tests> |
655 |
|
|
656 |
|
<javadoc destdir="${4jdk7docs.dir}" |
657 |
|
packagenames="none" |
658 |
< |
link="${jdkapi7docs.url}" |
658 |
> |
link="${java7.api.url}" |
659 |
|
overview="${4jdk7src.dir}/intro.html" |
660 |
|
access="${build.javadoc.access}" |
661 |
|
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
664 |
|
<fileset dir="${4jdk7src.dir}" defaultexcludes="yes"> |
665 |
|
<include name="**/*.java"/> |
666 |
|
</fileset> |
667 |
+ |
<arg line="-Xdocrootparent ${java7.docroot.url}"/> |
668 |
|
<arg value="-XDignore.symbol.file=true"/> |
669 |
|
</javadoc> |
670 |
|
</target> |
683 |
|
</target> |
684 |
|
|
685 |
|
|
771 |
– |
<target name="4jdk7dist-clean" |
772 |
– |
description="Removes all build and distribution products"> |
773 |
– |
|
774 |
– |
</target> |
775 |
– |
|
686 |
|
<target name="4jdk7dist-jar" |
687 |
|
depends="4jdk7clean, 4jdk7jar"> |
688 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
744 |
|
|
745 |
|
<javadoc destdir="${jsr166xdocs.dir}" |
746 |
|
packagenames="jsr166x.*" |
747 |
< |
link="${jdkapidocs.url}" |
747 |
> |
link="${java.api.url}" |
748 |
|
access="${build.javadoc.access}" |
749 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
750 |
|
bootclasspath="${bootclasspath6}" |
751 |
|
source="5" |
752 |
|
executable="${javadoc7}"> |
753 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
754 |
|
<arg value="-XDignore.symbol.file=true"/> |
755 |
|
|
756 |
|
</javadoc> |
770 |
|
</target> |
771 |
|
|
772 |
|
|
862 |
– |
<target name="jsr166xdist-clean" |
863 |
– |
description="Removes all build and distribution products"> |
864 |
– |
|
865 |
– |
</target> |
866 |
– |
|
867 |
– |
|
773 |
|
<target name="jsr166xdist-jar" |
774 |
|
depends="jsr166xclean, jsr166xjar"> |
775 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
830 |
|
|
831 |
|
<javadoc destdir="${jsr166ydocs.dir}" |
832 |
|
packagenames="jsr166y.*" |
833 |
< |
link="${jdkapidocs.url}" |
833 |
> |
link="${java.api.url}" |
834 |
|
access="${build.javadoc.access}" |
835 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
836 |
|
bootclasspath="${bootclasspath6}" |
837 |
|
source="6" |
838 |
|
executable="${javadoc7}"> |
839 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
840 |
|
<arg value="-XDignore.symbol.file=true"/> |
841 |
|
|
842 |
|
</javadoc> |
856 |
|
</target> |
857 |
|
|
858 |
|
|
953 |
– |
<target name="jsr166ydist-clean" |
954 |
– |
description="Removes all build and distribution products"> |
955 |
– |
|
956 |
– |
</target> |
957 |
– |
|
859 |
|
<target name="jsr166ydist-jar" |
860 |
|
depends="jsr166yclean, jsr166yjar"> |
861 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
917 |
|
|
918 |
|
<javadoc destdir="${extra166ydocs.dir}" |
919 |
|
packagenames="extra166y.*" |
920 |
< |
link="${jdkapidocs.url}" |
920 |
> |
link="${java.api.url}" |
921 |
|
access="${build.javadoc.access}" |
922 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
923 |
|
bootclasspath="${bootclasspath6}" |
924 |
|
source="6" |
925 |
|
executable="${javadoc7}"> |
926 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
927 |
|
<arg value="-XDignore.symbol.file=true"/> |
928 |
|
|
929 |
|
</javadoc> |
943 |
|
</target> |
944 |
|
|
945 |
|
|
1044 |
– |
<target name="extra166ydist-clean" |
1045 |
– |
description="Removes all build and distribution products"> |
1046 |
– |
|
1047 |
– |
</target> |
1048 |
– |
|
946 |
|
<target name="extra166ydist-jar" |
947 |
|
depends="extra166yclean, extra166yjar"> |
948 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
955 |
|
|
956 |
|
<!-- jsr166e --> |
957 |
|
|
958 |
+ |
<property name="build.jsr166e.java.version" value="6"/> |
959 |
+ |
<property name="build.jsr166e.javac" value="${javac6}"/> |
960 |
+ |
|
961 |
|
<target name="jsr166ecompile" |
962 |
|
depends="configure-compiler" |
963 |
|
description="Compiles jsr166e sources"> |
969 |
|
debug="${build.debug}" |
970 |
|
debuglevel="${build.debuglevel}" |
971 |
|
deprecation="${build.deprecation}" |
972 |
< |
source="7" |
972 |
> |
source="${build.jsr166e.java.version}" |
973 |
|
classpath="" |
974 |
|
includeAntRuntime="false" |
975 |
|
includeJavaRuntime="false" |
976 |
< |
executable="${javac7}" |
976 |
> |
executable="${build.jsr166e.javac}" |
977 |
|
fork="true"> |
978 |
|
|
979 |
|
<include name="jsr166e/**/*.java"/> |
984 |
|
</javac> |
985 |
|
</target> |
986 |
|
|
987 |
+ |
<!-- jsr166e: find doclint errors --> |
988 |
+ |
<target name="jsr166edoclint"> |
989 |
+ |
|
990 |
+ |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
991 |
+ |
|
992 |
+ |
<javac srcdir="${topsrc.dir}" |
993 |
+ |
destdir="${build.jsr166e.classes.dir}" |
994 |
+ |
debug="${build.debug}" |
995 |
+ |
debuglevel="${build.debuglevel}" |
996 |
+ |
deprecation="${build.deprecation}" |
997 |
+ |
source="${build.jsr166e.java.version}" |
998 |
+ |
classpath="" |
999 |
+ |
bootclasspath="${bootclasspath7}" |
1000 |
+ |
includeAntRuntime="false" |
1001 |
+ |
includeJavaRuntime="false" |
1002 |
+ |
executable="${javac8}" |
1003 |
+ |
fork="true"> |
1004 |
+ |
|
1005 |
+ |
<include name="jsr166e/**/*.java"/> |
1006 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
1007 |
+ |
<compilerarg value="-Xlint:all"/> |
1008 |
+ |
<compilerarg value="-Xdoclint:all/protected"/> |
1009 |
+ |
|
1010 |
+ |
</javac> |
1011 |
+ |
</target> |
1012 |
+ |
|
1013 |
|
|
1014 |
|
<target name="jsr166ejar" |
1015 |
|
depends="jsr166ecompile" |
1030 |
|
|
1031 |
|
<javadoc destdir="${jsr166edocs.dir}" |
1032 |
|
packagenames="jsr166e.*" |
1033 |
< |
link="${jdkapidocs.url}" |
1033 |
> |
link="${java.api.url}" |
1034 |
|
access="${build.javadoc.access}" |
1035 |
< |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
1036 |
< |
source="7" |
1035 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
1036 |
> |
source="${build.jsr166e.java.version}" |
1037 |
|
executable="${javadoc7}"> |
1038 |
+ |
<arg line="-Xdocrootparent ${java.docroot.url}"/> |
1039 |
|
<arg value="-XDignore.symbol.file=true"/> |
1040 |
|
|
1041 |
|
</javadoc> |
1042 |
|
</target> |
1043 |
|
|
1044 |
|
|
1045 |
< |
<target name="jsr166e-test-tck" |
1046 |
< |
depends="jsr166ejar" |
1047 |
< |
description="Runs tck tests for jsr166e"> |
1045 |
> |
<target name="jsr166e-test-tck-one-java-version" |
1046 |
> |
depends="jsr166ejar"> |
1047 |
> |
|
1048 |
> |
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
1049 |
|
|
1050 |
|
<run-tck-tests |
1051 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
1052 |
< |
target="7" |
1052 |
> |
target="${build.jsr166e.java.version}" |
1053 |
|
workdir="${build.jsr166e.dir}" |
1054 |
|
classes="${jsr166e.jar}"/> |
1055 |
|
</target> |
1056 |
|
|
1057 |
+ |
<target name="jsr166e-test-tck" |
1058 |
+ |
description="Runs tck tests for jsr166e for multiple java versions"> |
1059 |
+ |
|
1060 |
+ |
<!-- <antcall target="clean"/> --> |
1061 |
+ |
<!-- <antcall target="jsr166e-test-tck-one-java-version"> --> |
1062 |
+ |
<!-- <param name="build.jsr166e.java.version" value="8"/> --> |
1063 |
+ |
<!-- <param name="build.jsr166e.javac" value="${javac8}"/> --> |
1064 |
+ |
<!-- </antcall> --> |
1065 |
+ |
|
1066 |
+ |
<antcall target="clean"/> |
1067 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
1068 |
+ |
<param name="build.jsr166e.java.version" value="7"/> |
1069 |
+ |
<param name="build.jsr166e.javac" value="${javac7}"/> |
1070 |
+ |
</antcall> |
1071 |
+ |
|
1072 |
+ |
<antcall target="clean"/> |
1073 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
1074 |
+ |
<param name="build.jsr166e.java.version" value="6"/> |
1075 |
+ |
<param name="build.jsr166e.javac" value="${javac6}"/> |
1076 |
+ |
</antcall> |
1077 |
+ |
</target> |
1078 |
+ |
|
1079 |
+ |
|
1080 |
+ |
<target name="jsr166e-test" |
1081 |
+ |
depends="jsr166e-test-tck" |
1082 |
+ |
description="Runs all tests for jsr166e"> |
1083 |
+ |
</target> |
1084 |
|
|
1085 |
|
<target name="jsr166edist" |
1086 |
|
depends="jsr166edist-jar, jsr166edist-docs" |
1093 |
|
</target> |
1094 |
|
|
1095 |
|
|
1141 |
– |
<target name="jsr166edist-clean" |
1142 |
– |
description="Removes all build and distribution products"> |
1143 |
– |
|
1144 |
– |
</target> |
1145 |
– |
|
1096 |
|
<target name="jsr166edist-jar" |
1097 |
|
depends="jsr166eclean, jsr166ejar"> |
1098 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |