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.255 by jsr166, Thu Sep 28 01:17:47 2017 UTC

#	Line 18 | Line 18
18		itself.  Because the JDK version matters and because different
19		targets require different JDKs, we assume that users have created a
20		hierarchy containing:
21	–	$HOME/jdk/jdk7
21		$HOME/jdk/jdk8
22		$HOME/jdk/jdk9
23		$HOME/jdk/jdk10
24		where each of the above is a JDK or a symlink to same, and
26	–	$HOME/jdk/src/jdk7
25		$HOME/jdk/src/jdk8
26		$HOME/jdk/src/jdk9
27		$HOME/jdk/src/jdk10
#	Line 32 | Line 30
30
31		Alternatively, define ant variables thus:
32		ant -Djdk$N.home=... -Djdk$N.src.home=...
33	<	for $N in 7 8 9 10 ...
33	>	for $N in 8 9 10 ...
34
35		As of 2016-03, the sources in src/main are for jdk9+ only.
36		------------------------------------------------------------------------------
#	Line 183 | Line 181
181		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
182
183		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
184	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
185	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
186	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
187	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
188	<	<!-- The expected canonical location does not yet exist as of 2016-04 -->
189	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
190	<	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
184	>	<property name="java5.docroot.url"  value="http://docs.oracle.com/javase/1.5.0/docs"/>
185	>	<property name="java6.docroot.url"  value="http://docs.oracle.com/javase/6/docs"/>
186	>	<property name="java7.docroot.url"  value="http://docs.oracle.com/javase/7/docs"/>
187	>	<property name="java8.docroot.url"  value="http://docs.oracle.com/javase/8/docs"/>
188	>	<property name="java9.docroot.url"  value="http://docs.oracle.com/javase/9/docs"/>
189	>	<!-- The location of jdk9 early access docs -->
190	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
191		<!-- Default jdk doc location (latest stable release seems best) -->
192	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
192	>	<property name="java.docroot.url"   value="${java9.docroot.url}"/>
193
194		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
195		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 234 | Line 232
232		<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
233		</condition>
234
235	+	<local name="use-doclint"/>
236	+	<condition property="use-doclint">
237	+	<not> <equals arg1="@{target}" arg2="7"/> </not>
238	+	</condition>
239	+
240		<mkdir dir="@{workdir}/tck-classes"/>
241
242		<javac srcdir="@{tck.src.dir}"
#	Line 253 | Line 256
256		<include name="*.java"/>
257		<compilerarg value="-XDignore.symbol.file=true"/>
258		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
259	+	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
260		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
261		<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
262		<compilerarg line="${build.args}"/>
#	Line 292 | Line 296
296		</macrodef>
297
298		<!-- Define jtreg test sets for different jdk versions -->
299	+	<fileset dir="${jtreg10.src.dir}">
300	+	<patternset id="jdk10.jtreg.tests">
301	+	<include name="**/*.java"/>
302	+	</patternset>
303	+	</fileset>
304	+
305		<fileset dir="${jtreg9.src.dir}">
306		<patternset id="jdk9.jtreg.tests">
307		<include name="**/*.java"/>
#	Line 315 | Line 325
325
326		<macrodef name="run-jtreg-tests">
327		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
318	–	<attribute name="source" default="7"/>
328		<attribute name="target"/>
329		<attribute name="workdir"/>
330		<attribute name="classes"/>
331	+	<attribute name="verbose" default="${jtreg.verbose}"/>
332		<attribute name="jtregflags" default=""/>
333	+	<element name="jtreg-elements" optional="true"/>
334
335		<sequential>
336
#	Line 337 | Line 348
348		workDir="@{workdir}/JTwork">
349		<patternset refid="jdk@{target}.jtreg.tests"/>
350		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
351	<	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
352	<	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
351	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
352	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
353		<arg value="-agentvm"/>
354		<arg value="-noreport"/>
355	<	<arg value="-verbose:${jtreg.verbose}"/>
355	>	<arg value="-verbose:@{verbose}"/>
356		<arg value="-vmoptions:-esa -ea"/>
357		<arg value="-automatic"/>
358		<arg value="-k:!ignore"/>
359		<arg line="@{jtregflags}"/>
360		<arg line="${jtreg.flags}"/>
361	+	<jtreg-elements/>
362		</jtreg>
363		</sequential>
364		</macrodef>
#	Line 363 | Line 375
375		<!-- Main targets -->
376
377		<property name="build.main.java.version" value="9"/>
378	<	<property name="build.main.javac" value="${javac9}"/>
378	>	<!-- Workaround "no nested properties in ant" -->
379	>	<macrodef name="define-build-main-properties">
380	>	<attribute name="v"/>
381	>	<sequential>
382	>	<property name="build.main.java"    value="${java@{v}}"/>
383	>	<property name="build.main.javac"   value="${javac@{v}}"/>
384	>	<property name="build.main.javadoc" value="${javadoc@{v}}"/>
385	>	</sequential>
386	>	</macrodef>
387	>	<define-build-main-properties v="${build.main.java.version}"/>
388
389		<target name="dists"
390	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
390	>	depends="dist, 4jdk8dist"
391		description="Builds all public jars and docs"/>
392	+	<!--
393	+	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
394	+	-->
395
396		<target name="compile"
397		depends="configure-compiler"
398		description="Compiles src/main sources to build dir">
399
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	–
400		<local name="destdir"/>
401	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
386	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
401	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
402
403		<mkdir dir="${destdir}"/>
404
#	Line 400 | Line 415
415		fork="true">
416
417		<include name="**/*.java"/>
418	<	<compilerarg value="--patch-module=java.base=${src.dir}" if:set="modules"/>
418	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
419		<compilerarg value="-Xprefer:source"/>
420		<compilerarg value="-XDignore.symbol.file=true"/>
421		<compilerarg value="-Xlint:all"/>
422	+	<compilerarg line="--doclint-format html5"/>
423	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
424		<compilerarg value="-Werror"/>
408	–	<compilerarg value="-Xdoclint:all/protected"/>
425		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
426		<compilerarg line="${build.args}"/>
427
#	Line 449 | Line 465
465		access="${build.javadoc.access}"
466		sourcepath="${src.dir}"
467		classpath=""
468	<	executable="${javadoc9}">
468	>	source="9"
469	>	executable="${build.main.javadoc}">
470		<fileset dir="${src.dir}" defaultexcludes="yes">
471		<include name="**/*.java"/>
472		</fileset>
473		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
474		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
475		<arg value="-XDignore.symbol.file=true"/>
476	+	<arg value="-html5"/>
477		<arg value="--patch-module=java.base=${src.dir}"/>
478		<arg value="-tag"/>
479		<arg value="${javadoc.jls.option}"/>
#	Line 504 | Line 522
522
523		<target name="clean"
524		description="Removes all build products">
507	–
525		<delete dir="${build.dir}"/>
509	–
526		</target>
527
528
529		<target name="dist-clean"
530		description="Removes all build and distribution products">
515	–
531		<delete dir="${build.dir}"/>
532		<delete dir="${dist.dir}"/>
518	–
533		</target>
534
535
#	Line 536 | Line 550
550		<run-tck-tests
551		target="${build.main.java.version}"
552		workdir="${build.dir}"
553	<	classes="${product.jar}"/>
553	>	classes="${product.jar}">
554	>	<javac-elements>
555	>	<compilerarg value="-Werror"/>
556	>	</javac-elements>
557	>	</run-tck-tests>
558		</target>
559
560		<target name="tck-parallelism-1"
#	Line 571 | Line 589
589
590		<target name="test"
591		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
592	<	description="Runs tck and jtreg tests for src/main">
575	<	</target>
592	>	description="Runs tck and jtreg tests for src/main"/>
593
594		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
595
#	Line 583 | Line 600
600
601		<!--   </target> -->
602
603	<	<!--   <target name="test89" -->
604	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
603	>	<target name="test910"
604	>	description="Runs tck and jtreg tests for src/main for multiple java versions">
605
606	<	<!--     <antcall target="clean"/> -->
607	<	<!--     <antcall target="test"> -->
608	<	<!--       <param name="build.main.java.version" value="8"/> -->
609	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
593	<	<!--     </antcall> -->
606	>	<antcall target="clean"/>
607	>	<antcall target="test">
608	>	<param name="build.main.java.version" value="9"/>
609	>	</antcall>
610
611	<	<!--     <antcall target="clean"/> -->
612	<	<!--     <antcall target="test"> -->
613	<	<!--       <param name="build.main.java.version" value="9"/> -->
614	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
599	<	<!--     </antcall> -->
611	>	<antcall target="clean"/>
612	>	<antcall target="test">
613	>	<param name="build.main.java.version" value="10"/>
614	>	</antcall>
615
616	<	<!--   </target> -->
616	>	<!-- Clean up to avoid obscure wrong class file version bugs -->
617	>	<antcall target="clean"/>
618	>
619	>	</target>
620
621
622
623		<target name="configure-compiler">
624		<fail message="ant version too old">
625	<	<condition>
608	<	<not> <antversion atleast="1.9.1"/> </not>
609	<	</condition>
625	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
626		</fail>
627
628		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 652 | Line 668
668		<java classname="ALoops" fork="true">
669		<classpath refid="loops.classpath"/>
670		</java>
655	–
671		</target>
672
673
674		<target name="compile-test-loops" depends="jar"
675	<	description="compile all the perf tests in src/test/loops">
675	>	description="Compiles all the perf tests in src/test/loops">
676
677		<mkdir dir="${build.dir}/test/loops"/>
678
#	Line 669 | Line 684
684		includeAntRuntime="false"
685		includeJavaRuntime="false"
686		encoding="ASCII"
687	<	executable="${javac9}"
687	>	executable="${build.main.javac}"
688		fork="true">
689
690		<include name="*.java"/>
#	Line 677 | Line 692
692		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
693		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
694		<compilerarg line="${build.args}"/>
680	–
695		</javac>
682	–
696		</target>
697
698
#	Line 705 | Line 718
718		encoding="ASCII"
719		executable="${javac8}"
720		fork="true">
708	–
721		<include name="**/*.java"/>
722		<compilerarg value="-Xprefer:source"/>
723		<compilerarg value="-XDignore.symbol.file=true"/>
724		<compilerarg value="-Xlint:all"/>
725		<compilerarg value="-Werror"/>
726		<compilerarg line="${build.args}"/>
715	–
727		</javac>
728		</target>
729
#	Line 736 | Line 747
747		encoding="ASCII"
748		executable="${javac8}"
749		fork="true">
739	–
750		<include name="**/*.java"/>
751		<compilerarg value="-Xprefer:source"/>
752		<compilerarg value="-XDignore.symbol.file=true"/>
753		<compilerarg value="-Xlint:all"/>
754	<	<compilerarg value="-Xdoclint:all/protected"/>
754	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
755		<compilerarg line="${build.args}"/>
746	–
756		</javac>
757		</target>
758
#	Line 759 | Line 768
768		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
769		</manifest>
770		</jar>
762	–
771		</target>
772
773
#	Line 775 | Line 783
783		<!-- JDK9+ test classes -->
784		<exclude name="*9Test.java"/>
785		<exclude name="*10Test.java"/>
786	+	<compilerarg value="-Werror"/>
787		</javac-elements>
788		</run-tck-tests>
789		</target>
#	Line 792 | Line 801
801
802		<target name="4jdk8-test"
803		depends="4jdk8-tck, 4jdk8-jtreg"
804	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
796	<	</target>
804	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
805
806
807		<target name="4jdk8docs"
#	Line 809 | Line 817
817		access="${build.javadoc.access}"
818		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
819		classpath=""
820	+	source="8"
821		executable="${javadoc8}"
822		failonerror = "true">
823		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 836 | Line 845
845
846		<target name="4jdk8clean"
847		description="Removes all 4jdk8 build products">
839	–
848		<delete dir="${build.4jdk8.dir}"/>
841	–
849		</target>
850
851
#	Line 854 | Line 861
861		</target>
862
863
864	+	<!-- jsr166 4jdk7 (no longer maintained) -->
865
866	<	<!-- jsr166 4jdk7 -->
859	<
860	<	<target name="4jdk7compile"
861	<	depends="configure-compiler"
862	<	description="Compiles src/jdk7 sources, targeting jdk7">
863	<
866	>	<target name="4jdk7compile" depends="configure-compiler">
867		<mkdir dir="${build.4jdk7.classes.dir}"/>
868
869		<javac srcdir="${4jdk7src.dir}"
#	Line 884 | Line 887
887		<compilerarg value="-Xlint:all"/>
888		<compilerarg value="-Werror"/>
889		<compilerarg line="${build.args}"/>
887	–
890		</javac>
891		</target>
892
893	<	<target name="4jdk7doclint"
892	<	depends="configure-compiler"
893	<	description="Finds doclint warnings">
894	<
893	>	<target name="4jdk7doclint" depends="configure-compiler">
894		<mkdir dir="${build.4jdk7.classes.dir}"/>
895
896		<javac srcdir="${4jdk7src.dir}"
#	Line 915 | Line 914
914		<compilerarg value="-Xlint:all"/>
915		<compilerarg value="-Xdoclint:all/protected"/>
916		<compilerarg line="${build.args}"/>
918	–
917		</javac>
918		</target>
919
920	<
923	<	<target name="4jdk7jar"
924	<	depends="4jdk7compile"
925	<	description="Builds library jar from compiled sources">
926	<
920	>	<target name="4jdk7jar" depends="4jdk7compile">
921		<jar destfile="${4jdk7product.jar}">
922		<fileset dir="${build.4jdk7.classes.dir}"/>
923		<manifest>
#	Line 931 | Line 925
925		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
926		</manifest>
927		</jar>
934	–
928		</target>
929
930	<
938	<	<target name="4jdk7-tck"
939	<	depends="4jdk7jar"
940	<	description="Runs tck tests for jsr166-4jdk7 directly">
941	<
930	>	<target name="4jdk7-tck" depends="4jdk7jar">
931		<run-tck-tests
932		target="7"
933		workdir="${build.4jdk7.dir}"
#	Line 956 | Line 945
945		<exclude name="SplittableRandomTest.java"/>
946		<exclude name="StampedLockTest.java"/>
947		<exclude name="SubmissionPublisherTest.java"/>
948	+	<compilerarg value="-Werror"/>
949		</javac-elements>
950		</run-tck-tests>
951		</target>
952
963	–
953		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
954	<	<target name="4jdk7-tck-junit"
966	<	depends="4jdk7compile">
954	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
955
956		<junit printsummary="true"
957		showoutput="true"
#	Line 985 | Line 973
973
974		<test name="${jsr166.tckTestClass}" haltonfailure="no">
975		</test>
988	–
976		</junit>
977		</target>
978
979	<	<target name="4jdk7-jtreg"
993	<	depends="4jdk7jar"
994	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
979	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
980		<run-jtreg-tests
981		target="7"
982		workdir="${build.4jdk7.dir}"
983		classes="${4jdk7product.jar}"/>
984		</target>
985
986	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
987
988	<	<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	<
988	>	<target name="4jdk7docs">
989		<delete dir="${4jdk7docs.dir}"/>
990		<mkdir dir="${4jdk7docs.dir}"/>
991
#	Line 1028 | Line 1006
1006		</javadoc>
1007		</target>
1008
1009	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1010
1011	<	<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	<
1011	>	<target name="4jdk7clean">
1012		<delete dir="${build.4jdk7.dir}"/>
1041	–
1013		</target>
1014
1015	<
1045	<	<target name="4jdk7dist-jar"
1046	<	depends="4jdk7clean, 4jdk7jar">
1015	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1016		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1017		</target>
1018
1019	<
1051	<	<target name="4jdk7dist-docs"
1052	<	depends="4jdk7clean, 4jdk7docs">
1019	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1020		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1021		</target>
1022
1023
1024	<	<!-- jsr166x -->
1058	<
1059	<	<target name="jsr166xcompile"
1060	<	depends="configure-compiler"
1061	<	description="Compiles jsr166x sources to build dir">
1024	>	<!-- jsr166x (no longer maintained) -->
1025
1026	+	<target name="jsr166xcompile" depends="configure-compiler">
1027		<mkdir dir="${build.jsr166x.classes.dir}"/>
1028
1029		<javac srcdir="${topsrc.dir}"
#	Line 1076 | Line 1040
1040		encoding="ASCII"
1041		executable="${javac7}"
1042		fork="true">
1079	–
1043		<include name="jsr166x/**/*.java"/>
1044		<compilerarg value="-XDignore.symbol.file=true"/>
1045		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1046		<compilerarg value="-Werror"/>
1047		<compilerarg line="${build.args}"/>
1085	–
1048		</javac>
1049		</target>
1050
1051	<
1090	<	<target name="jsr166xjar"
1091	<	depends="jsr166xcompile"
1092	<	description="Builds library jar from compiled sources">
1093	<
1051	>	<target name="jsr166xjar" depends="jsr166xcompile">
1052		<jar destfile="${jsr166x.jar}">
1053		<fileset dir="${build.jsr166x.classes.dir}"/>
1054		<manifest>
#	Line 1098 | Line 1056
1056		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1057		</manifest>
1058		</jar>
1101	–
1059		</target>
1060
1061	<
1105	<	<target name="jsr166xdocs"
1106	<	description="Builds javadocs to dist dir">
1107	<
1061	>	<target name="jsr166xdocs">
1062		<delete dir="${jsr166xdocs.dir}"/>
1063		<mkdir dir="${jsr166xdocs.dir}"/>
1064
#	Line 1119 | Line 1073
1073		failonerror = "true">
1074		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1075		<arg value="-XDignore.symbol.file=true"/>
1122	–
1076		</javadoc>
1077		</target>
1078
1079	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1080
1081	<	<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	<
1081	>	<target name="jsr166xclean">
1082		<delete dir="${build.jsr166x.dir}"/>
1136	–
1083		</target>
1084
1085	<
1140	<	<target name="jsr166xdist-jar"
1141	<	depends="jsr166xclean, jsr166xjar">
1085	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1086		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1087		</target>
1088
1089	<	<target name="jsr166xdist-docs"
1146	<	depends="jsr166xclean, jsr166xdocs">
1089	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1090		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1091		</target>
1092
1150	–	<!-- jsr166y -->
1151	–
1093
1094	<	<target name="jsr166ycompile"
1154	<	depends="configure-compiler"
1155	<	description="Compiles jsr166y sources">
1094	>	<!-- jsr166y (no longer maintained) -->
1095
1096	+	<target name="jsr166ycompile" depends="configure-compiler">
1097		<mkdir dir="${build.jsr166y.classes.dir}"/>
1098
1099		<javac srcdir="${topsrc.dir}"
#	Line 1176 | Line 1116
1116		<compilerarg value="-Xlint:all"/>
1117		<compilerarg value="-Werror"/>
1118		<compilerarg line="${build.args}"/>
1179	–
1119		</javac>
1120		</target>
1121
1122	<
1184	<	<target name="jsr166yjar"
1185	<	depends="jsr166ycompile"
1186	<	description="Builds library jar from compiled sources">
1187	<
1122	>	<target name="jsr166yjar" depends="jsr166ycompile">
1123		<jar destfile="${jsr166y.jar}" index="true">
1124		<fileset dir="${build.jsr166y.classes.dir}"/>
1125		<manifest>
#	Line 1192 | Line 1127
1127		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1128		</manifest>
1129		</jar>
1195	–
1130		</target>
1131
1132	<
1199	<	<target name="jsr166ydocs"
1200	<	description="Builds javadocs to dist dir">
1201	<
1132	>	<target name="jsr166ydocs">
1133		<delete dir="${jsr166ydocs.dir}"/>
1134		<mkdir dir="${jsr166ydocs.dir}"/>
1135
#	Line 1213 | Line 1144
1144		failonerror = "true">
1145		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1146		<arg value="-XDignore.symbol.file=true"/>
1216	–
1147		</javadoc>
1148		</target>
1149
1150	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1151
1152	<	<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	<
1152	>	<target name="jsr166yclean">
1153		<delete dir="${build.jsr166y.dir}"/>
1230	–
1154		</target>
1155
1156	<
1234	<	<target name="jsr166ydist-jar"
1235	<	depends="jsr166yclean, jsr166yjar">
1156	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1157		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1158		</target>
1159
1160	<	<target name="jsr166ydist-docs"
1240	<	depends="jsr166yclean, jsr166ydocs">
1160	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1161		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1162		</target>
1163
1164
1165	<	<!-- extra166y -->
1246	<
1247	<
1248	<	<target name="extra166ycompile"
1249	<	depends="configure-compiler, jsr166yjar"
1250	<	description="Compiles extra166y sources">
1165	>	<!-- extra166y (no longer maintained) -->
1166
1167	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1168		<mkdir dir="${build.extra166y.classes.dir}"/>
1169
1170		<javac srcdir="${topsrc.dir}"
#	Line 1271 | Line 1187
1187		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1188		<compilerarg value="-Werror"/>
1189		<compilerarg line="${build.args}"/>
1274	–
1190		</javac>
1191		</target>
1192
1193	<
1279	<	<target name="extra166yjar"
1280	<	depends="extra166ycompile"
1281	<	description="Builds library jar from compiled sources">
1282	<
1193	>	<target name="extra166yjar" depends="extra166ycompile">
1194		<jar destfile="${extra166y.jar}" index="true">
1195		<fileset dir="${build.extra166y.classes.dir}"/>
1196		<manifest>
#	Line 1287 | Line 1198
1198		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1199		</manifest>
1200		</jar>
1290	–
1201		</target>
1202
1203	<
1294	<	<target name="extra166ydocs"
1295	<	description="Builds javadocs to build dir">
1296	<
1203	>	<target name="extra166ydocs">
1204		<delete dir="${extra166ydocs.dir}"/>
1205		<mkdir dir="${extra166ydocs.dir}"/>
1206
#	Line 1307 | Line 1214
1214		executable="${javadoc7}">
1215		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1216		<arg value="-XDignore.symbol.file=true"/>
1310	–
1217		</javadoc>
1218		</target>
1219
1220	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1221
1222	<	<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	<
1222	>	<target name="extra166yclean">
1223		<delete dir="${build.extra166y.dir}"/>
1324	–
1224		</target>
1225
1226	<
1328	<	<target name="extra166ydist-jar"
1329	<	depends="extra166yclean, extra166yjar">
1226	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1227		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1228		</target>
1229
1230	<	<target name="extra166ydist-docs"
1334	<	depends="extra166yclean, extra166ydocs">
1230	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1231		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1232		</target>
1233
1234	<	<!-- jsr166e -->
1234	>
1235	>	<!-- jsr166e (no longer maintained) -->
1236
1237		<property name="build.jsr166e.java.version" value="6"/>
1238		<property name="build.jsr166e.javac" value="${javac6}"/>
1239
1240	<	<target name="jsr166ecompile"
1344	<	depends="configure-compiler"
1345	<	description="Compiles jsr166e sources">
1346	<
1240	>	<target name="jsr166ecompile" depends="configure-compiler">
1241		<mkdir dir="${build.jsr166e.classes.dir}"/>
1242
1243		<javac srcdir="${topsrc.dir}"
#	Line 1364 | Line 1258
1258		<compilerarg value="-Xlint:all"/>
1259		<compilerarg value="-Werror"/>
1260		<compilerarg line="${build.args}"/>
1367	–
1261		</javac>
1262		</target>
1263
1371	–	<!-- jsr166e: find doclint errors -->
1264		<target name="jsr166edoclint">
1373	–
1265		<mkdir dir="${build.jsr166e.classes.dir}"/>
1266
1267		<javac srcdir="${topsrc.dir}"
#	Line 1392 | Line 1283
1283		<compilerarg value="-Xlint:all"/>
1284		<compilerarg value="-Werror"/>
1285		<compilerarg value="-Xdoclint:all/protected"/>
1395	–
1286		</javac>
1287		</target>
1288
1289	<
1400	<	<target name="jsr166ejar"
1401	<	depends="jsr166ecompile"
1402	<	description="Builds library jar from compiled sources">
1403	<
1289	>	<target name="jsr166ejar" depends="jsr166ecompile">
1290		<jar destfile="${jsr166e.jar}" index="true">
1291		<fileset dir="${build.jsr166e.classes.dir}"/>
1292		<manifest>
#	Line 1408 | Line 1294
1294		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1295		</manifest>
1296		</jar>
1411	–
1297		</target>
1298
1299	<
1415	<	<target name="jsr166edocs"
1416	<	description="Builds javadocs to build dir">
1417	<
1299	>	<target name="jsr166edocs">
1300		<delete dir="${jsr166edocs.dir}"/>
1301		<mkdir dir="${jsr166edocs.dir}"/>
1302
#	Line 1428 | Line 1310
1310		failonerror = "true">
1311		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1312		<arg value="-XDignore.symbol.file=true"/>
1431	–
1313		</javadoc>
1314		</target>
1315
1316	<
1436	<	<target name="jsr166e-tck-one-java-version"
1437	<	depends="jsr166ejar">
1438	<
1316	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1317		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1440	–
1318		<run-tck-tests
1319		tck.src.dir="${test.src.dir}/tck-jsr166e"
1320		target="${build.jsr166e.java.version}"
#	Line 1445 | Line 1322
1322		classes="${jsr166e.jar}"/>
1323		</target>
1324
1325	<	<target name="jsr166e-tck"
1449	<	description="Runs tck tests for jsr166e for multiple java versions">
1325	>	<target name="jsr166e-tck">
1326
1327		<!--     <antcall target="clean"/> -->
1328		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1467 | Line 1343
1343		</antcall>
1344		</target>
1345
1346	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1347
1348	<	<target name="jsr166e-test"
1472	<	depends="jsr166e-tck"
1473	<	description="Runs all tests for jsr166e">
1474	<	</target>
1348	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1349
1350	<	<target name="jsr166edist"
1477	<	depends="jsr166edist-jar, jsr166edist-docs"
1478	<	description="Puts all distributable products in single hierarchy"/>
1479	<
1480	<
1481	<	<target name="jsr166eclean"
1482	<	description="Removes all jsr166e build products">
1350	>	<target name="jsr166eclean">
1351		<delete dir="${build.jsr166e.dir}"/>
1352		</target>
1353
1486	–
1354		<target name="jsr166edist-jar"
1355		depends="jsr166eclean, jsr166ejar">
1356		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1357		</target>
1358
1359	<	<target name="jsr166edist-docs"
1493	<	depends="jsr166eclean, jsr166edocs">
1359	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1360		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1361		</target>
1362
#	Line 1510 | Line 1376
1376		</antcall>
1377		</target>
1378
1379	+
1380	+	<!-- ==============================================================
1381	+	Experimental errorprone support - http://errorprone.info
1382	+	=================================================================== -->
1383	+	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.0.21.jar"/>
1384	+	<target name="errorprone"
1385	+	depends="clean, configure-compiler"
1386	+	description="Run errorprone over jsr166 source code (experimental)">
1387	+
1388	+	<local name="destdir"/>
1389	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1390	+	<mkdir dir="${destdir}"/>
1391	+
1392	+	<javac srcdir="${src.dir}"
1393	+	destdir="${destdir}"
1394	+	debug="${build.debug}"
1395	+	debuglevel="${build.debuglevel}"
1396	+	deprecation="${build.deprecation}"
1397	+	classpath=""
1398	+	includeAntRuntime="false"
1399	+	includeJavaRuntime="false"
1400	+	encoding="ASCII"
1401	+	executable="${build.main.javac}"
1402	+	fork="true">
1403	+
1404	+	<include name="**/*.java"/>
1405	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1406	+	<compilerarg value="-Xplugin:ErrorProne
1407	+	-Xep:IdentityBinaryExpression:WARN
1408	+	-Xep:MissingOverride:OFF
1409	+	-Xep:MixedArrayDimensions:WARN
1410	+	-Xep:RemoveUnusedImports:ERROR
1411	+	-Xep:ClassName:ERROR
1412	+	-Xep:MultipleTopLevelClasses:ERROR
1413	+	-Xep:EmptyIf:ERROR
1414	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1415	+	-Xep:RedundantThrows:ERROR
1416	+	-Xep:MethodCanBeStatic:WARN"/>
1417	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1418	+	<compilerarg value="-Xprefer:source"/>
1419	+	<compilerarg value="-XDignore.symbol.file=true"/>
1420	+	<compilerarg value="-Xlint:all"/>
1421	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1422	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1423	+	<compilerarg line="${build.args}"/>
1424	+	</javac>
1425	+
1426	+	<jar destfile="${product.jar}">
1427	+	<fileset dir="${destdir}"/>
1428	+	</jar>
1429	+
1430	+	<run-tck-tests
1431	+	target="${build.main.java.version}"
1432	+	workdir="${build.dir}"
1433	+	classes="${product.jar}">
1434	+	<javac-elements>
1435	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1436	+	<compilerarg value="-Xplugin:ErrorProne
1437	+	-Xep:IdentityBinaryExpression:WARN
1438	+	-Xep:BoxedPrimitiveConstructor:OFF
1439	+	-Xep:HashtableContains:OFF
1440	+	-Xep:ModifyingCollectionWithItself:OFF
1441	+	-Xep:MissingOverride:OFF
1442	+	-Xep:MixedArrayDimensions:WARN
1443	+	-Xep:RemoveUnusedImports:ERROR
1444	+	-Xep:ClassName:ERROR
1445	+	-Xep:MultipleTopLevelClasses:ERROR
1446	+	-Xep:EmptyIf:ERROR
1447	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1448	+	-Xep:RedundantThrows:ERROR
1449	+	-Xep:MethodCanBeStatic:WARN"/>
1450	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1451	+	</javac-elements>
1452	+	</run-tck-tests>
1453	+	</target>
1454	+
1455	+	<!-- ant errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1456	+	<target name="errorprone-jtreg"
1457	+	depends="jar"
1458	+	description="Run errorprone over jtreg tests (experimental)">
1459	+
1460	+	<run-jtreg-tests
1461	+	target="${build.main.java.version}"
1462	+	workdir="${build.dir}"
1463	+	classes="${product.jar}"
1464	+	verbose="all">
1465	+	<jtreg-elements>
1466	+	<arg value="-javacoption:-processorpath"/>
1467	+	<arg value="-javacoption:${errorprone.jar}"/>
1468	+	<arg value="-javacoption:-Xplugin:ErrorProne
1469	+	-Xep:IdentityBinaryExpression:WARN
1470	+	-Xep:BoxedPrimitiveConstructor:OFF
1471	+	-Xep:HashtableContains:OFF
1472	+	-Xep:ModifyingCollectionWithItself:OFF
1473	+	-Xep:MissingOverride:OFF
1474	+	-Xep:MixedArrayDimensions:WARN
1475	+	-Xep:RemoveUnusedImports:ERROR
1476	+	-Xep:ClassName:ERROR
1477	+	-Xep:MultipleTopLevelClasses:ERROR
1478	+	-Xep:EmptyIf:ERROR
1479	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1480	+	-Xep:RedundantThrows:ERROR
1481	+	-Xep:MethodCanBeStatic:WARN"/>
1482	+	</jtreg-elements>
1483	+	</run-jtreg-tests>
1484	+	</target>
1485	+
1486	+
1487		<!-- ==============================================================
1488		Running guava tests against jsr166 code
1489		=================================================================== -->
#	Line 1562 | Line 1536
1536		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1537		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1538		<junit printsummary="true" showoutput="true" haltonfailure="true"
1539	<	jvm="${java9}" fork="true">
1540	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1539	>	jvm="${build.main.java}" fork="true">
1540	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1541		<formatter type="brief"/>
1542		<classpath>
1543		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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