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.231 by jsr166, Sun Jan 29 20:19:00 2017 UTC vs.
Revision 1.262 by jsr166, Tue Jan 23 04:59:10 2018 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/jdk6
22	–	$HOME/jdk/jdk7
21		$HOME/jdk/jdk8
22		$HOME/jdk/jdk9
23	+	$HOME/jdk/jdk10
24	+	$HOME/jdk/jdk11
25		where each of the above is a JDK or a symlink to same, and
26	–	$HOME/jdk/src/jdk6
27	–	$HOME/jdk/src/jdk7
26		$HOME/jdk/src/jdk8
27		$HOME/jdk/src/jdk9
28	+	$HOME/jdk/src/jdk10
29	+	$HOME/jdk/src/jdk11
30		where each of the above is a complete JDK source tree
31		(e.g. mercurial forest) or a symlink to same.
32
33		Alternatively, define ant variables thus:
34		ant -Djdk$N.home=... -Djdk$N.src.home=...
35	<	for $N in 6 7 8 9 ...
35	>	for $N in 8 9 10 ...
36
37	<	As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
38	<	target is currently broken.
37	>	As of 2016-03, the sources in src/main are for jdk9+ only.
38		------------------------------------------------------------------------------
39		</description>
40
#	Line 134 | Line 133
133		<defjdklocations v="7"/>
134		<defjdklocations v="8"/>
135		<defjdklocations v="9"/>
136	+	<defjdklocations v="10"/>
137	+	<defjdklocations v="11"/>
138
139		<!-- Source locations -->
140		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 143 | Line 144
144		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
145		<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
146		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
147	+	<property name="jtreg10.src.dir"      location="${test.src.dir}/jtreg"/>
148	+	<property name="jtreg11.src.dir"      location="${test.src.dir}/jtreg"/>
149		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
150		<property name="lib.dir"              location="${basedir}/lib"/>
151		<property name="dist.dir"             location="${basedir}/dist"/>
#	Line 182 | Line 185
185		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
186
187		<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
188	<	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
189	<	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
190	<	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
191	<	<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
192	<	<!-- The expected canonical location does not yet exist as of 2016-04 -->
193	<	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
194	<	<property name="java9.docroot.url"      value="http://download.java.net/java/jdk9/docs"/>
188	>	<!-- Switched to https: in 2017-10 - JDK-8190312 -->
189	>	<property name="java5.docroot.url"  value="https://docs.oracle.com/javase/1.5.0/docs"/>
190	>	<property name="java6.docroot.url"  value="https://docs.oracle.com/javase/6/docs"/>
191	>	<property name="java7.docroot.url"  value="https://docs.oracle.com/javase/7/docs"/>
192	>	<property name="java8.docroot.url"  value="https://docs.oracle.com/javase/8/docs"/>
193	>	<property name="java9.docroot.url"  value="https://docs.oracle.com/javase/9/docs"/>
194	>	<!-- The location of jdk9 early access docs (RIP) -->
195	>	<!-- <property name="java9.docroot.url" value="http://download.java.net/java/jdk9/docs"/> -->
196		<!-- Default jdk doc location (latest stable release seems best) -->
197	<	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
197	>	<property name="java10.docroot.url" value="http://download.java.net/java/jdk10/docs"/>
198	>	<property name="java11.docroot.url" value="http://download.java.net/java/jdk11/docs"/>
199	>	<property name="java.docroot.url"   value="${java9.docroot.url}"/>
200
201		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
202		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 198 | Line 204
204		<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
205		<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
206		<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
207	+	<property name="java10.api.url"     value="${java10.docroot.url}/api/"/>
208	+	<property name="java11.api.url"     value="${java11.docroot.url}/api/"/>
209		<property name="java.api.url"       value="${java.docroot.url}/api/"/>
210
211		<!-- Define the "jtreg" task -->
#	Line 233 | Line 241
241		<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
242		</condition>
243
244	+	<local name="use-doclint"/>
245	+	<condition property="use-doclint">
246	+	<not> <equals arg1="@{target}" arg2="7"/> </not>
247	+	</condition>
248	+
249		<mkdir dir="@{workdir}/tck-classes"/>
250
251		<javac srcdir="@{tck.src.dir}"
#	Line 252 | Line 265
265		<include name="*.java"/>
266		<compilerarg value="-XDignore.symbol.file=true"/>
267		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
268	+	<compilerarg value="-Xdoclint:reference/private" if:set="use-doclint"/>
269		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
270	<	<compilerarg line="--patch-module java.base=@{classes}" if:set="modules"/>
270	>	<compilerarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
271		<compilerarg line="${build.args}"/>
272		<javac-elements/>
273
#	Line 264 | Line 278
278		jvm="${java@{target}}"
279		fork="true">
280		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
281	<	<jvmarg line="--patch-module java.base=@{classes}" if:set="modules"/>
282	<	<jvmarg line="--add-opens java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
283	<	<jvmarg line="--add-opens java.base/java.util=ALL-UNNAMED" if:set="modules"/>
284	<	<jvmarg line="--add-opens java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
285	<	<jvmarg line="--add-opens java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
286	<	<jvmarg line="--add-opens java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
281	>	<jvmarg value="--patch-module=java.base=@{classes}" if:set="modules"/>
282	>	<jvmarg value="--add-opens=java.base/java.lang=ALL-UNNAMED" if:set="modules"/>
283	>	<jvmarg value="--add-opens=java.base/java.util=ALL-UNNAMED" if:set="modules"/>
284	>	<jvmarg value="--add-opens=java.base/java.util.concurrent=ALL-UNNAMED" if:set="modules"/>
285	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.atomic=ALL-UNNAMED" if:set="modules"/>
286	>	<jvmarg value="--add-opens=java.base/java.util.concurrent.locks=ALL-UNNAMED" if:set="modules"/>
287		<jvmarg line="@{jvmflags}"/>
288		<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
289		<jvmarg line="${vmoptions}" if:set="vmoptions"/>
#	Line 291 | Line 305
305		</macrodef>
306
307		<!-- Define jtreg test sets for different jdk versions -->
308	+	<fileset dir="${jtreg11.src.dir}">
309	+	<patternset id="jdk11.jtreg.tests">
310	+	<include name="**/*.java"/>
311	+	</patternset>
312	+	</fileset>
313	+
314	+	<fileset dir="${jtreg10.src.dir}">
315	+	<patternset id="jdk10.jtreg.tests">
316	+	<include name="**/*.java"/>
317	+	</patternset>
318	+	</fileset>
319	+
320		<fileset dir="${jtreg9.src.dir}">
321		<patternset id="jdk9.jtreg.tests">
322		<include name="**/*.java"/>
#	Line 314 | Line 340
340
341		<macrodef name="run-jtreg-tests">
342		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
317	–	<attribute name="source" default="7"/>
343		<attribute name="target"/>
344		<attribute name="workdir"/>
345		<attribute name="classes"/>
346	+	<attribute name="verbose" default="${jtreg.verbose}"/>
347		<attribute name="jtregflags" default=""/>
348	+	<element name="jtreg-elements" optional="true"/>
349
350		<sequential>
351
#	Line 336 | Line 363
363		workDir="@{workdir}/JTwork">
364		<patternset refid="jdk@{target}.jtreg.tests"/>
365		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
366	<	<arg value="-javacoptions:--patch-module java.base=@{classes}" if:set="modules"/>
367	<	<arg value="-vmoptions:--patch-module java.base=@{classes}" if:set="modules"/>
366	>	<arg value="-javacoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
367	>	<arg value="-vmoptions:--patch-module=java.base=@{classes}" if:set="modules"/>
368		<arg value="-agentvm"/>
369		<arg value="-noreport"/>
370	<	<arg value="-verbose:${jtreg.verbose}"/>
370	>	<arg value="-verbose:@{verbose}"/>
371		<arg value="-vmoptions:-esa -ea"/>
372		<arg value="-automatic"/>
373		<arg value="-k:!ignore"/>
374		<arg line="@{jtregflags}"/>
375		<arg line="${jtreg.flags}"/>
376	+	<jtreg-elements/>
377		</jtreg>
378		</sequential>
379		</macrodef>
#	Line 362 | Line 390
390		<!-- Main targets -->
391
392		<property name="build.main.java.version" value="9"/>
393	<	<property name="build.main.javac" value="${javac9}"/>
393	>	<!-- Workaround "no nested properties in ant" -->
394	>	<macrodef name="define-build-main-properties">
395	>	<attribute name="v"/>
396	>	<sequential>
397	>	<property name="build.main.java"    value="${java@{v}}"/>
398	>	<property name="build.main.javac"   value="${javac@{v}}"/>
399	>	<property name="build.main.javadoc" value="${javadoc@{v}}"/>
400	>	</sequential>
401	>	</macrodef>
402	>	<define-build-main-properties v="${build.main.java.version}"/>
403
404		<target name="dists"
405	<	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
405	>	depends="dist, 4jdk8dist"
406		description="Builds all public jars and docs"/>
407	+	<!--
408	+	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
409	+	-->
410
411		<target name="compile"
412		depends="configure-compiler"
413		description="Compiles src/main sources to build dir">
414
375	–	<local name="modules"/>
376	–	<condition property="modules">
377	–	<and>
378	–	<available file="${jdk9.home}/jmods" type="dir"/>
379	–	<equals arg1="9" arg2="${build.main.java.version}"/>
380	–	</and>
381	–	</condition>
382	–
415		<local name="destdir"/>
416	<	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
385	<	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
416	>	<property name="destdir" value="${build.classes.dir}/java.base"/>
417
418		<mkdir dir="${destdir}"/>
419
#	Line 399 | Line 430
430		fork="true">
431
432		<include name="**/*.java"/>
433	<	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
433	>	<compilerarg value="--patch-module=java.base=${src.dir}"/>
434		<compilerarg value="-Xprefer:source"/>
435		<compilerarg value="-XDignore.symbol.file=true"/>
436		<compilerarg value="-Xlint:all"/>
437	+	<compilerarg line="--doclint-format html5"/>
438	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
439		<compilerarg value="-Werror"/>
407	–	<compilerarg value="-Xdoclint:all/protected"/>
440		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
441		<compilerarg line="${build.args}"/>
442
#	Line 448 | Line 480
480		access="${build.javadoc.access}"
481		sourcepath="${src.dir}"
482		classpath=""
483	<	executable="${javadoc9}">
483	>	source="9"
484	>	executable="${build.main.javadoc}">
485		<fileset dir="${src.dir}" defaultexcludes="yes">
486		<include name="**/*.java"/>
487		</fileset>
488		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
489		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
490		<arg value="-XDignore.symbol.file=true"/>
491	<	<arg value="-Xmodule:java.base"/>
491	>	<arg value="-html5"/>
492	>	<arg value="--patch-module=java.base=${src.dir}"/>
493		<arg value="-tag"/>
494		<arg value="${javadoc.jls.option}"/>
495		<!-- @apiNote currently unused -->
#	Line 503 | Line 537
537
538		<target name="clean"
539		description="Removes all build products">
506	–
540		<delete dir="${build.dir}"/>
508	–
541		</target>
542
543
544		<target name="dist-clean"
545		description="Removes all build and distribution products">
514	–
546		<delete dir="${build.dir}"/>
547		<delete dir="${dist.dir}"/>
517	–
548		</target>
549
550
#	Line 535 | Line 565
565		<run-tck-tests
566		target="${build.main.java.version}"
567		workdir="${build.dir}"
568	<	classes="${product.jar}"/>
568	>	classes="${product.jar}">
569	>	<javac-elements>
570	>	<compilerarg value="-Werror"/>
571	>	</javac-elements>
572	>	</run-tck-tests>
573		</target>
574
575		<target name="tck-parallelism-1"
#	Line 570 | Line 604
604
605		<target name="test"
606		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
607	<	description="Runs tck and jtreg tests for src/main">
574	<	</target>
607	>	description="Runs tck and jtreg tests for src/main"/>
608
609		<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
610
#	Line 582 | Line 615
615
616		<!--   </target> -->
617
618	<	<!--   <target name="test89" -->
619	<	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
618	>	<target name="test91011"
619	>	description="Runs tck and jtreg tests for src/main for multiple java versions">
620
621	<	<!--     <antcall target="clean"/> -->
622	<	<!--     <antcall target="test"> -->
623	<	<!--       <param name="build.main.java.version" value="8"/> -->
624	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
592	<	<!--     </antcall> -->
621	>	<antcall target="clean"/>
622	>	<antcall target="test">
623	>	<param name="build.main.java.version" value="9"/>
624	>	</antcall>
625
626	<	<!--     <antcall target="clean"/> -->
627	<	<!--     <antcall target="test"> -->
628	<	<!--       <param name="build.main.java.version" value="9"/> -->
629	<	<!--       <param name="build.main.javac" value="${javac9}"/> -->
598	<	<!--     </antcall> -->
626	>	<antcall target="clean"/>
627	>	<antcall target="test">
628	>	<param name="build.main.java.version" value="10"/>
629	>	</antcall>
630
631	<	<!--   </target> -->
631	>	<antcall target="clean"/>
632	>	<antcall target="test">
633	>	<param name="build.main.java.version" value="11"/>
634	>	</antcall>
635	>
636	>	<!-- Clean up to avoid obscure wrong class file version bugs -->
637	>	<antcall target="clean"/>
638	>
639	>	</target>
640
641
642
643		<target name="configure-compiler">
644		<fail message="ant version too old">
645	<	<condition>
607	<	<not> <antversion atleast="1.9.1"/> </not>
608	<	</condition>
645	>	<condition> <not> <antversion atleast="1.9.1"/> </not> </condition>
646		</fail>
647
648		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 651 | Line 688
688		<java classname="ALoops" fork="true">
689		<classpath refid="loops.classpath"/>
690		</java>
654	–
691		</target>
692
693
694		<target name="compile-test-loops" depends="jar"
695	<	description="compile all the perf tests in src/test/loops">
695	>	description="Compiles all the perf tests in src/test/loops">
696
697		<mkdir dir="${build.dir}/test/loops"/>
698
#	Line 668 | Line 704
704		includeAntRuntime="false"
705		includeJavaRuntime="false"
706		encoding="ASCII"
707	<	executable="${javac9}"
707	>	executable="${build.main.javac}"
708		fork="true">
709
710		<include name="*.java"/>
#	Line 676 | Line 712
712		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
713		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
714		<compilerarg line="${build.args}"/>
679	–
715		</javac>
681	–
716		</target>
717
718
#	Line 704 | Line 738
738		encoding="ASCII"
739		executable="${javac8}"
740		fork="true">
707	–
741		<include name="**/*.java"/>
742		<compilerarg value="-Xprefer:source"/>
743		<compilerarg value="-XDignore.symbol.file=true"/>
744		<compilerarg value="-Xlint:all"/>
745		<compilerarg value="-Werror"/>
746		<compilerarg line="${build.args}"/>
714	–
747		</javac>
748		</target>
749
#	Line 735 | Line 767
767		encoding="ASCII"
768		executable="${javac8}"
769		fork="true">
738	–
770		<include name="**/*.java"/>
771		<compilerarg value="-Xprefer:source"/>
772		<compilerarg value="-XDignore.symbol.file=true"/>
773		<compilerarg value="-Xlint:all"/>
774	<	<compilerarg value="-Xdoclint:all/protected"/>
774	>	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
775		<compilerarg line="${build.args}"/>
745	–
776		</javac>
777		</target>
778
#	Line 758 | Line 788
788		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
789		</manifest>
790		</jar>
761	–
791		</target>
792
793
#	Line 774 | Line 803
803		<!-- JDK9+ test classes -->
804		<exclude name="*9Test.java"/>
805		<exclude name="*10Test.java"/>
806	+	<compilerarg value="-Werror"/>
807		</javac-elements>
808		</run-tck-tests>
809		</target>
#	Line 791 | Line 821
821
822		<target name="4jdk8-test"
823		depends="4jdk8-tck, 4jdk8-jtreg"
824	<	description="Runs tck and jtreg tests for jsr166-4jdk8">
795	<	</target>
824	>	description="Runs tck and jtreg tests for jsr166-4jdk8"/>
825
826
827		<target name="4jdk8docs"
#	Line 808 | Line 837
837		access="${build.javadoc.access}"
838		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
839		classpath=""
840	+	source="8"
841		executable="${javadoc8}"
842		failonerror = "true">
843		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
#	Line 835 | Line 865
865
866		<target name="4jdk8clean"
867		description="Removes all 4jdk8 build products">
838	–
868		<delete dir="${build.4jdk8.dir}"/>
840	–
869		</target>
870
871
#	Line 853 | Line 881
881		</target>
882
883
884	+	<!-- jsr166 4jdk7 (no longer maintained) -->
885
886	<	<!-- jsr166 4jdk7 -->
858	<
859	<	<target name="4jdk7compile"
860	<	depends="configure-compiler"
861	<	description="Compiles src/jdk7 sources, targeting jdk7">
862	<
886	>	<target name="4jdk7compile" depends="configure-compiler">
887		<mkdir dir="${build.4jdk7.classes.dir}"/>
888
889		<javac srcdir="${4jdk7src.dir}"
#	Line 883 | Line 907
907		<compilerarg value="-Xlint:all"/>
908		<compilerarg value="-Werror"/>
909		<compilerarg line="${build.args}"/>
886	–
910		</javac>
911		</target>
912
913	<	<target name="4jdk7doclint"
891	<	depends="configure-compiler"
892	<	description="Finds doclint warnings">
893	<
913	>	<target name="4jdk7doclint" depends="configure-compiler">
914		<mkdir dir="${build.4jdk7.classes.dir}"/>
915
916		<javac srcdir="${4jdk7src.dir}"
#	Line 914 | Line 934
934		<compilerarg value="-Xlint:all"/>
935		<compilerarg value="-Xdoclint:all/protected"/>
936		<compilerarg line="${build.args}"/>
917	–
937		</javac>
938		</target>
939
940	<
922	<	<target name="4jdk7jar"
923	<	depends="4jdk7compile"
924	<	description="Builds library jar from compiled sources">
925	<
940	>	<target name="4jdk7jar" depends="4jdk7compile">
941		<jar destfile="${4jdk7product.jar}">
942		<fileset dir="${build.4jdk7.classes.dir}"/>
943		<manifest>
#	Line 930 | Line 945
945		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
946		</manifest>
947		</jar>
933	–
948		</target>
949
950	<
937	<	<target name="4jdk7-tck"
938	<	depends="4jdk7jar"
939	<	description="Runs tck tests for jsr166-4jdk7 directly">
940	<
950	>	<target name="4jdk7-tck" depends="4jdk7jar">
951		<run-tck-tests
952		target="7"
953		workdir="${build.4jdk7.dir}"
#	Line 955 | Line 965
965		<exclude name="SplittableRandomTest.java"/>
966		<exclude name="StampedLockTest.java"/>
967		<exclude name="SubmissionPublisherTest.java"/>
968	+	<compilerarg value="-Werror"/>
969		</javac-elements>
970		</run-tck-tests>
971		</target>
972
962	–
973		<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
974	<	<target name="4jdk7-tck-junit"
965	<	depends="4jdk7compile">
974	>	<target name="4jdk7-tck-junit" depends="4jdk7compile">
975
976		<junit printsummary="true"
977		showoutput="true"
#	Line 984 | Line 993
993
994		<test name="${jsr166.tckTestClass}" haltonfailure="no">
995		</test>
987	–
996		</junit>
997		</target>
998
999	<	<target name="4jdk7-jtreg"
992	<	depends="4jdk7jar"
993	<	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
999	>	<target name="4jdk7-jtreg" depends="4jdk7jar">
1000		<run-jtreg-tests
1001		target="7"
1002		workdir="${build.4jdk7.dir}"
1003		classes="${4jdk7product.jar}"/>
1004		</target>
1005
1006	+	<target name="4jdk7-test" depends="4jdk7-tck, 4jdk7-jtreg"/>
1007
1008	<	<target name="4jdk7-test"
1002	<	depends="4jdk7-tck, 4jdk7-jtreg"
1003	<	description="Runs tck and jtreg tests for jsr166-4jdk7">
1004	<	</target>
1005	<
1006	<
1007	<	<target name="4jdk7docs"
1008	<	description="Builds javadocs for src/jdk7 to dist dir">
1009	<
1008	>	<target name="4jdk7docs">
1009		<delete dir="${4jdk7docs.dir}"/>
1010		<mkdir dir="${4jdk7docs.dir}"/>
1011
#	Line 1027 | Line 1026
1026		</javadoc>
1027		</target>
1028
1029	+	<target name="4jdk7dist" depends="4jdk7dist-jar, 4jdk7dist-docs"/>
1030
1031	<	<target name="4jdk7dist"
1032	<	depends="4jdk7dist-jar, 4jdk7dist-docs"
1033	<	description="Puts all distributable products in single hierarchy"/>
1034	<
1035	<
1036	<	<target name="4jdk7clean"
1037	<	description="Removes all 4jdk7 build products">
1038	<
1031	>	<target name="4jdk7clean">
1032		<delete dir="${build.4jdk7.dir}"/>
1040	–
1033		</target>
1034
1035	<
1044	<	<target name="4jdk7dist-jar"
1045	<	depends="4jdk7clean, 4jdk7jar">
1035	>	<target name="4jdk7dist-jar" depends="4jdk7clean, 4jdk7jar">
1036		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
1037		</target>
1038
1039	<
1050	<	<target name="4jdk7dist-docs"
1051	<	depends="4jdk7clean, 4jdk7docs">
1039	>	<target name="4jdk7dist-docs" depends="4jdk7clean, 4jdk7docs">
1040		<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
1041		</target>
1042
1043
1044	<	<!-- jsr166x -->
1057	<
1058	<	<target name="jsr166xcompile"
1059	<	depends="configure-compiler"
1060	<	description="Compiles jsr166x sources to build dir">
1044	>	<!-- jsr166x (no longer maintained) -->
1045
1046	+	<target name="jsr166xcompile" depends="configure-compiler">
1047		<mkdir dir="${build.jsr166x.classes.dir}"/>
1048
1049		<javac srcdir="${topsrc.dir}"
#	Line 1075 | Line 1060
1060		encoding="ASCII"
1061		executable="${javac7}"
1062		fork="true">
1078	–
1063		<include name="jsr166x/**/*.java"/>
1064		<compilerarg value="-XDignore.symbol.file=true"/>
1065		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
1066		<compilerarg value="-Werror"/>
1067		<compilerarg line="${build.args}"/>
1084	–
1068		</javac>
1069		</target>
1070
1071	<
1089	<	<target name="jsr166xjar"
1090	<	depends="jsr166xcompile"
1091	<	description="Builds library jar from compiled sources">
1092	<
1071	>	<target name="jsr166xjar" depends="jsr166xcompile">
1072		<jar destfile="${jsr166x.jar}">
1073		<fileset dir="${build.jsr166x.classes.dir}"/>
1074		<manifest>
#	Line 1097 | Line 1076
1076		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1077		</manifest>
1078		</jar>
1100	–
1079		</target>
1080
1081	<
1104	<	<target name="jsr166xdocs"
1105	<	description="Builds javadocs to dist dir">
1106	<
1081	>	<target name="jsr166xdocs">
1082		<delete dir="${jsr166xdocs.dir}"/>
1083		<mkdir dir="${jsr166xdocs.dir}"/>
1084
#	Line 1118 | Line 1093
1093		failonerror = "true">
1094		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1095		<arg value="-XDignore.symbol.file=true"/>
1121	–
1096		</javadoc>
1097		</target>
1098
1099	+	<target name="jsr166xdist" depends="jsr166xdist-jar, jsr166xdist-docs"/>
1100
1101	<	<target name="jsr166xdist"
1127	<	depends="jsr166xdist-jar, jsr166xdist-docs"
1128	<	description="Puts all distributable products in single hierarchy"/>
1129	<
1130	<
1131	<	<target name="jsr166xclean"
1132	<	description="Removes all jsr166x build products">
1133	<
1101	>	<target name="jsr166xclean">
1102		<delete dir="${build.jsr166x.dir}"/>
1135	–
1103		</target>
1104
1105	<
1139	<	<target name="jsr166xdist-jar"
1140	<	depends="jsr166xclean, jsr166xjar">
1105	>	<target name="jsr166xdist-jar" depends="jsr166xclean, jsr166xjar">
1106		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
1107		</target>
1108
1109	<	<target name="jsr166xdist-docs"
1145	<	depends="jsr166xclean, jsr166xdocs">
1109	>	<target name="jsr166xdist-docs" depends="jsr166xclean, jsr166xdocs">
1110		<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
1111		</target>
1112
1149	–	<!-- jsr166y -->
1113
1114	+	<!-- jsr166y (no longer maintained) -->
1115
1116	<	<target name="jsr166ycompile"
1153	<	depends="configure-compiler"
1154	<	description="Compiles jsr166y sources">
1155	<
1116	>	<target name="jsr166ycompile" depends="configure-compiler">
1117		<mkdir dir="${build.jsr166y.classes.dir}"/>
1118
1119		<javac srcdir="${topsrc.dir}"
#	Line 1175 | Line 1136
1136		<compilerarg value="-Xlint:all"/>
1137		<compilerarg value="-Werror"/>
1138		<compilerarg line="${build.args}"/>
1178	–
1139		</javac>
1140		</target>
1141
1142	<
1183	<	<target name="jsr166yjar"
1184	<	depends="jsr166ycompile"
1185	<	description="Builds library jar from compiled sources">
1186	<
1142	>	<target name="jsr166yjar" depends="jsr166ycompile">
1143		<jar destfile="${jsr166y.jar}" index="true">
1144		<fileset dir="${build.jsr166y.classes.dir}"/>
1145		<manifest>
#	Line 1191 | Line 1147
1147		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1148		</manifest>
1149		</jar>
1194	–
1150		</target>
1151
1152	<
1198	<	<target name="jsr166ydocs"
1199	<	description="Builds javadocs to dist dir">
1200	<
1152	>	<target name="jsr166ydocs">
1153		<delete dir="${jsr166ydocs.dir}"/>
1154		<mkdir dir="${jsr166ydocs.dir}"/>
1155
#	Line 1212 | Line 1164
1164		failonerror = "true">
1165		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1166		<arg value="-XDignore.symbol.file=true"/>
1215	–
1167		</javadoc>
1168		</target>
1169
1170	+	<target name="jsr166ydist" depends="jsr166ydist-jar, jsr166ydist-docs"/>
1171
1172	<	<target name="jsr166ydist"
1221	<	depends="jsr166ydist-jar, jsr166ydist-docs"
1222	<	description="Puts all distributable products in single hierarchy"/>
1223	<
1224	<
1225	<	<target name="jsr166yclean"
1226	<	description="Removes all jsr166y build products">
1227	<
1172	>	<target name="jsr166yclean">
1173		<delete dir="${build.jsr166y.dir}"/>
1229	–
1174		</target>
1175
1176	<
1233	<	<target name="jsr166ydist-jar"
1234	<	depends="jsr166yclean, jsr166yjar">
1176	>	<target name="jsr166ydist-jar" depends="jsr166yclean, jsr166yjar">
1177		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
1178		</target>
1179
1180	<	<target name="jsr166ydist-docs"
1239	<	depends="jsr166yclean, jsr166ydocs">
1180	>	<target name="jsr166ydist-docs" depends="jsr166yclean, jsr166ydocs">
1181		<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
1182		</target>
1183
1184
1185	<	<!-- extra166y -->
1245	<
1246	<
1247	<	<target name="extra166ycompile"
1248	<	depends="configure-compiler, jsr166yjar"
1249	<	description="Compiles extra166y sources">
1185	>	<!-- extra166y (no longer maintained) -->
1186
1187	+	<target name="extra166ycompile" depends="configure-compiler, jsr166yjar">
1188		<mkdir dir="${build.extra166y.classes.dir}"/>
1189
1190		<javac srcdir="${topsrc.dir}"
#	Line 1270 | Line 1207
1207		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1208		<compilerarg value="-Werror"/>
1209		<compilerarg line="${build.args}"/>
1273	–
1210		</javac>
1211		</target>
1212
1213	<
1278	<	<target name="extra166yjar"
1279	<	depends="extra166ycompile"
1280	<	description="Builds library jar from compiled sources">
1281	<
1213	>	<target name="extra166yjar" depends="extra166ycompile">
1214		<jar destfile="${extra166y.jar}" index="true">
1215		<fileset dir="${build.extra166y.classes.dir}"/>
1216		<manifest>
#	Line 1286 | Line 1218
1218		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1219		</manifest>
1220		</jar>
1289	–
1221		</target>
1222
1223	<
1293	<	<target name="extra166ydocs"
1294	<	description="Builds javadocs to build dir">
1295	<
1223	>	<target name="extra166ydocs">
1224		<delete dir="${extra166ydocs.dir}"/>
1225		<mkdir dir="${extra166ydocs.dir}"/>
1226
#	Line 1306 | Line 1234
1234		executable="${javadoc7}">
1235		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1236		<arg value="-XDignore.symbol.file=true"/>
1309	–
1237		</javadoc>
1238		</target>
1239
1240	+	<target name="extra166ydist" depends="extra166ydist-jar, extra166ydist-docs"/>
1241
1242	<	<target name="extra166ydist"
1315	<	depends="extra166ydist-jar, extra166ydist-docs"
1316	<	description="Puts all distributable products in single hierarchy"/>
1317	<
1318	<
1319	<	<target name="extra166yclean"
1320	<	description="Removes all extra166y build products">
1321	<
1242	>	<target name="extra166yclean">
1243		<delete dir="${build.extra166y.dir}"/>
1323	–
1244		</target>
1245
1246	<
1327	<	<target name="extra166ydist-jar"
1328	<	depends="extra166yclean, extra166yjar">
1246	>	<target name="extra166ydist-jar" depends="extra166yclean, extra166yjar">
1247		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1248		</target>
1249
1250	<	<target name="extra166ydist-docs"
1333	<	depends="extra166yclean, extra166ydocs">
1250	>	<target name="extra166ydist-docs" depends="extra166yclean, extra166ydocs">
1251		<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1252		</target>
1253
1254	<	<!-- jsr166e -->
1254	>
1255	>	<!-- jsr166e (no longer maintained) -->
1256
1257		<property name="build.jsr166e.java.version" value="6"/>
1258		<property name="build.jsr166e.javac" value="${javac6}"/>
1259
1260	<	<target name="jsr166ecompile"
1343	<	depends="configure-compiler"
1344	<	description="Compiles jsr166e sources">
1345	<
1260	>	<target name="jsr166ecompile" depends="configure-compiler">
1261		<mkdir dir="${build.jsr166e.classes.dir}"/>
1262
1263		<javac srcdir="${topsrc.dir}"
#	Line 1363 | Line 1278
1278		<compilerarg value="-Xlint:all"/>
1279		<compilerarg value="-Werror"/>
1280		<compilerarg line="${build.args}"/>
1366	–
1281		</javac>
1282		</target>
1283
1370	–	<!-- jsr166e: find doclint errors -->
1284		<target name="jsr166edoclint">
1372	–
1285		<mkdir dir="${build.jsr166e.classes.dir}"/>
1286
1287		<javac srcdir="${topsrc.dir}"
#	Line 1391 | Line 1303
1303		<compilerarg value="-Xlint:all"/>
1304		<compilerarg value="-Werror"/>
1305		<compilerarg value="-Xdoclint:all/protected"/>
1394	–
1306		</javac>
1307		</target>
1308
1309	<
1399	<	<target name="jsr166ejar"
1400	<	depends="jsr166ecompile"
1401	<	description="Builds library jar from compiled sources">
1402	<
1309	>	<target name="jsr166ejar" depends="jsr166ecompile">
1310		<jar destfile="${jsr166e.jar}" index="true">
1311		<fileset dir="${build.jsr166e.classes.dir}"/>
1312		<manifest>
#	Line 1407 | Line 1314
1314		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1315		</manifest>
1316		</jar>
1410	–
1317		</target>
1318
1319	<
1414	<	<target name="jsr166edocs"
1415	<	description="Builds javadocs to build dir">
1416	<
1319	>	<target name="jsr166edocs">
1320		<delete dir="${jsr166edocs.dir}"/>
1321		<mkdir dir="${jsr166edocs.dir}"/>
1322
#	Line 1427 | Line 1330
1330		failonerror = "true">
1331		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1332		<arg value="-XDignore.symbol.file=true"/>
1430	–
1333		</javadoc>
1334		</target>
1335
1336	<
1435	<	<target name="jsr166e-tck-one-java-version"
1436	<	depends="jsr166ejar">
1437	<
1336	>	<target name="jsr166e-tck-one-java-version" depends="jsr166ejar">
1337		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
1439	–
1338		<run-tck-tests
1339		tck.src.dir="${test.src.dir}/tck-jsr166e"
1340		target="${build.jsr166e.java.version}"
#	Line 1444 | Line 1342
1342		classes="${jsr166e.jar}"/>
1343		</target>
1344
1345	<	<target name="jsr166e-tck"
1448	<	description="Runs tck tests for jsr166e for multiple java versions">
1345	>	<target name="jsr166e-tck">
1346
1347		<!--     <antcall target="clean"/> -->
1348		<!--     <antcall target="jsr166e-tck-one-java-version"> -->
#	Line 1466 | Line 1363
1363		</antcall>
1364		</target>
1365
1366	+	<target name="jsr166e-test" depends="jsr166e-tck"/>
1367
1368	<	<target name="jsr166e-test"
1471	<	depends="jsr166e-tck"
1472	<	description="Runs all tests for jsr166e">
1473	<	</target>
1474	<
1475	<	<target name="jsr166edist"
1476	<	depends="jsr166edist-jar, jsr166edist-docs"
1477	<	description="Puts all distributable products in single hierarchy"/>
1478	<
1368	>	<target name="jsr166edist" depends="jsr166edist-jar, jsr166edist-docs"/>
1369
1370	<	<target name="jsr166eclean"
1481	<	description="Removes all jsr166e build products">
1370	>	<target name="jsr166eclean">
1371		<delete dir="${build.jsr166e.dir}"/>
1372		</target>
1373
1485	–
1374		<target name="jsr166edist-jar"
1375		depends="jsr166eclean, jsr166ejar">
1376		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1377		</target>
1378
1379	<	<target name="jsr166edist-docs"
1492	<	depends="jsr166eclean, jsr166edocs">
1379	>	<target name="jsr166edist-docs" depends="jsr166eclean, jsr166edocs">
1380		<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1381		</target>
1382
#	Line 1509 | Line 1396
1396		</antcall>
1397		</target>
1398
1399	+
1400	+	<!-- ==============================================================
1401	+	Experimental errorprone support - http://errorprone.info
1402	+	=================================================================== -->
1403	+	<property name="errorprone.jar" location="${lib.dir}/error_prone_ant-2.2.0.jar"/>
1404	+	<property name="errorprone.jsr166.flags"
1405	+	value="-Xep:BoxedPrimitiveConstructor:OFF
1406	+	-Xep:HashtableContains:OFF
1407	+	-Xep:JdkObsolete:OFF
1408	+	-Xep:ModifyingCollectionWithItself:OFF
1409	+	-Xep:MissingOverride:OFF
1410	+	-Xep:MissingFail:OFF
1411	+	-Xep:IdentityBinaryExpression:WARN
1412	+	-Xep:MethodCanBeStatic:WARN"/>
1413	+	<!-- -Xep:WildcardImport:ERROR -->
1414	+	<property name="errorprone.jsr166.test.flags"
1415	+	value="-Xep:MissingOverride:OFF
1416	+	-Xep:StringSplitter:OFF
1417	+	-Xep:MixedArrayDimensions:ERROR
1418	+	-Xep:RemoveUnusedImports:ERROR
1419	+	-Xep:LongLiteralLowerCaseSuffix:ERROR
1420	+	-Xep:RedundantThrows:ERROR
1421	+	-Xep:EmptyIf:ERROR
1422	+	-Xep:MultipleTopLevelClasses:ERROR
1423	+	-Xep:ClassName:ERROR"/>
1424	+	<!-- ant -emacs errorprone |& grep -EA1 '(warning|error):|warnings' -->
1425	+	<target name="errorprone"
1426	+	depends="clean, configure-compiler"
1427	+	description="Run errorprone over jsr166 source code (experimental)">
1428	+
1429	+	<local name="destdir"/>
1430	+	<property name="destdir" value="${build.classes.dir}/java.base"/>
1431	+	<mkdir dir="${destdir}"/>
1432	+
1433	+	<javac srcdir="${src.dir}"
1434	+	destdir="${destdir}"
1435	+	debug="${build.debug}"
1436	+	debuglevel="${build.debuglevel}"
1437	+	deprecation="${build.deprecation}"
1438	+	classpath=""
1439	+	includeAntRuntime="false"
1440	+	includeJavaRuntime="false"
1441	+	encoding="ASCII"
1442	+	executable="${build.main.javac}"
1443	+	fork="true">
1444	+
1445	+	<include name="**/*.java"/>
1446	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1447	+	<compilerarg value="-Xplugin:ErrorProne
1448	+	${errorprone.jsr166.flags}"/>
1449	+	<compilerarg value="--patch-module=java.base=${src.dir}"/>
1450	+	<compilerarg value="-Xprefer:source"/>
1451	+	<compilerarg value="-XDignore.symbol.file=true"/>
1452	+	<compilerarg value="-Xlint:all"/>
1453	+	<compilerarg value="-Xdoclint:all/protected,reference/private"/>
1454	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1455	+	<compilerarg line="${build.args}"/>
1456	+	</javac>
1457	+
1458	+	<jar destfile="${product.jar}">
1459	+	<fileset dir="${destdir}"/>
1460	+	</jar>
1461	+
1462	+	<run-tck-tests
1463	+	target="${build.main.java.version}"
1464	+	workdir="${build.dir}"
1465	+	classes="${product.jar}">
1466	+	<javac-elements>
1467	+	<compilerarg line="-processorpath ${errorprone.jar}"/>
1468	+	<compilerarg value="-Xplugin:ErrorProne
1469	+	${errorprone.jsr166.flags}
1470	+	${errorprone.jsr166.test.flags}"/>
1471	+	<compilerarg line="-Xmaxerrs 3000 -Xmaxwarns 3000"/>
1472	+	</javac-elements>
1473	+	</run-tck-tests>
1474	+	</target>
1475	+
1476	+	<!-- ant -emacs errorprone-jtreg |& grep -EA1 '(warning|error):' -->
1477	+	<!-- -XDcompilePolicy=simple or byfile avoids confusing UnusedImports -->
1478	+	<target name="errorprone-jtreg"
1479	+	depends="jar"
1480	+	description="Run errorprone over jtreg tests (experimental)">
1481	+
1482	+	<run-jtreg-tests
1483	+	target="${build.main.java.version}"
1484	+	workdir="${build.dir}"
1485	+	classes="${product.jar}"
1486	+	verbose="all">
1487	+	<jtreg-elements>
1488	+	<arg value="-javacoption:-XDcompilePolicy=byfile"/>
1489	+	<arg value="-javacoption:-processorpath"/>
1490	+	<arg value="-javacoption:${errorprone.jar}"/>
1491	+	<arg value="-javacoption:-Xplugin:ErrorProne
1492	+	${errorprone.jsr166.flags}
1493	+	${errorprone.jsr166.test.flags}
1494	+	-Xep:NonAtomicVolatileUpdate:OFF"/>
1495	+	</jtreg-elements>
1496	+	</run-jtreg-tests>
1497	+	</target>
1498	+
1499	+
1500		<!-- ==============================================================
1501		Running guava tests against jsr166 code
1502		=================================================================== -->
#	Line 1561 | Line 1549
1549		<get src="http://repo2.maven.org/maven2/com/google/guava/guava-testlib/${guava.version}/guava-testlib-${guava.version}-tests.jar"
1550		dest="${guava.dir}/guava-testlib-tests.jar" usetimestamp="true"/>
1551		<junit printsummary="true" showoutput="true" haltonfailure="true"
1552	<	jvm="${java9}" fork="true">
1553	<	<jvmarg line="-ea -esa --patch-module java.base=${product.jar}"/>
1552	>	jvm="${build.main.java}" fork="true">
1553	>	<jvmarg line="-ea -esa --patch-module=java.base=${product.jar}"/>
1554		<formatter type="brief"/>
1555		<classpath>
1556		<pathelement location="${guava.dir}/guava-testlib-tests.jar"/>

Diff Legend

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