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.202 by jsr166, Sat Mar 26 15:10:14 2016 UTC vs.
Revision 1.226 by jsr166, Fri Dec 9 04:06:46 2016 UTC

#	Line 38 | Line 38
38		------------------------------------------------------------------------------
39		</description>
40
41	<	<!-- Display main targets by running 'ant -projecthelp' -->
41	>	<!-- Run 'ant -projecthelp' (default target) -->
42		<target name="usage">
43		<java classname="org.apache.tools.ant.Main">
44		<arg value="-projecthelp" />
#	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 186 | Line 185
185		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
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-03 -->
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://download.java.net/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"/>
330	–	<mkdir dir="@{workdir}/JTwork/scratch"/>
331	–	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
332	–	<mkdir dir="@{workdir}/JTreport/html"/>
333	–	<mkdir dir="@{workdir}/JTreport/text"/>
335		<jtreg dir="${jtreg@{target}.src.dir}"
336		jdk="${jdk@{target}.home}"
337	<	workDir="@{workdir}/JTwork"
337	<	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 393 | Line 395
395		classpath=""
396		includeAntRuntime="false"
397		includeJavaRuntime="false"
398	+	encoding="ASCII"
399		executable="${build.main.javac}"
400		fork="true">
401
#	Line 407 | Line 410
410		<compilerarg line="${build.args}"/>
411
412		</javac>
410	–
411	–	<!-- We need jdk9's Contended annotation, but at compile time only -->
412	–	<!--
413	–	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
414	–	-->
413		</target>
414
415
416		<target name="jar"
417		depends="compile"
418	<	description="Builds library jar from compiled sources">
419	<
418	>	description="Builds library jar for src/main from compiled sources">
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 438 | 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 452 | 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;"/>
460	<	<arg value="-tag"/>
461	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
466	>	<arg value="implSpec:a:Implementation Requirements:"/>
467		<arg value="-tag"/>
468	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
469	<	<!-- tags added in jdk9 -->
470	<	<arg value="-tag"/>
471	<	<arg value="revised:X"/>
472	<	<arg value="-tag"/>
473	<	<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 526 | Line 531
531
532		<target name="tck"
533		depends="jar"
534	<	description="Runs tck tests for main directly">
534	>	description="Runs tck tests for src/main directly">
535
536		<run-tck-tests
537		target="${build.main.java.version}"
#	Line 535 | Line 540
540		</target>
541
542		<target name="tck-parallelism-1"
543	<	description="Runs tck with given common pool parallelism">
543	>	description="Runs tck with common pool parallelism 1">
544		<antcall target="tck">
545		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
546		</antcall>
547		</target>
548
549		<target name="tck-parallelism-0"
550	<	description="Runs tck with given common pool parallelism">
550	>	description="Runs tck with common pool parallelism 0">
551		<antcall target="tck">
552		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
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 main using the jtreg ant task">
565	>	description="Runs jtreg tests for src/main using the jtreg ant task">
566		<run-jtreg-tests
567		target="${build.main.java.version}"
568		workdir="${build.dir}"
#	Line 558 | Line 570
570		</target>
571
572		<target name="test"
573	<	depends="tck, tck-parallelism-1, jtreg"
574	<	description="Runs tck and jtreg tests for main">
573	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
574	>	description="Runs tck and jtreg tests for src/main">
575		</target>
576
577	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
577	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
578
579	<	<antcall target="jtreg">
580	<	<param name="build.main.java.version" value="8"/>
581	<	<param name="build.main.javac" value="${javac8}"/>
582	<	</antcall>
579	>	<!--     <antcall target="jtreg"> -->
580	>	<!--       <param name="build.main.java.version" value="8"/> -->
581	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
582	>	<!--     </antcall> -->
583
584	<	</target>
584	>	<!--   </target> -->
585
586	<	<target name="test89"
587	<	description="Runs tck and jtreg tests for main for multiple java versions">
586	>	<!--   <target name="test89" -->
587	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
588
589	<	<antcall target="clean"/>
590	<	<antcall target="test">
591	<	<param name="build.main.java.version" value="8"/>
592	<	<param name="build.main.javac" value="${javac8}"/>
593	<	</antcall>
589	>	<!--     <antcall target="clean"/> -->
590	>	<!--     <antcall target="test"> -->
591	>	<!--       <param name="build.main.java.version" value="8"/> -->
592	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
593	>	<!--     </antcall> -->
594
595	<	<antcall target="clean"/>
596	<	<antcall target="test">
597	<	<param name="build.main.java.version" value="9"/>
598	<	<param name="build.main.javac" value="${javac9}"/>
599	<	</antcall>
595	>	<!--     <antcall target="clean"/> -->
596	>	<!--     <antcall target="test"> -->
597	>	<!--       <param name="build.main.java.version" value="9"/> -->
598	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
599	>	<!--     </antcall> -->
600
601	<	</target>
601	>	<!--   </target> -->
602
603
604
#	Line 616 | Line 628
628		<!-- Various demos and test programs -->
629
630
631	<	<target name="loops" depends="configure-compiler"
632	<	description="Benchmark from Doug Lea's AQS paper">
631	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
632	>	<target name="loops" depends="configure-compiler">
633
634		<mkdir dir="${build.loops.dir}"/>
635
#	Line 628 | 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 655 | Line 668
668		deprecation="${build.deprecation}"
669		includeAntRuntime="false"
670		includeJavaRuntime="false"
671	+	encoding="ASCII"
672		executable="${javac9}"
673		fork="true">
674
#	Line 688 | Line 702
702		bootclasspath="${bootclasspath8}"
703		includeAntRuntime="false"
704		includeJavaRuntime="false"
705	+	encoding="ASCII"
706		executable="${javac8}"
707		fork="true">
708
#	Line 718 | Line 733
733		bootclasspath="${bootclasspath8}"
734		includeAntRuntime="false"
735		includeJavaRuntime="false"
736	+	encoding="ASCII"
737		executable="${javac8}"
738		fork="true">
739
#	Line 793 | Line 809
809		access="${build.javadoc.access}"
810		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
811		classpath=""
812	<	executable="${javadoc8}">
812	>	executable="${javadoc8}"
813	>	failonerror = "true">
814		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
815		<include name="**/*.java"/>
816		</fileset>
#	Line 801 | 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 856 | Line 874
874		bootclasspath="${bootclasspath6}"
875		includeAntRuntime="false"
876		includeJavaRuntime="false"
877	+	encoding="ASCII"
878		executable="${javac7}"
879		fork="true">
880
#	Line 886 | Line 905
905		bootclasspath="${bootclasspath6}"
906		includeAntRuntime="false"
907		includeJavaRuntime="false"
908	+	encoding="ASCII"
909		executable="${javac8}"
910		fork="true">
911
#	Line 941 | Line 961
961		</target>
962
963
964	+	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
965		<target name="4jdk7-tck-junit"
966	<	depends="4jdk7compile"
946	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
966	>	depends="4jdk7compile">
967
968		<junit printsummary="true"
969		showoutput="true"
#	Line 998 | Line 1018
1018		access="${build.javadoc.access}"
1019		sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1020		classpath=""
1021	<	executable="${javadoc7}">
1021	>	executable="${javadoc7}"
1022	>	failonerror = "true">
1023		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1024		<include name="**/*.java"/>
1025		</fileset>
#	Line 1052 | Line 1073
1073		target="5"
1074		includeAntRuntime="false"
1075		includeJavaRuntime="false"
1076	+	encoding="ASCII"
1077		executable="${javac7}"
1078		fork="true">
1079
#	Line 1093 | Line 1115
1115		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1116		bootclasspath="${bootclasspath6}"
1117		source="5"
1118	<	executable="${javadoc7}">
1118	>	executable="${javadoc7}"
1119	>	failonerror = "true">
1120		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1121		<arg value="-XDignore.symbol.file=true"/>
1122
#	Line 1144 | Line 1167
1167		bootclasspath="${bootclasspath6}"
1168		includeAntRuntime="false"
1169		includeJavaRuntime="false"
1170	+	encoding="ASCII"
1171		executable="${javac7}"
1172		fork="true">
1173
#	Line 1185 | Line 1209
1209		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1210		bootclasspath="${bootclasspath6}"
1211		source="6"
1212	<	executable="${javadoc7}">
1212	>	executable="${javadoc7}"
1213	>	failonerror = "true">
1214		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1215		<arg value="-XDignore.symbol.file=true"/>
1216
#	Line 1237 | Line 1262
1262		target="6"
1263		includeAntRuntime="false"
1264		includeJavaRuntime="false"
1265	+	encoding="ASCII"
1266		executable="${javac7}"
1267		fork="true">
1268
#	Line 1398 | Line 1424
1424		access="${build.javadoc.access}"
1425		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1426		source="${build.jsr166e.java.version}"
1427	<	executable="${javadoc7}">
1427	>	executable="${javadoc7}"
1428	>	failonerror = "true">
1429		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1430		<arg value="-XDignore.symbol.file=true"/>
1431

Diff Legend

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