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.184 by jsr166, Wed Sep 30 15:30:46 2015 UTC vs.
Revision 1.190 by jsr166, Thu Nov 5 17:18:53 2015 UTC

#	Line 194 | Line 194
194		<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
195		classpath="${lib.dir}/jtreg.jar" />
196
197	–	<!-- Test classpath -->
198	–	<path id="test.classpath">
199	–	<pathelement location="${build.testcases.dir}"/>
200	–	<pathelement location="${junit.jar}"/>
201	–	</path>
202	–
197		<!-- Tck options; see JSR166TestCase.java
198		To profile a single tck test class:
199		ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
#	Line 242 | Line 236
236
237		<include name="*.java"/>
238		<compilerarg value="-XDignore.symbol.file=true"/>
239	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
239	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241		<compilerarg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
242		<compilerarg line="${build.args}"/>
#	Line 305 | Line 299
299
300		<sequential>
301
302	+	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
303	+	<property name="jtreg.verbose" value="nopass,fail,error"/>
304	+
305		<local name="modules"/>
306		<condition property="modules">
307		<available file="${jdk@{target}.home}/jmods" type="dir"/>
#	Line 322 | Line 319
319		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
320		<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
321		<arg value="-agentvm"/>
322	<	<arg value="-v:nopass,fail"/>
322	>	<arg value="-verbose:${jtreg.verbose}"/>
323		<arg value="-vmoptions:-esa -ea"/>
324		<arg value="-automatic"/>
325		<arg value="-k:!ignore"/>
#	Line 654 | Line 651
651		debuglevel="${build.debuglevel}"
652		deprecation="${build.deprecation}"
653		source="6"
654	+	target="6"
655		classpath=""
656		bootclasspath="${bootclasspath6}"
657		includeAntRuntime="false"
#	Line 683 | Line 681
681		debuglevel="${build.debuglevel}"
682		deprecation="${build.deprecation}"
683		source="6"
684	+	target="6"
685		classpath=""
686	<	bootclasspath="${bootclasspath7}"
686	>	bootclasspath="${bootclasspath6}"
687		includeAntRuntime="false"
688		includeJavaRuntime="false"
689		executable="${javac8}"
#	Line 850 | Line 849
849		classpath=""
850		bootclasspath="${bootclasspath6}"
851		source="5"
852	+	target="5"
853		includeAntRuntime="false"
854		includeJavaRuntime="false"
855		executable="${javac7}"
#	Line 939 | Line 939
939		debuglevel="${build.debuglevel}"
940		deprecation="${build.deprecation}"
941		source="6"
942	+	target="6"
943		classpath=""
944		bootclasspath="${bootclasspath6}"
945		includeAntRuntime="false"
#	Line 1033 | Line 1034
1034		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1035		classpath=""
1036		source="6"
1037	+	target="6"
1038		includeAntRuntime="false"
1039		includeJavaRuntime="false"
1040		executable="${javac7}"
#	Line 1124 | Line 1126
1126		debuglevel="${build.debuglevel}"
1127		deprecation="${build.deprecation}"
1128		source="${build.jsr166e.java.version}"
1129	+	target="${build.jsr166e.java.version}"
1130		classpath=""
1131		includeAntRuntime="false"
1132		includeJavaRuntime="false"
#	Line 1150 | Line 1153
1153		debuglevel="${build.debuglevel}"
1154		deprecation="${build.deprecation}"
1155		source="${build.jsr166e.java.version}"
1156	+	target="${build.jsr166e.java.version}"
1157		classpath=""
1158	<	bootclasspath="${bootclasspath7}"
1158	>	bootclasspath="${bootclasspath6}"
1159		includeAntRuntime="false"
1160		includeJavaRuntime="false"
1161		executable="${javac8}"

Diff Legend

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