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.106 by jsr166, Sat Jan 19 22:23:57 2013 UTC vs.
Revision 1.107 by jsr166, Sat Jan 19 23:40:04 2013 UTC

#	Line 154 | Line 154
154		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
155		<!-- The below does not yet exist as of 2012-11 -->
156		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
157	+
158	+	<!-- Default jdk api doc location (latest stable release seems best) -->
159		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
160
161		<!-- Test classpath -->
#	Line 177 | Line 179
179		<!-- Main targets -->
180
181		<target name="dists"
182	<	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
182	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
183		description="Builds all public jars and docs"/>
184
185		<target name="compile"
#	Line 534 | Line 536
536		debug="${build.debug}"
537		debuglevel="${build.debuglevel}"
538		deprecation="${build.deprecation}"
539	<	source="1.6"
539	>	source="6"
540		classpath=""
541		bootclasspath="${bootclasspath6}"
542		includeAntRuntime="false"
#	Line 562 | Line 564
564		debug="${build.debug}"
565		debuglevel="${build.debuglevel}"
566		deprecation="${build.deprecation}"
567	<	source="1.6"
567	>	source="6"
568		classpath="${junit.jar}"
569		bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
570		includeAntRuntime="false"
#	Line 683 | Line 685
685		debuglevel="${build.debuglevel}"
686		deprecation="${build.deprecation}"
687		classpath=""
688	<	source="1.5"
688	>	source="5"
689		bootclasspath="${bootclasspath6}"
690		includeAntRuntime="false"
691		includeJavaRuntime="false"
#	Line 722 | Line 724
724		<mkdir dir="${build.jsr166xjavadocs.dir}"/>
725
726		<javadoc destdir="${build.jsr166xjavadocs.dir}"
727	<	packagenames="jsr166x"
727	>	packagenames="jsr166x.*"
728		link="${jdkapidocs.url}"
729	<	source="${build.sourcelevel}"
730	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
729	>	source="5"
730	>	bootclasspath="${bootclasspath6}"
731	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
732	>	executable="${javadoc7}"
733		additionalparam="-XDignore.symbol.file=true" />
734
735		</target>
#	Line 761 | Line 765
765		<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
766
767		<javadoc destdir="${dist.jsr166xjavadocs.dir}"
768	<	packagenames="jsr166x"
768	>	packagenames="jsr166x.*"
769		link="${jdkapidocs.url}"
770		source="${build.sourcelevel}"
771	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
771	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
772	>	executable="${javadoc7}"
773		additionalparam="-XDignore.symbol.file=true" />
774
775		</target>
#	Line 790 | Line 795
795		debug="${build.debug}"
796		debuglevel="${build.debuglevel}"
797		deprecation="${build.deprecation}"
798	<	source="1.6"
798	>	source="6"
799		classpath=""
800		bootclasspath="${bootclasspath6}"
801		includeAntRuntime="false"
#	Line 827 | Line 832
832		<mkdir dir="${build.jsr166yjavadocs.dir}"/>
833
834		<javadoc destdir="${build.jsr166yjavadocs.dir}"
835	<	packagenames="jsr166y"
835	>	packagenames="jsr166y.*"
836		link="${jdkapidocs.url}"
837	<	source="${build.sourcelevel}"
838	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
837	>	source="6"
838	>	bootclasspath="${bootclasspath6}"
839	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
840	>	executable="${javadoc7}"
841		additionalparam="-XDignore.symbol.file=true" />
842
843		</target>
#	Line 864 | Line 871
871		<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
872
873		<javadoc destdir="${dist.jsr166yjavadocs.dir}"
874	<	packagenames="jsr166y"
874	>	packagenames="jsr166y.*"
875		link="${jdkapidocs.url}"
876		source="${build.sourcelevel}"
877	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
877	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
878	>	executable="${javadoc7}"
879		additionalparam="-XDignore.symbol.file=true" />
880
881		</target>
#	Line 895 | Line 903
903		debuglevel="${build.debuglevel}"
904		deprecation="${build.deprecation}"
905		classpath=""
906	<	source="1.6"
906	>	source="6"
907		bootclasspath="${jsr166y.jar}:${bootclasspath6}"
908		includeAntRuntime="false"
909		includeJavaRuntime="false"
#	Line 928 | Line 936
936
937
938		<target name="extra166ydocs"
939	<	description="Builds javadocs with custom tags to build dir">
939	>	description="Builds javadocs to build dir">
940
941		<delete dir="${build.extra166yjavadocs.dir}"/>
942		<mkdir dir="${build.extra166yjavadocs.dir}"/>
943
944		<javadoc destdir="${build.extra166yjavadocs.dir}"
945	<	packagenames="extra166y"
945	>	packagenames="extra166y.*"
946		link="${jdkapidocs.url}"
947	<	source="${build.sourcelevel}"
948	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
947	>	source="6"
948	>	bootclasspath="${bootclasspath6}"
949	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
950	>	executable="${javadoc7}"
951		additionalparam="-XDignore.symbol.file=true" />
952
953		</target>
#	Line 971 | Line 981
981		<mkdir dir="${dist.extra166yjavadocs.dir}"/>
982
983		<javadoc destdir="${dist.extra166yjavadocs.dir}"
984	<	packagenames="extra166y"
984	>	packagenames="extra166y.*"
985		link="${jdkapidocs.url}"
986		source="${build.sourcelevel}"
987	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
987	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
988	>	executable="${javadoc7}"
989		additionalparam="-XDignore.symbol.file=true" />
990
991		</target>
#	Line 999 | Line 1010
1010		debug="${build.debug}"
1011		debuglevel="${build.debuglevel}"
1012		deprecation="${build.deprecation}"
1013	<	source="1.7"
1013	>	source="7"
1014		classpath=""
1015		includeAntRuntime="false"
1016		includeJavaRuntime="false"
#	Line 1032 | Line 1043
1043
1044
1045		<target name="jsr166edocs"
1046	<	description="Builds javadocs with custom tags to build dir">
1046	>	description="Builds javadocs to build dir">
1047
1048		<delete dir="${build.jsr166ejavadocs.dir}"/>
1049		<mkdir dir="${build.jsr166ejavadocs.dir}"/>
1050
1051		<javadoc destdir="${build.jsr166ejavadocs.dir}"
1052	<	packagenames="jsr166e,jsr166e.extra"
1053	<	link="${jdkapi7docs.url}"
1054	<	source="1.7"
1052	>	packagenames="jsr166e.*"
1053	>	link="${jdkapidocs.url}"
1054	>	source="7"
1055		sourcepath="${topsrc.dir}:${jdk7src.dir}"
1056		executable="${javadoc7}"
1057		additionalparam="-XDignore.symbol.file=true" >
1047	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1048	–	<include name="jsr166e/**/*.java"/>
1049	–	</fileset>
1058		</javadoc>
1059
1060		</target>
#	Line 1080 | Line 1088
1088		<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1089
1090		<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1091	<	packagenames="jsr166e,jsr166e.extra"
1091	>	packagenames="jsr166e.*"
1092		link="${jdkapidocs.url}"
1093	<	source="1.7"
1094	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1093	>	source="7"
1094	>	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1095	>	executable="${javadoc7}"
1096		additionalparam="-XDignore.symbol.file=true" />
1097
1098		</target>

Diff Legend

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