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.201 by dl, Sat Mar 26 12:35:25 2016 UTC vs.
Revision 1.216 by jsr166, Tue Aug 30 00:01:22 2016 UTC

#	Line 7 | Line 7
7
8		Usage: ant [target]
9
10	+	See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11	+	more details.
12	+
13		User-specific settings are read from user.properties.
14		See user.properties.sample for an explanation of some useful settings.
15
#	Line 30 | Line 33
33		ant -Djdk$N.home=... -Djdk$N.src.home=...
34		for $N in 6 7 8 9 ...
35
36	<	As of 2015-09, there is incomplete hacky support for jigsaw
37	<	Build for jigsaw using something like:
35	<	ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.home="$HOME/jdk/src/jigsaw" clean test dist
36	<	"docs" target is still broken.
36	>	As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37	>	target is currently broken.
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 185 | Line 186
186		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
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-03 -->
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://download.java.net/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 251 | 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 value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
256		<compilerarg line="${build.args}"/>
257		<javac-elements/>
258
#	Line 262 | 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 value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267		<jvmarg line="@{jvmflags}"/>
268	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
269	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
270
271	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
271	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
272		<syspropertyset id="system-properties-used-by-tck">
273		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
274		<propertyref prefix="jsr166."/>
#	Line 326 | Line 329
329
330		<delete dir="@{workdir}/JTwork"   quiet="true"/>
331		<delete dir="@{workdir}/JTreport" quiet="true"/>
329	–	<mkdir dir="@{workdir}/JTwork/scratch"/>
330	–	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
331	–	<mkdir dir="@{workdir}/JTreport/html"/>
332	–	<mkdir dir="@{workdir}/JTreport/text"/>
332		<jtreg dir="${jtreg@{target}.src.dir}"
333		jdk="${jdk@{target}.home}"
334		workDir="@{workdir}/JTwork"
335		reportDir="@{workdir}/JTreport">
336		<patternset refid="jdk@{target}.jtreg.tests"/>
337		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338	<	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
338	>	<arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
339		<arg value="-agentvm"/>
340		<arg value="-verbose:${jtreg.verbose}"/>
341		<arg value="-vmoptions:-esa -ea"/>
#	Line 406 | Line 405
405		<compilerarg line="${build.args}"/>
406
407		</javac>
409	–
410	–	<!-- We need jdk9's Contended annotation, but at compile time only -->
411	–	<!--
412	–	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
413	–	-->
408		</target>
409
410
411		<target name="jar"
412		depends="compile"
413	<	description="Builds library jar from compiled sources">
414	<
413	>	description="Builds library jar for src/main from compiled sources">
414	>	<local name="subdir"/>
415	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
416		<jar destfile="${product.jar}">
417	<	<fileset dir="${build.classes.dir}"/>
417	>	<fileset dir="${build.classes.dir}${subdir}"/>
418		<manifest>
419		<attribute name="Built-By" value="${user.name}"/>
420		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
#	Line 437 | Line 432
432		<!-- the packagenames="none" hack below prevents scanning the -->
433		<!-- sourcepath for packages -->
434
435	+	<!--  TODO:       sourcepath="${src.dir}:${jdk9.src.dir}" -->
436		<javadoc destdir="${docs.dir}"
437		packagenames="none"
438		link="${java9.api.url}"
439		overview="${src.dir}/intro.html"
440		access="${build.javadoc.access}"
441	<	sourcepath="${src.dir}:${jdk9.src.dir}"
441	>	sourcepath="${src.dir}"
442		classpath=""
443		executable="${javadoc9}">
444		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 451 | Line 447
447		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
448		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
449		<arg value="-XDignore.symbol.file=true"/>
450	<	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
450	>	<arg value="-Xmodule:java.base"/>
451		<arg value="-tag"/>
452		<arg value="${javadoc.jls.option}"/>
453		<arg value="-tag"/>
#	Line 525 | Line 521
521
522		<target name="tck"
523		depends="jar"
524	<	description="Runs tck tests for main directly">
524	>	description="Runs tck tests for src/main directly">
525
526		<run-tck-tests
527		target="${build.main.java.version}"
#	Line 534 | Line 530
530		</target>
531
532		<target name="tck-parallelism-1"
533	<	description="Runs tck with given common pool parallelism">
533	>	description="Runs tck with common pool parallelism 1">
534		<antcall target="tck">
535		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
536		</antcall>
537		</target>
538
539		<target name="tck-parallelism-0"
540	<	description="Runs tck with given common pool parallelism">
540	>	description="Runs tck with common pool parallelism 0">
541		<antcall target="tck">
542		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
543		</antcall>
544		</target>
545
546	+	<target name="tck-security-manager"
547	+	description="Runs tck with a security manager">
548	+	<antcall target="tck">
549	+	<param name="jsr166.useSecurityManager" value="true"/>
550	+	</antcall>
551	+	</target>
552	+
553		<target name="jtreg"
554		depends="jar"
555	<	description="Runs jtreg tests for main using the jtreg ant task">
555	>	description="Runs jtreg tests for src/main using the jtreg ant task">
556		<run-jtreg-tests
557		target="${build.main.java.version}"
558		workdir="${build.dir}"
#	Line 557 | Line 560
560		</target>
561
562		<target name="test"
563	<	depends="tck, tck-parallelism-1, jtreg"
564	<	description="Runs tck and jtreg tests for main">
563	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
564	>	description="Runs tck and jtreg tests for src/main">
565		</target>
566
567	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
567	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
568
569	<	<antcall target="jtreg">
570	<	<param name="build.main.java.version" value="8"/>
571	<	<param name="build.main.javac" value="${javac8}"/>
572	<	</antcall>
569	>	<!--     <antcall target="jtreg"> -->
570	>	<!--       <param name="build.main.java.version" value="8"/> -->
571	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
572	>	<!--     </antcall> -->
573
574	<	</target>
574	>	<!--   </target> -->
575
576	<	<target name="test89"
577	<	description="Runs tck and jtreg tests for main for multiple java versions">
576	>	<!--   <target name="test89" -->
577	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
578
579	<	<antcall target="clean"/>
580	<	<antcall target="test">
581	<	<param name="build.main.java.version" value="8"/>
582	<	<param name="build.main.javac" value="${javac8}"/>
583	<	</antcall>
579	>	<!--     <antcall target="clean"/> -->
580	>	<!--     <antcall target="test"> -->
581	>	<!--       <param name="build.main.java.version" value="8"/> -->
582	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
583	>	<!--     </antcall> -->
584
585	<	<antcall target="clean"/>
586	<	<antcall target="test">
587	<	<param name="build.main.java.version" value="9"/>
588	<	<param name="build.main.javac" value="${javac9}"/>
589	<	</antcall>
585	>	<!--     <antcall target="clean"/> -->
586	>	<!--     <antcall target="test"> -->
587	>	<!--       <param name="build.main.java.version" value="9"/> -->
588	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
589	>	<!--     </antcall> -->
590
591	<	</target>
591	>	<!--   </target> -->
592
593
594
#	Line 615 | Line 618
618		<!-- Various demos and test programs -->
619
620
621	<	<target name="loops" depends="configure-compiler"
622	<	description="Benchmark from Doug Lea's AQS paper">
621	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
622	>	<target name="loops" depends="configure-compiler">
623
624		<mkdir dir="${build.loops.dir}"/>
625
#	Line 792 | Line 795
795		access="${build.javadoc.access}"
796		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
797		classpath=""
798	<	executable="${javadoc8}">
798	>	executable="${javadoc8}"
799	>	failonerror = "true">
800		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
801		<include name="**/*.java"/>
802		</fileset>
#	Line 940 | Line 944
944		</target>
945
946
947	+	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
948		<target name="4jdk7-tck-junit"
949	<	depends="4jdk7compile"
945	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
949	>	depends="4jdk7compile">
950
951		<junit printsummary="true"
952		showoutput="true"
#	Line 997 | Line 1001
1001		access="${build.javadoc.access}"
1002		sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1003		classpath=""
1004	<	executable="${javadoc7}">
1004	>	executable="${javadoc7}"
1005	>	failonerror = "true">
1006		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1007		<include name="**/*.java"/>
1008		</fileset>
#	Line 1092 | Line 1097
1097		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1098		bootclasspath="${bootclasspath6}"
1099		source="5"
1100	<	executable="${javadoc7}">
1100	>	executable="${javadoc7}"
1101	>	failonerror = "true">
1102		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1103		<arg value="-XDignore.symbol.file=true"/>
1104
#	Line 1184 | Line 1190
1190		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1191		bootclasspath="${bootclasspath6}"
1192		source="6"
1193	<	executable="${javadoc7}">
1193	>	executable="${javadoc7}"
1194	>	failonerror = "true">
1195		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1196		<arg value="-XDignore.symbol.file=true"/>
1197
#	Line 1397 | Line 1404
1404		access="${build.javadoc.access}"
1405		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1406		source="${build.jsr166e.java.version}"
1407	<	executable="${javadoc7}">
1407	>	executable="${javadoc7}"
1408	>	failonerror = "true">
1409		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1410		<arg value="-XDignore.symbol.file=true"/>
1411

Diff Legend

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