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.286 by jsr166, Wed Nov 21 21:05:59 2018 UTC vs.
Revision 1.294 by jsr166, Mon Dec 31 07:05:54 2018 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 202 | Line 206
206		<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
207		<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
208		<property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/>
209	<	<!-- Default jdk doc location (latest stable release seems best) -->
210	<	<!-- But pin to jdk 10 until fix for -->
211	<	<!-- 8211194: javadoc -link doesn't take module path into consideration -->
208	<	<property name="java.docroot.url"   value="${java10.docroot.url}"/>
209	>	<property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
210	>	<!-- Default jdk doc location (latest stable LTS release seems best) -->
211	>	<property name="java.docroot.url"   value="${java11.docroot.url}"/>
212
213		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
214		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 216 | Line 219
219		<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
220		<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
221		<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
222	+	<property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
223		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
224
225		<!-- Define the "jtreg" task -->
#	Line 329 | Line 333
333		</sequential>
334		</macrodef>
335
336	+	<defjtregtests v="13"/>
337		<defjtregtests v="12"/>
338		<defjtregtests v="11"/>
339		<defjtregtests v="10"/>
#	Line 340 | Line 345
345		<property name="jtreg.flags" value=""/>
346
347		<macrodef name="run-jtreg-tests">
348	<	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
348	>	<!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
349		<attribute name="target"/>
350		<attribute name="workdir"/>
351		<attribute name="classes"/>
#	Line 393 | Line 398
398		<!-- Default values: may seem strange ... -->
399		<!-- At runtime, target latest LTS, i.e. jdk11 -->
400		<!-- But at build time, target jdk9, for maximal binary portability -->
401	<	<!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
402	<	<property name="build.main.java.version" value="11"/>
401	>	<!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
402	>	o override-methods=summary
403	>	o {@systemProperty ...}
404	>	o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
405	>	o 8202628: javadoc generates bad links in TestModules.java
406	>	-->
407	>	<property name="java.runtime.target" value="11"/>
408		<property name="build.main.java" value="${java11}"/>
409		<property name="build.main.javac" value="${javac9}"/>
410		<property name="build.main.javadoc" value="${javadoc12}"/>
411	+	<property name="build.main.javadoc.source" value="${java.runtime.target}"/>
412
413		<target name="dists"
414		depends="dist, 4jdk8dist"
#	Line 471 | Line 482
482		<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
483		<javadoc destdir="${docs.dir}"
484		packagenames="none"
485	<	link="${java11.api.url}"
485	>	link="${java.api.url}"
486		overview="${src.dir}/intro.html"
487		access="${build.javadoc.access}"
488		sourcepath="${src.dir}"
489		classpath=""
490	<	source="11"
490	>	source="${build.main.javadoc.source}"
491		executable="${build.main.javadoc}">
492	+	<!-- TODO: JDK-8214571 failonerror = "true" -->
493		<fileset dir="${src.dir}" defaultexcludes="yes">
494		<include name="**/*.java"/>
495		</fileset>
496	<	<arg line="-Xdocrootparent ${java10.docroot.url}"/>
496	>	<arg line="-Xdocrootparent ${java.docroot.url}"/>
497		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
498		<arg value="-XDignore.symbol.file=true"/>
499		<arg value="-html5"/>
500		<arg value="--patch-module=java.base=${src.dir}"/>
501	+	<!-- old school frames via docs/index.html?overview-summary.html -->
502		<arg value="--frames"/>
503		<arg value="--override-methods=summary"/>
504		<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
#	Line 532 | Line 545
545		description="Runs tck tests for src/main directly">
546
547		<run-tck-tests
548	<	target="${build.main.java.version}"
548	>	target="${java.runtime.target}"
549		workdir="${build.dir}"
550		classes="${product.jar}">
551		<javac-elements>
#	Line 566 | Line 579
579		depends="jar"
580		description="Runs jtreg tests for src/main using the jtreg ant task">
581		<run-jtreg-tests
582	<	target="${build.main.java.version}"
582	>	target="${java.runtime.target}"
583		workdir="${build.dir}"
584		classes="${product.jar}"/>
585		</target>
#	Line 576 | Line 589
589		description="Runs tck and jtreg tests for src/main"/>
590
591		<target name="test-version-permutations"
592	<	depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
592	>	depends="test9, test10, test11, test12, test13, test9-11, test9-12, test9-13, clean, test, docs">
593		</target>
594
595		<target name="test9">
596		<antcall target="clean"/>
597		<antcall>
598	<	<param name="build.main.java.version" value="9"/>
586	<	<param name="build.main.java" value="${java9}"/>
598	>	<param name="java.runtime.target" value="9"/>
599		<param name="build.main.javac" value="${javac9}"/>
600	+	<param name="build.main.javadoc" value="${javadoc12}"/>
601	+	<param name="build.main.javadoc.source" value="9"/>
602		<target name="test"/>
603	+	<target name="docs"/>
604		</antcall>
605		</target>
606
607		<target name="test10">
608		<antcall target="clean"/>
609		<antcall>
610	<	<param name="build.main.java.version" value="10"/>
596	<	<param name="build.main.java" value="${java10}"/>
610	>	<param name="java.runtime.target" value="10"/>
611		<param name="build.main.javac" value="${javac10}"/>
612	<	<param name="build.main.javadoc" value="${javadoc10}"/>
612	>	<param name="build.main.javadoc" value="${javadoc12}"/>
613	>	<param name="build.main.javadoc.source" value="10"/>
614		<target name="test"/>
615		<target name="docs"/>
616		</antcall>
#	Line 604 | Line 619
619		<target name="test11">
620		<antcall target="clean"/>
621		<antcall>
622	<	<param name="build.main.java.version" value="11"/>
608	<	<param name="build.main.java" value="${java11}"/>
622	>	<param name="java.runtime.target" value="11"/>
623		<param name="build.main.javac" value="${javac11}"/>
624	<	<param name="build.main.javadoc" value="${javadoc11}"/>
624	>	<param name="build.main.javadoc" value="${javadoc12}"/>
625	>	<param name="build.main.javadoc.source" value="11"/>
626		<target name="test"/>
627		<target name="docs"/>
628		</antcall>
#	Line 616 | Line 631
631		<target name="test12">
632		<antcall target="clean"/>
633		<antcall>
634	<	<param name="build.main.java.version" value="12"/>
620	<	<param name="build.main.java" value="${java12}"/>
634	>	<param name="java.runtime.target" value="12"/>
635		<param name="build.main.javac" value="${javac12}"/>
636		<param name="build.main.javadoc" value="${javadoc12}"/>
637	+	<param name="build.main.javadoc.source" value="12"/>
638	+	<target name="test"/>
639	+	<target name="docs"/>
640	+	</antcall>
641	+	</target>
642	+
643	+	<target name="test13">
644	+	<antcall target="clean"/>
645	+	<antcall>
646	+	<param name="java.runtime.target" value="13"/>
647	+	<param name="build.main.javac" value="${javac13}"/>
648	+	<param name="build.main.javadoc" value="${javadoc13}"/>
649	+	<param name="build.main.javadoc.source" value="13"/>
650		<target name="test"/>
651		<target name="docs"/>
652		</antcall>
#	Line 628 | Line 655
655		<target name="test9-11">
656		<antcall target="clean"/>
657		<antcall>
658	<	<param name="build.main.java.version" value="11"/>
632	<	<param name="build.main.java" value="${java11}"/>
658	>	<param name="java.runtime.target" value="11"/>
659		<param name="build.main.javac" value="${javac9}"/>
660	<	<param name="build.main.javadoc" value="${javadoc11}"/>
660	>	<param name="build.main.javadoc" value="${javadoc12}"/>
661	>	<param name="build.main.javadoc.source" value="9"/>
662		<target name="test"/>
663		<target name="docs"/>
664		</antcall>
#	Line 640 | Line 667
667		<target name="test9-12">
668		<antcall target="clean"/>
669		<antcall>
670	<	<param name="build.main.java.version" value="12"/>
644	<	<param name="build.main.java" value="${java12}"/>
670	>	<param name="java.runtime.target" value="12"/>
671		<param name="build.main.javac" value="${javac9}"/>
672		<param name="build.main.javadoc" value="${javadoc12}"/>
673	+	<param name="build.main.javadoc.source" value="9"/>
674	+	<target name="test"/>
675	+	<target name="docs"/>
676	+	</antcall>
677	+	</target>
678	+
679	+	<target name="test9-13">
680	+	<antcall target="clean"/>
681	+	<antcall>
682	+	<param name="java.runtime.target" value="13"/>
683	+	<param name="build.main.javac" value="${javac9}"/>
684	+	<param name="build.main.javadoc" value="${javadoc13}"/>
685	+	<param name="build.main.javadoc.source" value="9"/>
686		<target name="test"/>
687		<target name="docs"/>
688		</antcall>
#	Line 1373 | Line 1412
1412
1413
1414		<!-- ==============================================================
1415	<	Experimental errorprone support - https://errorprone.info
1415	>	Experimental errorprone support
1416	>	https://errorprone.info
1417	>	https://errorprone.info/docs/installation
1418	>	https://github.com/google/error-prone/issues/1143
1419		=================================================================== -->
1420	<	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.jar"/>
1421	<	<property name="errorprone.processorpath" value="${errorprone.jar}"/>
1420	>	<path id="errorprone.processorpath.path">
1421	>	<pathelement location="${lib.dir}/error_prone_core-2.3.2-with-dependencies.jar"/>
1422	>	<pathelement location="${lib.dir}/dataflow-2.5.7.jar"/>
1423	>	<pathelement location="${lib.dir}/javacutil-2.5.7.jar"/>
1424	>	<pathelement location="${lib.dir}/jFormatString-3.0.0.jar"/>
1425	>	</path>
1426	>	<property name="errorprone.processorpath" refid="errorprone.processorpath.path" />
1427		<property name="errorprone.jsr166.user.flags" value=""/>
1428		<property name="errorprone.jsr166.flags"
1429		value="-Xep:HashtableContains:OFF
1430		-Xep:JdkObsolete:OFF
1431		-Xep:MissingOverride:OFF
1432		-Xep:MissingFail:OFF
1433	+	-Xep:ThreadPriorityCheck:OFF
1434		-Xep:MixedArrayDimensions:ERROR
1435		-Xep:RemoveUnusedImports:ERROR
1436		-Xep:EmptyIf:ERROR
#	Line 1391 | Line 1439
1439		-Xep:LongLiteralLowerCaseSuffix:ERROR
1440		-Xep:RedundantThrows:ERROR
1441		-Xep:IdentityBinaryExpression:WARN
1442	+	-Xep:ConstructorInvokesOverridable:WARN
1443		-Xep:MethodCanBeStatic:WARN
1444		${errorprone.jsr166.user.flags}"/>
1445		<!-- -Xep:WildcardImport:ERROR -->
#	Line 1423 | Line 1472
1472		<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1473		<compilerarg value="-J--illegal-access=permit"/>
1474		<compilerarg value="-XDcompilePolicy=simple"/>
1475	<	<compilerarg line="-processorpath ${errorprone.processorpath}"/>
1475	>	<compilerarg value="-processorpath"/>
1476	>	<compilerarg pathref="errorprone.processorpath.path"/>
1477		<compilerarg value="-Xplugin:ErrorProne
1478		${errorprone.jsr166.flags}"/>
1479		<compilerarg value="--patch-module=java.base=${src.dir}"/>
#	Line 1440 | Line 1490
1490		</jar>
1491
1492		<run-tck-tests
1493	<	target="${build.main.java.version}"
1493	>	target="${java.runtime.target}"
1494		workdir="${build.dir}"
1495		classes="${product.jar}">
1496		<javac-elements>
#	Line 1463 | Line 1513
1513		description="Run errorprone over jtreg tests (experimental)">
1514
1515		<run-jtreg-tests
1516	<	target="${build.main.java.version}"
1516	>	target="${java.runtime.target}"
1517		workdir="${build.dir}"
1518		classes="${product.jar}"
1519		verbose="all">

Diff Legend

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