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.234 by jsr166, Sat Feb 18 18:33:42 2017 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 18 | Line 19
19		itself.  Because the JDK version matters and because different
20		targets require different JDKs, we assume that users have created a
21		hierarchy containing:
21	–	$HOME/jdk/jdk7
22		$HOME/jdk/jdk8
23		$HOME/jdk/jdk9
24		$HOME/jdk/jdk10
25	+	$HOME/jdk/jdk11
26		where each of the above is a JDK or a symlink to same, and
26	–	$HOME/jdk/src/jdk7
27		$HOME/jdk/src/jdk8
28		$HOME/jdk/src/jdk9
29		$HOME/jdk/src/jdk10
30	+	$HOME/jdk/src/jdk11
31		where each of the above is a complete JDK source tree
32		(e.g. mercurial forest) or a symlink to same.
33
34		Alternatively, define ant variables thus:
35		ant -Djdk$N.home=... -Djdk$N.src.home=...
36	<	for $N in 7 8 9 10 ...
36	>	for $N in 8 9 10 ...
37
38		As of 2016-03, the sources in src/main are for jdk9+ only.
39		------------------------------------------------------------------------------
#	Line 134 | Line 135
135		<defjdklocations v="8"/>
136		<defjdklocations v="9"/>
137		<defjdklocations v="10"/>
138	+	<defjdklocations v="11"/>
139
140		<!-- Source locations -->
141		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 144 | Line 146
146		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
147		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
148		<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
149	+	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
150		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
151		<property name="lib.dir"              location="${basedir}/lib"/>
152		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 183 | Line 186
186		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
187
188		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
189	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
190	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
191	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
192	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
193	<	<!-- The expected canonical location does not yet exist as of 2016-04 -->
194	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
195	<	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
189	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
190	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
191	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
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) -->
196	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
197		<!-- Default jdk doc location (latest stable release seems best) -->
198	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
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}"/>
201
202		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
203		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 199 | Line 205
205		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
206		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
207		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
208	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
209	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
210		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
211
212		<!-- Define the "jtreg" task -->
#	Line 234 | Line 242
242		<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
243		</condition>
244
245	+	<local name="use-doclint"/>
246	+	<condition property="use-doclint">
247	+	<not> <equals arg1="@{target}" arg2="7"/> </not>
248	+	</condition>
249	+
250		<mkdir dir="@{workdir}/tck-classes"/>
251
252		<javac srcdir="@{tck.src.dir}"
#	Line 253 | Line 266
266		<include name="*.java"/>
267		<compilerarg value="-XDignore.symbol.file=true"/>
268		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
269	+	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
270		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
271		<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
272		<compilerarg line="${build.args}"/>
#	Line 292 | Line 306
306		</macrodef>
307
308		<!-- Define jtreg test sets for different jdk versions -->
309	<	<fileset dir="${jtreg9.src.dir}">
310	<	<patternset id="jdk9.jtreg.tests">
311	<	<include name="**/*.java"/>
312	<	</patternset>
313	<	</fileset>
314	<
315	<	<fileset dir="${jtreg8.src.dir}">
316	<	<patternset id="jdk8.jtreg.tests">
317	<	<include name="**/*.java"/>
318	<	</patternset>
319	<	</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=""/>
331
332		<macrodef name="run-jtreg-tests">
333		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
318	–	<attribute name="source" default="7"/>
334		<attribute name="target"/>
335		<attribute name="workdir"/>
336		<attribute name="classes"/>
337	+	<attribute name="verbose" default="${jtreg.verbose}"/>
338		<attribute name="jtregflags" default=""/>
339	+	<element name="jtreg-elements" optional="true"/>
340
341		<sequential>
342
#	Line 337 | Line 354
354		workDir="@{workdir}/JTwork">
355		<patternset refid="jdk@{target}.jtreg.tests"/>
356		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
357	<	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
358	<	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
357	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
358	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
359		<arg value="-agentvm"/>
360		<arg value="-noreport"/>
361	<	<arg value="-verbose:${jtreg.verbose}"/>
361	>	<arg value="-verbose:@{verbose}"/>
362		<arg value="-vmoptions:-esa -ea"/>
363		<arg value="-automatic"/>
364		<arg value="-k:!ignore"/>
365		<arg line="@{jtregflags}"/>
366		<arg line="${jtreg.flags}"/>
367	+	<jtreg-elements/>
368		</jtreg>
369		</sequential>
370		</macrodef>
#	Line 363 | Line 381
381		<!-- Main targets -->
382
383		<property name="build.main.java.version" value="9"/>
384	<	<property name="build.main.javac" value="${javac9}"/>
384	>	<!-- Workaround "no nested properties in ant" -->
385	>	<macrodef name="define-build-main-properties">
386	>	<attribute name="v"/>
387	>	<sequential>
388	>	<property name="build.main.java"    value="${java@{v}}"/>
389	>	<property name="build.main.javac"   value="${javac@{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}"/>
400
401		<target name="dists"
402	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
402	>	depends="dist, 4jdk8dist"
403		description="Builds all public jars and docs"/>
404	+	<!--
405	+	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
406	+	-->
407
408		<target name="compile"
409		depends="configure-compiler"
410		description="Compiles src/main sources to build dir">
411
376	–	<local name="modules"/>
377	–	<condition property="modules">
378	–	<and>
379	–	<available file="${jdk9.home}/jmods" type="dir"/>
380	–	<equals arg1="9" arg2="${build.main.java.version}"/>
381	–	</and>
382	–	</condition>
383	–
412		<local name="destdir"/>
413	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
386	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
413	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
414
415		<mkdir dir="${destdir}"/>
416
#	Line 400 | Line 427
427		fork="true">
428
429		<include name="**/*.java"/>
430	<	<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
430	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
431		<compilerarg value="-Xprefer:source"/>
432		<compilerarg value="-XDignore.symbol.file=true"/>
433		<compilerarg value="-Xlint:all"/>
434	+	<compilerarg line="--doclint-format html5"/>
435	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
436		<compilerarg value="-Werror"/>
408	–	<compilerarg value="-Xdoclint:all/protected"/>
437		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
438		<compilerarg line="${build.args}"/>
439
#	Line 449 | Line 477
477		access="${build.javadoc.access}"
478		sourcepath="${src.dir}"
479		classpath=""
480	<	executable="${javadoc9}">
480	>	source="9"
481	>	executable="${build.main.javadoc}">
482		<fileset dir="${src.dir}" defaultexcludes="yes">
483		<include name="**/*.java"/>
484		</fileset>
485		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
486		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
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"/>
466	<	<arg value="implSpec:a:Implementation Requirements:"/>
467	<	<arg value="-tag"/>
468	<	<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"/> -->
472	<	<!--       <arg value="-tag"/> -->
473	<	<!--       <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 504 | Line 529
529
530		<target name="clean"
531		description="Removes all build products">
507	–
532		<delete dir="${build.dir}"/>
509	–
533		</target>
534
535
536		<target name="dist-clean"
537		description="Removes all build and distribution products">
515	–
538		<delete dir="${build.dir}"/>
539		<delete dir="${dist.dir}"/>
518	–
540		</target>
541
542
#	Line 536 | Line 557
557		<run-tck-tests
558		target="${build.main.java.version}"
559		workdir="${build.dir}"
560	<	classes="${product.jar}"/>
560	>	classes="${product.jar}">
561	>	<javac-elements>
562	>	<compilerarg value="-Werror"/>
563	>	</javac-elements>
564	>	</run-tck-tests>
565		</target>
566
567		<target name="tck-parallelism-1"
#	Line 571 | Line 596
596
597		<target name="test"
598		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
599	<	description="Runs tck and jtreg tests for src/main">
575	<	</target>
599	>	description="Runs tck and jtreg tests for src/main"/>
600
601		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
602
#	Line 583 | Line 607
607
608		<!--   </target> -->
609
610	<	<!--   <target name="test89" -->
611	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
610	>	<target name="test91011"
611	>	description="Runs tck and jtreg tests for src/main for multiple java versions">
612
613	<	<!--     <antcall target="clean"/> -->
614	<	<!--     <antcall target="test"> -->
615	<	<!--       <param name="build.main.java.version" value="8"/> -->
616	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
593	<	<!--     </antcall> -->
613	>	<antcall target="clean"/>
614	>	<antcall target="test">
615	>	<param name="build.main.java.version" value="9"/>
616	>	</antcall>
617
618	<	<!--     <antcall target="clean"/> -->
619	<	<!--     <antcall target="test"> -->
620	<	<!--       <param name="build.main.java.version" value="9"/> -->
621	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
599	<	<!--     </antcall> -->
618	>	<antcall target="clean"/>
619	>	<antcall target="test">
620	>	<param name="build.main.java.version" value="10"/>
621	>	</antcall>
622
623	<	<!--   </target> -->
623	>	<antcall target="clean"/>
624	>	<antcall target="test">
625	>	<param name="build.main.java.version" value="11"/>
626	>	</antcall>
627	>
628	>	<!-- Clean up to avoid obscure wrong class file version bugs -->
629	>	<antcall target="clean"/>
630	>
631	>	</target>
632
633
634
635		<target name="configure-compiler">
636		<fail message="ant version too old">
637	<	<condition>
608	<	<not> <antversion atleast="1.9.1"/> </not>
609	<	</condition>
637	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
638		</fail>
639
640		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 652 | Line 680
680		<java classname="ALoops" fork="true">
681		<classpath refid="loops.classpath"/>
682		</java>
655	–
683		</target>
684
685
686		<target name="compile-test-loops" depends="jar"
687	<	description="compile all the perf tests in src/test/loops">
687	>	description="Compiles all the perf tests in src/test/loops">
688
689		<mkdir dir="${build.dir}/test/loops"/>
690
#	Line 669 | Line 696
696		includeAntRuntime="false"
697		includeJavaRuntime="false"
698		encoding="ASCII"
699	<	executable="${javac9}"
699	>	executable="${build.main.javac}"
700		fork="true">
701
702		<include name="*.java"/>
#	Line 677 | Line 704
704		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
705		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
706		<compilerarg line="${build.args}"/>
680	–
707		</javac>
682	–
708		</target>
709
710
#	Line 705 | Line 730
730		encoding="ASCII"
731		executable="${javac8}"
732		fork="true">
708	–
733		<include name="**/*.java"/>
734		<compilerarg value="-Xprefer:source"/>
735		<compilerarg value="-XDignore.symbol.file=true"/>
736		<compilerarg value="-Xlint:all"/>
737		<compilerarg value="-Werror"/>
738		<compilerarg line="${build.args}"/>
715	–
739		</javac>
740		</target>
741
#	Line 736 | Line 759
759		encoding="ASCII"
760		executable="${javac8}"
761		fork="true">
739	–
762		<include name="**/*.java"/>
763		<compilerarg value="-Xprefer:source"/>
764		<compilerarg value="-XDignore.symbol.file=true"/>
765		<compilerarg value="-Xlint:all"/>
766	<	<compilerarg value="-Xdoclint:all/protected"/>
766	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
767		<compilerarg line="${build.args}"/>
746	–
768		</javac>
769		</target>
770
#	Line 759 | Line 780
780		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
781		</manifest>
782		</jar>
762	–
783		</target>
784
785
#	Line 775 | Line 795
795		<!-- JDK9+ test classes -->
796		<exclude name="*9Test.java"/>
797		<exclude name="*10Test.java"/>
798	+	<compilerarg value="-Werror"/>
799		</javac-elements>
800		</run-tck-tests>
801		</target>
#	Line 792 | Line 813
813
814		<target name="4jdk8-test"
815		depends="4jdk8-tck, 4jdk8-jtreg"
816	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
796	<	</target>
816	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
817
818
819		<target name="4jdk8docs"
#	Line 809 | Line 829
829		access="${build.javadoc.access}"
830		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
831		classpath=""
832	+	source="8"
833		executable="${javadoc8}"
834		failonerror = "true">
835		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 816 | 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;"/> -->
824	<	<arg value="-tag"/>
825	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
826	<	<arg value="-tag"/>
827	<	<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 836 | Line 853
853
854		<target name="4jdk8clean"
855		description="Removes all 4jdk8 build products">
839	–
856		<delete dir="${build.4jdk8.dir}"/>
841	–
857		</target>
858
859
#	Line 854 | Line 869
869		</target>
870
871
872	+	<!-- jsr166 4jdk7 (no longer maintained) -->
873
874	<	<!-- jsr166 4jdk7 -->
859	<
860	<	<target name="4jdk7compile"
861	<	depends="configure-compiler"
862	<	description="Compiles src/jdk7 sources, targeting jdk7">
863	<
874	>	<target name="4jdk7compile" depends="configure-compiler">
875		<mkdir dir="${build.4jdk7.classes.dir}"/>
876
877		<javac srcdir="${4jdk7src.dir}"
#	Line 884 | Line 895
895		<compilerarg value="-Xlint:all"/>
896		<compilerarg value="-Werror"/>
897		<compilerarg line="${build.args}"/>
887	–
898		</javac>
899		</target>
900
901	<	<target name="4jdk7doclint"
892	<	depends="configure-compiler"
893	<	description="Finds doclint warnings">
894	<
901	>	<target name="4jdk7doclint" depends="configure-compiler">
902		<mkdir dir="${build.4jdk7.classes.dir}"/>
903
904		<javac srcdir="${4jdk7src.dir}"
#	Line 915 | Line 922
922		<compilerarg value="-Xlint:all"/>
923		<compilerarg value="-Xdoclint:all/protected"/>
924		<compilerarg line="${build.args}"/>
918	–
925		</javac>
926		</target>
927
928	<
923	<	<target name="4jdk7jar"
924	<	depends="4jdk7compile"
925	<	description="Builds library jar from compiled sources">
926	<
928	>	<target name="4jdk7jar" depends="4jdk7compile">
929		<jar destfile="${4jdk7product.jar}">
930		<fileset dir="${build.4jdk7.classes.dir}"/>
931		<manifest>
#	Line 931 | Line 933
933		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
934		</manifest>
935		</jar>
934	–
936		</target>
937
938	<
938	<	<target name="4jdk7-tck"
939	<	depends="4jdk7jar"
940	<	description="Runs tck tests for jsr166-4jdk7 directly">
941	<
938	>	<target name="4jdk7-tck" depends="4jdk7jar">
939		<run-tck-tests
940		target="7"
941		workdir="${build.4jdk7.dir}"
#	Line 956 | Line 953
953		<exclude name="SplittableRandomTest.java"/>
954		<exclude name="StampedLockTest.java"/>
955		<exclude name="SubmissionPublisherTest.java"/>
956	+	<compilerarg value="-Werror"/>
957		</javac-elements>
958		</run-tck-tests>
959		</target>
960
963	–
961		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
962	<	<target name="4jdk7-tck-junit"
966	<	depends="4jdk7compile">
962	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
963
964		<junit printsummary="true"
965		showoutput="true"
#	Line 985 | Line 981
981
982		<test name="${jsr166.tckTestClass}" haltonfailure="no">
983		</test>
988	–
984		</junit>
985		</target>
986
987	<	<target name="4jdk7-jtreg"
993	<	depends="4jdk7jar"
994	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
987	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
988		<run-jtreg-tests
989		target="7"
990		workdir="${build.4jdk7.dir}"
991		classes="${4jdk7product.jar}"/>
992		</target>
993
994	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
995
996	<	<target name="4jdk7-test"
1003	<	depends="4jdk7-tck, 4jdk7-jtreg"
1004	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
1005	<	</target>
1006	<
1007	<
1008	<	<target name="4jdk7docs"
1009	<	description="Builds javadocs for src/jdk7 to dist dir">
1010	<
996	>	<target name="4jdk7docs">
997		<delete dir="${4jdk7docs.dir}"/>
998		<mkdir dir="${4jdk7docs.dir}"/>
999
#	Line 1028 | Line 1014
1014		</javadoc>
1015		</target>
1016
1017	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1018
1019	<	<target name="4jdk7dist"
1033	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1034	<	description="Puts all distributable products in single hierarchy"/>
1035	<
1036	<
1037	<	<target name="4jdk7clean"
1038	<	description="Removes all 4jdk7 build products">
1039	<
1019	>	<target name="4jdk7clean">
1020		<delete dir="${build.4jdk7.dir}"/>
1041	–
1021		</target>
1022
1023	<
1045	<	<target name="4jdk7dist-jar"
1046	<	depends="4jdk7clean, 4jdk7jar">
1023	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1024		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1025		</target>
1026
1027	<
1051	<	<target name="4jdk7dist-docs"
1052	<	depends="4jdk7clean, 4jdk7docs">
1027	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1028		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1029		</target>
1030
1031
1032	<	<!-- jsr166x -->
1058	<
1059	<	<target name="jsr166xcompile"
1060	<	depends="configure-compiler"
1061	<	description="Compiles jsr166x sources to build dir">
1032	>	<!-- jsr166x (no longer maintained) -->
1033
1034	+	<target name="jsr166xcompile" depends="configure-compiler">
1035		<mkdir dir="${build.jsr166x.classes.dir}"/>
1036
1037		<javac srcdir="${topsrc.dir}"
#	Line 1076 | Line 1048
1048		encoding="ASCII"
1049		executable="${javac7}"
1050		fork="true">
1079	–
1051		<include name="jsr166x/**/*.java"/>
1052		<compilerarg value="-XDignore.symbol.file=true"/>
1053		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1054		<compilerarg value="-Werror"/>
1055		<compilerarg line="${build.args}"/>
1085	–
1056		</javac>
1057		</target>
1058
1059	<
1090	<	<target name="jsr166xjar"
1091	<	depends="jsr166xcompile"
1092	<	description="Builds library jar from compiled sources">
1093	<
1059	>	<target name="jsr166xjar" depends="jsr166xcompile">
1060		<jar destfile="${jsr166x.jar}">
1061		<fileset dir="${build.jsr166x.classes.dir}"/>
1062		<manifest>
#	Line 1098 | Line 1064
1064		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1065		</manifest>
1066		</jar>
1101	–
1067		</target>
1068
1069	<
1105	<	<target name="jsr166xdocs"
1106	<	description="Builds javadocs to dist dir">
1107	<
1069	>	<target name="jsr166xdocs">
1070		<delete dir="${jsr166xdocs.dir}"/>
1071		<mkdir dir="${jsr166xdocs.dir}"/>
1072
#	Line 1119 | Line 1081
1081		failonerror = "true">
1082		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1083		<arg value="-XDignore.symbol.file=true"/>
1122	–
1084		</javadoc>
1085		</target>
1086
1087	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1088
1089	<	<target name="jsr166xdist"
1128	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1129	<	description="Puts all distributable products in single hierarchy"/>
1130	<
1131	<
1132	<	<target name="jsr166xclean"
1133	<	description="Removes all jsr166x build products">
1134	<
1089	>	<target name="jsr166xclean">
1090		<delete dir="${build.jsr166x.dir}"/>
1136	–
1091		</target>
1092
1093	<
1140	<	<target name="jsr166xdist-jar"
1141	<	depends="jsr166xclean, jsr166xjar">
1093	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1094		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1095		</target>
1096
1097	<	<target name="jsr166xdist-docs"
1146	<	depends="jsr166xclean, jsr166xdocs">
1097	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1098		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1099		</target>
1100
1150	–	<!-- jsr166y -->
1101
1102	+	<!-- jsr166y (no longer maintained) -->
1103
1104	<	<target name="jsr166ycompile"
1154	<	depends="configure-compiler"
1155	<	description="Compiles jsr166y sources">
1156	<
1104	>	<target name="jsr166ycompile" depends="configure-compiler">
1105		<mkdir dir="${build.jsr166y.classes.dir}"/>
1106
1107		<javac srcdir="${topsrc.dir}"
#	Line 1176 | Line 1124
1124		<compilerarg value="-Xlint:all"/>
1125		<compilerarg value="-Werror"/>
1126		<compilerarg line="${build.args}"/>
1179	–
1127		</javac>
1128		</target>
1129
1130	<
1184	<	<target name="jsr166yjar"
1185	<	depends="jsr166ycompile"
1186	<	description="Builds library jar from compiled sources">
1187	<
1130	>	<target name="jsr166yjar" depends="jsr166ycompile">
1131		<jar destfile="${jsr166y.jar}" index="true">
1132		<fileset dir="${build.jsr166y.classes.dir}"/>
1133		<manifest>
#	Line 1192 | Line 1135
1135		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1136		</manifest>
1137		</jar>
1195	–
1138		</target>
1139
1140	<
1199	<	<target name="jsr166ydocs"
1200	<	description="Builds javadocs to dist dir">
1201	<
1140	>	<target name="jsr166ydocs">
1141		<delete dir="${jsr166ydocs.dir}"/>
1142		<mkdir dir="${jsr166ydocs.dir}"/>
1143
#	Line 1213 | Line 1152
1152		failonerror = "true">
1153		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1154		<arg value="-XDignore.symbol.file=true"/>
1216	–
1155		</javadoc>
1156		</target>
1157
1158	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1159
1160	<	<target name="jsr166ydist"
1222	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1223	<	description="Puts all distributable products in single hierarchy"/>
1224	<
1225	<
1226	<	<target name="jsr166yclean"
1227	<	description="Removes all jsr166y build products">
1228	<
1160	>	<target name="jsr166yclean">
1161		<delete dir="${build.jsr166y.dir}"/>
1230	–
1162		</target>
1163
1164	<
1234	<	<target name="jsr166ydist-jar"
1235	<	depends="jsr166yclean, jsr166yjar">
1164	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1165		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1166		</target>
1167
1168	<	<target name="jsr166ydist-docs"
1240	<	depends="jsr166yclean, jsr166ydocs">
1168	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1169		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1170		</target>
1171
1172
1173	<	<!-- extra166y -->
1246	<
1247	<
1248	<	<target name="extra166ycompile"
1249	<	depends="configure-compiler, jsr166yjar"
1250	<	description="Compiles extra166y sources">
1173	>	<!-- extra166y (no longer maintained) -->
1174
1175	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1176		<mkdir dir="${build.extra166y.classes.dir}"/>
1177
1178		<javac srcdir="${topsrc.dir}"
#	Line 1271 | Line 1195
1195		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1196		<compilerarg value="-Werror"/>
1197		<compilerarg line="${build.args}"/>
1274	–
1198		</javac>
1199		</target>
1200
1201	<
1279	<	<target name="extra166yjar"
1280	<	depends="extra166ycompile"
1281	<	description="Builds library jar from compiled sources">
1282	<
1201	>	<target name="extra166yjar" depends="extra166ycompile">
1202		<jar destfile="${extra166y.jar}" index="true">
1203		<fileset dir="${build.extra166y.classes.dir}"/>
1204		<manifest>
#	Line 1287 | Line 1206
1206		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1207		</manifest>
1208		</jar>
1290	–
1209		</target>
1210
1211	<
1294	<	<target name="extra166ydocs"
1295	<	description="Builds javadocs to build dir">
1296	<
1211	>	<target name="extra166ydocs">
1212		<delete dir="${extra166ydocs.dir}"/>
1213		<mkdir dir="${extra166ydocs.dir}"/>
1214
#	Line 1307 | Line 1222
1222		executable="${javadoc7}">
1223		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1224		<arg value="-XDignore.symbol.file=true"/>
1310	–
1225		</javadoc>
1226		</target>
1227
1228	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1229
1230	<	<target name="extra166ydist"
1316	<	depends="extra166ydist-jar, extra166ydist-docs"
1317	<	description="Puts all distributable products in single hierarchy"/>
1318	<
1319	<
1320	<	<target name="extra166yclean"
1321	<	description="Removes all extra166y build products">
1322	<
1230	>	<target name="extra166yclean">
1231		<delete dir="${build.extra166y.dir}"/>
1324	–
1232		</target>
1233
1234	<
1328	<	<target name="extra166ydist-jar"
1329	<	depends="extra166yclean, extra166yjar">
1234	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1235		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1236		</target>
1237
1238	<	<target name="extra166ydist-docs"
1334	<	depends="extra166yclean, extra166ydocs">
1238	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1239		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1240		</target>
1241
1242	<	<!-- jsr166e -->
1242	>
1243	>	<!-- jsr166e (no longer maintained) -->
1244
1245		<property name="build.jsr166e.java.version" value="6"/>
1246		<property name="build.jsr166e.javac" value="${javac6}"/>
1247
1248	<	<target name="jsr166ecompile"
1344	<	depends="configure-compiler"
1345	<	description="Compiles jsr166e sources">
1346	<
1248	>	<target name="jsr166ecompile" depends="configure-compiler">
1249		<mkdir dir="${build.jsr166e.classes.dir}"/>
1250
1251		<javac srcdir="${topsrc.dir}"
#	Line 1364 | Line 1266
1266		<compilerarg value="-Xlint:all"/>
1267		<compilerarg value="-Werror"/>
1268		<compilerarg line="${build.args}"/>
1367	–
1269		</javac>
1270		</target>
1271
1371	–	<!-- jsr166e: find doclint errors -->
1272		<target name="jsr166edoclint">
1373	–
1273		<mkdir dir="${build.jsr166e.classes.dir}"/>
1274
1275		<javac srcdir="${topsrc.dir}"
#	Line 1392 | Line 1291
1291		<compilerarg value="-Xlint:all"/>
1292		<compilerarg value="-Werror"/>
1293		<compilerarg value="-Xdoclint:all/protected"/>
1395	–
1294		</javac>
1295		</target>
1296
1297	<
1400	<	<target name="jsr166ejar"
1401	<	depends="jsr166ecompile"
1402	<	description="Builds library jar from compiled sources">
1403	<
1297	>	<target name="jsr166ejar" depends="jsr166ecompile">
1298		<jar destfile="${jsr166e.jar}" index="true">
1299		<fileset dir="${build.jsr166e.classes.dir}"/>
1300		<manifest>
#	Line 1408 | Line 1302
1302		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1303		</manifest>
1304		</jar>
1411	–
1305		</target>
1306
1307	<
1415	<	<target name="jsr166edocs"
1416	<	description="Builds javadocs to build dir">
1417	<
1307	>	<target name="jsr166edocs">
1308		<delete dir="${jsr166edocs.dir}"/>
1309		<mkdir dir="${jsr166edocs.dir}"/>
1310
#	Line 1428 | Line 1318
1318		failonerror = "true">
1319		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1320		<arg value="-XDignore.symbol.file=true"/>
1431	–
1321		</javadoc>
1322		</target>
1323
1324	<
1436	<	<target name="jsr166e-tck-one-java-version"
1437	<	depends="jsr166ejar">
1438	<
1324	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1325		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1440	–
1326		<run-tck-tests
1327		tck.src.dir="${test.src.dir}/tck-jsr166e"
1328		target="${build.jsr166e.java.version}"
#	Line 1445 | Line 1330
1330		classes="${jsr166e.jar}"/>
1331		</target>
1332
1333	<	<target name="jsr166e-tck"
1449	<	description="Runs tck tests for jsr166e for multiple java versions">
1333	>	<target name="jsr166e-tck">
1334
1335		<!--     <antcall target="clean"/> -->
1336		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1467 | Line 1351
1351		</antcall>
1352		</target>
1353
1354	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1355
1356	<	<target name="jsr166e-test"
1472	<	depends="jsr166e-tck"
1473	<	description="Runs all tests for jsr166e">
1474	<	</target>
1475	<
1476	<	<target name="jsr166edist"
1477	<	depends="jsr166edist-jar, jsr166edist-docs"
1478	<	description="Puts all distributable products in single hierarchy"/>
1356	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1357
1358	<
1481	<	<target name="jsr166eclean"
1482	<	description="Removes all jsr166e build products">
1358	>	<target name="jsr166eclean">
1359		<delete dir="${build.jsr166e.dir}"/>
1360		</target>
1361
1486	–
1362		<target name="jsr166edist-jar"
1363		depends="jsr166eclean, jsr166ejar">
1364		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1365		</target>
1366
1367	<	<target name="jsr166edist-docs"
1493	<	depends="jsr166eclean, jsr166edocs">
1367	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1368		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1369		</target>
1370
#	Line 1510 | Line 1384
1384		</antcall>
1385		</target>
1386
1387	+
1388	+	<!-- ==============================================================
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
1396	+	-Xep:MissingOverride:OFF
1397	+	-Xep:MissingFail:OFF
1398	+	-Xep:MixedArrayDimensions:ERROR
1399	+	-Xep:RemoveUnusedImports:ERROR
1400	+	-Xep:EmptyIf:ERROR
1401	+	-Xep:MultipleTopLevelClasses:ERROR
1402	+	-Xep:ClassName:ERROR
1403	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1404	+	-Xep:RedundantThrows:ERROR
1405	+	-Xep:IdentityBinaryExpression: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
1411	+	-Xep:BoxedPrimitiveConstructor:OFF
1412	+	-Xep:ModifyingCollectionWithItself:OFF"/>
1413	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1414	+	<target name="errorprone"
1415	+	depends="clean, configure-compiler"
1416	+	description="Run errorprone over jsr166 source code (experimental)">
1417	+
1418	+	<local name="destdir"/>
1419	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1420	+	<mkdir dir="${destdir}"/>
1421	+
1422	+	<javac srcdir="${src.dir}"
1423	+	destdir="${destdir}"
1424	+	debug="${build.debug}"
1425	+	debuglevel="${build.debuglevel}"
1426	+	deprecation="${build.deprecation}"
1427	+	classpath=""
1428	+	includeAntRuntime="false"
1429	+	includeJavaRuntime="false"
1430	+	encoding="ASCII"
1431	+	executable="${build.main.javac}"
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}"/>
1439	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1440	+	<compilerarg value="-Xprefer:source"/>
1441	+	<compilerarg value="-XDignore.symbol.file=true"/>
1442	+	<compilerarg value="-Xlint:all"/>
1443	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1444	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1445	+	<compilerarg line="${build.args}"/>
1446	+	</javac>
1447	+
1448	+	<jar destfile="${product.jar}">
1449	+	<fileset dir="${destdir}"/>
1450	+	</jar>
1451	+
1452	+	<run-tck-tests
1453	+	target="${build.main.java.version}"
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}
1461	+	${errorprone.jsr166.test.flags}"/>
1462	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1463	+	</javac-elements>
1464	+	</run-tck-tests>
1465	+	</target>
1466	+
1467	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1468	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1469	+	<target name="errorprone-jtreg"
1470	+	depends="jar"
1471	+	description="Run errorprone over jtreg tests (experimental)">
1472	+
1473	+	<run-jtreg-tests
1474	+	target="${build.main.java.version}"
1475	+	workdir="${build.dir}"
1476	+	classes="${product.jar}"
1477	+	verbose="all">
1478	+	<jtreg-elements>
1479	+	<arg value="-javacoption:-XDcompilePolicy=simple"/>
1480	+	<arg value="-javacoption:-processorpath"/>
1481	+	<arg value="-javacoption:${errorprone.jar}"/>
1482	+	<arg value="-javacoption:-Xplugin:ErrorProne
1483	+	${errorprone.jsr166.flags}
1484	+	${errorprone.jsr166.test.flags}
1485	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1486	+	</jtreg-elements>
1487	+	</run-jtreg-tests>
1488	+	</target>
1489	+
1490	+
1491		<!-- ==============================================================
1492		Running guava tests against jsr166 code
1493		=================================================================== -->
#	Line 1562 | Line 1540
1540		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1541		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1542		<junit printsummary="true" showoutput="true" haltonfailure="true"
1543	<	jvm="${java9}" fork="true">
1544	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1543	>	jvm="${build.main.java}" fork="true">
1544	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1545		<formatter type="brief"/>
1546		<classpath>
1547		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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