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

Diff Legend

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