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.210 by jsr166, Mon Apr 18 15:30:49 2016 UTC vs.
Revision 1.226 by jsr166, Fri Dec 9 04:06:46 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 188 | Line 187
187		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188		<!-- The expected canonical location does not yet exist as of 2016-04 -->
189		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190	<	<property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>
190	>	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
191		<!-- Default jdk doc location (latest stable release seems best) -->
192		<property name="java.docroot.url"       value="${java8.docroot.url}"/>
193
#	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 252 | Line 252
252		<compilerarg value="-XDignore.symbol.file=true"/>
253		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255	<	<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
255	>	<compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
256		<compilerarg line="${build.args}"/>
257		<javac-elements/>
258
#	Line 263 | Line 263
263		jvm="${java@{target}}"
264		fork="true">
265		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266	<	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
266	>	<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
267	>	<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
268	>	<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
269	>	<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
270	>	<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
271		<jvmarg line="@{jvmflags}"/>
272	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
273	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
274
275	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
275	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
276		<syspropertyset id="system-properties-used-by-tck">
277		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
278		<propertyref prefix="jsr166."/>
#	Line 326 | Line 332
332		</condition>
333
334		<delete dir="@{workdir}/JTwork"   quiet="true"/>
329	–	<delete dir="@{workdir}/JTreport" quiet="true"/>
335		<jtreg dir="${jtreg@{target}.src.dir}"
336		jdk="${jdk@{target}.home}"
337	<	workDir="@{workdir}/JTwork"
333	<	reportDir="@{workdir}/JTreport">
337	>	workDir="@{workdir}/JTwork">
338		<patternset refid="jdk@{target}.jtreg.tests"/>
339		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
340	<	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
340	>	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
341	>	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
342		<arg value="-agentvm"/>
343	+	<arg value="-noreport"/>
344		<arg value="-verbose:${jtreg.verbose}"/>
345		<arg value="-vmoptions:-esa -ea"/>
346		<arg value="-automatic"/>
#	Line 389 | Line 395
395		classpath=""
396		includeAntRuntime="false"
397		includeJavaRuntime="false"
398	+	encoding="ASCII"
399		executable="${build.main.javac}"
400		fork="true">
401
#	Line 409 | Line 416
416		<target name="jar"
417		depends="compile"
418		description="Builds library jar for src/main from compiled sources">
419	<
419	>	<local name="subdir"/>
420	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
421		<jar destfile="${product.jar}">
422	<	<fileset dir="${build.classes.dir}"/>
422	>	<fileset dir="${build.classes.dir}${subdir}"/>
423		<manifest>
424		<attribute name="Built-By" value="${user.name}"/>
425		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
#	Line 429 | Line 437
437		<!-- the packagenames="none" hack below prevents scanning the -->
438		<!-- sourcepath for packages -->
439
440	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
441	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
442	+	<!-- TODO: sourcepath="${src.dir}:${jdk9.home}/src.zip" -->
443	+	<!-- TODO: <arg line="-sourcepath ${src.dir}:${jdk9.home}/src.zip"/> -->
444	+	<!-- TODO: <arg line="- -module-source-path ${jdk9.home}/src.zip"/> -->
445		<javadoc destdir="${docs.dir}"
446		packagenames="none"
447		link="${java9.api.url}"
448		overview="${src.dir}/intro.html"
449		access="${build.javadoc.access}"
450	<	sourcepath="${src.dir}:${jdk9.src.dir}"
450	>	sourcepath="${src.dir}"
451		classpath=""
452		executable="${javadoc9}">
453		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 443 | Line 456
456		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
457		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
458		<arg value="-XDignore.symbol.file=true"/>
459	<	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
459	>	<arg value="-Xmodule:java.base"/>
460		<arg value="-tag"/>
461		<arg value="${javadoc.jls.option}"/>
462	+	<!-- @apiNote currently unused -->
463	+	<!--       <arg value="-tag"/> -->
464	+	<!--       <arg value="apiNote:a:API Note:"/> -->
465		<arg value="-tag"/>
466	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
451	<	<arg value="-tag"/>
452	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
453	<	<arg value="-tag"/>
454	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
455	<	<!-- tags added in jdk9 -->
456	<	<arg value="-tag"/>
457	<	<arg value="revised:X"/>
466	>	<arg value="implSpec:a:Implementation Requirements:"/>
467		<arg value="-tag"/>
468	<	<arg value="spec:X"/>
468	>	<arg value="implNote:a:Implementation Note:"/>
469	>	<!-- tags added in jdk9: currently unused -->
470	>	<!--       <arg value="-tag"/> -->
471	>	<!--       <arg value="revised:X"/> -->
472	>	<!--       <arg value="-tag"/> -->
473	>	<!--       <arg value="spec:X"/> -->
474		</javadoc>
475		</target>
476
#	Line 539 | Line 553
553		</antcall>
554		</target>
555
556	+	<target name="tck-security-manager"
557	+	description="Runs tck with a security manager">
558	+	<antcall target="tck">
559	+	<param name="jsr166.useSecurityManager" value="true"/>
560	+	</antcall>
561	+	</target>
562	+
563		<target name="jtreg"
564		depends="jar"
565		description="Runs jtreg tests for src/main using the jtreg ant task">
#	Line 619 | Line 640
640		deprecation="${build.deprecation}"
641		source="${build.sourcelevel}"
642		target="${build.sourcelevel}"
643	+	encoding="ASCII"
644		fork="true">
645
646		<compilerarg line="${build.args}"/>
#	Line 646 | Line 668
668		deprecation="${build.deprecation}"
669		includeAntRuntime="false"
670		includeJavaRuntime="false"
671	+	encoding="ASCII"
672		executable="${javac9}"
673		fork="true">
674
#	Line 679 | Line 702
702		bootclasspath="${bootclasspath8}"
703		includeAntRuntime="false"
704		includeJavaRuntime="false"
705	+	encoding="ASCII"
706		executable="${javac8}"
707		fork="true">
708
#	Line 709 | Line 733
733		bootclasspath="${bootclasspath8}"
734		includeAntRuntime="false"
735		includeJavaRuntime="false"
736	+	encoding="ASCII"
737		executable="${javac8}"
738		fork="true">
739
#	Line 793 | Line 818
818		<arg value="-XDignore.symbol.file=true"/>
819		<arg value="-tag"/>
820		<arg value="${javadoc.jls.option}"/>
821	<	<arg value="-tag"/>
822	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
821	>	<!-- @apiNote currently unused -->
822	>	<!--       <arg value="-tag"/> -->
823	>	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
824		<arg value="-tag"/>
825		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
826		<arg value="-tag"/>
#	Line 848 | Line 874
874		bootclasspath="${bootclasspath6}"
875		includeAntRuntime="false"
876		includeJavaRuntime="false"
877	+	encoding="ASCII"
878		executable="${javac7}"
879		fork="true">
880
#	Line 878 | Line 905
905		bootclasspath="${bootclasspath6}"
906		includeAntRuntime="false"
907		includeJavaRuntime="false"
908	+	encoding="ASCII"
909		executable="${javac8}"
910		fork="true">
911
#	Line 1045 | Line 1073
1073		target="5"
1074		includeAntRuntime="false"
1075		includeJavaRuntime="false"
1076	+	encoding="ASCII"
1077		executable="${javac7}"
1078		fork="true">
1079
#	Line 1138 | Line 1167
1167		bootclasspath="${bootclasspath6}"
1168		includeAntRuntime="false"
1169		includeJavaRuntime="false"
1170	+	encoding="ASCII"
1171		executable="${javac7}"
1172		fork="true">
1173
#	Line 1232 | Line 1262
1262		target="6"
1263		includeAntRuntime="false"
1264		includeJavaRuntime="false"
1265	+	encoding="ASCII"
1266		executable="${javac7}"
1267		fork="true">
1268

Diff Legend

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