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.213 by jsr166, Sat Jun 4 23:49:29 2016 UTC vs.
Revision 1.222 by jsr166, Mon Oct 10 04:51:19 2016 UTC

#	Line 188 | Line 188
188		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189		<!-- The expected canonical location does not yet exist as of 2016-04 -->
190		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191	<	<property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>
191	>	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
192		<!-- Default jdk doc location (latest stable release seems best) -->
193		<property name="java.docroot.url"       value="${java8.docroot.url}"/>
194
#	Line 245 | Line 245
245		classpath="${junit.jar}"
246		includeAntRuntime="false"
247		includeJavaRuntime="false"
248	+	encoding="ASCII"
249		executable="${javac@{compile-target}}"
250		fork="true">
251
#	Line 252 | Line 253
253		<compilerarg value="-XDignore.symbol.file=true"/>
254		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
255		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
256	<	<compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
256	>	<compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
257		<compilerarg line="${build.args}"/>
258		<javac-elements/>
259
#	Line 263 | Line 264
264		jvm="${java@{target}}"
265		fork="true">
266		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
267	<	<jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267	>	<jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
268		<jvmarg line="@{jvmflags}"/>
269	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
270	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
271
272	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
272	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
273		<syspropertyset id="system-properties-used-by-tck">
274		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
275		<propertyref prefix="jsr166."/>
#	Line 333 | Line 336
336		reportDir="@{workdir}/JTreport">
337		<patternset refid="jdk@{target}.jtreg.tests"/>
338		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
339	<	<arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
339	>	<arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
340	>	<arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
341		<arg value="-agentvm"/>
342		<arg value="-verbose:${jtreg.verbose}"/>
343		<arg value="-vmoptions:-esa -ea"/>
#	Line 389 | Line 393
393		classpath=""
394		includeAntRuntime="false"
395		includeJavaRuntime="false"
396	+	encoding="ASCII"
397		executable="${build.main.javac}"
398		fork="true">
399
#	Line 430 | Line 435
435		<!-- the packagenames="none" hack below prevents scanning the -->
436		<!-- sourcepath for packages -->
437
438	+	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439	+	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440		<javadoc destdir="${docs.dir}"
441		packagenames="none"
442		link="${java9.api.url}"
443		overview="${src.dir}/intro.html"
444		access="${build.javadoc.access}"
445	<	sourcepath="${src.dir}:${jdk9.src.dir}"
445	>	sourcepath="${src.dir}"
446		classpath=""
447		executable="${javadoc9}">
448		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 444 | Line 451
451		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
452		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
453		<arg value="-XDignore.symbol.file=true"/>
454	<	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
454	>	<arg value="-Xmodule:java.base"/>
455		<arg value="-tag"/>
456		<arg value="${javadoc.jls.option}"/>
457	+	<!-- @apiNote currently unused -->
458	+	<!--       <arg value="-tag"/> -->
459	+	<!--       <arg value="apiNote:a:API Note:"/> -->
460		<arg value="-tag"/>
461	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
461	>	<arg value="implSpec:a:Implementation Requirements:"/>
462		<arg value="-tag"/>
463	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
464	<	<arg value="-tag"/>
465	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
466	<	<!-- tags added in jdk9 -->
467	<	<arg value="-tag"/>
468	<	<arg value="revised:X"/>
459	<	<arg value="-tag"/>
460	<	<arg value="spec:X"/>
463	>	<arg value="implNote:a:Implementation Note:"/>
464	>	<!-- tags added in jdk9: currently unused -->
465	>	<!--       <arg value="-tag"/> -->
466	>	<!--       <arg value="revised:X"/> -->
467	>	<!--       <arg value="-tag"/> -->
468	>	<!--       <arg value="spec:X"/> -->
469		</javadoc>
470		</target>
471
#	Line 627 | Line 635
635		deprecation="${build.deprecation}"
636		source="${build.sourcelevel}"
637		target="${build.sourcelevel}"
638	+	encoding="ASCII"
639		fork="true">
640
641		<compilerarg line="${build.args}"/>
#	Line 654 | Line 663
663		deprecation="${build.deprecation}"
664		includeAntRuntime="false"
665		includeJavaRuntime="false"
666	+	encoding="ASCII"
667		executable="${javac9}"
668		fork="true">
669
#	Line 687 | Line 697
697		bootclasspath="${bootclasspath8}"
698		includeAntRuntime="false"
699		includeJavaRuntime="false"
700	+	encoding="ASCII"
701		executable="${javac8}"
702		fork="true">
703
#	Line 717 | Line 728
728		bootclasspath="${bootclasspath8}"
729		includeAntRuntime="false"
730		includeJavaRuntime="false"
731	+	encoding="ASCII"
732		executable="${javac8}"
733		fork="true">
734
#	Line 801 | Line 813
813		<arg value="-XDignore.symbol.file=true"/>
814		<arg value="-tag"/>
815		<arg value="${javadoc.jls.option}"/>
816	<	<arg value="-tag"/>
817	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
816	>	<!-- @apiNote currently unused -->
817	>	<!--       <arg value="-tag"/> -->
818	>	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
819		<arg value="-tag"/>
820		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
821		<arg value="-tag"/>
#	Line 856 | Line 869
869		bootclasspath="${bootclasspath6}"
870		includeAntRuntime="false"
871		includeJavaRuntime="false"
872	+	encoding="ASCII"
873		executable="${javac7}"
874		fork="true">
875
#	Line 886 | Line 900
900		bootclasspath="${bootclasspath6}"
901		includeAntRuntime="false"
902		includeJavaRuntime="false"
903	+	encoding="ASCII"
904		executable="${javac8}"
905		fork="true">
906
#	Line 1053 | Line 1068
1068		target="5"
1069		includeAntRuntime="false"
1070		includeJavaRuntime="false"
1071	+	encoding="ASCII"
1072		executable="${javac7}"
1073		fork="true">
1074
#	Line 1146 | Line 1162
1162		bootclasspath="${bootclasspath6}"
1163		includeAntRuntime="false"
1164		includeJavaRuntime="false"
1165	+	encoding="ASCII"
1166		executable="${javac7}"
1167		fork="true">
1168
#	Line 1240 | Line 1257
1257		target="6"
1258		includeAntRuntime="false"
1259		includeJavaRuntime="false"
1260	+	encoding="ASCII"
1261		executable="${javac7}"
1262		fork="true">
1263

Diff Legend

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