ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.288 by jsr166, Sat Nov 24 17:39:35 2018 UTC vs.
Revision 1.292 by jsr166, Thu Dec 13 01:12:01 2018 UTC

#	Line 202 | Line 202
202		<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
203		<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
204		<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
205	<	<!-- Default jdk doc location (latest stable release seems best) -->
206	<	<!-- But pin to jdk 10 until fix for -->
207	<	<!-- 8211194: javadoc -link doesn't take module path into consideration -->
208	<	<property name="java.docroot.url"   value="${java10.docroot.url}"/>
205	>	<!-- Default jdk doc location (latest stable LTS release seems best) -->
206	>	<property name="java.docroot.url"   value="${java11.docroot.url}"/>
207
208		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
209		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 340 | Line 338
338		<property name="jtreg.flags" value=""/>
339
340		<macrodef name="run-jtreg-tests">
341	<	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
341	>	<!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
342		<attribute name="target"/>
343		<attribute name="workdir"/>
344		<attribute name="classes"/>
#	Line 393 | Line 391
391		<!-- Default values: may seem strange ... -->
392		<!-- At runtime, target latest LTS, i.e. jdk11 -->
393		<!-- But at build time, target jdk9, for maximal binary portability -->
394	<	<!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
395	<	<property name="build.main.java.version" value="11"/>
394	>	<!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
395	>	o override-methods=summary
396	>	o {@systemProperty ...}
397	>	o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
398	>	o 8202628: javadoc generates bad links in TestModules.java
399	>	-->
400	>	<property name="java.runtime.target" value="11"/>
401		<property name="build.main.java" value="${java11}"/>
402		<property name="build.main.javac" value="${javac9}"/>
403		<property name="build.main.javadoc" value="${javadoc12}"/>
404	+	<property name="build.main.javadoc.source" value="${java.runtime.target}"/>
405
406		<target name="dists"
407		depends="dist, 4jdk8dist"
#	Line 471 | Line 475
475		<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
476		<javadoc destdir="${docs.dir}"
477		packagenames="none"
478	<	link="${java11.api.url}"
478	>	link="${java.api.url}"
479		overview="${src.dir}/intro.html"
480		access="${build.javadoc.access}"
481		sourcepath="${src.dir}"
482		classpath=""
483	<	source="11"
483	>	source="${build.main.javadoc.source}"
484		executable="${build.main.javadoc}">
485	+	<!-- TODO: JDK-8214571 failonerror = "true" -->
486		<fileset dir="${src.dir}" defaultexcludes="yes">
487		<include name="**/*.java"/>
488		</fileset>
489	<	<arg line="-Xdocrootparent ${java10.docroot.url}"/>
489	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
490		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
491		<arg value="-XDignore.symbol.file=true"/>
492		<arg value="-html5"/>
493		<arg value="--patch-module=java.base=${src.dir}"/>
494	+	<!-- old school frames via docs/index.html?overview-summary.html -->
495		<arg value="--frames"/>
496		<arg value="--override-methods=summary"/>
497		<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
#	Line 532 | Line 538
538		description="Runs tck tests for src/main directly">
539
540		<run-tck-tests
541	<	target="${build.main.java.version}"
541	>	target="${java.runtime.target}"
542		workdir="${build.dir}"
543		classes="${product.jar}">
544		<javac-elements>
#	Line 566 | Line 572
572		depends="jar"
573		description="Runs jtreg tests for src/main using the jtreg ant task">
574		<run-jtreg-tests
575	<	target="${build.main.java.version}"
575	>	target="${java.runtime.target}"
576		workdir="${build.dir}"
577		classes="${product.jar}"/>
578		</target>
#	Line 582 | Line 588
588		<target name="test9">
589		<antcall target="clean"/>
590		<antcall>
591	<	<param name="build.main.java.version" value="9"/>
586	<	<param name="build.main.java" value="${java9}"/>
591	>	<param name="java.runtime.target" value="9"/>
592		<param name="build.main.javac" value="${javac9}"/>
593	+	<param name="build.main.javadoc" value="${javadoc12}"/>
594	+	<param name="build.main.javadoc.source" value="9"/>
595		<target name="test"/>
596	+	<target name="docs"/>
597		</antcall>
598		</target>
599
600		<target name="test10">
601		<antcall target="clean"/>
602		<antcall>
603	<	<param name="build.main.java.version" value="10"/>
596	<	<param name="build.main.java" value="${java10}"/>
603	>	<param name="java.runtime.target" value="10"/>
604		<param name="build.main.javac" value="${javac10}"/>
605	<	<param name="build.main.javadoc" value="${javadoc10}"/>
605	>	<param name="build.main.javadoc" value="${javadoc12}"/>
606	>	<param name="build.main.javadoc.source" value="10"/>
607		<target name="test"/>
608		<target name="docs"/>
609		</antcall>
#	Line 604 | Line 612
612		<target name="test11">
613		<antcall target="clean"/>
614		<antcall>
615	<	<param name="build.main.java.version" value="11"/>
608	<	<param name="build.main.java" value="${java11}"/>
615	>	<param name="java.runtime.target" value="11"/>
616		<param name="build.main.javac" value="${javac11}"/>
617	<	<param name="build.main.javadoc" value="${javadoc11}"/>
617	>	<param name="build.main.javadoc" value="${javadoc12}"/>
618	>	<param name="build.main.javadoc.source" value="11"/>
619		<target name="test"/>
620		<target name="docs"/>
621		</antcall>
#	Line 616 | Line 624
624		<target name="test12">
625		<antcall target="clean"/>
626		<antcall>
627	<	<param name="build.main.java.version" value="12"/>
620	<	<param name="build.main.java" value="${java12}"/>
627	>	<param name="java.runtime.target" value="12"/>
628		<param name="build.main.javac" value="${javac12}"/>
629		<param name="build.main.javadoc" value="${javadoc12}"/>
630	+	<param name="build.main.javadoc.source" value="12"/>
631		<target name="test"/>
632		<target name="docs"/>
633		</antcall>
#	Line 628 | Line 636
636		<target name="test9-11">
637		<antcall target="clean"/>
638		<antcall>
639	<	<param name="build.main.java.version" value="11"/>
632	<	<param name="build.main.java" value="${java11}"/>
639	>	<param name="java.runtime.target" value="11"/>
640		<param name="build.main.javac" value="${javac9}"/>
641	<	<param name="build.main.javadoc" value="${javadoc11}"/>
641	>	<param name="build.main.javadoc" value="${javadoc12}"/>
642	>	<param name="build.main.javadoc.source" value="9"/>
643		<target name="test"/>
644		<target name="docs"/>
645		</antcall>
#	Line 640 | Line 648
648		<target name="test9-12">
649		<antcall target="clean"/>
650		<antcall>
651	<	<param name="build.main.java.version" value="12"/>
644	<	<param name="build.main.java" value="${java12}"/>
651	>	<param name="java.runtime.target" value="12"/>
652		<param name="build.main.javac" value="${javac9}"/>
653		<param name="build.main.javadoc" value="${javadoc12}"/>
654	+	<param name="build.main.javadoc.source" value="9"/>
655		<target name="test"/>
656		<target name="docs"/>
657		</antcall>
#	Line 1451 | Line 1459
1459		</jar>
1460
1461		<run-tck-tests
1462	<	target="${build.main.java.version}"
1462	>	target="${java.runtime.target}"
1463		workdir="${build.dir}"
1464		classes="${product.jar}">
1465		<javac-elements>
#	Line 1474 | Line 1482
1482		description="Run errorprone over jtreg tests (experimental)">
1483
1484		<run-jtreg-tests
1485	<	target="${build.main.java.version}"
1485	>	target="${java.runtime.target}"
1486		workdir="${build.dir}"
1487		classes="${product.jar}"
1488		verbose="all">

Diff Legend

–	Removed lines
+	Added lines
<	Changed lines
>	Changed lines