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.283 by jsr166, Wed Oct 24 22:31:14 2018 UTC vs.
Revision 1.284 by jsr166, Sat Oct 27 01:16:23 2018 UTC

#	Line 55 | Line 55
55
56
57		<!-- Compilation options -->
58	–	<property name="build.sourcelevel"    value="6"/>
58		<property name="build.debug"          value="true"/>
59		<property name="build.debuglevel"     value="source,lines,vars"/>
60		<property name="build.deprecation"    value="false"/>
#	Line 391 | Line 390
390
391		<!-- Main targets -->
392
393	+	<!-- Default values: may seem strange ... -->
394	+	<!-- At runtime, target latest LTS, i.e. jdk11 -->
395	+	<!-- But at build time, target jdk9, for maximal binary portability -->
396	+	<!-- Use javadoc12, so we can use override-methods=summary, and JDK-8202628 -->
397		<property name="build.main.java.version" value="11"/>
398	<	<!-- Workaround "no nested properties in ant" -->
399	<	<macrodef name="define-build-main-properties">
400	<	<attribute name="v"/>
398	<	<sequential>
399	<	<property name="build.main.java"    value="${java@{v}}"/>
400	<	<property name="build.main.javac"   value="${javac@{v}}"/>
401	<	<!-- Force javadoc version to be at least 10, so we can use override-methods=summary -->
402	<	<!-- Force javadoc version to be at least 12, due to JDK-8202628 -->
403	<	<condition property="build.main.javadoc"
404	<	value="${javadoc12}"
405	<	else="${javadoc@{v}}">
406	<	<matches pattern="^(9|10|11)$" string="@{v}"/>
407	<	</condition>
408	<	</sequential>
409	<	</macrodef>
410	<	<define-build-main-properties v="${build.main.java.version}"/>
398	>	<property name="build.main.java" value="${java11}"/>
399	>	<property name="build.main.javac" value="${javac9}"/>
400	>	<property name="build.main.javadoc" value="${javadoc12}"/>
401
402		<target name="dists"
403		depends="dist, 4jdk8dist"
#	Line 439 | Line 429
429		<compilerarg value="--patch-module=java.base=${src.dir}"/>
430		<compilerarg value="-Xprefer:source"/>
431		<compilerarg value="-XDignore.symbol.file=true"/>
432	<	<compilerarg value="-Xlint:all"/>
432	>	<compilerarg value="-Xlint:all,-removal"/>
433		<compilerarg line="--doclint-format html5"/>
434		<compilerarg value="-Xdoclint:all/protected,reference/private"/>
435		<compilerarg value="-Werror"/>
#	Line 585 | Line 575
575		depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
576		description="Runs tck and jtreg tests for src/main"/>
577
578	<	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
579	<
580	<	<!--     <antcall target="jtreg"> -->
591	<	<!--       <param name="build.main.java.version" value="8"/> -->
592	<	<!--       <param name="build.main.javac" value="${javac8}"/> -->
593	<	<!--     </antcall> -->
594	<
595	<	<!--   </target> -->
596	<
597	<	<target name="test9101112"
598	<	description="Runs tck and jtreg tests for src/main for multiple java versions">
578	>	<target name="test-version-permutations"
579	>	depends="test9, test10, test11, test12, test9-11, test9-12, clean, test, docs">
580	>	</target>
581
582	+	<target name="test9">
583		<antcall target="clean"/>
584	<	<antcall target="test">
584	>	<antcall>
585		<param name="build.main.java.version" value="9"/>
586		<param name="build.main.java" value="${java9}"/>
587		<param name="build.main.javac" value="${javac9}"/>
588	+	<target name="test"/>
589		</antcall>
590	+	</target>
591
592	+	<target name="test10">
593		<antcall target="clean"/>
594	<	<antcall target="test">
594	>	<antcall>
595		<param name="build.main.java.version" value="10"/>
596		<param name="build.main.java" value="${java10}"/>
597		<param name="build.main.javac" value="${javac10}"/>
598	+	<param name="build.main.javadoc" value="${javadoc10}"/>
599	+	<target name="test"/>
600	+	<target name="docs"/>
601		</antcall>
602	+	</target>
603
604	+	<target name="test11">
605		<antcall target="clean"/>
606	<	<antcall target="test">
606	>	<antcall>
607		<param name="build.main.java.version" value="11"/>
608		<param name="build.main.java" value="${java11}"/>
609		<param name="build.main.javac" value="${javac11}"/>
610	+	<param name="build.main.javadoc" value="${javadoc11}"/>
611	+	<target name="test"/>
612	+	<target name="docs"/>
613		</antcall>
614	+	</target>
615
616	+	<target name="test12">
617		<antcall target="clean"/>
618	<	<antcall target="test">
623	<	<param name="build.main.java.version" value="12"/>
624	<	<param name="build.main.java" value="${java12}"/>
625	<	<param name="build.main.javac" value="${javac12}"/>
626	<	</antcall>
627	<	<antcall target="docs">
618	>	<antcall>
619		<param name="build.main.java.version" value="12"/>
620		<param name="build.main.java" value="${java12}"/>
621		<param name="build.main.javac" value="${javac12}"/>
622		<param name="build.main.javadoc" value="${javadoc12}"/>
623	+	<target name="test"/>
624	+	<target name="docs"/>
625		</antcall>
626	+	</target>
627
628	<	<!-- Clean up to avoid obscure wrong class file version bugs -->
628	>	<target name="test9-11">
629		<antcall target="clean"/>
630	<
630	>	<antcall>
631	>	<param name="build.main.java.version" value="11"/>
632	>	<param name="build.main.java" value="${java11}"/>
633	>	<param name="build.main.javac" value="${javac9}"/>
634	>	<param name="build.main.javadoc" value="${javadoc11}"/>
635	>	<target name="test"/>
636	>	<target name="docs"/>
637	>	</antcall>
638		</target>
639
640	+	<target name="test9-12">
641	+	<antcall target="clean"/>
642	+	<antcall>
643	+	<param name="build.main.java.version" value="12"/>
644	+	<param name="build.main.java" value="${java12}"/>
645	+	<param name="build.main.javac" value="${javac9}"/>
646	+	<param name="build.main.javadoc" value="${javadoc12}"/>
647	+	<target name="test"/>
648	+	<target name="docs"/>
649	+	</antcall>
650	+	</target>
651
652
653		<target name="configure-compiler">
#	Line 658 | Line 670
670		</target>
671
672
661	–
662	–	<!-- Various demos and test programs -->
663	–
664	–
665	–	<!-- description="Benchmark from Doug Lea's AQS paper" -->
666	–	<target name="loops" depends="configure-compiler">
667	–
668	–	<mkdir dir="${build.loops.dir}"/>
669	–
670	–	<javac srcdir="${loops.src.dir}"
671	–	destdir="${build.loops.dir}"
672	–	debug="${build.debug}"
673	–	debuglevel="${build.debuglevel}"
674	–	deprecation="${build.deprecation}"
675	–	source="${build.sourcelevel}"
676	–	target="${build.sourcelevel}"
677	–	encoding="ASCII"
678	–	fork="true">
679	–
680	–	<compilerarg line="${build.args}"/>
681	–	<classpath refid="loops.classpath"/>
682	–	<compilerarg value="-XDignore.symbol.file=true"/>
683	–
684	–	</javac>
685	–
686	–	<java classname="ALoops" fork="true">
687	–	<classpath refid="loops.classpath"/>
688	–	</java>
689	–	</target>
690	–
691	–
673		<target name="compile-test-loops" depends="jar"
674		description="Compiles all the perf tests in src/test/loops">
675

Diff Legend

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