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.107 by jsr166, Sat Jan 19 23:40:04 2013 UTC vs.
Revision 1.114 by jsr166, Sun Jan 20 04:44:26 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"/>
49	–	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
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"/>
56	<	<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"/>
59	–	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60	–	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61	–
56		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63	–	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64	–	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65	–
57		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67	–	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68	–	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69	–
58		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59	<	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
60	<	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
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 124 | Line 115
115		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
116		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
117		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127	–	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
118
119		<!-- Distribution locations -->
120	<	<property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
121	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
122	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
123	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
124	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
125	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
120	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
121	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
122	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
123	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
124	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
125	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
126
127		<!-- Jar locations -->
128	<	<property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>
129	<	<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
130	<	<property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
131	<	<property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
132	<	<property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
133	<	<property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
128	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
129	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
130	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
131	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
132	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
133	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
134		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
135
136		<!-- Bootclasspath argument -->
#	Line 220 | Line 210
210		depends="compile"
211		description="Builds library jar from compiled sources">
212
223	–	<mkdir dir="${build.lib.dir}"/>
224	–
213		<jar destfile="${product.jar}">
214		<fileset dir="${build.classes.dir}"/>
215		</jar>
#	Line 293 | Line 281
281		description="Removes all build products">
282
283		<delete dir="${build.dir}"/>
296	–	<delete dir="${build.classes.dir}"/>
297	–	<delete dir="${build.lib.dir}"/>
284
285		</target>
286
#	Line 326 | Line 312
312		<mkdir dir="${build.testcases.dir}"/>
313
314		<javac srcdir="${tck.src.dir}"
315	<	destdir="${build.testcases.dir}"
316	<	debug="${build.debug}"
317	<	debuglevel="${build.debuglevel}"
318	<	deprecation="${build.deprecation}"
319	<	source="${build.sourcelevel}"
320	<	fork="true">
315	>	destdir="${build.testcases.dir}"
316	>	debug="${build.debug}"
317	>	debuglevel="${build.debuglevel}"
318	>	deprecation="${build.deprecation}"
319	>	source="6"
320	>	classpath="${junit.jar}"
321	>	bootclasspath="${product.jar}:${bootclasspath6}"
322	>	includeAntRuntime="false"
323	>	includeJavaRuntime="false"
324	>	executable="${javac8}"
325	>	fork="true">
326
327	<	<compilerarg value="${bootclasspath.args}"/>
327	>	<include name="**/*.java"/>
328		<compilerarg line="${build.args}"/>
329		<compilerarg value="-XDignore.symbol.file=true"/>
330	<
340	<	<classpath refid="test.classpath"/>
330	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
331
332		</javac>
333
334		<javac srcdir="${test.src.dir}"
335	<	destdir="${build.testcases.dir}"
336	<	debug="${build.debug}"
337	<	debuglevel="${build.debuglevel}"
338	<	deprecation="${build.deprecation}"
339	<	source="${build.sourcelevel}"
340	<	fork="true">
335	>	destdir="${build.testcases.dir}"
336	>	debug="${build.debug}"
337	>	debuglevel="${build.debuglevel}"
338	>	deprecation="${build.deprecation}"
339	>	source="6"
340	>	classpath=""
341	>	bootclasspath="${product.jar}:${bootclasspath6}"
342	>	includeAntRuntime="false"
343	>	includeJavaRuntime="false"
344	>	executable="${javac8}"
345	>	fork="true">
346
347	<	<include name="jsr166/test/**"/>
347	>	<include name="jsr166/test/**/*.java"/>
348
354	–	<compilerarg value="${bootclasspath.args}"/>
349		<compilerarg line="${build.args}"/>
350		<compilerarg value="-XDignore.symbol.file=true"/>
351	<
358	<	<classpath refid="test.classpath"/>
351	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
352
353		</javac>
354
#	Line 372 | Line 365
365		<compilerarg line="${build.args}"/>
366		<compilerarg value="-XDignore.symbol.file=true"/>
367
375	–	<classpath refid="test.classpath"/>
376	–
368		</javac>
369		-->
370
#	Line 393 | Line 384
384		errorProperty="junit.failed"
385		failureProperty="junit.failed"
386		dir="${build.reports.dir}"
387	+	jvm="${java8}"
388		fork="true">
389
390	<	<jvmarg value="${bootclasspath.args}"/>
390	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
391		<jvmarg value="-server"/>
392		<jvmarg value="-showversion"/>
393
#	Line 551 | Line 543
543
544		</javac>
545
554	–	<mkdir dir="${build.4jdk7.lib.dir}"/>
555	–
546		<jar destfile="${4jdk7product.jar}" index="true">
547		<fileset dir="${build.4jdk7.classes.dir}"/>
548		</jar>
#	Line 650 | Line 640
640
641
642		<target name="4jdk7clean"
643	<	description="Removes all build products">
643	>	description="Removes all 4jdk7 build products">
644
645		<delete dir="${build.4jdk7.dir}"/>
646
#	Line 670 | Line 660
660
661		</target>
662
673	–	<!-- jsr166x -->
663
664	+	<!-- jsr166x -->
665
666		<target name="jsr166xcompile"
667		depends="configure-compiler"
668		description="Compiles jsr166x sources to build dir">
669
670	<	<mkdir dir="${build.jsr166x.dir}"/>
670	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
671
672		<javac srcdir="${topsrc.dir}"
673	<	destdir="${build.jsr166x.dir}"
673	>	destdir="${build.jsr166x.classes.dir}"
674		debug="${build.debug}"
675		debuglevel="${build.debuglevel}"
676		deprecation="${build.deprecation}"
#	Line 707 | Line 697
697		depends="jsr166xcompile"
698		description="Builds library jar from compiled sources">
699
710	–	<mkdir dir="${build.jsr166xlib.dir}"/>
711	–
700		<jar destfile="${jsr166x.jar}">
701	<	<fileset dir="${build.jsr166x.dir}"/>
701	>	<fileset dir="${build.jsr166x.classes.dir}"/>
702		</jar>
703
704		</target>
#	Line 720 | Line 708
708		<target name="jsr166xdocs"
709		description="Builds javadocs to dist dir">
710
711	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
712	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
711	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
712	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
713
714	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
714	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
715		packagenames="jsr166x.*"
716		link="${jdkapidocs.url}"
717		source="5"
#	Line 736 | Line 724
724
725
726		<target name="jsr166xdist"
727	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
727	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
728		description="Puts all distributable products in single hierarchy"/>
729
730
731
732		<target name="jsr166xclean"
733	<	description="Removes all build products">
733	>	description="Removes all jsr166x build products">
734
735		<delete dir="${build.jsr166x.dir}"/>
748	–	<delete dir="${build.jsr166xlib.dir}"/>
736
737		</target>
738
#	Line 757 | Line 744
744		</target>
745
746
760	–
761	–	<target name="jsr166xdist-docs"
762	–	description="Builds javadocs to dist dir">
763	–
764	–	<delete dir="${dist.jsr166xjavadocs.dir}"/>
765	–	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
766	–
767	–	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
768	–	packagenames="jsr166x.*"
769	–	link="${jdkapidocs.url}"
770	–	source="${build.sourcelevel}"
771	–	sourcepath="${topsrc.dir}:${jdk6src.dir}"
772	–	executable="${javadoc7}"
773	–	additionalparam="-XDignore.symbol.file=true" />
774	–
775	–	</target>
776	–
747		<target name="jsr166xdist-jar"
748		depends="jsr166xclean, jsr166xjar">
749
#	Line 788 | Line 758
758		depends="configure-compiler"
759		description="Compiles jsr166y sources">
760
761	<	<mkdir dir="${build.jsr166y.dir}"/>
761	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
762
763		<javac srcdir="${topsrc.dir}"
764	<	destdir="${build.jsr166y.dir}"
764	>	destdir="${build.jsr166y.classes.dir}"
765		debug="${build.debug}"
766		debuglevel="${build.debuglevel}"
767		deprecation="${build.deprecation}"
#	Line 815 | Line 785
785		depends="jsr166ycompile"
786		description="Builds library jar from compiled sources">
787
818	–	<mkdir dir="${build.jsr166ylib.dir}"/>
819	–
788		<jar destfile="${jsr166y.jar}" index="true">
789	<	<fileset dir="${build.jsr166y.dir}"/>
789	>	<fileset dir="${build.jsr166y.classes.dir}"/>
790		</jar>
791
792		</target>
#	Line 828 | Line 796
796		<target name="jsr166ydocs"
797		description="Builds javadocs to dist dir">
798
799	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
800	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
799	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
800	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
801
802	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
802	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
803		packagenames="jsr166y.*"
804		link="${jdkapidocs.url}"
805		source="6"
#	Line 844 | Line 812
812
813
814		<target name="jsr166ydist"
815	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
815	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
816		description="Puts all distributable products in single hierarchy"/>
817
818
819
820		<target name="jsr166yclean"
821	<	description="Removes all build products">
821	>	description="Removes all jsr166y build products">
822
823		<delete dir="${build.jsr166y.dir}"/>
856	–	<delete dir="${build.jsr166ylib.dir}"/>
824
825		</target>
826
#	Line 864 | Line 831
831
832		</target>
833
867	–	<target name="jsr166ydist-docs"
868	–	description="Builds javadocs to dist dir">
869	–
870	–	<delete dir="${dist.jsr166yjavadocs.dir}"/>
871	–	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
872	–
873	–	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
874	–	packagenames="jsr166y.*"
875	–	link="${jdkapidocs.url}"
876	–	source="${build.sourcelevel}"
877	–	sourcepath="${topsrc.dir}:${jdk6src.dir}"
878	–	executable="${javadoc7}"
879	–	additionalparam="-XDignore.symbol.file=true" />
880	–
881	–	</target>
882	–
834		<target name="jsr166ydist-jar"
835		depends="jsr166yclean, jsr166yjar">
836
#	Line 895 | Line 846
846		depends="configure-compiler, jsr166yjar"
847		description="Compiles extra166y sources">
848
849	<	<mkdir dir="${build.extra166y.dir}"/>
849	>	<mkdir dir="${build.extra166y.classes.dir}"/>
850
851		<javac srcdir="${topsrc.dir}"
852	<	destdir="${build.extra166y.dir}"
852	>	destdir="${build.extra166y.classes.dir}"
853		debug="${build.debug}"
854		debuglevel="${build.debuglevel}"
855		deprecation="${build.deprecation}"
#	Line 925 | Line 876
876		depends="extra166ycompile"
877		description="Builds library jar from compiled sources">
878
928	–	<mkdir dir="${build.extra166ylib.dir}"/>
929	–
879		<jar destfile="${extra166y.jar}" index="true">
880	<	<fileset dir="${build.extra166y.dir}"/>
880	>	<fileset dir="${build.extra166y.classes.dir}"/>
881		</jar>
882
883		</target>
#	Line 938 | Line 887
887		<target name="extra166ydocs"
888		description="Builds javadocs to build dir">
889
890	<	<delete dir="${build.extra166yjavadocs.dir}"/>
891	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
890	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
891	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
892
893	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
893	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
894		packagenames="extra166y.*"
895		link="${jdkapidocs.url}"
896		source="6"
#	Line 954 | Line 903
903
904
905		<target name="extra166ydist"
906	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
906	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
907		description="Puts all distributable products in single hierarchy"/>
908
909
910
911		<target name="extra166yclean"
912	<	description="Removes all build products">
912	>	description="Removes all extra166y build products">
913
914		<delete dir="${build.extra166y.dir}"/>
966	–	<delete dir="${build.extra166ylib.dir}"/>
915
916		</target>
917
#	Line 974 | Line 922
922
923		</target>
924
977	–	<target name="extra166ydist-docs"
978	–	description="Builds javadocs to dist dir">
979	–
980	–	<delete dir="${dist.extra166yjavadocs.dir}"/>
981	–	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
982	–
983	–	<javadoc destdir="${dist.extra166yjavadocs.dir}"
984	–	packagenames="extra166y.*"
985	–	link="${jdkapidocs.url}"
986	–	source="${build.sourcelevel}"
987	–	sourcepath="${topsrc.dir}:${jdk6src.dir}"
988	–	executable="${javadoc7}"
989	–	additionalparam="-XDignore.symbol.file=true" />
990	–
991	–	</target>
992	–
925		<target name="extra166ydist-jar"
926		depends="extra166yclean, extra166yjar">
927
#	Line 1003 | Line 935
935		depends="configure-compiler"
936		description="Compiles jsr166e sources">
937
938	<	<mkdir dir="${build.jsr166e.dir}"/>
938	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
939
940		<javac srcdir="${topsrc.dir}"
941	<	destdir="${build.jsr166e.dir}"
941	>	destdir="${build.jsr166e.classes.dir}"
942		debug="${build.debug}"
943		debuglevel="${build.debuglevel}"
944		deprecation="${build.deprecation}"
#	Line 1032 | Line 964
964		depends="jsr166ecompile"
965		description="Builds library jar from compiled sources">
966
1035	–	<mkdir dir="${build.jsr166elib.dir}"/>
1036	–
967		<jar destfile="${jsr166e.jar}" index="true">
968	<	<fileset dir="${build.jsr166e.dir}"/>
968	>	<fileset dir="${build.jsr166e.classes.dir}"/>
969		</jar>
970
971		</target>
#	Line 1045 | Line 975
975		<target name="jsr166edocs"
976		description="Builds javadocs to build dir">
977
978	<	<delete dir="${build.jsr166ejavadocs.dir}"/>
979	<	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
978	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
979	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
980
981	<	<javadoc destdir="${build.jsr166ejavadocs.dir}"
981	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
982		packagenames="jsr166e.*"
983		link="${jdkapidocs.url}"
984		source="7"
#	Line 1061 | Line 991
991
992
993		<target name="jsr166edist"
994	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
994	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
995		description="Puts all distributable products in single hierarchy"/>
996
997
998
999		<target name="jsr166eclean"
1000	<	description="Removes all build products">
1000	>	description="Removes all jsr166e build products">
1001
1002		<delete dir="${build.jsr166e.dir}"/>
1073	–	<delete dir="${build.jsr166elib.dir}"/>
1003
1004		</target>
1005
1006
1078	–
1007		<target name="jsr166edist-clean"
1008		description="Removes all build and distribution products">
1009
1010		</target>
1011
1084	–	<target name="jsr166edist-docs"
1085	–	description="Builds javadocs to dist dir">
1086	–
1087	–	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1088	–	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1089	–
1090	–	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1091	–	packagenames="jsr166e.*"
1092	–	link="${jdkapidocs.url}"
1093	–	source="7"
1094	–	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1095	–	executable="${javadoc7}"
1096	–	additionalparam="-XDignore.symbol.file=true" />
1097	–
1098	–	</target>
1099	–
1012		<target name="jsr166edist-jar"
1013		depends="jsr166eclean, jsr166ejar">
1014

Diff Legend

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