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.300 by jsr166, Sat Jul 13 18:31:40 2019 UTC vs.
Revision 1.301 by jsr166, Sat Aug 10 16:48:04 2019 UTC

#	Line 20 | Line 20
20		targets require different JDKs, we assume that users have created a
21		hierarchy containing:
22		$HOME/jdk/jdk8
23	–	$HOME/jdk/jdk9
24	–	$HOME/jdk/jdk10
23		$HOME/jdk/jdk11
24		$HOME/jdk/jdk12
25		$HOME/jdk/jdk13
26		$HOME/jdk/jdk14
27		where each of the above is a JDK or a symlink to same, and
28		$HOME/jdk/src/jdk8
31	–	$HOME/jdk/src/jdk9
32	–	$HOME/jdk/src/jdk10
29		$HOME/jdk/src/jdk11
30		$HOME/jdk/src/jdk12
31		$HOME/jdk/src/jdk13
#	Line 42 | Line 38
38		for $N in 8 .. 14 ...
39
40		As of 2016-03, the sources in src/main are for jdk9+ only.
41	+	As of 2019-08, the sources in src/main are for jdk11+ only.
42		------------------------------------------------------------------------------
43		</description>
44
#	Line 135 | Line 132
132		</sequential>
133		</macrodef>
134
138	–	<defjdklocations v="6"/>
139	–	<defjdklocations v="7"/>
135		<defjdklocations v="8"/>
141	–	<defjdklocations v="9"/>
142	–	<defjdklocations v="10"/>
136		<defjdklocations v="11"/>
137		<defjdklocations v="12"/>
138		<defjdklocations v="13"/>
#	Line 150 | Line 143
143		<property name="test.src.dir"         location="${basedir}/src/test"/>
144		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
145		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
153	–	<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
146		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
155	–	<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
156	–	<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
147		<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
148		<property name="jtreg12.src.dir"      location="${test.src.dir}/jtreg"/>
149		<property name="jtreg13.src.dir"      location="${test.src.dir}/jtreg"/>
150		<property name="jtreg14.src.dir"      location="${test.src.dir}/jtreg"/>
151	<	<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
151	>	<property name="jtreg.src.dir"        location="${jtreg11.src.dir}"/>
152		<property name="lib.dir"              location="${basedir}/lib"/>
153		<property name="dist.dir"             location="${basedir}/dist"/>
154		<property name="topsrc.dir"           location="${basedir}/src"/>
#	Line 202 | Line 192
192		<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
193		<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
194		<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
205	–	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
206	–	<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
195		<property name="java11.docroot.url" value="https://docs.oracle.com/en/java/javase/11/docs"/>
196		<property name="java12.docroot.url" value="https://docs.oracle.com/en/java/javase/12/docs"/>
197		<!-- The location of jdk early access docs (RIP) -->
210	–	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
211	–	<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
198		<!-- <property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/> -->
199		<!--   <property name="java12.docroot.url" value="https://download.java.net/java/jdk12/docs"/> -->
200		<property name="java13.docroot.url" value="https://download.java.net/java/early_access/jdk13/docs"/>
#	Line 217 | Line 203
203		<property name="java.docroot.url"   value="${java11.docroot.url}"/>
204
205		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
220	–	<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
221	–	<property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
222	–	<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
206		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
224	–	<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
225	–	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
207		<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
208		<property name="java12.api.url"     value="${java12.docroot.url}/api/"/>
209		<property name="java13.api.url"     value="${java13.docroot.url}/api/"/>
#	Line 344 | Line 325
325		<defjtregtests v="13"/>
326		<defjtregtests v="12"/>
327		<defjtregtests v="11"/>
347	–	<defjtregtests v="10"/>
348	–	<defjtregtests v="9"/>
328		<defjtregtests v="8"/>
350	–	<defjtregtests v="7"/>
329
330		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
331		<property name="jtreg.flags" value=""/>
#	Line 407 | Line 385
385		<!-- Default values: may seem strange ... -->
386		<!-- At runtime, target latest LTS, i.e. jdk11 -->
387		<!-- But at build time, target jdk9, for maximal binary portability -->
388	+	<!-- ButButBut as of 2019-08, target jdk11 at build time -->
389		<!-- Use javadoc12 (but -link to jdk11 api docs!), to get:
390		o override-methods=summary
391		o {@systemProperty ...}
#	Line 415 | Line 394
394		-->
395		<property name="java.runtime.target" value="11"/>
396		<property name="build.main.java" value="${java11}"/>
397	<	<property name="build.main.javac" value="${javac9}"/>
397	>	<property name="build.main.javac" value="${javac11}"/>
398		<property name="build.main.javadoc" value="${javadoc12}"/>
399		<property name="build.main.javadoc.source" value="${java.runtime.target}"/>
400
#	Line 600 | Line 579
579		description="Runs tck and jtreg tests for src/main"/>
580
581		<target name="test-version-permutations"
582	<	depends="test9, test10, test11, test12, test13, test14, test9-11, test9-12, test9-13, test9-14, clean, test, docs">
582	>	depends="test11, test12, test13, test14, test11-12, test11-13, test11-14, clean, test, docs">
583		</target>
584
585	<	<target name="test9">
586	<	<antcall target="clean"/>
587	<	<antcall>
588	<	<param name="java.runtime.target" value="9"/>
589	<	<param name="build.main.javac" value="${javac9}"/>
590	<	<param name="build.main.javadoc" value="${javadoc12}"/>
591	<	<param name="build.main.javadoc.source" value="9"/>
592	<	<target name="test"/>
593	<	<target name="docs"/>
594	<	</antcall>
595	<	</target>
596	<
597	<	<target name="test10">
598	<	<antcall target="clean"/>
599	<	<antcall>
600	<	<param name="java.runtime.target" value="10"/>
601	<	<param name="build.main.javac" value="${javac10}"/>
602	<	<param name="build.main.javadoc" value="${javadoc12}"/>
603	<	<param name="build.main.javadoc.source" value="10"/>
604	<	<target name="test"/>
605	<	<target name="docs"/>
606	<	</antcall>
607	<	</target>
585	>	<!-- jdk9 is unsupported as of 2019-08 -->
586	>	<!--   <target name="test9"> -->
587	>	<!--     <antcall target="clean"/> -->
588	>	<!--     <antcall> -->
589	>	<!--       <param name="java.runtime.target" value="9"/> -->
590	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
591	>	<!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
592	>	<!--       <param name="build.main.javadoc.source" value="9"/> -->
593	>	<!--       <target name="test"/> -->
594	>	<!--       <target name="docs"/> -->
595	>	<!--     </antcall> -->
596	>	<!--   </target> -->
597	>
598	>	<!-- jdk10 is unsupported as of 2019-08 -->
599	>	<!--   <target name="test10"> -->
600	>	<!--     <antcall target="clean"/> -->
601	>	<!--     <antcall> -->
602	>	<!--       <param name="java.runtime.target" value="10"/> -->
603	>	<!--       <param name="build.main.javac" value="${javac10}"/> -->
604	>	<!--       <param name="build.main.javadoc" value="${javadoc12}"/> -->
605	>	<!--       <param name="build.main.javadoc.source" value="10"/> -->
606	>	<!--       <target name="test"/> -->
607	>	<!--       <target name="docs"/> -->
608	>	<!--     </antcall> -->
609	>	<!--   </target> -->
610
611		<target name="test11">
612		<antcall target="clean"/>
#	Line 675 | Line 656
656		</antcall>
657		</target>
658
659	<	<target name="test9-11">
679	<	<antcall target="clean"/>
680	<	<antcall>
681	<	<param name="java.runtime.target" value="11"/>
682	<	<param name="build.main.javac" value="${javac9}"/>
683	<	<param name="build.main.javadoc" value="${javadoc12}"/>
684	<	<param name="build.main.javadoc.source" value="9"/>
685	<	<target name="test"/>
686	<	<target name="docs"/>
687	<	</antcall>
688	<	</target>
689	<
690	<	<target name="test9-12">
659	>	<target name="test11-12">
660		<antcall target="clean"/>
661		<antcall>
662		<param name="java.runtime.target" value="12"/>
663	<	<param name="build.main.javac" value="${javac9}"/>
663	>	<param name="build.main.javac" value="${javac11}"/>
664		<param name="build.main.javadoc" value="${javadoc12}"/>
665	<	<param name="build.main.javadoc.source" value="9"/>
665	>	<param name="build.main.javadoc.source" value="11"/>
666		<target name="test"/>
667		<target name="docs"/>
668		</antcall>
669		</target>
670
671	<	<target name="test9-13">
671	>	<target name="test11-13">
672		<antcall target="clean"/>
673		<antcall>
674		<param name="java.runtime.target" value="13"/>
675	<	<param name="build.main.javac" value="${javac9}"/>
675	>	<param name="build.main.javac" value="${javac11}"/>
676		<param name="build.main.javadoc" value="${javadoc13}"/>
677	<	<param name="build.main.javadoc.source" value="9"/>
677	>	<param name="build.main.javadoc.source" value="11"/>
678		<target name="test"/>
679		<target name="docs"/>
680		</antcall>
681		</target>
682
683	<	<target name="test9-14">
683	>	<target name="test11-14">
684		<antcall target="clean"/>
685		<antcall>
686		<param name="java.runtime.target" value="14"/>
687	<	<param name="build.main.javac" value="${javac9}"/>
687	>	<param name="build.main.javac" value="${javac11}"/>
688		<param name="build.main.javadoc" value="${javadoc14}"/>
689	<	<param name="build.main.javadoc.source" value="9"/>
689	>	<param name="build.main.javadoc.source" value="11"/>
690		<target name="test"/>
691		<target name="docs"/>
692		</antcall>

Diff Legend

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