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.211 by jsr166, Sat May 21 00:12:12 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://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 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 value="-Xpatch:java.base=${build.classes.dir}/java.base" 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 value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267		<jvmarg line="@{jvmflags}"/>
268
269		<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
#	Line 327 | Line 327
327
328		<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"/>
330		<jtreg dir="${jtreg@{target}.src.dir}"
331		jdk="${jdk@{target}.home}"
332		workDir="@{workdir}/JTwork"
333		reportDir="@{workdir}/JTreport">
334		<patternset refid="jdk@{target}.jtreg.tests"/>
335		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
336	<	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
336	>	<arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
337		<arg value="-agentvm"/>
338		<arg value="-verbose:${jtreg.verbose}"/>
339		<arg value="-vmoptions:-esa -ea"/>
#	Line 530 | Line 526
526		</target>
527
528		<target name="tck-parallelism-1"
529	<	description="Runs tck with given common pool parallelism">
529	>	description="Runs tck with common pool parallelism 1">
530		<antcall target="tck">
531		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
532		</antcall>
533		</target>
534
535		<target name="tck-parallelism-0"
536	<	description="Runs tck with given common pool parallelism">
536	>	description="Runs tck with common pool parallelism 0">
537		<antcall target="tck">
538		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
539		</antcall>
#	Line 553 | Line 549
549		</target>
550
551		<target name="test"
552	<	depends="tck, tck-parallelism-1, jtreg"
552	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
553		description="Runs tck and jtreg tests for src/main">
554		</target>
555
#	Line 788 | Line 784
784		access="${build.javadoc.access}"
785		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
786		classpath=""
787	<	executable="${javadoc8}">
787	>	executable="${javadoc8}"
788	>	failonerror = "true">
789		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
790		<include name="**/*.java"/>
791		</fileset>
#	Line 993 | Line 990
990		access="${build.javadoc.access}"
991		sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
992		classpath=""
993	<	executable="${javadoc7}">
993	>	executable="${javadoc7}"
994	>	failonerror = "true">
995		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
996		<include name="**/*.java"/>
997		</fileset>
#	Line 1088 | Line 1086
1086		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1087		bootclasspath="${bootclasspath6}"
1088		source="5"
1089	<	executable="${javadoc7}">
1089	>	executable="${javadoc7}"
1090	>	failonerror = "true">
1091		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1092		<arg value="-XDignore.symbol.file=true"/>
1093
#	Line 1180 | Line 1179
1179		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1180		bootclasspath="${bootclasspath6}"
1181		source="6"
1182	<	executable="${javadoc7}">
1182	>	executable="${javadoc7}"
1183	>	failonerror = "true">
1184		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1185		<arg value="-XDignore.symbol.file=true"/>
1186
#	Line 1393 | Line 1393
1393		access="${build.javadoc.access}"
1394		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1395		source="${build.jsr166e.java.version}"
1396	<	executable="${javadoc7}">
1396	>	executable="${javadoc7}"
1397	>	failonerror = "true">
1398		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1399		<arg value="-XDignore.symbol.file=true"/>
1400

Diff Legend

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