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.126 by jsr166, Wed Jan 23 06:46:27 2013 UTC vs.
Revision 1.140 by jsr166, Mon May 20 19:12:23 2013 UTC

#	Line 22 | Line 22
22		$HOME/jdk/src/jdk8
23		where each of the above is a complete JDK source tree
24		(e.g. mercurial forest) or a symlink to same.
25	+	As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26		------------------------------------------------------------------------------
27		</description>
28
29	<	<target name="usage" description="Advises user to run with -projecthelp">
30	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
29	>	<target name="usage" description="Display main targets by running 'ant -projecthelp'">
30	>	<java classname="org.apache.tools.ant.Main">
31	>	<arg value="-projecthelp" />
32	>	</java>
33		</target>
34
35
#	Line 39 | Line 42
42		<property name="build.debug"          value="true"/>
43		<property name="build.debuglevel"     value="source,lines,vars"/>
44		<property name="build.deprecation"    value="false"/>
45	+	<property name="build.javadoc.access" value="protected"/>
46	+
47	+	<!-- Tck options; see JSR166TestCase.java -->
48	+	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49	+	<property name="jsr166.profileTests"     value="false"/>
50	+	<property name="jsr166.profileThreshold" value="100"/>
51	+	<property name="jsr166.runsPerTest"      value="1"/>
52	+	<!-- Allow running an individual tck test class -->
53	+	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55
56		<!-- Build locations -->
57		<property name="build.dir"                   location="build"/>
#	Line 118 | Line 131
131		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
132
133		<!-- Javadoc locations -->
134	<	<property name="javadocs.dir"          location="${build.dir}/javadocs"/>
135	<	<property name="4jdk7javadocs.dir"     location="${build.4jdk7.dir}/javadocs"/>
136	<	<property name="jsr166xjavadocs.dir"   location="${build.jsr166x.dir}/javadocs"/>
137	<	<property name="jsr166yjavadocs.dir"   location="${build.jsr166y.dir}/javadocs"/>
138	<	<property name="jsr166ejavadocs.dir"   location="${build.jsr166e.dir}/javadocs"/>
139	<	<property name="extra166yjavadocs.dir" location="${build.extra166y.dir}/javadocs"/>
140	<
141	<	<property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
142	<	<property name="dist.4jdk7javadocs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
146	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
134	>	<property name="docs.dir"          location="${build.dir}/docs"/>
135	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
136	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
140	>
141	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
142	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
146	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
147
148		<!-- Jar locations -->
149		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
#	Line 166 | Line 179
179
180		<macrodef name="run-tck-tests">
181		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
169	–	<attribute name="source" default="6"/>
182		<attribute name="target"/>
183	+	<attribute name="compile-target" default="@{target}"/>
184		<attribute name="workdir"/>
185		<attribute name="classes"/>
186		<attribute name="jvmflags" default=""/>
187	+	<element name="javac-elements" optional="true"/>
188		<sequential>
189
190		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 180 | Line 194
194		debug="${build.debug}"
195		debuglevel="${build.debuglevel}"
196		deprecation="${build.deprecation}"
197	<	source="@{source}"
197	>	source="@{compile-target}"
198	>	target="@{compile-target}"
199		classpath="${junit.jar}"
200	<	bootclasspath="@{classes}:${bootclasspath@{source}}"
200	>	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
201		includeAntRuntime="false"
202		includeJavaRuntime="false"
203	<	executable="${javac@{target}}"
203	>	executable="${javac@{compile-target}}"
204		fork="true">
205
206		<include name="*.java"/>
207		<compilerarg value="-XDignore.symbol.file=true"/>
208		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
209		<compilerarg line="${build.args}"/>
210	+	<javac-elements/>
211
212		</javac>
213
214	<	<java classname="JSR166TestCase"
214	>	<java classname="${jsr166.tckTestClass}"
215		failonerror="true"
216		jvm="${java@{target}}"
217		fork="true">
218		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
219		<jvmarg line="@{jvmflags}"/>
220	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
221	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
222	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
223		<classpath>
224		<pathelement location="${junit.jar}"/>
225		<pathelement location="@{workdir}/tck-classes"/>
#	Line 210 | Line 229
229		</sequential>
230		</macrodef>
231
232	+	<macrodef name="run-jtreg-tests">
233	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
234	+	<attribute name="source" default="7"/>
235	+	<attribute name="target"/>
236	+	<attribute name="workdir"/>
237	+	<attribute name="classes"/>
238	+	<attribute name="jtregflags" default=""/>
239	+	<sequential>
240	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
241	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
242	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
243	+	<mkdir dir="@{workdir}/JTreport"/>
244	+	<jtreg dir="@{jtreg.src.dir}"
245	+	jdk="${jdk@{target}.home}"
246	+	workDir="@{workdir}/JTwork"
247	+	reportDir="@{workdir}/JTreport">
248	+
249	+	<arg value="-Xbootclasspath/p:@{classes}"/>
250	+	<arg value="-agentvm"/>
251	+	<arg value="-v:nopass,fail"/>
252	+	<arg value="-vmoptions:-esa -ea"/>
253	+	<arg value="-automatic"/>
254	+	<arg value="-k:!ignore"/>
255	+	<arg line="@{jtregflags}"/>
256	+	</jtreg>
257	+	</sequential>
258	+	</macrodef>
259	+
260		<!-- ALoops classpath -->
261		<path id="loops.classpath">
262		<pathelement location="${build.loops.dir}"/>
#	Line 243 | Line 290
290		fork="true">
291
292		<include name="**/*.java"/>
293	+	<compilerarg value="-Xprefer:source"/>
294		<compilerarg value="-XDignore.symbol.file=true"/>
295		<compilerarg value="-Xlint:all"/>
296		<compilerarg line="${build.args}"/>
#	Line 269 | Line 317
317		<target name="docs"
318		description="Builds javadocs for src/main to dist dir">
319
320	<	<delete dir="${javadocs.dir}"/>
321	<	<mkdir dir="${javadocs.dir}"/>
320	>	<delete dir="${docs.dir}"/>
321	>	<mkdir dir="${docs.dir}"/>
322
323		<!-- the packagenames="none" hack below prevents scanning the -->
324		<!-- sourcepath for packages -->
325
326	<	<javadoc destdir="${javadocs.dir}"
326	>	<javadoc destdir="${docs.dir}"
327		packagenames="none"
328		link="${jdkapi8docs.url}"
329		overview="${src.dir}/intro.html"
330	+	access="${build.javadoc.access}"
331		sourcepath="${src.dir}:${jdk8src.dir}"
332		classpath=""
333		executable="${javadoc8}">
#	Line 341 | Line 390
390
391		<target name="dist-docs"
392		depends="clean, docs">
393	<	<mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
393	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
394		</target>
395
396
#	Line 408 | Line 457
457
458		</target>
459
460	+	<target name="test-tck"
461	+	depends="jar"
462	+	description="Runs tck tests for main directly">
463	+
464	+	<run-tck-tests
465	+	target="8"
466	+	workdir="${build.dir}"
467	+	classes="${product.jar}"/>
468	+	</target>
469	+
470	+	<target name="test-jtreg"
471	+	depends="jar"
472	+	description="Runs jtreg tests for main using the jtreg ant task">
473	+	<run-jtreg-tests
474	+	target="8"
475	+	workdir="${build.dir}"
476	+	classes="${product.jar}"/>
477	+	</target>
478	+
479	+	<target name="test-ng"
480	+	depends="test-tck, test-jtreg"
481	+	description="Runs tck and jtreg tests for main">
482	+	</target>
483
484		<target name="run-tests"
485		depends="compile-tests">
#	Line 574 | Line 646
646		fork="true">
647
648		<include name="**/*.java"/>
649	+	<compilerarg value="-Xprefer:source"/>
650		<compilerarg value="-XDignore.symbol.file=true"/>
651		<compilerarg value="-Xlint:all"/>
652		<compilerarg line="${build.args}"/>
#	Line 582 | Line 655
655		</target>
656
657
658	<	<target name="4jdk7-jar"
658	>	<target name="4jdk7jar"
659		depends="4jdk7compile"
660		description="Builds library jar from compiled sources">
661
#	Line 594 | Line 667
667
668
669		<target name="4jdk7-test-tck"
670	<	depends="4jdk7-jar"
670	>	depends="4jdk7jar"
671		description="Runs tck tests for jsr166-4jdk7 directly">
672
673		<run-tck-tests
674		target="7"
675		workdir="${build.4jdk7.dir}"
676	<	classes="${4jdk7product.jar}"/>
676	>	classes="${4jdk7product.jar}">
677	>	<javac-elements>
678	>	<!-- JDK8+ test classes -->
679	>	<exclude name="*8Test.java"/>
680	>	<exclude name="DoubleAccumulatorTest.java"/>
681	>	<exclude name="DoubleAdderTest.java"/>
682	>	<exclude name="LongAccumulatorTest.java"/>
683	>	<exclude name="LongAdderTest.java"/>
684	>	<exclude name="CompletableFutureTest.java"/>
685	>	<exclude name="StampedLockTest.java"/>
686	>	</javac-elements>
687	>	</run-tck-tests>
688		</target>
689
690
#	Line 626 | Line 710
710
711		<formatter type="brief"/>
712
713	<	<test name="JSR166TestCase" haltonfailure="no">
713	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
714		</test>
715
716		</junit>
717		</target>
718
719		<target name="4jdk7-test-jtreg"
720	<	depends="4jdk7compile"
720	>	depends="4jdk7jar"
721		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
722	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
723	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
724	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
725	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
642	<	<jtreg dir="${jtreg.src.dir}"
643	<	jdk="${jdk7.home}"
644	<	workDir="${build.4jdk7.dir}/JTwork"
645	<	reportDir="${build.4jdk7.dir}/JTreport">
646	<
647	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
648	<	<arg value="-agentvm"/>
649	<	<arg value="-v:nopass,fail"/>
650	<	<arg value="-vmoptions:-esa -ea"/>
651	<	<arg value="-automatic"/>
652	<	<arg value="-k:!ignore"/>
653	<	</jtreg>
722	>	<run-jtreg-tests
723	>	target="7"
724	>	workdir="${build.4jdk7.dir}"
725	>	classes="${4jdk7product.jar}"/>
726		</target>
727
728
#	Line 663 | Line 735
735		<target name="4jdk7docs"
736		description="Builds javadocs for src/jdk7 to dist dir">
737
738	<	<delete dir="${4jdk7javadocs.dir}"/>
739	<	<mkdir dir="${4jdk7javadocs.dir}"/>
738	>	<delete dir="${4jdk7docs.dir}"/>
739	>	<mkdir dir="${4jdk7docs.dir}"/>
740
741	<	<javadoc destdir="${4jdk7javadocs.dir}"
741	>	<javadoc destdir="${4jdk7docs.dir}"
742		packagenames="none"
743		link="${jdkapi7docs.url}"
744		overview="${4jdk7src.dir}/intro.html"
745	+	access="${build.javadoc.access}"
746		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
747		classpath=""
748		executable="${javadoc7}">
#	Line 700 | Line 773
773		</target>
774
775		<target name="4jdk7dist-jar"
776	<	depends="4jdk7clean, 4jdk7-jar">
776	>	depends="4jdk7clean, 4jdk7jar">
777		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
778		</target>
779
780
781		<target name="4jdk7dist-docs"
782		depends="4jdk7clean, 4jdk7docs">
783	<	<mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
783	>	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
784		</target>
785
786
#	Line 741 | Line 814
814		</target>
815
816
817	<	<target name="jsr166x-jar"
817	>	<target name="jsr166xjar"
818		depends="jsr166xcompile"
819		description="Builds library jar from compiled sources">
820
#	Line 755 | Line 828
828		<target name="jsr166xdocs"
829		description="Builds javadocs to dist dir">
830
831	<	<delete dir="${jsr166xjavadocs.dir}"/>
832	<	<mkdir dir="${jsr166xjavadocs.dir}"/>
831	>	<delete dir="${jsr166xdocs.dir}"/>
832	>	<mkdir dir="${jsr166xdocs.dir}"/>
833
834	<	<javadoc destdir="${jsr166xjavadocs.dir}"
834	>	<javadoc destdir="${jsr166xdocs.dir}"
835		packagenames="jsr166x.*"
836		link="${jdkapidocs.url}"
837	+	access="${build.javadoc.access}"
838		sourcepath="${topsrc.dir}:${jdk6src.dir}"
839		bootclasspath="${bootclasspath6}"
840		source="5"
#	Line 791 | Line 865
865
866
867		<target name="jsr166xdist-jar"
868	<	depends="jsr166xclean, jsr166x-jar">
868	>	depends="jsr166xclean, jsr166xjar">
869		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
870		</target>
871
872		<target name="jsr166xdist-docs"
873		depends="jsr166xclean, jsr166xdocs">
874	<	<mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
874	>	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
875		</target>
876
877		<!-- jsr166y -->
#	Line 831 | Line 905
905		</target>
906
907
908	<	<target name="jsr166y-jar"
908	>	<target name="jsr166yjar"
909		depends="jsr166ycompile"
910		description="Builds library jar from compiled sources">
911
#	Line 845 | Line 919
919		<target name="jsr166ydocs"
920		description="Builds javadocs to dist dir">
921
922	<	<delete dir="${jsr166yjavadocs.dir}"/>
923	<	<mkdir dir="${jsr166yjavadocs.dir}"/>
922	>	<delete dir="${jsr166ydocs.dir}"/>
923	>	<mkdir dir="${jsr166ydocs.dir}"/>
924
925	<	<javadoc destdir="${jsr166yjavadocs.dir}"
925	>	<javadoc destdir="${jsr166ydocs.dir}"
926		packagenames="jsr166y.*"
927		link="${jdkapidocs.url}"
928	+	access="${build.javadoc.access}"
929		sourcepath="${topsrc.dir}:${jdk6src.dir}"
930		bootclasspath="${bootclasspath6}"
931		source="6"
#	Line 880 | Line 955
955		</target>
956
957		<target name="jsr166ydist-jar"
958	<	depends="jsr166yclean, jsr166y-jar">
958	>	depends="jsr166yclean, jsr166yjar">
959		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
960		</target>
961
962		<target name="jsr166ydist-docs"
963		depends="jsr166yclean, jsr166ydocs">
964	<	<mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
964	>	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
965		</target>
966
967
#	Line 894 | Line 969
969
970
971		<target name="extra166ycompile"
972	<	depends="configure-compiler, jsr166y-jar"
972	>	depends="configure-compiler, jsr166yjar"
973		description="Compiles extra166y sources">
974
975		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 921 | Line 996
996		</target>
997
998
999	<	<target name="extra166y-jar"
999	>	<target name="extra166yjar"
1000		depends="extra166ycompile"
1001		description="Builds library jar from compiled sources">
1002
#	Line 935 | Line 1010
1010		<target name="extra166ydocs"
1011		description="Builds javadocs to build dir">
1012
1013	<	<delete dir="${extra166yjavadocs.dir}"/>
1014	<	<mkdir dir="${extra166yjavadocs.dir}"/>
1013	>	<delete dir="${extra166ydocs.dir}"/>
1014	>	<mkdir dir="${extra166ydocs.dir}"/>
1015
1016	<	<javadoc destdir="${extra166yjavadocs.dir}"
1016	>	<javadoc destdir="${extra166ydocs.dir}"
1017		packagenames="extra166y.*"
1018		link="${jdkapidocs.url}"
1019	+	access="${build.javadoc.access}"
1020		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1021		bootclasspath="${bootclasspath6}"
1022		source="6"
#	Line 970 | Line 1046
1046		</target>
1047
1048		<target name="extra166ydist-jar"
1049	<	depends="extra166yclean, extra166y-jar">
1049	>	depends="extra166yclean, extra166yjar">
1050		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1051		</target>
1052
1053		<target name="extra166ydist-docs"
1054		depends="extra166yclean, extra166ydocs">
1055	<	<mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
1055	>	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1056		</target>
1057
1058		<!-- jsr166e -->
#	Line 1008 | Line 1084
1084		</target>
1085
1086
1087	<	<target name="jsr166e-jar"
1087	>	<target name="jsr166ejar"
1088		depends="jsr166ecompile"
1089		description="Builds library jar from compiled sources">
1090
#	Line 1022 | Line 1098
1098		<target name="jsr166edocs"
1099		description="Builds javadocs to build dir">
1100
1101	<	<delete dir="${jsr166ejavadocs.dir}"/>
1102	<	<mkdir dir="${jsr166ejavadocs.dir}"/>
1101	>	<delete dir="${jsr166edocs.dir}"/>
1102	>	<mkdir dir="${jsr166edocs.dir}"/>
1103
1104	<	<javadoc destdir="${jsr166ejavadocs.dir}"
1104	>	<javadoc destdir="${jsr166edocs.dir}"
1105		packagenames="jsr166e.*"
1106		link="${jdkapidocs.url}"
1107	+	access="${build.javadoc.access}"
1108		sourcepath="${topsrc.dir}:${jdk7src.dir}"
1109		source="7"
1110		executable="${javadoc7}">
#	Line 1038 | Line 1115
1115
1116
1117		<target name="jsr166e-test-tck"
1118	<	depends="jsr166e-jar"
1118	>	depends="jsr166ejar"
1119		description="Runs tck tests for jsr166e">
1120
1121		<run-tck-tests
1122		tck.src.dir="${test.src.dir}/tck-jsr166e"
1123	<	source="7"
1047	<	target="8"
1123	>	target="7"
1124		workdir="${build.jsr166e.dir}"
1125		classes="${jsr166e.jar}"/>
1126		</target>
#	Line 1067 | Line 1143
1143		</target>
1144
1145		<target name="jsr166edist-jar"
1146	<	depends="jsr166eclean, jsr166e-jar">
1146	>	depends="jsr166eclean, jsr166ejar">
1147		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1148		</target>
1149
1150		<target name="jsr166edist-docs"
1151		depends="jsr166eclean, jsr166edocs">
1152	<	<mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
1152	>	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1153		</target>
1154
1155	+
1156	+	<!-- Find buglets that can be detected by static build tools -->
1157	+
1158	+	<target name="lint">
1159	+	<antcall target="dists">
1160	+	<param name="build.javadoc.access" value="private"/>
1161	+	</antcall>
1162	+	</target>
1163	+
1164	+
1165		</project>

Diff Legend

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