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.108 by jsr166, Sat Jan 19 23:58:12 2013 UTC

#	Line 46 | Line 46
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"/>
49		<property name="build.reports.dir"           location="${build.dir}/reports"/>
50
51		<property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
#	Line 57 | Line 56
56
57		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
58		<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60	–	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
59
60		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
61		<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64	–	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
62
63		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
64		<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68	–	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
65
66		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
67		<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72	–	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
68
69		<!-- JDK binary locations -->
70		<property name="jdks.home"  location="${user.home}/jdk"/>
#	Line 720 | Line 715
715		<target name="jsr166xdocs"
716		description="Builds javadocs to dist dir">
717
718	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
719	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
718	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
719	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
720
721	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
721	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
722		packagenames="jsr166x.*"
723		link="${jdkapidocs.url}"
724		source="5"
#	Line 736 | Line 731
731
732
733		<target name="jsr166xdist"
734	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
734	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
735		description="Puts all distributable products in single hierarchy"/>
736
737
#	Line 757 | Line 752
752		</target>
753
754
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	–
755		<target name="jsr166xdist-jar"
756		depends="jsr166xclean, jsr166xjar">
757
#	Line 828 | Line 806
806		<target name="jsr166ydocs"
807		description="Builds javadocs to dist dir">
808
809	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
810	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
809	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
810	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
811
812	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
812	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
813		packagenames="jsr166y.*"
814		link="${jdkapidocs.url}"
815		source="6"
#	Line 844 | Line 822
822
823
824		<target name="jsr166ydist"
825	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
825	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
826		description="Puts all distributable products in single hierarchy"/>
827
828
#	Line 864 | Line 842
842
843		</target>
844
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	–
845		<target name="jsr166ydist-jar"
846		depends="jsr166yclean, jsr166yjar">
847
#	Line 938 | Line 900
900		<target name="extra166ydocs"
901		description="Builds javadocs to build dir">
902
903	<	<delete dir="${build.extra166yjavadocs.dir}"/>
904	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
903	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
904	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
905
906	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
906	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
907		packagenames="extra166y.*"
908		link="${jdkapidocs.url}"
909		source="6"
#	Line 954 | Line 916
916
917
918		<target name="extra166ydist"
919	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
919	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
920		description="Puts all distributable products in single hierarchy"/>
921
922
#	Line 974 | Line 936
936
937		</target>
938
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	–
939		<target name="extra166ydist-jar"
940		depends="extra166yclean, extra166yjar">
941
#	Line 1045 | Line 991
991		<target name="jsr166edocs"
992		description="Builds javadocs to build dir">
993
994	<	<delete dir="${build.jsr166ejavadocs.dir}"/>
995	<	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
994	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
995	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
996
997	<	<javadoc destdir="${build.jsr166ejavadocs.dir}"
997	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
998		packagenames="jsr166e.*"
999		link="${jdkapidocs.url}"
1000		source="7"
#	Line 1061 | Line 1007
1007
1008
1009		<target name="jsr166edist"
1010	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1010	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1011		description="Puts all distributable products in single hierarchy"/>
1012
1013
#	Line 1075 | Line 1021
1021		</target>
1022
1023
1078	–
1024		<target name="jsr166edist-clean"
1025		description="Removes all build and distribution products">
1026
1027		</target>
1028
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	–
1029		<target name="jsr166edist-jar"
1030		depends="jsr166eclean, jsr166ejar">
1031

Diff Legend

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