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.124 by jsr166, Tue Jan 22 21:22:57 2013 UTC vs.
Revision 1.130 by jsr166, Mon Jan 28 22:00:34 2013 UTC

#	Line 25 | Line 25
25		------------------------------------------------------------------------------
26		</description>
27
28	<	<target name="usage" description="Advises user to run with -projecthelp">
29	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
28	>	<target name="usage" description="Display main targets by running 'ant -projecthelp'">
29	>	<java classname="org.apache.tools.ant.Main">
30	>	<arg value="-projecthelp" />
31	>	</java>
32		</target>
33
34
#	Line 39 | Line 41
41		<property name="build.debug"          value="true"/>
42		<property name="build.debuglevel"     value="source,lines,vars"/>
43		<property name="build.deprecation"    value="false"/>
44	+	<property name="build.javadoc.access" value="protected"/>
45
46		<!-- Build locations -->
47		<property name="build.dir"                   location="build"/>
#	Line 57 | Line 60
60		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
61		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
62
63	<	<property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
64	<	<property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
65	<	<property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
66	<	<property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
63	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
64	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
65	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
66	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
67
68		<!-- JDK locations -->
69		<property name="jdks.home"  location="${user.home}/jdk"/>
#	Line 86 | Line 89
89		</sequential>
90		</macrodef>
91
92	+	<macrodef name="mirror-dir">
93	+	<attribute name="src"/>
94	+	<attribute name="dst"/>
95	+	<sequential>
96	+	<delete dir="@{dst}"/>
97	+	<mkdir dir="@{dst}"/>
98	+	<copy todir="@{dst}" preservelastmodified="true">
99	+	<fileset dir="@{src}"/>
100	+	</copy>
101	+	</sequential>
102	+	</macrodef>
103	+
104		<defjdklocations v="6"/>
105		<defjdklocations v="7"/>
106		<defjdklocations v="8"/>
#	Line 105 | Line 120
120		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
121		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
122
123	<	<!-- Distribution locations -->
124	<	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166docs"/>
125	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
126	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
127	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
128	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
129	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
123	>	<!-- Javadoc locations -->
124	>	<property name="docs.dir"          location="${build.dir}/docs"/>
125	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
126	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
127	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
128	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
129	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
130	>
131	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
132	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
133	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
134	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
135	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
136	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
137
138		<!-- Jar locations -->
139		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
#	Line 250 | Line 272
272		<target name="docs"
273		description="Builds javadocs for src/main to dist dir">
274
275	<	<delete dir="${dist.javadocs.dir}"/>
276	<	<mkdir dir="${dist.javadocs.dir}"/>
275	>	<delete dir="${docs.dir}"/>
276	>	<mkdir dir="${docs.dir}"/>
277
278		<!-- the packagenames="none" hack below prevents scanning the -->
279		<!-- sourcepath for packages -->
280
281	<	<javadoc destdir="${dist.javadocs.dir}"
281	>	<javadoc destdir="${docs.dir}"
282		packagenames="none"
283		link="${jdkapi8docs.url}"
284		overview="${src.dir}/intro.html"
285	+	access="${build.javadoc.access}"
286		sourcepath="${src.dir}:${jdk8src.dir}"
287		classpath=""
288		executable="${javadoc8}">
#	Line 274 | Line 297
297
298
299		<target name="dist"
300	<	depends="dist-clean, dist-jar, docs"
300	>	depends="dist-clean, dist-jar, dist-docs"
301		description="Puts all distributable products in single hierarchy"/>
302
303
#	Line 317 | Line 340
340
341		<target name="dist-jar"
342		depends="clean, jar">
320	–
343		<copy file="${product.jar}" todir="${dist.dir}"/>
344	+	</target>
345
346	+	<target name="dist-docs"
347	+	depends="clean, docs">
348	+	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
349		</target>
350
351
#	Line 560 | Line 586
586		</target>
587
588
589	<	<target name="4jdk7-jar"
589	>	<target name="4jdk7jar"
590		depends="4jdk7compile"
591		description="Builds library jar from compiled sources">
592
#	Line 572 | Line 598
598
599
600		<target name="4jdk7-test-tck"
601	<	depends="4jdk7-jar"
601	>	depends="4jdk7jar"
602		description="Runs tck tests for jsr166-4jdk7 directly">
603
604		<run-tck-tests
#	Line 641 | Line 667
667		<target name="4jdk7docs"
668		description="Builds javadocs for src/jdk7 to dist dir">
669
670	<	<delete dir="${dist.4jdk7.docs.dir}"/>
671	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
670	>	<delete dir="${4jdk7docs.dir}"/>
671	>	<mkdir dir="${4jdk7docs.dir}"/>
672
673	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
673	>	<javadoc destdir="${4jdk7docs.dir}"
674		packagenames="none"
675		link="${jdkapi7docs.url}"
676		overview="${4jdk7src.dir}/intro.html"
677	+	access="${build.javadoc.access}"
678		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
679		classpath=""
680		executable="${javadoc7}">
#	Line 660 | Line 687
687
688
689		<target name="4jdk7dist"
690	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
690	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
691		description="Puts all distributable products in single hierarchy"/>
692
693
#	Line 678 | Line 705
705		</target>
706
707		<target name="4jdk7dist-jar"
708	<	depends="4jdk7clean, 4jdk7-jar">
682	<
708	>	depends="4jdk7clean, 4jdk7jar">
709		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
710	+	</target>
711	+
712
713	+	<target name="4jdk7dist-docs"
714	+	depends="4jdk7clean, 4jdk7docs">
715	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
716		</target>
717
718
#	Line 715 | Line 746
746		</target>
747
748
749	<	<target name="jsr166x-jar"
749	>	<target name="jsr166xjar"
750		depends="jsr166xcompile"
751		description="Builds library jar from compiled sources">
752
#	Line 729 | Line 760
760		<target name="jsr166xdocs"
761		description="Builds javadocs to dist dir">
762
763	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
764	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
763	>	<delete dir="${jsr166xdocs.dir}"/>
764	>	<mkdir dir="${jsr166xdocs.dir}"/>
765
766	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
766	>	<javadoc destdir="${jsr166xdocs.dir}"
767		packagenames="jsr166x.*"
768		link="${jdkapidocs.url}"
769	+	access="${build.javadoc.access}"
770		sourcepath="${topsrc.dir}:${jdk6src.dir}"
771		bootclasspath="${bootclasspath6}"
772		source="5"
#	Line 746 | Line 778
778
779
780		<target name="jsr166xdist"
781	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
781	>	depends="jsr166xdist-jar, jsr166xdist-docs"
782		description="Puts all distributable products in single hierarchy"/>
783
784
#	Line 765 | Line 797
797
798
799		<target name="jsr166xdist-jar"
800	<	depends="jsr166xclean, jsr166x-jar">
769	<
800	>	depends="jsr166xclean, jsr166xjar">
801		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
802	+	</target>
803
804	+	<target name="jsr166xdist-docs"
805	+	depends="jsr166xclean, jsr166xdocs">
806	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
807		</target>
808
809		<!-- jsr166y -->
#	Line 802 | Line 837
837		</target>
838
839
840	<	<target name="jsr166y-jar"
840	>	<target name="jsr166yjar"
841		depends="jsr166ycompile"
842		description="Builds library jar from compiled sources">
843
#	Line 816 | Line 851
851		<target name="jsr166ydocs"
852		description="Builds javadocs to dist dir">
853
854	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
855	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
854	>	<delete dir="${jsr166ydocs.dir}"/>
855	>	<mkdir dir="${jsr166ydocs.dir}"/>
856
857	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
857	>	<javadoc destdir="${jsr166ydocs.dir}"
858		packagenames="jsr166y.*"
859		link="${jdkapidocs.url}"
860	+	access="${build.javadoc.access}"
861		sourcepath="${topsrc.dir}:${jdk6src.dir}"
862		bootclasspath="${bootclasspath6}"
863		source="6"
#	Line 833 | Line 869
869
870
871		<target name="jsr166ydist"
872	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
872	>	depends="jsr166ydist-jar, jsr166ydist-docs"
873		description="Puts all distributable products in single hierarchy"/>
874
875
#	Line 851 | Line 887
887		</target>
888
889		<target name="jsr166ydist-jar"
890	<	depends="jsr166yclean, jsr166y-jar">
855	<
890	>	depends="jsr166yclean, jsr166yjar">
891		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
892	+	</target>
893
894	+	<target name="jsr166ydist-docs"
895	+	depends="jsr166yclean, jsr166ydocs">
896	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
897		</target>
898
899
#	Line 862 | Line 901
901
902
903		<target name="extra166ycompile"
904	<	depends="configure-compiler, jsr166y-jar"
904	>	depends="configure-compiler, jsr166yjar"
905		description="Compiles extra166y sources">
906
907		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 889 | Line 928
928		</target>
929
930
931	<	<target name="extra166y-jar"
931	>	<target name="extra166yjar"
932		depends="extra166ycompile"
933		description="Builds library jar from compiled sources">
934
#	Line 903 | Line 942
942		<target name="extra166ydocs"
943		description="Builds javadocs to build dir">
944
945	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
946	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
945	>	<delete dir="${extra166ydocs.dir}"/>
946	>	<mkdir dir="${extra166ydocs.dir}"/>
947
948	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
948	>	<javadoc destdir="${extra166ydocs.dir}"
949		packagenames="extra166y.*"
950		link="${jdkapidocs.url}"
951	+	access="${build.javadoc.access}"
952		sourcepath="${topsrc.dir}:${jdk6src.dir}"
953		bootclasspath="${bootclasspath6}"
954		source="6"
#	Line 920 | Line 960
960
961
962		<target name="extra166ydist"
963	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
963	>	depends="extra166ydist-jar, extra166ydist-docs"
964		description="Puts all distributable products in single hierarchy"/>
965
966
#	Line 938 | Line 978
978		</target>
979
980		<target name="extra166ydist-jar"
981	<	depends="extra166yclean, extra166y-jar">
942	<
981	>	depends="extra166yclean, extra166yjar">
982		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
983	+	</target>
984
985	+	<target name="extra166ydist-docs"
986	+	depends="extra166yclean, extra166ydocs">
987	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
988		</target>
989
990		<!-- jsr166e -->
#	Line 973 | Line 1016
1016		</target>
1017
1018
1019	<	<target name="jsr166e-jar"
1019	>	<target name="jsr166ejar"
1020		depends="jsr166ecompile"
1021		description="Builds library jar from compiled sources">
1022
#	Line 987 | Line 1030
1030		<target name="jsr166edocs"
1031		description="Builds javadocs to build dir">
1032
1033	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1034	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1033	>	<delete dir="${jsr166edocs.dir}"/>
1034	>	<mkdir dir="${jsr166edocs.dir}"/>
1035
1036	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1036	>	<javadoc destdir="${jsr166edocs.dir}"
1037		packagenames="jsr166e.*"
1038		link="${jdkapidocs.url}"
1039	+	access="${build.javadoc.access}"
1040		sourcepath="${topsrc.dir}:${jdk7src.dir}"
1041		source="7"
1042		executable="${javadoc7}">
#	Line 1003 | Line 1047
1047
1048
1049		<target name="jsr166e-test-tck"
1050	<	depends="jsr166e-jar"
1050	>	depends="jsr166ejar"
1051		description="Runs tck tests for jsr166e">
1052
1053		<run-tck-tests
#	Line 1016 | Line 1060
1060
1061
1062		<target name="jsr166edist"
1063	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1063	>	depends="jsr166edist-jar, jsr166edist-docs"
1064		description="Puts all distributable products in single hierarchy"/>
1065
1066
1067		<target name="jsr166eclean"
1068		description="Removes all jsr166e build products">
1025	–
1069		<delete dir="${build.jsr166e.dir}"/>
1027	–
1070		</target>
1071
1072
#	Line 1034 | Line 1076
1076		</target>
1077
1078		<target name="jsr166edist-jar"
1079	<	depends="jsr166eclean, jsr166e-jar">
1038	<
1079	>	depends="jsr166eclean, jsr166ejar">
1080		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1081	+	</target>
1082	+
1083	+	<target name="jsr166edist-docs"
1084	+	depends="jsr166eclean, jsr166edocs">
1085	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1086	+	</target>
1087
1088	+
1089	+	<!-- Find buglets that can be detected by static build tools -->
1090	+
1091	+	<target name="lint">
1092	+	<antcall target="dists">
1093	+	<param name="build.javadoc.access" value="private"/>
1094	+	</antcall>
1095		</target>
1096
1097	+
1098		</project>

Diff Legend

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