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.218 by jsr166, Sat Sep 10 04:06:10 2016 UTC vs.
Revision 1.224 by jsr166, Thu Nov 24 01:58:04 2016 UTC

#	Line 63 | Line 63
63		<property name="build.classes.dir"           location="${build.dir}/classes"/>
64		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
65		<property name="build.loops.dir"             location="${build.dir}/loops"/>
66	–	<property name="build.reports.dir"           location="${build.dir}/reports"/>
66
67		<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
68		<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
#	Line 245 | Line 244
244		classpath="${junit.jar}"
245		includeAntRuntime="false"
246		includeJavaRuntime="false"
247	+	encoding="ASCII"
248		executable="${javac@{compile-target}}"
249		fork="true">
250
#	Line 328 | Line 328
328		</condition>
329
330		<delete dir="@{workdir}/JTwork"   quiet="true"/>
331	–	<delete dir="@{workdir}/JTreport" quiet="true"/>
331		<jtreg dir="${jtreg@{target}.src.dir}"
332		jdk="${jdk@{target}.home}"
333	<	workDir="@{workdir}/JTwork"
335	<	reportDir="@{workdir}/JTreport">
333	>	workDir="@{workdir}/JTwork">
334		<patternset refid="jdk@{target}.jtreg.tests"/>
335		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
336	+	<arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
337		<arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
338		<arg value="-agentvm"/>
339	+	<arg value="-noreport"/>
340		<arg value="-verbose:${jtreg.verbose}"/>
341		<arg value="-vmoptions:-esa -ea"/>
342		<arg value="-automatic"/>
#	Line 391 | Line 391
391		classpath=""
392		includeAntRuntime="false"
393		includeJavaRuntime="false"
394	+	encoding="ASCII"
395		executable="${build.main.javac}"
396		fork="true">
397
#	Line 451 | Line 452
452		<arg value="-Xmodule:java.base"/>
453		<arg value="-tag"/>
454		<arg value="${javadoc.jls.option}"/>
455	+	<!-- @apiNote currently unused -->
456	+	<!--       <arg value="-tag"/> -->
457	+	<!--       <arg value="apiNote:a:API Note:"/> -->
458		<arg value="-tag"/>
459	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
459	>	<arg value="implSpec:a:Implementation Requirements:"/>
460		<arg value="-tag"/>
461	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
462	<	<arg value="-tag"/>
463	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
464	<	<!-- tags added in jdk9 -->
465	<	<arg value="-tag"/>
466	<	<arg value="revised:X"/>
463	<	<arg value="-tag"/>
464	<	<arg value="spec:X"/>
461	>	<arg value="implNote:a:Implementation Note:"/>
462	>	<!-- tags added in jdk9: currently unused -->
463	>	<!--       <arg value="-tag"/> -->
464	>	<!--       <arg value="revised:X"/> -->
465	>	<!--       <arg value="-tag"/> -->
466	>	<!--       <arg value="spec:X"/> -->
467		</javadoc>
468		</target>
469
#	Line 631 | Line 633
633		deprecation="${build.deprecation}"
634		source="${build.sourcelevel}"
635		target="${build.sourcelevel}"
636	+	encoding="ASCII"
637		fork="true">
638
639		<compilerarg line="${build.args}"/>
#	Line 658 | Line 661
661		deprecation="${build.deprecation}"
662		includeAntRuntime="false"
663		includeJavaRuntime="false"
664	+	encoding="ASCII"
665		executable="${javac9}"
666		fork="true">
667
#	Line 691 | Line 695
695		bootclasspath="${bootclasspath8}"
696		includeAntRuntime="false"
697		includeJavaRuntime="false"
698	+	encoding="ASCII"
699		executable="${javac8}"
700		fork="true">
701
#	Line 721 | Line 726
726		bootclasspath="${bootclasspath8}"
727		includeAntRuntime="false"
728		includeJavaRuntime="false"
729	+	encoding="ASCII"
730		executable="${javac8}"
731		fork="true">
732
#	Line 805 | Line 811
811		<arg value="-XDignore.symbol.file=true"/>
812		<arg value="-tag"/>
813		<arg value="${javadoc.jls.option}"/>
814	<	<arg value="-tag"/>
815	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
814	>	<!-- @apiNote currently unused -->
815	>	<!--       <arg value="-tag"/> -->
816	>	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
817		<arg value="-tag"/>
818		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
819		<arg value="-tag"/>
#	Line 860 | Line 867
867		bootclasspath="${bootclasspath6}"
868		includeAntRuntime="false"
869		includeJavaRuntime="false"
870	+	encoding="ASCII"
871		executable="${javac7}"
872		fork="true">
873
#	Line 890 | Line 898
898		bootclasspath="${bootclasspath6}"
899		includeAntRuntime="false"
900		includeJavaRuntime="false"
901	+	encoding="ASCII"
902		executable="${javac8}"
903		fork="true">
904
#	Line 1057 | Line 1066
1066		target="5"
1067		includeAntRuntime="false"
1068		includeJavaRuntime="false"
1069	+	encoding="ASCII"
1070		executable="${javac7}"
1071		fork="true">
1072
#	Line 1150 | Line 1160
1160		bootclasspath="${bootclasspath6}"
1161		includeAntRuntime="false"
1162		includeJavaRuntime="false"
1163	+	encoding="ASCII"
1164		executable="${javac7}"
1165		fork="true">
1166
#	Line 1244 | Line 1255
1255		target="6"
1256		includeAntRuntime="false"
1257		includeJavaRuntime="false"
1258	+	encoding="ASCII"
1259		executable="${javac7}"
1260		fork="true">
1261

Diff Legend

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