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.322 by jsr166, Sat Dec 12 22:13:53 2020 UTC vs.
Revision 1.328 by jsr166, Sat Jan 7 16:30:33 2023 UTC

#	Line 19 | Line 19
19		itself.  Because the JDK version matters and because different
20		targets require different JDKs, we assume that users have created a
21		hierarchy containing:
22	–	$HOME/jdk/jdk11
23	–	$HOME/jdk/jdk12
24	–	$HOME/jdk/jdk13
25	–	$HOME/jdk/jdk14
26	–	$HOME/jdk/jdk15
27	–	$HOME/jdk/jdk16
22		$HOME/jdk/jdk17
23	+	$HOME/jdk/jdk19
24		where each of the above is a JDK or a symlink to same, and
30	–	$HOME/jdk/src/jdk11
31	–	$HOME/jdk/src/jdk12
32	–	$HOME/jdk/src/jdk13
33	–	$HOME/jdk/src/jdk14
34	–	$HOME/jdk/src/jdk15
35	–	$HOME/jdk/src/jdk16
25		$HOME/jdk/src/jdk17
26		where each of the above is a JDK source tree or a symlink to same.
27
28		Alternatively, define ant variables thus:
29		ant -Djdk$N.home=... -Djdk$N.src.home=...
30	<	for $N in 11 .. 17 ...
30	>	for $N in 17 .. 19 ...
31
32		As of 2016-03, the sources in src/main are for jdk9+ only.
33		As of 2019-08, the sources in src/main are for jdk11+ only.
34		As of 2019-10, compatibility support for jdk8 is dropped entirely.
35	+	As of 2022-02, the sources in src/main are for jdk17+ only.
36		------------------------------------------------------------------------------
37		</description>
38
#	Line 98 | Line 88
88		</sequential>
89		</macrodef>
90
101	–	<defjdklocations v="11"/>
102	–	<defjdklocations v="12"/>
103	–	<defjdklocations v="13"/>
104	–	<defjdklocations v="14"/>
105	–	<defjdklocations v="15"/>
106	–	<defjdklocations v="16"/>
91		<defjdklocations v="17"/>
92	+	<defjdklocations v="18"/>
93	+	<defjdklocations v="19"/>
94	+	<defjdklocations v="20"/>
95	+	<defjdklocations v="21"/>
96
97		<!-- Source locations -->
98		<property name="src.dir"              location="${basedir}/src/main"/>
99		<property name="test.src.dir"         location="${basedir}/src/test"/>
100		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
101		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
114	–	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
115	–	<property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
116	–	<property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
117	–	<property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
118	–	<property name="jtreg15.src.dir"      location="${test.src.dir}/jtreg"/>
119	–	<property name="jtreg16.src.dir"      location="${test.src.dir}/jtreg"/>
102		<property name="jtreg17.src.dir"      location="${test.src.dir}/jtreg"/>
103	<	<property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
103	>	<property name="jtreg18.src.dir"      location="${test.src.dir}/jtreg"/>
104	>	<property name="jtreg19.src.dir"      location="${test.src.dir}/jtreg"/>
105	>	<property name="jtreg20.src.dir"      location="${test.src.dir}/jtreg"/>
106	>	<property name="jtreg21.src.dir"      location="${test.src.dir}/jtreg"/>
107	>	<property name="jtreg.src.dir"        location="${jtreg17.src.dir}"/>
108		<property name="lib.dir"              location="${basedir}/lib"/>
109		<property name="dist.dir"             location="${basedir}/dist"/>
110		<property name="topsrc.dir"           location="${basedir}/src"/>
#	Line 133 | Line 119
119
120		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
121		<!-- Switched to https: in 2017-10 - JDK-8190312 -->
122	<	<!-- <property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/> -->
123	<	<!-- <property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/> -->
124	<	<!-- <property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/> -->
125	<	<!-- <property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/> -->
126	<	<!-- The location of jdk early access docs (RIP) -->
141	<	<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
142	<	<!-- <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
143	<	<!-- <property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/> -->
144	<	<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
145	<	<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
146	<	<property name="java13.docroot.url" value="https://docs.oracle.com/en/java/javase/13/docs"/>
147	<	<property name="java14.docroot.url" value="https://docs.oracle.com/en/java/javase/14/docs"/>
148	<	<property name="java15.docroot.url" value="https://docs.oracle.com/en/java/javase/15/docs"/>
149	<	<property name="java16.docroot.url" value="https://download.java.net/java/early_access/jdk16/docs"/>
150	<	<property name="java17.docroot.url" value="https://download.java.net/java/early_access/jdk17/docs"/>
122	>	<property name="java17.docroot.url" value="https://docs.oracle.com/en/java/javase/17/docs"/>
123	>	<property name="java18.docroot.url" value="https://docs.oracle.com/en/java/javase/18/docs"/>
124	>	<property name="java19.docroot.url" value="https://docs.oracle.com/en/java/javase/19/docs"/>
125	>	<property name="java20.docroot.url" value="https://download.java.net/java/early_access/jdk20/docs"/>
126	>	<property name="java21.docroot.url" value="https://download.java.net/java/early_access/jdk21/docs"/>
127		<!-- Default jdk doc location (latest stable LTS release seems best) -->
128	<	<property name="java.docroot.url"   value="${java11.docroot.url}"/>
128	>	<property name="java.docroot.url"   value="${java17.docroot.url}"/>
129
130		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
155	–	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
156	–	<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
157	–	<property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
158	–	<property name="java14.api.url"     value="${java14.docroot.url}/api/"/>
159	–	<property name="java15.api.url"     value="${java15.docroot.url}/api/"/>
160	–	<property name="java16.api.url"     value="${java16.docroot.url}/api/"/>
131		<property name="java17.api.url"     value="${java17.docroot.url}/api/"/>
132	+	<property name="java18.api.url"     value="${java18.docroot.url}/api/"/>
133	+	<property name="java19.api.url"     value="${java19.docroot.url}/api/"/>
134	+	<property name="java20.api.url"     value="${java20.docroot.url}/api/"/>
135	+	<property name="java21.api.url"     value="${java21.docroot.url}/api/"/>
136		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
137
138		<!-- Define the "jtreg" task -->
#	Line 261 | Line 235
235		</macrodef>
236
237		<defjtregtests v="17"/>
238	<	<defjtregtests v="16"/>
239	<	<defjtregtests v="15"/>
240	<	<defjtregtests v="14"/>
241	<	<defjtregtests v="13"/>
268	<	<defjtregtests v="12"/>
269	<	<defjtregtests v="11"/>
238	>	<defjtregtests v="18"/>
239	>	<defjtregtests v="19"/>
240	>	<defjtregtests v="20"/>
241	>	<defjtregtests v="21"/>
242
243		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
244		<property name="jtreg.flags" value=""/>
245
246		<macrodef name="run-jtreg-tests">
275	–	<!-- ant -Djtreg11.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
247		<attribute name="target"/>
248		<attribute name="workdir"/>
249		<attribute name="classes"/>
#	Line 327 | Line 298
298		<!-- Main targets -->
299
300		<!-- Default values: may seem strange ... -->
301	<	<!-- At runtime, target latest LTS, i.e. jdk11 -->
302	<	<!-- But at build time, target jdk9, for maximal binary portability -->
303	<	<!-- ButButBut as of 2019-08, target jdk11 at build time -->
304	<	<!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
305	<	o override-methods=summary
335	<	o {@systemProperty ...}
336	<	o 8211194: issues linking to external documentation (was: missing package-list for JDK10 / JDK11 documentation)
337	<	o 8202628: javadoc generates bad links in TestModules.java
338	<	-->
339	<	<property name="java.runtime.target" value="11"/>
340	<	<property name="build.main.java" value="${java11}"/>
341	<	<property name="build.main.javac" value="${javac11}"/>
342	<	<property name="build.main.javadoc" value="${javadoc12}"/>
301	>	<!-- At runtime, target latest, but build for current LTS -->
302	>	<property name="java.runtime.target" value="19"/>
303	>	<property name="build.main.java" value="${java17}"/>
304	>	<property name="build.main.javac" value="${javac17}"/>
305	>	<property name="build.main.javadoc" value="${javadoc19}"/>
306		<property name="build.main.javadoc.source" value="${java.runtime.target}"/>
307
308		<target name="dists"
#	Line 371 | Line 334
334		<compilerarg value="--patch-module=java.base=${src.dir}"/>
335		<compilerarg value="-Xprefer:source"/>
336		<compilerarg value="-XDignore.symbol.file=true"/>
337	<	<!--   Xlint:-removal for jdk12 Unsafe Object -> Reference renaming -->
375	<	<compilerarg value="-Xlint:all,-removal"/>
376	<	<compilerarg line="--doclint-format html5"/>
377	<	<!--  Temporarily disable doclint for private elements, due to -->
378	<	<!--  https://bugs.openjdk.java.net/browse/JDK-8214571 -->
379	<	<!--  which is expected to be fixed in openjdk 11.0.8 -->
380	<	<!--  <compilerarg value="-Xdoclint:all/protected,reference/private"/> -->
337	>	<compilerarg value="-Xlint:all"/>
338		<compilerarg value="-Xdoclint:all/protected"/>
339		<compilerarg value="-Xdoclint/package:java.util.*"/>
340		<compilerarg value="-Werror"/>
341		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
342		<compilerarg line="${build.args}"/>
386	–
343		</javac>
344		</target>
345
390	–
346		<target name="jar"
347		depends="compile"
348		description="Builds library jar for src/main from compiled sources">
#	Line 405 | Line 360
360
361		<target name="docs"
362		description="Builds javadocs for src/main to dist dir">
408	–
363		<delete dir="${docs.dir}" quiet="true"/>
364		<mkdir dir="${docs.dir}"/>
411	–
412	–	<!-- old school frames via docs/index.html?overview-summary.html -->
413	–	<!-- dash-dash-frames no longer a supported option in jdk13+ -->
414	–	<local name="use-frames"/>
415	–	<condition property="use-frames">
416	–	<equals arg1="${build.main.javadoc}" arg2="${javadoc12}"/>
417	–	</condition>
418	–
419	–	<!-- the packagenames="none" hack below prevents scanning the -->
420	–	<!-- sourcepath for packages -->
421	–
422	–	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
423	–	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
424	–	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
425	–	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
426	–	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
365		<javadoc destdir="${docs.dir}"
366		packagenames="none"
367		link="${java.api.url}"
#	Line 433 | Line 371
371		classpath=""
372		source="${build.main.javadoc.source}"
373		executable="${build.main.javadoc}">
436	–	<!-- TODO: JDK-8214571 failonerror = "true" -->
374		<fileset dir="${src.dir}" defaultexcludes="yes">
375		<include name="java/**/*.java"/>
376		</fileset>
377		<arg line="-Xdocrootparent ${java.docroot.url}"/>
378		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
379	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1"/>
380		<arg value="-quiet"/>
381		<arg value="-XDignore.symbol.file=true"/>
382		<arg value="-html5"/>
#	Line 450 | Line 388
388		<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
389		<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
390		<arg value="-tag"/> <arg value="apiNote:a:API Note:"/>
453	–	<!-- tags added in jdk9: currently unused -->
454	–	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
455	–	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
391		</javadoc>
392		</target>
393
459	–
394		<target name="dist"
395		depends="dist-clean, dist-jar, dist-docs"
396		description="Puts all distributable products in single hierarchy"/>
397
464	–
398		<target name="clean"
399		description="Removes all build products">
400		<delete dir="${build.dir}"/>
401		</target>
402
470	–
403		<target name="dist-clean"
404		description="Removes all build and distribution products">
405		<delete dir="${build.dir}"/>
406		<delete dir="${dist.dir}"/>
407		</target>
408
477	–
409		<target name="dist-jar"
410		depends="clean, jar">
411		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 488 | Line 419
419		<target name="tck"
420		depends="jar"
421		description="Runs tck tests for src/main directly">
491	–
422		<run-tck-tests
423		target="${java.runtime.target}"
424		workdir="${build.dir}"
425		classes="${product.jar}">
426		<javac-elements>
427	<	<compilerarg value="-Werror"/>
427	>	<!-- <compilerarg value="-Werror"/> -->
428		</javac-elements>
429		</run-tck-tests>
430		</target>
#	Line 534 | Line 464
464		description="Runs tck and jtreg tests for src/main"/>
465
466		<target name="test-version-permutations"
467	<	depends="test11, test12, test13, test14, test15, test16,
538	<	test11-12, test11-13, test11-14, test11-15, test11-16,
539	<	clean, test, docs"
467	>	depends="test17, test19, clean, test, docs"
468		description="Runs tck and jtreg tests for various build-time and runtime java versions"/>
469
542	–	<target name="test11">
543	–	<antcall>
544	–	<param name="java.runtime.target" value="11"/>
545	–	<param name="build.main.javac" value="${javac11}"/>
546	–	<param name="build.main.javadoc" value="${javadoc12}"/>
547	–	<param name="build.main.javadoc.source" value="11"/>
548	–	<target name="clean"/>
549	–	<target name="test"/>
550	–	<target name="docs"/>
551	–	</antcall>
552	–	</target>
553	–
554	–	<target name="test12">
555	–	<antcall>
556	–	<param name="java.runtime.target" value="12"/>
557	–	<param name="build.main.javac" value="${javac12}"/>
558	–	<param name="build.main.javadoc" value="${javadoc12}"/>
559	–	<param name="build.main.javadoc.source" value="12"/>
560	–	<target name="clean"/>
561	–	<target name="test"/>
562	–	<target name="docs"/>
563	–	</antcall>
564	–	</target>
470
471	<	<target name="test13">
471	>	<target name="test17">
472		<antcall>
473	<	<param name="java.runtime.target" value="13"/>
474	<	<param name="build.main.javac" value="${javac13}"/>
475	<	<param name="build.main.javadoc" value="${javadoc13}"/>
476	<	<param name="build.main.javadoc.source" value="13"/>
473	>	<param name="java.runtime.target" value="17"/>
474	>	<param name="build.main.javac" value="${javac17}"/>
475	>	<param name="build.main.javadoc" value="${javadoc17}"/>
476	>	<param name="build.main.javadoc.source" value="17"/>
477		<target name="clean"/>
478		<target name="test"/>
479		<target name="docs"/>
480		</antcall>
481		</target>
482	<
578	<	<target name="test14">
579	<	<antcall>
580	<	<param name="java.runtime.target" value="14"/>
581	<	<param name="build.main.javac" value="${javac14}"/>
582	<	<param name="build.main.javadoc" value="${javadoc14}"/>
583	<	<param name="build.main.javadoc.source" value="14"/>
584	<	<target name="clean"/>
585	<	<target name="test"/>
586	<	<target name="docs"/>
587	<	</antcall>
588	<	</target>
589	<
590	<	<target name="test15">
591	<	<antcall>
592	<	<param name="java.runtime.target" value="15"/>
593	<	<param name="build.main.javac" value="${javac15}"/>
594	<	<param name="build.main.javadoc" value="${javadoc15}"/>
595	<	<param name="build.main.javadoc.source" value="15"/>
596	<	<target name="clean"/>
597	<	<target name="test"/>
598	<	<target name="docs"/>
599	<	</antcall>
600	<	</target>
601	<
602	<	<target name="test16">
482	>	<target name="test19">
483		<antcall>
484	<	<param name="java.runtime.target" value="16"/>
485	<	<param name="build.main.javac" value="${javac16}"/>
486	<	<param name="build.main.javadoc" value="${javadoc16}"/>
487	<	<param name="build.main.javadoc.source" value="16"/>
484	>	<param name="java.runtime.target" value="19"/>
485	>	<param name="build.main.javac" value="${javac19}"/>
486	>	<param name="build.main.javadoc" value="${javadoc19}"/>
487	>	<param name="build.main.javadoc.source" value="19"/>
488		<target name="clean"/>
489		<target name="test"/>
490		<target name="docs"/>
491		</antcall>
492		</target>
493
614	–	<target name="test11-12">
615	–	<antcall>
616	–	<param name="java.runtime.target" value="12"/>
617	–	<param name="build.main.javac" value="${javac11}"/>
618	–	<param name="build.main.javadoc" value="${javadoc12}"/>
619	–	<param name="build.main.javadoc.source" value="11"/>
620	–	<target name="clean"/>
621	–	<target name="test"/>
622	–	<target name="docs"/>
623	–	</antcall>
624	–	</target>
625	–
626	–	<target name="test11-13">
627	–	<antcall>
628	–	<param name="java.runtime.target" value="13"/>
629	–	<param name="build.main.javac" value="${javac11}"/>
630	–	<param name="build.main.javadoc" value="${javadoc13}"/>
631	–	<param name="build.main.javadoc.source" value="11"/>
632	–	<target name="clean"/>
633	–	<target name="test"/>
634	–	<target name="docs"/>
635	–	</antcall>
636	–	</target>
637	–
638	–	<target name="test11-14">
639	–	<antcall>
640	–	<param name="java.runtime.target" value="14"/>
641	–	<param name="build.main.javac" value="${javac11}"/>
642	–	<param name="build.main.javadoc" value="${javadoc14}"/>
643	–	<param name="build.main.javadoc.source" value="11"/>
644	–	<target name="clean"/>
645	–	<target name="test"/>
646	–	<target name="docs"/>
647	–	</antcall>
648	–	</target>
649	–
650	–	<target name="test11-15">
651	–	<antcall>
652	–	<param name="java.runtime.target" value="15"/>
653	–	<param name="build.main.javac" value="${javac11}"/>
654	–	<param name="build.main.javadoc" value="${javadoc15}"/>
655	–	<param name="build.main.javadoc.source" value="11"/>
656	–	<target name="clean"/>
657	–	<target name="test"/>
658	–	<target name="docs"/>
659	–	</antcall>
660	–	</target>
661	–
662	–	<target name="test11-16">
663	–	<antcall>
664	–	<param name="java.runtime.target" value="16"/>
665	–	<param name="build.main.javac" value="${javac11}"/>
666	–	<param name="build.main.javadoc" value="${javadoc16}"/>
667	–	<param name="build.main.javadoc.source" value="11"/>
668	–	<target name="clean"/>
669	–	<target name="test"/>
670	–	<target name="docs"/>
671	–	</antcall>
672	–	</target>
673	–
674	–	<target name="docs16">
675	–	<antcall>
676	–	<param name="java.runtime.target" value="16"/>
677	–	<param name="build.main.javac" value="${javac16}"/>
678	–	<param name="build.main.javadoc" value="${javadoc16}"/>
679	–	<param name="build.main.javadoc.source" value="16"/>
680	–	<target name="clean"/>
681	–	<target name="docs"/>
682	–	</antcall>
683	–	</target>
684	–
494
495		<target name="configure-compiler">
496		<fail message="ant version too old">
#	Line 825 | Line 634
634		<compilerarg value="-XDignore.symbol.file=true"/>
635		<compilerarg value="-Xlint:all"/>
636		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
637	<	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
637	>	<!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
638	>	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
639		<compilerarg line="${build.args}"/>
640		</javac>
641
#	Line 845 | Line 655
655		<compilerarg value="-Xplugin:ErrorProne
656		${errorprone.jsr166.flags}
657		${errorprone.jsr166.test.flags}"/>
658	<	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
658	>	<!--      <compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/> -->
659	>	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 1"/>
660		</javac-elements>
661		</run-tck-tests>
662		</target>

Diff Legend

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