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.108 by jsr166, Sat Jan 19 23:58:12 2013 UTC vs.
Revision 1.116 by jsr166, Sun Jan 20 07:24:52 2013 UTC

#	Line 35 | Line 35
35
36
37		<!-- Compilation options -->
38	<	<property name="build.sourcelevel"    value="1.6"/>
38	>	<property name="build.sourcelevel"    value="6"/>
39		<property name="build.debug"          value="true"/>
40		<property name="build.debuglevel"     value="source,lines,vars"/>
41		<property name="build.deprecation"    value="false"/>
#	Line 45 | Line 45
45		<property name="build.classes.dir"           location="${build.dir}/classes"/>
46		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47		<property name="build.loops.dir"             location="${build.dir}/loops"/>
48	–	<property name="build.lib.dir"               location="${build.dir}/lib"/>
48		<property name="build.reports.dir"           location="${build.dir}/reports"/>
49
50	<	<property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
51	<	<property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
52	<	<property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
53	<	<property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
55	<	<property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
50	>	<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51	>	<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52	>	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
53	>	<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54
55		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
58	–	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
59	–
56		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
61	–	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
62	–
57		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
64	–	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
65	–
58		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59	<	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
59	>
60	>	<property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
61	>	<property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
62	>	<property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
63	>	<property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
64
65		<!-- JDK binary locations -->
66		<property name="jdks.home"  location="${user.home}/jdk"/>
#	Line 88 | Line 84
84		<defjdklocations v="8"/>
85
86		<macrodef name="run-tck-tests">
87	<	<attribute name="jvm"/>
88	<	<attribute name="tck.classes"/>
87	>	<attribute name="target"/>
88	>	<attribute name="workdir"/>
89		<attribute name="product.jar" default="${product.jar}"/>
90		<attribute name="jvmflags" default=""/>
91		<sequential>
92	<	<java classname="JSR166TestCase"
93	<	jvm="@{jvm}" fork="true">
92	>
93	>	<mkdir dir="@{workdir}/tck-classes"/>
94	>
95	>	<javac srcdir="${tck.src.dir}"
96	>	destdir="@{workdir}/tck-classes"
97	>	debug="${build.debug}"
98	>	debuglevel="${build.debuglevel}"
99	>	deprecation="${build.deprecation}"
100	>	source="6"
101	>	classpath="${junit.jar}"
102	>	bootclasspath="@{product.jar}:${bootclasspath6}"
103	>	includeAntRuntime="false"
104	>	includeJavaRuntime="false"
105	>	executable="${javac@{target}}"
106	>	fork="true">
107	>
108	>	<include name="**/*.java"/>
109	>	<compilerarg value="-XDignore.symbol.file=true"/>
110	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
111	>	<compilerarg line="${build.args}"/>
112	>	</javac>
113	>
114	>	<java classname="JSR166TestCase" jvm="${java@{target}}" fork="true">
115		<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
116		<jvmarg line="@{jvmflags}"/>
117		<classpath>
118		<pathelement location="${junit.jar}"/>
119	<	<pathelement location="@{tck.classes}"/>
119	>	<pathelement location="@{workdir}/tck-classes"/>
120		</classpath>
121		</java>
122	+
123		</sequential>
124		</macrodef>
125
#	Line 119 | Line 137
137		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
138		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
139		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
122	–	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
140
141		<!-- Distribution locations -->
142	<	<property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
143	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
144	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
145	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
146	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
147	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
142	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
143	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
144	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
145	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
146	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
147	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
148
149		<!-- Jar locations -->
150	<	<property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>
151	<	<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
152	<	<property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
153	<	<property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
154	<	<property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
155	<	<property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
150	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
151	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
152	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
153	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
154	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
155	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
156		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
157
158		<!-- Bootclasspath argument -->
#	Line 153 | Line 170
170		<!-- Default jdk api doc location (latest stable release seems best) -->
171		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
172
173	+	<!-- Define the "jtreg" task -->
174	+	<!-- See the docs in "jtreg -onlineHelp" -->
175	+	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
176	+	classpath="${lib.dir}/jtreg.jar" />
177	+
178		<!-- Test classpath -->
179		<path id="test.classpath">
180		<pathelement location="${build.testcases.dir}"/>
#	Line 215 | Line 237
237		depends="compile"
238		description="Builds library jar from compiled sources">
239
218	–	<mkdir dir="${build.lib.dir}"/>
219	–
240		<jar destfile="${product.jar}">
241		<fileset dir="${build.classes.dir}"/>
242		</jar>
#	Line 288 | Line 308
308		description="Removes all build products">
309
310		<delete dir="${build.dir}"/>
291	–	<delete dir="${build.classes.dir}"/>
292	–	<delete dir="${build.lib.dir}"/>
311
312		</target>
313
#	Line 321 | Line 339
339		<mkdir dir="${build.testcases.dir}"/>
340
341		<javac srcdir="${tck.src.dir}"
342	<	destdir="${build.testcases.dir}"
343	<	debug="${build.debug}"
344	<	debuglevel="${build.debuglevel}"
345	<	deprecation="${build.deprecation}"
346	<	source="${build.sourcelevel}"
347	<	fork="true">
342	>	destdir="${build.testcases.dir}"
343	>	debug="${build.debug}"
344	>	debuglevel="${build.debuglevel}"
345	>	deprecation="${build.deprecation}"
346	>	source="6"
347	>	classpath="${junit.jar}"
348	>	bootclasspath="${product.jar}:${bootclasspath6}"
349	>	includeAntRuntime="false"
350	>	includeJavaRuntime="false"
351	>	executable="${javac8}"
352	>	fork="true">
353
354	<	<compilerarg value="${bootclasspath.args}"/>
354	>	<include name="**/*.java"/>
355		<compilerarg line="${build.args}"/>
356		<compilerarg value="-XDignore.symbol.file=true"/>
357	<
335	<	<classpath refid="test.classpath"/>
357	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
358
359		</javac>
360
361		<javac srcdir="${test.src.dir}"
362	<	destdir="${build.testcases.dir}"
363	<	debug="${build.debug}"
364	<	debuglevel="${build.debuglevel}"
365	<	deprecation="${build.deprecation}"
366	<	source="${build.sourcelevel}"
367	<	fork="true">
362	>	destdir="${build.testcases.dir}"
363	>	debug="${build.debug}"
364	>	debuglevel="${build.debuglevel}"
365	>	deprecation="${build.deprecation}"
366	>	source="6"
367	>	classpath=""
368	>	bootclasspath="${product.jar}:${bootclasspath6}"
369	>	includeAntRuntime="false"
370	>	includeJavaRuntime="false"
371	>	executable="${javac8}"
372	>	fork="true">
373
374	<	<include name="jsr166/test/**"/>
374	>	<include name="jsr166/test/**/*.java"/>
375
349	–	<compilerarg value="${bootclasspath.args}"/>
376		<compilerarg line="${build.args}"/>
377		<compilerarg value="-XDignore.symbol.file=true"/>
378	<
353	<	<classpath refid="test.classpath"/>
378	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
379
380		</javac>
381
#	Line 367 | Line 392
392		<compilerarg line="${build.args}"/>
393		<compilerarg value="-XDignore.symbol.file=true"/>
394
370	–	<classpath refid="test.classpath"/>
371	–
395		</javac>
396		-->
397
#	Line 388 | Line 411
411		errorProperty="junit.failed"
412		failureProperty="junit.failed"
413		dir="${build.reports.dir}"
414	+	jvm="${java8}"
415		fork="true">
416
417	<	<jvmarg value="${bootclasspath.args}"/>
417	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
418		<jvmarg value="-server"/>
419		<jvmarg value="-showversion"/>
420
#	Line 546 | Line 570
570
571		</javac>
572
573	<	<mkdir dir="${build.4jdk7.lib.dir}"/>
573	>	</target>
574
575	<	<jar destfile="${4jdk7product.jar}" index="true">
575	>	<target name="4jdk7-jar"
576	>	depends="4jdk7compile"
577	>	description="Builds library jar from compiled sources">
578	>
579	>	<jar destfile="${4jdk7product.jar}">
580		<fileset dir="${build.4jdk7.classes.dir}"/>
581		</jar>
582
555	–	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
556	–
557	–	<javac srcdir="${tck.src.dir}"
558	–	destdir="${build.4jdk7.tck.classes.dir}"
559	–	debug="${build.debug}"
560	–	debuglevel="${build.debuglevel}"
561	–	deprecation="${build.deprecation}"
562	–	source="6"
563	–	classpath="${junit.jar}"
564	–	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
565	–	includeAntRuntime="false"
566	–	includeJavaRuntime="false"
567	–	executable="${javac7}"
568	–	fork="true">
569	–
570	–	<include name="**/*.java"/>
571	–	<compilerarg line="${build.args}"/>
572	–	<compilerarg value="-XDignore.symbol.file=true"/>
573	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
574	–
575	–	</javac>
576	–
583		</target>
584
585
586		<target name="4jdk7-test-tck"
587	<	depends="4jdk7compile"
587	>	depends="4jdk7-jar"
588		description="Runs tck tests for jsr166-4jdk7 directly">
589	+
590		<run-tck-tests
591	<	jvm="${java7}"
592	<	tck.classes="${build.4jdk7.tck.classes.dir}"
591	>	target="7"
592	>	workdir="${build.4jdk7.dir}"
593		product.jar="${4jdk7product.jar}"/>
594		</target>
595
#	Line 615 | Line 622
622		</junit>
623		</target>
624
625	+	<target name="4jdk7-test-jtreg"
626	+	depends="4jdk7compile"
627	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
628	+	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
629	+	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
630	+	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
631	+	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
632	+	<jtreg dir="${jtreg.src.dir}"
633	+	jdk="${jdk7.home}"
634	+	workDir="${build.4jdk7.dir}/JTwork"
635	+	reportDir="${build.4jdk7.dir}/JTreport">
636	+
637	+	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
638	+	<arg value="-agentvm"/>
639	+	<arg value="-v:nopass,fail"/>
640	+	<arg value="-vmoptions:-esa -ea"/>
641	+	<arg value="-automatic"/>
642	+	<arg value="-k:!ignore"/>
643	+	</jtreg>
644	+	</target>
645	+
646	+
647	+	<target name="4jdk7-test"
648	+	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
649	+	description="Runs tck and jtreg tests for jsr166-4jdk7">
650	+	</target>
651	+
652
653		<target name="4jdk7docs"
654		description="Builds javadocs for src/jdk7 to dist dir">
#	Line 645 | Line 679
679
680
681		<target name="4jdk7clean"
682	<	description="Removes all build products">
682	>	description="Removes all 4jdk7 build products">
683
684		<delete dir="${build.4jdk7.dir}"/>
685
#	Line 665 | Line 699
699
700		</target>
701
668	–	<!-- jsr166x -->
702
703	+	<!-- jsr166x -->
704
705		<target name="jsr166xcompile"
706		depends="configure-compiler"
707		description="Compiles jsr166x sources to build dir">
708
709	<	<mkdir dir="${build.jsr166x.dir}"/>
709	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
710
711		<javac srcdir="${topsrc.dir}"
712	<	destdir="${build.jsr166x.dir}"
712	>	destdir="${build.jsr166x.classes.dir}"
713		debug="${build.debug}"
714		debuglevel="${build.debuglevel}"
715		deprecation="${build.deprecation}"
#	Line 702 | Line 736
736		depends="jsr166xcompile"
737		description="Builds library jar from compiled sources">
738
705	–	<mkdir dir="${build.jsr166xlib.dir}"/>
706	–
739		<jar destfile="${jsr166x.jar}">
740	<	<fileset dir="${build.jsr166x.dir}"/>
740	>	<fileset dir="${build.jsr166x.classes.dir}"/>
741		</jar>
742
743		</target>
#	Line 725 | Line 757
757		bootclasspath="${bootclasspath6}"
758		sourcepath="${topsrc.dir}:${jdk6src.dir}"
759		executable="${javadoc7}"
760	<	additionalparam="-XDignore.symbol.file=true" />
760	>	additionalparam="-XDignore.symbol.file=true"/>
761
762		</target>
763
#	Line 737 | Line 769
769
770
771		<target name="jsr166xclean"
772	<	description="Removes all build products">
772	>	description="Removes all jsr166x build products">
773
774		<delete dir="${build.jsr166x.dir}"/>
743	–	<delete dir="${build.jsr166xlib.dir}"/>
775
776		</target>
777
#	Line 766 | Line 797
797		depends="configure-compiler"
798		description="Compiles jsr166y sources">
799
800	<	<mkdir dir="${build.jsr166y.dir}"/>
800	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
801
802		<javac srcdir="${topsrc.dir}"
803	<	destdir="${build.jsr166y.dir}"
803	>	destdir="${build.jsr166y.classes.dir}"
804		debug="${build.debug}"
805		debuglevel="${build.debuglevel}"
806		deprecation="${build.deprecation}"
#	Line 793 | Line 824
824		depends="jsr166ycompile"
825		description="Builds library jar from compiled sources">
826
796	–	<mkdir dir="${build.jsr166ylib.dir}"/>
797	–
827		<jar destfile="${jsr166y.jar}" index="true">
828	<	<fileset dir="${build.jsr166y.dir}"/>
828	>	<fileset dir="${build.jsr166y.classes.dir}"/>
829		</jar>
830
831		</target>
#	Line 816 | Line 845
845		bootclasspath="${bootclasspath6}"
846		sourcepath="${topsrc.dir}:${jdk6src.dir}"
847		executable="${javadoc7}"
848	<	additionalparam="-XDignore.symbol.file=true" />
848	>	additionalparam="-XDignore.symbol.file=true"/>
849
850		</target>
851
#	Line 828 | Line 857
857
858
859		<target name="jsr166yclean"
860	<	description="Removes all build products">
860	>	description="Removes all jsr166y build products">
861
862		<delete dir="${build.jsr166y.dir}"/>
834	–	<delete dir="${build.jsr166ylib.dir}"/>
863
864		</target>
865
#	Line 857 | Line 885
885		depends="configure-compiler, jsr166yjar"
886		description="Compiles extra166y sources">
887
888	<	<mkdir dir="${build.extra166y.dir}"/>
888	>	<mkdir dir="${build.extra166y.classes.dir}"/>
889
890		<javac srcdir="${topsrc.dir}"
891	<	destdir="${build.extra166y.dir}"
891	>	destdir="${build.extra166y.classes.dir}"
892		debug="${build.debug}"
893		debuglevel="${build.debuglevel}"
894		deprecation="${build.deprecation}"
#	Line 887 | Line 915
915		depends="extra166ycompile"
916		description="Builds library jar from compiled sources">
917
890	–	<mkdir dir="${build.extra166ylib.dir}"/>
891	–
918		<jar destfile="${extra166y.jar}" index="true">
919	<	<fileset dir="${build.extra166y.dir}"/>
919	>	<fileset dir="${build.extra166y.classes.dir}"/>
920		</jar>
921
922		</target>
#	Line 910 | Line 936
936		bootclasspath="${bootclasspath6}"
937		sourcepath="${topsrc.dir}:${jdk6src.dir}"
938		executable="${javadoc7}"
939	<	additionalparam="-XDignore.symbol.file=true" />
939	>	additionalparam="-XDignore.symbol.file=true"/>
940
941		</target>
942
#	Line 922 | Line 948
948
949
950		<target name="extra166yclean"
951	<	description="Removes all build products">
951	>	description="Removes all extra166y build products">
952
953		<delete dir="${build.extra166y.dir}"/>
928	–	<delete dir="${build.extra166ylib.dir}"/>
954
955		</target>
956
#	Line 949 | Line 974
974		depends="configure-compiler"
975		description="Compiles jsr166e sources">
976
977	<	<mkdir dir="${build.jsr166e.dir}"/>
977	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
978
979		<javac srcdir="${topsrc.dir}"
980	<	destdir="${build.jsr166e.dir}"
980	>	destdir="${build.jsr166e.classes.dir}"
981		debug="${build.debug}"
982		debuglevel="${build.debuglevel}"
983		deprecation="${build.deprecation}"
#	Line 978 | Line 1003
1003		depends="jsr166ecompile"
1004		description="Builds library jar from compiled sources">
1005
981	–	<mkdir dir="${build.jsr166elib.dir}"/>
982	–
1006		<jar destfile="${jsr166e.jar}" index="true">
1007	<	<fileset dir="${build.jsr166e.dir}"/>
1007	>	<fileset dir="${build.jsr166e.classes.dir}"/>
1008		</jar>
1009
1010		</target>
#	Line 1013 | Line 1036
1036
1037
1038		<target name="jsr166eclean"
1039	<	description="Removes all build products">
1039	>	description="Removes all jsr166e build products">
1040
1041		<delete dir="${build.jsr166e.dir}"/>
1019	–	<delete dir="${build.jsr166elib.dir}"/>
1042
1043		</target>
1044

Diff Legend

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