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.139 by jsr166, Thu May 2 21:38:03 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	+	<!-- Use via, e.g. 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
53		<!-- Build locations -->
54		<property name="build.dir"                   location="build"/>
#	Line 118 | Line 128
128		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
129
130		<!-- Javadoc locations -->
131	<	<property name="javadocs.dir"          location="${build.dir}/javadocs"/>
132	<	<property name="4jdk7javadocs.dir"     location="${build.4jdk7.dir}/javadocs"/>
133	<	<property name="jsr166xjavadocs.dir"   location="${build.jsr166x.dir}/javadocs"/>
134	<	<property name="jsr166yjavadocs.dir"   location="${build.jsr166y.dir}/javadocs"/>
135	<	<property name="jsr166ejavadocs.dir"   location="${build.jsr166e.dir}/javadocs"/>
136	<	<property name="extra166yjavadocs.dir" location="${build.extra166y.dir}/javadocs"/>
137	<
138	<	<property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
139	<	<property name="dist.4jdk7javadocs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
140	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
141	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
142	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
143	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
131	>	<property name="docs.dir"          location="${build.dir}/docs"/>
132	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
133	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
134	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
135	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
136	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
137	>
138	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
139	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
140	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
141	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
142	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
143	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
144
145		<!-- Jar locations -->
146		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
#	Line 166 | Line 176
176
177		<macrodef name="run-tck-tests">
178		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
169	–	<attribute name="source" default="6"/>
179		<attribute name="target"/>
180	+	<attribute name="compile-target" default="@{target}"/>
181		<attribute name="workdir"/>
182		<attribute name="classes"/>
183		<attribute name="jvmflags" default=""/>
184	+	<element name="javac-elements" optional="true"/>
185		<sequential>
186
187		<mkdir dir="@{workdir}/tck-classes"/>
#	Line 180 | Line 191
191		debug="${build.debug}"
192		debuglevel="${build.debuglevel}"
193		deprecation="${build.deprecation}"
194	<	source="@{source}"
194	>	source="@{compile-target}"
195	>	target="@{compile-target}"
196		classpath="${junit.jar}"
197	<	bootclasspath="@{classes}:${bootclasspath@{source}}"
197	>	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
198		includeAntRuntime="false"
199		includeJavaRuntime="false"
200	<	executable="${javac@{target}}"
200	>	executable="${javac@{compile-target}}"
201		fork="true">
202
203		<include name="*.java"/>
204		<compilerarg value="-XDignore.symbol.file=true"/>
205		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
206		<compilerarg line="${build.args}"/>
207	+	<javac-elements/>
208
209		</javac>
210
#	Line 201 | Line 214
214		fork="true">
215		<jvmarg value="-Xbootclasspath/p:@{classes}"/>
216		<jvmarg line="@{jvmflags}"/>
217	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
218	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
219	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
220		<classpath>
221		<pathelement location="${junit.jar}"/>
222		<pathelement location="@{workdir}/tck-classes"/>
#	Line 210 | Line 226
226		</sequential>
227		</macrodef>
228
229	+	<macrodef name="run-jtreg-tests">
230	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
231	+	<attribute name="source" default="7"/>
232	+	<attribute name="target"/>
233	+	<attribute name="workdir"/>
234	+	<attribute name="classes"/>
235	+	<attribute name="jtregflags" default=""/>
236	+	<sequential>
237	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
238	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
239	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
240	+	<mkdir dir="@{workdir}/JTreport"/>
241	+	<jtreg dir="@{jtreg.src.dir}"
242	+	jdk="${jdk@{target}.home}"
243	+	workDir="@{workdir}/JTwork"
244	+	reportDir="@{workdir}/JTreport">
245	+
246	+	<arg value="-Xbootclasspath/p:@{classes}"/>
247	+	<arg value="-agentvm"/>
248	+	<arg value="-v:nopass,fail"/>
249	+	<arg value="-vmoptions:-esa -ea"/>
250	+	<arg value="-automatic"/>
251	+	<arg value="-k:!ignore"/>
252	+	<arg line="@{jtregflags}"/>
253	+	</jtreg>
254	+	</sequential>
255	+	</macrodef>
256	+
257		<!-- ALoops classpath -->
258		<path id="loops.classpath">
259		<pathelement location="${build.loops.dir}"/>
#	Line 243 | Line 287
287		fork="true">
288
289		<include name="**/*.java"/>
290	+	<compilerarg value="-Xprefer:source"/>
291		<compilerarg value="-XDignore.symbol.file=true"/>
292		<compilerarg value="-Xlint:all"/>
293		<compilerarg line="${build.args}"/>
#	Line 269 | Line 314
314		<target name="docs"
315		description="Builds javadocs for src/main to dist dir">
316
317	<	<delete dir="${javadocs.dir}"/>
318	<	<mkdir dir="${javadocs.dir}"/>
317	>	<delete dir="${docs.dir}"/>
318	>	<mkdir dir="${docs.dir}"/>
319
320		<!-- the packagenames="none" hack below prevents scanning the -->
321		<!-- sourcepath for packages -->
322
323	<	<javadoc destdir="${javadocs.dir}"
323	>	<javadoc destdir="${docs.dir}"
324		packagenames="none"
325		link="${jdkapi8docs.url}"
326		overview="${src.dir}/intro.html"
327	+	access="${build.javadoc.access}"
328		sourcepath="${src.dir}:${jdk8src.dir}"
329		classpath=""
330		executable="${javadoc8}">
#	Line 341 | Line 387
387
388		<target name="dist-docs"
389		depends="clean, docs">
390	<	<mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
390	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
391		</target>
392
393
#	Line 408 | Line 454
454
455		</target>
456
457	+	<target name="test-tck"
458	+	depends="jar"
459	+	description="Runs tck tests for main directly">
460	+
461	+	<run-tck-tests
462	+	target="8"
463	+	workdir="${build.dir}"
464	+	classes="${product.jar}"/>
465	+	</target>
466	+
467	+	<target name="test-jtreg"
468	+	depends="jar"
469	+	description="Runs jtreg tests for main using the jtreg ant task">
470	+	<run-jtreg-tests
471	+	target="8"
472	+	workdir="${build.dir}"
473	+	classes="${product.jar}"/>
474	+	</target>
475	+
476	+	<target name="test-ng"
477	+	depends="test-tck, test-jtreg"
478	+	description="Runs tck and jtreg tests for main">
479	+	</target>
480
481		<target name="run-tests"
482		depends="compile-tests">
#	Line 574 | Line 643
643		fork="true">
644
645		<include name="**/*.java"/>
646	+	<compilerarg value="-Xprefer:source"/>
647		<compilerarg value="-XDignore.symbol.file=true"/>
648		<compilerarg value="-Xlint:all"/>
649		<compilerarg line="${build.args}"/>
#	Line 582 | Line 652
652		</target>
653
654
655	<	<target name="4jdk7-jar"
655	>	<target name="4jdk7jar"
656		depends="4jdk7compile"
657		description="Builds library jar from compiled sources">
658
#	Line 594 | Line 664
664
665
666		<target name="4jdk7-test-tck"
667	<	depends="4jdk7-jar"
667	>	depends="4jdk7jar"
668		description="Runs tck tests for jsr166-4jdk7 directly">
669
670		<run-tck-tests
671		target="7"
672		workdir="${build.4jdk7.dir}"
673	<	classes="${4jdk7product.jar}"/>
673	>	classes="${4jdk7product.jar}">
674	>	<javac-elements>
675	>	<!-- JDK8+ test classes -->
676	>	<exclude name="*8Test.java"/>
677	>	<exclude name="DoubleAccumulatorTest.java"/>
678	>	<exclude name="DoubleAdderTest.java"/>
679	>	<exclude name="LongAccumulatorTest.java"/>
680	>	<exclude name="LongAdderTest.java"/>
681	>	<exclude name="CompletableFutureTest.java"/>
682	>	<exclude name="StampedLockTest.java"/>
683	>	</javac-elements>
684	>	</run-tck-tests>
685		</target>
686
687
#	Line 633 | Line 714
714		</target>
715
716		<target name="4jdk7-test-jtreg"
717	<	depends="4jdk7compile"
717	>	depends="4jdk7jar"
718		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
719	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
720	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
721	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
722	<	<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>
719	>	<run-jtreg-tests
720	>	target="7"
721	>	workdir="${build.4jdk7.dir}"
722	>	classes="${4jdk7product.jar}"/>
723		</target>
724
725
#	Line 663 | Line 732
732		<target name="4jdk7docs"
733		description="Builds javadocs for src/jdk7 to dist dir">
734
735	<	<delete dir="${4jdk7javadocs.dir}"/>
736	<	<mkdir dir="${4jdk7javadocs.dir}"/>
735	>	<delete dir="${4jdk7docs.dir}"/>
736	>	<mkdir dir="${4jdk7docs.dir}"/>
737
738	<	<javadoc destdir="${4jdk7javadocs.dir}"
738	>	<javadoc destdir="${4jdk7docs.dir}"
739		packagenames="none"
740		link="${jdkapi7docs.url}"
741		overview="${4jdk7src.dir}/intro.html"
742	+	access="${build.javadoc.access}"
743		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
744		classpath=""
745		executable="${javadoc7}">
#	Line 700 | Line 770
770		</target>
771
772		<target name="4jdk7dist-jar"
773	<	depends="4jdk7clean, 4jdk7-jar">
773	>	depends="4jdk7clean, 4jdk7jar">
774		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
775		</target>
776
777
778		<target name="4jdk7dist-docs"
779		depends="4jdk7clean, 4jdk7docs">
780	<	<mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
780	>	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
781		</target>
782
783
#	Line 741 | Line 811
811		</target>
812
813
814	<	<target name="jsr166x-jar"
814	>	<target name="jsr166xjar"
815		depends="jsr166xcompile"
816		description="Builds library jar from compiled sources">
817
#	Line 755 | Line 825
825		<target name="jsr166xdocs"
826		description="Builds javadocs to dist dir">
827
828	<	<delete dir="${jsr166xjavadocs.dir}"/>
829	<	<mkdir dir="${jsr166xjavadocs.dir}"/>
828	>	<delete dir="${jsr166xdocs.dir}"/>
829	>	<mkdir dir="${jsr166xdocs.dir}"/>
830
831	<	<javadoc destdir="${jsr166xjavadocs.dir}"
831	>	<javadoc destdir="${jsr166xdocs.dir}"
832		packagenames="jsr166x.*"
833		link="${jdkapidocs.url}"
834	+	access="${build.javadoc.access}"
835		sourcepath="${topsrc.dir}:${jdk6src.dir}"
836		bootclasspath="${bootclasspath6}"
837		source="5"
#	Line 791 | Line 862
862
863
864		<target name="jsr166xdist-jar"
865	<	depends="jsr166xclean, jsr166x-jar">
865	>	depends="jsr166xclean, jsr166xjar">
866		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
867		</target>
868
869		<target name="jsr166xdist-docs"
870		depends="jsr166xclean, jsr166xdocs">
871	<	<mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
871	>	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
872		</target>
873
874		<!-- jsr166y -->
#	Line 831 | Line 902
902		</target>
903
904
905	<	<target name="jsr166y-jar"
905	>	<target name="jsr166yjar"
906		depends="jsr166ycompile"
907		description="Builds library jar from compiled sources">
908
#	Line 845 | Line 916
916		<target name="jsr166ydocs"
917		description="Builds javadocs to dist dir">
918
919	<	<delete dir="${jsr166yjavadocs.dir}"/>
920	<	<mkdir dir="${jsr166yjavadocs.dir}"/>
919	>	<delete dir="${jsr166ydocs.dir}"/>
920	>	<mkdir dir="${jsr166ydocs.dir}"/>
921
922	<	<javadoc destdir="${jsr166yjavadocs.dir}"
922	>	<javadoc destdir="${jsr166ydocs.dir}"
923		packagenames="jsr166y.*"
924		link="${jdkapidocs.url}"
925	+	access="${build.javadoc.access}"
926		sourcepath="${topsrc.dir}:${jdk6src.dir}"
927		bootclasspath="${bootclasspath6}"
928		source="6"
#	Line 880 | Line 952
952		</target>
953
954		<target name="jsr166ydist-jar"
955	<	depends="jsr166yclean, jsr166y-jar">
955	>	depends="jsr166yclean, jsr166yjar">
956		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
957		</target>
958
959		<target name="jsr166ydist-docs"
960		depends="jsr166yclean, jsr166ydocs">
961	<	<mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
961	>	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
962		</target>
963
964
#	Line 894 | Line 966
966
967
968		<target name="extra166ycompile"
969	<	depends="configure-compiler, jsr166y-jar"
969	>	depends="configure-compiler, jsr166yjar"
970		description="Compiles extra166y sources">
971
972		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 921 | Line 993
993		</target>
994
995
996	<	<target name="extra166y-jar"
996	>	<target name="extra166yjar"
997		depends="extra166ycompile"
998		description="Builds library jar from compiled sources">
999
#	Line 935 | Line 1007
1007		<target name="extra166ydocs"
1008		description="Builds javadocs to build dir">
1009
1010	<	<delete dir="${extra166yjavadocs.dir}"/>
1011	<	<mkdir dir="${extra166yjavadocs.dir}"/>
1010	>	<delete dir="${extra166ydocs.dir}"/>
1011	>	<mkdir dir="${extra166ydocs.dir}"/>
1012
1013	<	<javadoc destdir="${extra166yjavadocs.dir}"
1013	>	<javadoc destdir="${extra166ydocs.dir}"
1014		packagenames="extra166y.*"
1015		link="${jdkapidocs.url}"
1016	+	access="${build.javadoc.access}"
1017		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1018		bootclasspath="${bootclasspath6}"
1019		source="6"
#	Line 970 | Line 1043
1043		</target>
1044
1045		<target name="extra166ydist-jar"
1046	<	depends="extra166yclean, extra166y-jar">
1046	>	depends="extra166yclean, extra166yjar">
1047		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1048		</target>
1049
1050		<target name="extra166ydist-docs"
1051		depends="extra166yclean, extra166ydocs">
1052	<	<mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
1052	>	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1053		</target>
1054
1055		<!-- jsr166e -->
#	Line 1008 | Line 1081
1081		</target>
1082
1083
1084	<	<target name="jsr166e-jar"
1084	>	<target name="jsr166ejar"
1085		depends="jsr166ecompile"
1086		description="Builds library jar from compiled sources">
1087
#	Line 1022 | Line 1095
1095		<target name="jsr166edocs"
1096		description="Builds javadocs to build dir">
1097
1098	<	<delete dir="${jsr166ejavadocs.dir}"/>
1099	<	<mkdir dir="${jsr166ejavadocs.dir}"/>
1098	>	<delete dir="${jsr166edocs.dir}"/>
1099	>	<mkdir dir="${jsr166edocs.dir}"/>
1100
1101	<	<javadoc destdir="${jsr166ejavadocs.dir}"
1101	>	<javadoc destdir="${jsr166edocs.dir}"
1102		packagenames="jsr166e.*"
1103		link="${jdkapidocs.url}"
1104	+	access="${build.javadoc.access}"
1105		sourcepath="${topsrc.dir}:${jdk7src.dir}"
1106		source="7"
1107		executable="${javadoc7}">
#	Line 1038 | Line 1112
1112
1113
1114		<target name="jsr166e-test-tck"
1115	<	depends="jsr166e-jar"
1115	>	depends="jsr166ejar"
1116		description="Runs tck tests for jsr166e">
1117
1118		<run-tck-tests
1119		tck.src.dir="${test.src.dir}/tck-jsr166e"
1120	<	source="7"
1047	<	target="8"
1120	>	target="7"
1121		workdir="${build.jsr166e.dir}"
1122		classes="${jsr166e.jar}"/>
1123		</target>
#	Line 1067 | Line 1140
1140		</target>
1141
1142		<target name="jsr166edist-jar"
1143	<	depends="jsr166eclean, jsr166e-jar">
1143	>	depends="jsr166eclean, jsr166ejar">
1144		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1145		</target>
1146
1147		<target name="jsr166edist-docs"
1148		depends="jsr166eclean, jsr166edocs">
1149	<	<mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
1149	>	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1150		</target>
1151
1152	+
1153	+	<!-- Find buglets that can be detected by static build tools -->
1154	+
1155	+	<target name="lint">
1156	+	<antcall target="dists">
1157	+	<param name="build.javadoc.access" value="private"/>
1158	+	</antcall>
1159	+	</target>
1160	+
1161	+
1162		</project>

Diff Legend

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