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.263 by jsr166, Tue Jan 23 06:09:53 2018 UTC vs.
Revision 1.267 by jsr166, Tue Feb 27 21:18:06 2018 UTC

#	Line 1 | Line 1
1		<project name="jsr166" default="usage"
2	<	xmlns:if="ant:if" xmlns:unless="ant:unless"
2	>	xmlns:if="ant:if"
3	>	xmlns:unless="ant:unless"
4		xmlns:ivy="antlib:org.apache.ivy.ant">
5
6		<description>
#	Line 305 | Line 306
306		</macrodef>
307
308		<!-- Define jtreg test sets for different jdk versions -->
309	<	<fileset dir="${jtreg11.src.dir}">
310	<	<patternset id="jdk11.jtreg.tests">
311	<	<include name="**/*.java"/>
312	<	</patternset>
313	<	</fileset>
314	<
315	<	<fileset dir="${jtreg10.src.dir}">
316	<	<patternset id="jdk10.jtreg.tests">
317	<	<include name="**/*.java"/>
318	<	</patternset>
319	<	</fileset>
320	<
321	<	<fileset dir="${jtreg9.src.dir}">
321	<	<patternset id="jdk9.jtreg.tests">
322	<	<include name="**/*.java"/>
323	<	</patternset>
324	<	</fileset>
325	<
326	<	<fileset dir="${jtreg8.src.dir}">
327	<	<patternset id="jdk8.jtreg.tests">
328	<	<include name="**/*.java"/>
329	<	</patternset>
330	<	</fileset>
309	>	<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
310	>	<!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
311	>	<property name="jtreg.test.pattern" value="**/*.java"/>
312	>	<macrodef name="defjtregtests">
313	>	<attribute name="v"/>
314	>	<sequential>
315	>	<fileset dir="${jtreg@{v}.src.dir}">
316	>	<patternset id="jdk@{v}.jtreg.tests">
317	>	<include name="${jtreg.test.pattern}"/>
318	>	</patternset>
319	>	</fileset>
320	>	</sequential>
321	>	</macrodef>
322
323	<	<fileset dir="${jtreg7.src.dir}">
324	<	<patternset id="jdk7.jtreg.tests">
325	<	<include name="**/*.java"/>
326	<	</patternset>
327	<	</fileset>
323	>	<defjtregtests v="11"/>
324	>	<defjtregtests v="10"/>
325	>	<defjtregtests v="9"/>
326	>	<defjtregtests v="8"/>
327	>	<defjtregtests v="7"/>
328
329		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
330		<property name="jtreg.flags" value=""/>
#	Line 396 | Line 387
387		<sequential>
388		<property name="build.main.java"    value="${java@{v}}"/>
389		<property name="build.main.javac"   value="${javac@{v}}"/>
390	<	<property name="build.main.javadoc" value="${javadoc@{v}}"/>
390	>	<!-- Force javadoc version to be at least 10,
391	>	so we can use override-methods=summary -->
392	>	<condition property="build.main.javadoc"
393	>	value="${javadoc10}"
394	>	else="${javadoc@{v}}">
395	>	<equals arg1="@{v}" arg2="9"/>
396	>	</condition>
397		</sequential>
398		</macrodef>
399		<define-build-main-properties v="${build.main.java.version}"/>
#	Line 490 | Line 487
487		<arg value="-XDignore.symbol.file=true"/>
488		<arg value="-html5"/>
489		<arg value="--patch-module=java.base=${src.dir}"/>
490	<	<arg value="-tag"/>
491	<	<arg value="${javadoc.jls.option}"/>
492	<	<!-- @apiNote currently unused -->
493	<	<!--       <arg value="-tag"/> -->
494	<	<!--       <arg value="apiNote:a:API Note:"/> -->
495	<	<arg value="-tag"/>
499	<	<arg value="implSpec:a:Implementation Requirements:"/>
500	<	<arg value="-tag"/>
501	<	<arg value="implNote:a:Implementation Note:"/>
490	>	<arg value="--override-methods=summary"/>
491	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
492	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
493	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
494	>	<!-- @apiNote tag currently unused -->
495	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:API Note:"/> -->
496		<!-- tags added in jdk9: currently unused -->
497	<	<!--       <arg value="-tag"/> -->
498	<	<!--       <arg value="revised:X"/> -->
505	<	<!--       <arg value="-tag"/> -->
506	<	<!--       <arg value="spec:X"/> -->
497	>	<!--  <arg value="-tag"/> <arg value="revised:X"/> -->
498	>	<!--  <arg value="-tag"/> <arg value="spec:X"/> -->
499		</javadoc>
500		</target>
501
#	Line 845 | Line 837
837		</fileset>
838		<arg line="-Xdocrootparent ${java8.docroot.url}"/>
839		<arg value="-XDignore.symbol.file=true"/>
840	<	<arg value="-tag"/>
841	<	<arg value="${javadoc.jls.option}"/>
842	<	<!-- @apiNote currently unused -->
843	<	<!--       <arg value="-tag"/> -->
844	<	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
853	<	<arg value="-tag"/>
854	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
855	<	<arg value="-tag"/>
856	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
840	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
841	>	<arg value="-tag"/> <arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
842	>	<arg value="-tag"/> <arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
843	>	<!-- @apiNote tag currently unused -->
844	>	<!--  <arg value="-tag"/> <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
845		</javadoc>
846		</target>
847
#	Line 1401 | Line 1389
1389		Experimental errorprone support - http://errorprone.info
1390		=================================================================== -->
1391		<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1392	+	<property name="errorprone.jsr166.user.flags" value=""/>
1393		<property name="errorprone.jsr166.flags"
1394		value="-Xep:HashtableContains:OFF
1395		-Xep:JdkObsolete:OFF
#	Line 1414 | Line 1403
1403		-Xep:LongLiteralLowerCaseSuffix:ERROR
1404		-Xep:RedundantThrows:ERROR
1405		-Xep:IdentityBinaryExpression:WARN
1406	<	-Xep:MethodCanBeStatic:WARN"/>
1406	>	-Xep:MethodCanBeStatic:WARN
1407	>	${errorprone.jsr166.user.flags}"/>
1408		<!-- -Xep:WildcardImport:ERROR -->
1409		<property name="errorprone.jsr166.test.flags"
1410		value="-Xep:StringSplitter:OFF
#	Line 1442 | Line 1432
1432		fork="true">
1433
1434		<include name="**/*.java"/>
1435	+	<compilerarg value="-XDcompilePolicy=simple"/>
1436		<compilerarg line="-processorpath ${errorprone.jar}"/>
1437		<compilerarg value="-Xplugin:ErrorProne
1438		${errorprone.jsr166.flags}"/>
#	Line 1463 | Line 1454
1454		workdir="${build.dir}"
1455		classes="${product.jar}">
1456		<javac-elements>
1457	+	<compilerarg value="-XDcompilePolicy=simple"/>
1458		<compilerarg line="-processorpath ${errorprone.jar}"/>
1459		<compilerarg value="-Xplugin:ErrorProne
1460		${errorprone.jsr166.flags}
#	Line 1484 | Line 1476
1476		classes="${product.jar}"
1477		verbose="all">
1478		<jtreg-elements>
1479	<	<arg value="-javacoption:-XDcompilePolicy=byfile"/>
1479	>	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1480		<arg value="-javacoption:-processorpath"/>
1481		<arg value="-javacoption:${errorprone.jar}"/>
1482		<arg value="-javacoption:-Xplugin:ErrorProne

Diff Legend

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