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.273 by jsr166, Fri Jun 22 17:45:02 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 191 | Line 192
192		<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
193		<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
194		<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
195	<	<!-- The location of jdk9 early access docs (RIP) -->
195	>	<property name="java10.docroot.url" value="https://docs.oracle.com/javase/10/docs"/>
196	>	<!-- The location of jdk early access docs (RIP) -->
197		<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
198	<	<!-- Default jdk doc location (latest stable release seems best) -->
197	<	<property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
198	>	<!-- <property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/> -->
199		<property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
200	<	<property name="java.docroot.url"   value="${java9.docroot.url}"/>
200	>	<!-- Default jdk doc location (latest stable release seems best) -->
201	>	<property name="java.docroot.url"   value="${java10.docroot.url}"/>
202
203		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
204		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 305 | Line 307
307		</macrodef>
308
309		<!-- Define jtreg test sets for different jdk versions -->
310	<	<fileset dir="${jtreg11.src.dir}">
311	<	<patternset id="jdk11.jtreg.tests">
312	<	<include name="**/*.java"/>
313	<	</patternset>
314	<	</fileset>
315	<
316	<	<fileset dir="${jtreg10.src.dir}">
317	<	<patternset id="jdk10.jtreg.tests">
318	<	<include name="**/*.java"/>
319	<	</patternset>
320	<	</fileset>
321	<
322	<	<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>
310	>	<!-- ant -Djtreg.test.pattern="**/ConcurrentHashMap/" -->
311	>	<!-- ant -Djtreg.test.pattern="**/ToArray.java" -->
312	>	<property name="jtreg.test.pattern" value="**/*.java"/>
313	>	<macrodef name="defjtregtests">
314	>	<attribute name="v"/>
315	>	<sequential>
316	>	<fileset dir="${jtreg@{v}.src.dir}">
317	>	<patternset id="jdk@{v}.jtreg.tests">
318	>	<include name="${jtreg.test.pattern}"/>
319	>	</patternset>
320	>	</fileset>
321	>	</sequential>
322	>	</macrodef>
323
324	<	<fileset dir="${jtreg7.src.dir}">
325	<	<patternset id="jdk7.jtreg.tests">
326	<	<include name="**/*.java"/>
327	<	</patternset>
328	<	</fileset>
324	>	<defjtregtests v="11"/>
325	>	<defjtregtests v="10"/>
326	>	<defjtregtests v="9"/>
327	>	<defjtregtests v="8"/>
328	>	<defjtregtests v="7"/>
329
330		<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
331		<property name="jtreg.flags" value=""/>
#	Line 396 | Line 388
388		<sequential>
389		<property name="build.main.java"    value="${java@{v}}"/>
390		<property name="build.main.javac"   value="${javac@{v}}"/>
391	<	<property name="build.main.javadoc" value="${javadoc@{v}}"/>
391	>	<!-- Force javadoc version to be at least 10,
392	>	so we can use override-methods=summary -->
393	>	<condition property="build.main.javadoc"
394	>	value="${javadoc11}"
395	>	else="${javadoc@{v}}">
396	>	<equals arg1="@{v}" arg2="9"/>
397	>	</condition>
398		</sequential>
399		</macrodef>
400		<define-build-main-properties v="${build.main.java.version}"/>
#	Line 490 | Line 488
488		<arg value="-XDignore.symbol.file=true"/>
489		<arg value="-html5"/>
490		<arg value="--patch-module=java.base=${src.dir}"/>
491	<	<arg value="-tag"/>
492	<	<arg value="${javadoc.jls.option}"/>
493	<	<!-- @apiNote currently unused -->
494	<	<!--       <arg value="-tag"/> -->
495	<	<!--       <arg value="apiNote:a:API Note:"/> -->
498	<	<arg value="-tag"/>
499	<	<arg value="implSpec:a:Implementation Requirements:"/>
500	<	<arg value="-tag"/>
501	<	<arg value="implNote:a:Implementation Note:"/>
491	>	<arg value="--override-methods=summary"/>
492	>	<arg value="-tag"/> <arg value="${javadoc.jls.option}"/>
493	>	<arg value="-tag"/> <arg value="implSpec:a:Implementation Requirements:"/>
494	>	<arg value="-tag"/> <arg value="implNote:a:Implementation Note:"/>
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 1383 | Line 1371
1371
1372		<!-- Find buglets that can be detected by static build tools -->
1373
1374	<	<target name="lint">
1375	<	<antcall target="dists">
1376	<	<param name="build.javadoc.access" value="public"/>
1377	<	</antcall>
1378	<	</target>
1374	>	<!--   <target name="lint"> -->
1375	>	<!--     <antcall target="dists"> -->
1376	>	<!--       <param name="build.javadoc.access" value="protected"/> -->
1377	>	<!--     </antcall> -->
1378	>	<!--   </target> -->
1379
1380		<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1381	<	<target name="lint-private">
1381	>	<target name="doclint-private">
1382		<antcall target="dist">
1383		<param name="build.javadoc.access" value="private"/>
1384		</antcall>
#	Line 1400 | Line 1388
1388		<!-- ==============================================================
1389		Experimental errorprone support - http://errorprone.info
1390		=================================================================== -->
1391	<	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1391	>	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.3.1.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	+	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1436	+	<compilerarg value="-J--illegal-access=permit"/>
1437	+	<compilerarg value="-XDcompilePolicy=simple"/>
1438		<compilerarg line="-processorpath ${errorprone.jar}"/>
1439		<compilerarg value="-Xplugin:ErrorProne
1440		${errorprone.jsr166.flags}"/>
#	Line 1463 | Line 1456
1456		workdir="${build.dir}"
1457		classes="${product.jar}">
1458		<javac-elements>
1459	+	<!-- Needed to silence -Xep:FutureReturnValueIgnored -->
1460	+	<compilerarg value="-J--illegal-access=permit"/>
1461	+	<compilerarg value="-XDcompilePolicy=simple"/>
1462		<compilerarg line="-processorpath ${errorprone.jar}"/>
1463		<compilerarg value="-Xplugin:ErrorProne
1464		${errorprone.jsr166.flags}
#	Line 1484 | Line 1480
1480		classes="${product.jar}"
1481		verbose="all">
1482		<jtreg-elements>
1483	<	<arg value="-javacoption:-XDcompilePolicy=byfile"/>
1483	>	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1484		<arg value="-javacoption:-processorpath"/>
1485		<arg value="-javacoption:${errorprone.jar}"/>
1486		<arg value="-javacoption:-Xplugin:ErrorProne
1487		${errorprone.jsr166.flags}
1488		${errorprone.jsr166.test.flags}
1489	+	-Xep:MultipleTopLevelClasses:WARN
1490		-Xep:NonAtomicVolatileUpdate:OFF"/>
1491		</jtreg-elements>
1492		</run-jtreg-tests>

Diff Legend

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