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.205 by jsr166, Sat Mar 26 17:35:47 2016 UTC vs.
Revision 1.219 by jsr166, Sat Sep 17 21:02:01 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 186 | 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 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:${build.classes.dir}" 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:${build.classes.dir}" 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 327 | Line 330
330
331		<delete dir="@{workdir}/JTwork"   quiet="true"/>
332		<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"/>
333		<jtreg dir="${jtreg@{target}.src.dir}"
334		jdk="${jdk@{target}.home}"
335		workDir="@{workdir}/JTwork"
336		reportDir="@{workdir}/JTreport">
337		<patternset refid="jdk@{target}.jtreg.tests"/>
338		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
339	<	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
339	>	<arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
340		<arg value="-agentvm"/>
341		<arg value="-verbose:${jtreg.verbose}"/>
342		<arg value="-vmoptions:-esa -ea"/>
#	Line 393 | Line 392
392		classpath=""
393		includeAntRuntime="false"
394		includeJavaRuntime="false"
395	+	encoding="ASCII"
396		executable="${build.main.javac}"
397		fork="true">
398
#	Line 413 | Line 413
413		<target name="jar"
414		depends="compile"
415		description="Builds library jar for src/main from compiled sources">
416	<
416	>	<local name="subdir"/>
417	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
418		<jar destfile="${product.jar}">
419	<	<fileset dir="${build.classes.dir}"/>
419	>	<fileset dir="${build.classes.dir}${subdir}"/>
420		<manifest>
421		<attribute name="Built-By" value="${user.name}"/>
422		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
#	Line 433 | Line 434
434		<!-- the packagenames="none" hack below prevents scanning the -->
435		<!-- sourcepath for packages -->
436
437	+	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
438	+	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
439		<javadoc destdir="${docs.dir}"
440		packagenames="none"
441		link="${java9.api.url}"
442		overview="${src.dir}/intro.html"
443		access="${build.javadoc.access}"
444	<	sourcepath="${src.dir}:${jdk9.src.dir}"
444	>	sourcepath="${src.dir}"
445		classpath=""
446		executable="${javadoc9}">
447		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 447 | Line 450
450		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
451		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
452		<arg value="-XDignore.symbol.file=true"/>
453	<	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
453	>	<arg value="-Xmodule:java.base"/>
454		<arg value="-tag"/>
455		<arg value="${javadoc.jls.option}"/>
456		<arg value="-tag"/>
#	Line 530 | Line 533
533		</target>
534
535		<target name="tck-parallelism-1"
536	<	description="Runs tck with given common pool parallelism">
536	>	description="Runs tck with common pool parallelism 1">
537		<antcall target="tck">
538		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
539		</antcall>
540		</target>
541
542		<target name="tck-parallelism-0"
543	<	description="Runs tck with given common pool parallelism">
543	>	description="Runs tck with common pool parallelism 0">
544		<antcall target="tck">
545		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
546		</antcall>
547		</target>
548
549	+	<target name="tck-security-manager"
550	+	description="Runs tck with a security manager">
551	+	<antcall target="tck">
552	+	<param name="jsr166.useSecurityManager" value="true"/>
553	+	</antcall>
554	+	</target>
555	+
556		<target name="jtreg"
557		depends="jar"
558		description="Runs jtreg tests for src/main using the jtreg ant task">
#	Line 553 | Line 563
563		</target>
564
565		<target name="test"
566	<	depends="tck, tck-parallelism-1, jtreg"
566	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
567		description="Runs tck and jtreg tests for src/main">
568		</target>
569
#	Line 623 | 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 650 | Line 661
661		deprecation="${build.deprecation}"
662		includeAntRuntime="false"
663		includeJavaRuntime="false"
664	+	encoding="ASCII"
665		executable="${javac9}"
666		fork="true">
667
#	Line 683 | Line 695
695		bootclasspath="${bootclasspath8}"
696		includeAntRuntime="false"
697		includeJavaRuntime="false"
698	+	encoding="ASCII"
699		executable="${javac8}"
700		fork="true">
701
#	Line 713 | Line 726
726		bootclasspath="${bootclasspath8}"
727		includeAntRuntime="false"
728		includeJavaRuntime="false"
729	+	encoding="ASCII"
730		executable="${javac8}"
731		fork="true">
732
#	Line 788 | Line 802
802		access="${build.javadoc.access}"
803		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
804		classpath=""
805	<	executable="${javadoc8}">
805	>	executable="${javadoc8}"
806	>	failonerror = "true">
807		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
808		<include name="**/*.java"/>
809		</fileset>
#	Line 851 | Line 866
866		bootclasspath="${bootclasspath6}"
867		includeAntRuntime="false"
868		includeJavaRuntime="false"
869	+	encoding="ASCII"
870		executable="${javac7}"
871		fork="true">
872
#	Line 881 | Line 897
897		bootclasspath="${bootclasspath6}"
898		includeAntRuntime="false"
899		includeJavaRuntime="false"
900	+	encoding="ASCII"
901		executable="${javac8}"
902		fork="true">
903
#	Line 993 | Line 1010
1010		access="${build.javadoc.access}"
1011		sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1012		classpath=""
1013	<	executable="${javadoc7}">
1013	>	executable="${javadoc7}"
1014	>	failonerror = "true">
1015		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1016		<include name="**/*.java"/>
1017		</fileset>
#	Line 1047 | Line 1065
1065		target="5"
1066		includeAntRuntime="false"
1067		includeJavaRuntime="false"
1068	+	encoding="ASCII"
1069		executable="${javac7}"
1070		fork="true">
1071
#	Line 1088 | Line 1107
1107		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1108		bootclasspath="${bootclasspath6}"
1109		source="5"
1110	<	executable="${javadoc7}">
1110	>	executable="${javadoc7}"
1111	>	failonerror = "true">
1112		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1113		<arg value="-XDignore.symbol.file=true"/>
1114
#	Line 1139 | Line 1159
1159		bootclasspath="${bootclasspath6}"
1160		includeAntRuntime="false"
1161		includeJavaRuntime="false"
1162	+	encoding="ASCII"
1163		executable="${javac7}"
1164		fork="true">
1165
#	Line 1180 | Line 1201
1201		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1202		bootclasspath="${bootclasspath6}"
1203		source="6"
1204	<	executable="${javadoc7}">
1204	>	executable="${javadoc7}"
1205	>	failonerror = "true">
1206		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1207		<arg value="-XDignore.symbol.file=true"/>
1208
#	Line 1232 | Line 1254
1254		target="6"
1255		includeAntRuntime="false"
1256		includeJavaRuntime="false"
1257	+	encoding="ASCII"
1258		executable="${javac7}"
1259		fork="true">
1260
#	Line 1393 | Line 1416
1416		access="${build.javadoc.access}"
1417		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1418		source="${build.jsr166e.java.version}"
1419	<	executable="${javadoc7}">
1419	>	executable="${javadoc7}"
1420	>	failonerror = "true">
1421		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1422		<arg value="-XDignore.symbol.file=true"/>
1423

Diff Legend

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