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.104 by jsr166, Sat Jan 19 21: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 127 | Line 122
122		<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
123
124		<!-- Distribution locations -->
125	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
126	<	<property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
127	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
128	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
129	<	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
130	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
125	>	<property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
126	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
127	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
128	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
129	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
130	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
131
132		<!-- Jar locations -->
133	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
134	<	<property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
135	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
136	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
137	<	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
138	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
139	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
133	>	<property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>
134	>	<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
135	>	<property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
136	>	<property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
137	>	<property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
138	>	<property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
139	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
140
141		<!-- Bootclasspath argument -->
142		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
#	Line 154 | Line 149
149		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
150		<!-- The below does not yet exist as of 2012-11 -->
151		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
152	+
153	+	<!-- Default jdk api doc location (latest stable release seems best) -->
154		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
155
156		<!-- Test classpath -->
#	Line 177 | Line 174
174		<!-- Main targets -->
175
176		<target name="dists"
177	<	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
177	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
178		description="Builds all public jars and docs"/>
179
180		<target name="compile"
#	Line 534 | Line 531
531		debug="${build.debug}"
532		debuglevel="${build.debuglevel}"
533		deprecation="${build.deprecation}"
534	<	source="1.6"
534	>	source="6"
535		classpath=""
536		bootclasspath="${bootclasspath6}"
537		includeAntRuntime="false"
#	Line 562 | Line 559
559		debug="${build.debug}"
560		debuglevel="${build.debuglevel}"
561		deprecation="${build.deprecation}"
562	<	source="1.6"
562	>	source="6"
563		classpath="${junit.jar}"
564		bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
565		includeAntRuntime="false"
#	Line 673 | Line 670
670
671		<target name="jsr166xcompile"
672		depends="configure-compiler"
673	<	description="Compiles jsr166x sources">
673	>	description="Compiles jsr166x sources to build dir">
674
675		<mkdir dir="${build.jsr166x.dir}"/>
676
677	<	<javac srcdir="${jsr166xsrc.dir}"
678	<	destdir="${build.jsr166x.dir}"
679	<	debug="${build.debug}"
680	<	debuglevel="${build.debuglevel}"
681	<	deprecation="${build.deprecation}"
682	<	source="${build.sourcelevel}"
683	<	fork="true">
677	>	<javac srcdir="${topsrc.dir}"
678	>	destdir="${build.jsr166x.dir}"
679	>	debug="${build.debug}"
680	>	debuglevel="${build.debuglevel}"
681	>	deprecation="${build.deprecation}"
682	>	classpath=""
683	>	source="5"
684	>	bootclasspath="${bootclasspath6}"
685	>	includeAntRuntime="false"
686	>	includeJavaRuntime="false"
687	>	executable="${javac7}"
688	>	fork="true">
689
690	<	<include name="**/*.java"/>
690	>	<include name="jsr166x/**/*.java"/>
691		<compilerarg line="${build.args}"/>
692		<compilerarg value="-XDignore.symbol.file=true"/>
693	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
694
695		</javac>
696
#	Line 701 | Line 704
704
705		<mkdir dir="${build.jsr166xlib.dir}"/>
706
707	<	<jar destfile="${jsr166xproduct.jar}">
707	>	<jar destfile="${jsr166x.jar}">
708		<fileset dir="${build.jsr166x.dir}"/>
709		</jar>
710
#	Line 712 | 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}"
722	<	packagenames="jsr166x"
721	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
722	>	packagenames="jsr166x.*"
723		link="${jdkapidocs.url}"
724	<	source="${build.sourcelevel}"
725	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
724	>	source="5"
725	>	bootclasspath="${bootclasspath6}"
726	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
727	>	executable="${javadoc7}"
728		additionalparam="-XDignore.symbol.file=true" />
729
730		</target>
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 747 | Line 752
752		</target>
753
754
750	–
751	–	<target name="jsr166xdist-docs"
752	–	description="Builds javadocs to dist dir">
753	–
754	–	<delete dir="${dist.jsr166xjavadocs.dir}"/>
755	–	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
756	–
757	–	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
758	–	packagenames="jsr166x"
759	–	link="${jdkapidocs.url}"
760	–	source="${build.sourcelevel}"
761	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
762	–	additionalparam="-XDignore.symbol.file=true" />
763	–
764	–	</target>
765	–
755		<target name="jsr166xdist-jar"
756		depends="jsr166xclean, jsr166xjar">
757
758	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
758	>	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
759
760		</target>
761
#	Line 784 | Line 773
773		debug="${build.debug}"
774		debuglevel="${build.debuglevel}"
775		deprecation="${build.deprecation}"
776	<	source="1.6"
776	>	source="6"
777		classpath=""
778		bootclasspath="${bootclasspath6}"
779		includeAntRuntime="false"
#	Line 806 | Line 795
795
796		<mkdir dir="${build.jsr166ylib.dir}"/>
797
798	<	<jar destfile="${jsr166yproduct.jar}" index="true">
798	>	<jar destfile="${jsr166y.jar}" index="true">
799		<fileset dir="${build.jsr166y.dir}"/>
800		</jar>
801
#	Line 817 | 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}"
813	<	packagenames="jsr166y"
812	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
813	>	packagenames="jsr166y.*"
814		link="${jdkapidocs.url}"
815	<	source="${build.sourcelevel}"
816	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
815	>	source="6"
816	>	bootclasspath="${bootclasspath6}"
817	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
818	>	executable="${javadoc7}"
819		additionalparam="-XDignore.symbol.file=true" />
820
821		</target>
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 851 | Line 842
842
843		</target>
844
854	–	<target name="jsr166ydist-docs"
855	–	description="Builds javadocs to dist dir">
856	–
857	–	<delete dir="${dist.jsr166yjavadocs.dir}"/>
858	–	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
859	–
860	–	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
861	–	packagenames="jsr166y"
862	–	link="${jdkapidocs.url}"
863	–	source="${build.sourcelevel}"
864	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
865	–	additionalparam="-XDignore.symbol.file=true" />
866	–
867	–	</target>
868	–
845		<target name="jsr166ydist-jar"
846		depends="jsr166yclean, jsr166yjar">
847
848	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
848	>	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
849
850		</target>
851
#	Line 886 | Line 862
862		<javac srcdir="${topsrc.dir}"
863		destdir="${build.extra166y.dir}"
864		debug="${build.debug}"
889	–	classpath=""
865		debuglevel="${build.debuglevel}"
866		deprecation="${build.deprecation}"
867	<	source="1.6"
868	<	bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
867	>	classpath=""
868	>	source="6"
869	>	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
870		includeAntRuntime="false"
871		includeJavaRuntime="false"
872		executable="${javac7}"
#	Line 913 | Line 889
889
890		<mkdir dir="${build.extra166ylib.dir}"/>
891
892	<	<jar destfile="${extra166yproduct.jar}" index="true">
892	>	<jar destfile="${extra166y.jar}" index="true">
893		<fileset dir="${build.extra166y.dir}"/>
894		</jar>
895
#	Line 922 | Line 898
898
899
900		<target name="extra166ydocs"
901	<	description="Builds javadocs with custom tags to build dir">
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}"
907	<	packagenames="extra166y"
906	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
907	>	packagenames="extra166y.*"
908		link="${jdkapidocs.url}"
909	<	source="${build.sourcelevel}"
910	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
909	>	source="6"
910	>	bootclasspath="${bootclasspath6}"
911	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
912	>	executable="${javadoc7}"
913		additionalparam="-XDignore.symbol.file=true" />
914
915		</target>
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 958 | Line 936
936
937		</target>
938
961	–	<target name="extra166ydist-docs"
962	–	description="Builds javadocs to dist dir">
963	–
964	–	<delete dir="${dist.extra166yjavadocs.dir}"/>
965	–	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
966	–
967	–	<javadoc destdir="${dist.extra166yjavadocs.dir}"
968	–	packagenames="extra166y"
969	–	link="${jdkapidocs.url}"
970	–	source="${build.sourcelevel}"
971	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
972	–	additionalparam="-XDignore.symbol.file=true" />
973	–
974	–	</target>
975	–
939		<target name="extra166ydist-jar"
940		depends="extra166yclean, extra166yjar">
941
942	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
942	>	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
943
944		</target>
945
#	Line 993 | Line 956
956		debug="${build.debug}"
957		debuglevel="${build.debuglevel}"
958		deprecation="${build.deprecation}"
959	<	source="1.7"
959	>	source="7"
960		classpath=""
961		includeAntRuntime="false"
962		includeJavaRuntime="false"
#	Line 1017 | Line 980
980
981		<mkdir dir="${build.jsr166elib.dir}"/>
982
983	<	<jar destfile="${jsr166eproduct.jar}" index="true">
983	>	<jar destfile="${jsr166e.jar}" index="true">
984		<fileset dir="${build.jsr166e.dir}"/>
985		</jar>
986
#	Line 1026 | Line 989
989
990
991		<target name="jsr166edocs"
992	<	description="Builds javadocs with custom tags to build dir">
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}"
998	<	packagenames="jsr166e,jsr166e.extra"
999	<	link="${jdkapi7docs.url}"
1000	<	source="1.7"
997	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
998	>	packagenames="jsr166e.*"
999	>	link="${jdkapidocs.url}"
1000	>	source="7"
1001		sourcepath="${topsrc.dir}:${jdk7src.dir}"
1002		executable="${javadoc7}"
1003		additionalparam="-XDignore.symbol.file=true" >
1041	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1042	–	<include name="jsr166e/**/*.java"/>
1043	–	</fileset>
1004		</javadoc>
1005
1006		</target>
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 1061 | Line 1021
1021		</target>
1022
1023
1064	–
1024		<target name="jsr166edist-clean"
1025		description="Removes all build and distribution products">
1026
1027		</target>
1028
1070	–	<target name="jsr166edist-docs"
1071	–	description="Builds javadocs to dist dir">
1072	–
1073	–	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1074	–	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1075	–
1076	–	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1077	–	packagenames="jsr166e,jsr166e.extra"
1078	–	link="${jdkapidocs.url}"
1079	–	source="1.7"
1080	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1081	–	additionalparam="-XDignore.symbol.file=true" />
1082	–
1083	–	</target>
1084	–
1029		<target name="jsr166edist-jar"
1030		depends="jsr166eclean, jsr166ejar">
1031
1032	<	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1032	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1033
1034		</target>
1035

Diff Legend

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