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.295 by jsr166, Sun Mar 24 00:44:14 2019 UTC

#	Line 24 | Line 24
24		$HOME/jdk/jdk10
25		$HOME/jdk/jdk11
26		$HOME/jdk/jdk12
27	+	$HOME/jdk/jdk13
28		where each of the above is a JDK or a symlink to same, and
29		$HOME/jdk/src/jdk8
30		$HOME/jdk/src/jdk9
31		$HOME/jdk/src/jdk10
32		$HOME/jdk/src/jdk11
33		$HOME/jdk/src/jdk12
34	+	$HOME/jdk/src/jdk13
35		where each of the above is a complete JDK source tree
36		(e.g. mercurial forest) or a symlink to same.
37
38		Alternatively, define ant variables thus:
39		ant -Djdk$N.home=... -Djdk$N.src.home=...
40	<	for $N in 8 9 10 ...
40	>	for $N in 8 .. 13 ...
41
42		As of 2016-03, the sources in src/main are for jdk9+ only.
43		------------------------------------------------------------------------------
#	Line 138 | Line 140
140		<defjdklocations v="10"/>
141		<defjdklocations v="11"/>
142		<defjdklocations v="12"/>
143	+	<defjdklocations v="13"/>
144
145		<!-- Source locations -->
146		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 150 | Line 153
153		<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
154		<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
155		<property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
156	+	<property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
157		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
158		<property name="lib.dir"              location="${basedir}/lib"/>
159		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 197 | Line 201
201		<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
202		<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
203		<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
204	+	<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
205		<!-- The location of jdk early access docs (RIP) -->
206		<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
207		<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
208		<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
209	<	<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
210	<	<!-- Default jdk doc location (latest stable release seems best) -->
211	<	<!-- But pin to jdk 10 until fix for -->
212	<	<!-- 8211194: javadoc -link doesn't take module path into consideration -->
208	<	<property name="java.docroot.url"   value="${java10.docroot.url}"/>
209	>	<!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
210	>	<property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
211	>	<!-- Default jdk doc location (latest stable LTS release seems best) -->
212	>	<property name="java.docroot.url"   value="${java11.docroot.url}"/>
213
214		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
215		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 216 | Line 220
220		<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
221		<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
222		<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
223	+	<property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
224		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
225
226		<!-- Define the "jtreg" task -->
#	Line 329 | Line 334
334		</sequential>
335		</macrodef>
336
337	+	<defjtregtests v="13"/>
338		<defjtregtests v="12"/>
339		<defjtregtests v="11"/>
340		<defjtregtests v="10"/>
#	Line 340 | Line 346
346		<property name="jtreg.flags" value=""/>
347
348		<macrodef name="run-jtreg-tests">
349	<	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
349	>	<!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
350		<attribute name="target"/>
351		<attribute name="workdir"/>
352		<attribute name="classes"/>
#	Line 393 | Line 399
399		<!-- Default values: may seem strange ... -->
400		<!-- At runtime, target latest LTS, i.e. jdk11 -->
401		<!-- But at build time, target jdk9, for maximal binary portability -->
402	<	<!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
403	<	<property name="build.main.java.version" value="11"/>
402	>	<!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
403	>	o override-methods=summary
404	>	o {@systemProperty ...}
405	>	o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
406	>	o 8202628: javadoc generates bad links in TestModules.java
407	>	-->
408	>	<property name="java.runtime.target" value="11"/>
409		<property name="build.main.java" value="${java11}"/>
410		<property name="build.main.javac" value="${javac9}"/>
411		<property name="build.main.javadoc" value="${javadoc12}"/>
412	+	<property name="build.main.javadoc.source" value="${java.runtime.target}"/>
413
414		<target name="dists"
415		depends="dist, 4jdk8dist"
#	Line 471 | Line 483
483		<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
484		<javadoc destdir="${docs.dir}"
485		packagenames="none"
486	<	link="${java11.api.url}"
486	>	link="${java.api.url}"
487		overview="${src.dir}/intro.html"
488		access="${build.javadoc.access}"
489		sourcepath="${src.dir}"
490		classpath=""
491	<	source="11"
491	>	source="${build.main.javadoc.source}"
492		executable="${build.main.javadoc}">
493	+	<!-- TODO: JDK-8214571 failonerror = "true" -->
494		<fileset dir="${src.dir}" defaultexcludes="yes">
495		<include name="**/*.java"/>
496		</fileset>
497	<	<arg line="-Xdocrootparent ${java10.docroot.url}"/>
497	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
498		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
499		<arg value="-XDignore.symbol.file=true"/>
500		<arg value="-html5"/>
501		<arg value="--patch-module=java.base=${src.dir}"/>
502	+	<!-- old school frames via docs/index.html?overview-summary.html -->
503		<arg value="--frames"/>
504		<arg value="--override-methods=summary"/>
505		<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
#	Line 532 | Line 546
546		description="Runs tck tests for src/main directly">
547
548		<run-tck-tests
549	<	target="${build.main.java.version}"
549	>	target="${java.runtime.target}"
550		workdir="${build.dir}"
551		classes="${product.jar}">
552		<javac-elements>
#	Line 566 | Line 580
580		depends="jar"
581		description="Runs jtreg tests for src/main using the jtreg ant task">
582		<run-jtreg-tests
583	<	target="${build.main.java.version}"
583	>	target="${java.runtime.target}"
584		workdir="${build.dir}"
585		classes="${product.jar}"/>
586		</target>
#	Line 576 | Line 590
590		description="Runs tck and jtreg tests for src/main"/>
591
592		<target name="test-version-permutations"
593	<	depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
593	>	depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
594		</target>
595
596		<target name="test9">
597		<antcall target="clean"/>
598		<antcall>
599	<	<param name="build.main.java.version" value="9"/>
586	<	<param name="build.main.java" value="${java9}"/>
599	>	<param name="java.runtime.target" value="9"/>
600		<param name="build.main.javac" value="${javac9}"/>
601	+	<param name="build.main.javadoc" value="${javadoc12}"/>
602	+	<param name="build.main.javadoc.source" value="9"/>
603		<target name="test"/>
604	+	<target name="docs"/>
605		</antcall>
606		</target>
607
608		<target name="test10">
609		<antcall target="clean"/>
610		<antcall>
611	<	<param name="build.main.java.version" value="10"/>
596	<	<param name="build.main.java" value="${java10}"/>
611	>	<param name="java.runtime.target" value="10"/>
612		<param name="build.main.javac" value="${javac10}"/>
613	<	<param name="build.main.javadoc" value="${javadoc10}"/>
613	>	<param name="build.main.javadoc" value="${javadoc12}"/>
614	>	<param name="build.main.javadoc.source" value="10"/>
615		<target name="test"/>
616		<target name="docs"/>
617		</antcall>
#	Line 604 | Line 620
620		<target name="test11">
621		<antcall target="clean"/>
622		<antcall>
623	<	<param name="build.main.java.version" value="11"/>
608	<	<param name="build.main.java" value="${java11}"/>
623	>	<param name="java.runtime.target" value="11"/>
624		<param name="build.main.javac" value="${javac11}"/>
625	<	<param name="build.main.javadoc" value="${javadoc11}"/>
625	>	<param name="build.main.javadoc" value="${javadoc12}"/>
626	>	<param name="build.main.javadoc.source" value="11"/>
627		<target name="test"/>
628		<target name="docs"/>
629		</antcall>
#	Line 616 | Line 632
632		<target name="test12">
633		<antcall target="clean"/>
634		<antcall>
635	<	<param name="build.main.java.version" value="12"/>
620	<	<param name="build.main.java" value="${java12}"/>
635	>	<param name="java.runtime.target" value="12"/>
636		<param name="build.main.javac" value="${javac12}"/>
637		<param name="build.main.javadoc" value="${javadoc12}"/>
638	+	<param name="build.main.javadoc.source" value="12"/>
639	+	<target name="test"/>
640	+	<target name="docs"/>
641	+	</antcall>
642	+	</target>
643	+
644	+	<target name="test13">
645	+	<antcall target="clean"/>
646	+	<antcall>
647	+	<param name="java.runtime.target" value="13"/>
648	+	<param name="build.main.javac" value="${javac13}"/>
649	+	<param name="build.main.javadoc" value="${javadoc13}"/>
650	+	<param name="build.main.javadoc.source" value="13"/>
651		<target name="test"/>
652		<target name="docs"/>
653		</antcall>
#	Line 628 | Line 656
656		<target name="test9-11">
657		<antcall target="clean"/>
658		<antcall>
659	<	<param name="build.main.java.version" value="11"/>
632	<	<param name="build.main.java" value="${java11}"/>
659	>	<param name="java.runtime.target" value="11"/>
660		<param name="build.main.javac" value="${javac9}"/>
661	<	<param name="build.main.javadoc" value="${javadoc11}"/>
661	>	<param name="build.main.javadoc" value="${javadoc12}"/>
662	>	<param name="build.main.javadoc.source" value="9"/>
663		<target name="test"/>
664		<target name="docs"/>
665		</antcall>
#	Line 640 | Line 668
668		<target name="test9-12">
669		<antcall target="clean"/>
670		<antcall>
671	<	<param name="build.main.java.version" value="12"/>
644	<	<param name="build.main.java" value="${java12}"/>
671	>	<param name="java.runtime.target" value="12"/>
672		<param name="build.main.javac" value="${javac9}"/>
673		<param name="build.main.javadoc" value="${javadoc12}"/>
674	+	<param name="build.main.javadoc.source" value="9"/>
675	+	<target name="test"/>
676	+	<target name="docs"/>
677	+	</antcall>
678	+	</target>
679	+
680	+	<target name="test9-13">
681	+	<antcall target="clean"/>
682	+	<antcall>
683	+	<param name="java.runtime.target" value="13"/>
684	+	<param name="build.main.javac" value="${javac9}"/>
685	+	<param name="build.main.javadoc" value="${javadoc13}"/>
686	+	<param name="build.main.javadoc.source" value="9"/>
687		<target name="test"/>
688		<target name="docs"/>
689		</antcall>
#	Line 1451 | Line 1491
1491		</jar>
1492
1493		<run-tck-tests
1494	<	target="${build.main.java.version}"
1494	>	target="${java.runtime.target}"
1495		workdir="${build.dir}"
1496		classes="${product.jar}">
1497		<javac-elements>
#	Line 1474 | Line 1514
1514		description="Run errorprone over jtreg tests (experimental)">
1515
1516		<run-jtreg-tests
1517	<	target="${build.main.java.version}"
1517	>	target="${java.runtime.target}"
1518		workdir="${build.dir}"
1519		classes="${product.jar}"
1520		verbose="all">

Diff Legend

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