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.189 by jsr166, Thu Nov 5 15:02:34 2015 UTC vs.
Revision 1.195 by jsr166, Thu Dec 17 23:55:06 2015 UTC

#	Line 175 | Line 175
175		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
176		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
177		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
178	<	<!-- The expected canonical location does not yet exist as of 2014-07 -->
178	>	<!-- The expected canonical location does not yet exist as of 2015-11 -->
179		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
180		<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
181		<!-- Default jdk doc location (latest stable release seems best) -->
#	Line 289 | Line 289
289		</patternset>
290		</fileset>
291
292	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
293	+	<property name="jtreg.flags" value=""/>
294	+
295		<macrodef name="run-jtreg-tests">
296		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
297		<attribute name="source" default="7"/>
#	Line 310 | Line 313
313		<delete dir="@{workdir}/JTwork"   quiet="true"/>
314		<delete dir="@{workdir}/JTreport" quiet="true"/>
315		<mkdir dir="@{workdir}/JTwork/scratch"/>
316	<	<mkdir dir="@{workdir}/JTreport"/>
316	>	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
317	>	<mkdir dir="@{workdir}/JTreport/html"/>
318	>	<mkdir dir="@{workdir}/JTreport/text"/>
319		<jtreg dir="${jtreg@{target}.src.dir}"
320		jdk="${jdk@{target}.home}"
321		workDir="@{workdir}/JTwork"
#	Line 324 | Line 329
329		<arg value="-automatic"/>
330		<arg value="-k:!ignore"/>
331		<arg line="@{jtregflags}"/>
332	+	<arg line="${jtreg.flags}"/>
333		</jtreg>
334		</sequential>
335		</macrodef>
#	Line 386 | Line 392
392		<compilerarg line="${build.args}"/>
393
394		</javac>
395	+
396	+	<!-- We need jdk9's Contended annotation, but at compile time only -->
397	+	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
398		</target>
399
400
#	Line 596 | Line 605
605		debuglevel="${build.debuglevel}"
606		deprecation="${build.deprecation}"
607		source="${build.sourcelevel}"
608	+	target="${build.sourcelevel}"
609		fork="true">
610
611		<compilerarg line="${build.args}"/>
#	Line 651 | Line 661
661		debuglevel="${build.debuglevel}"
662		deprecation="${build.deprecation}"
663		source="6"
664	+	target="6"
665		classpath=""
666		bootclasspath="${bootclasspath6}"
667		includeAntRuntime="false"
#	Line 680 | Line 691
691		debuglevel="${build.debuglevel}"
692		deprecation="${build.deprecation}"
693		source="6"
694	+	target="6"
695		classpath=""
696	<	bootclasspath="${bootclasspath7}"
696	>	bootclasspath="${bootclasspath6}"
697		includeAntRuntime="false"
698		includeJavaRuntime="false"
699		executable="${javac8}"
#	Line 847 | Line 859
859		classpath=""
860		bootclasspath="${bootclasspath6}"
861		source="5"
862	+	target="5"
863		includeAntRuntime="false"
864		includeJavaRuntime="false"
865		executable="${javac7}"
#	Line 1031 | Line 1044
1044		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1045		classpath=""
1046		source="6"
1047	+	target="6"
1048		includeAntRuntime="false"
1049		includeJavaRuntime="false"
1050		executable="${javac7}"
#	Line 1122 | Line 1136
1136		debuglevel="${build.debuglevel}"
1137		deprecation="${build.deprecation}"
1138		source="${build.jsr166e.java.version}"
1139	+	target="${build.jsr166e.java.version}"
1140		classpath=""
1141		includeAntRuntime="false"
1142		includeJavaRuntime="false"
#	Line 1148 | Line 1163
1163		debuglevel="${build.debuglevel}"
1164		deprecation="${build.deprecation}"
1165		source="${build.jsr166e.java.version}"
1166	+	target="${build.jsr166e.java.version}"
1167		classpath=""
1168	<	bootclasspath="${bootclasspath7}"
1168	>	bootclasspath="${bootclasspath6}"
1169		includeAntRuntime="false"
1170		includeJavaRuntime="false"
1171		executable="${javac8}"

Diff Legend

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