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.111 by jsr166, Sun Jan 20 03:34:23 2013 UTC

#	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"/>
71	–	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72	–	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
59
60		<!-- JDK binary locations -->
61		<property name="jdks.home"  location="${user.home}/jdk"/>
#	Line 124 | Line 110
110		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
111		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
112		<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"/>
113
114		<!-- Distribution locations -->
115	<	<property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
116	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
117	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
118	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
119	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
120	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
115	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
116	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
117	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
118	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
119	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
120	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
121
122		<!-- Jar locations -->
123	<	<property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>
124	<	<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
125	<	<property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
126	<	<property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
127	<	<property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
128	<	<property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
123	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
124	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
125	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
129		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
130
131		<!-- Bootclasspath argument -->
#	Line 220 | Line 205
205		depends="compile"
206		description="Builds library jar from compiled sources">
207
223	–	<mkdir dir="${build.lib.dir}"/>
224	–
208		<jar destfile="${product.jar}">
209		<fileset dir="${build.classes.dir}"/>
210		</jar>
#	Line 293 | Line 276
276		description="Removes all build products">
277
278		<delete dir="${build.dir}"/>
296	–	<delete dir="${build.classes.dir}"/>
297	–	<delete dir="${build.lib.dir}"/>
279
280		</target>
281
#	Line 326 | Line 307
307		<mkdir dir="${build.testcases.dir}"/>
308
309		<javac srcdir="${tck.src.dir}"
310	<	destdir="${build.testcases.dir}"
311	<	debug="${build.debug}"
312	<	debuglevel="${build.debuglevel}"
313	<	deprecation="${build.deprecation}"
314	<	source="${build.sourcelevel}"
315	<	fork="true">
310	>	destdir="${build.testcases.dir}"
311	>	debug="${build.debug}"
312	>	debuglevel="${build.debuglevel}"
313	>	deprecation="${build.deprecation}"
314	>	source="6"
315	>	classpath="${junit.jar}"
316	>	bootclasspath="${product.jar}:${bootclasspath6}"
317	>	includeAntRuntime="false"
318	>	includeJavaRuntime="false"
319	>	executable="${javac8}"
320	>	fork="true">
321
322	<	<compilerarg value="${bootclasspath.args}"/>
322	>	<include name="**/*.java"/>
323		<compilerarg line="${build.args}"/>
324		<compilerarg value="-XDignore.symbol.file=true"/>
325	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
326
327		<classpath refid="test.classpath"/>
328
329		</javac>
330
331		<javac srcdir="${test.src.dir}"
332	<	destdir="${build.testcases.dir}"
333	<	debug="${build.debug}"
334	<	debuglevel="${build.debuglevel}"
335	<	deprecation="${build.deprecation}"
336	<	source="${build.sourcelevel}"
337	<	fork="true">
332	>	destdir="${build.testcases.dir}"
333	>	debug="${build.debug}"
334	>	debuglevel="${build.debuglevel}"
335	>	deprecation="${build.deprecation}"
336	>	source="6"
337	>	classpath="${junit.jar}"
338	>	bootclasspath="${product.jar}:${bootclasspath6}"
339	>	includeAntRuntime="false"
340	>	includeJavaRuntime="false"
341	>	executable="${javac8}"
342	>	fork="true">
343
344	<	<include name="jsr166/test/**"/>
344	>	<include name="jsr166/test/**/*.java"/>
345
354	–	<compilerarg value="${bootclasspath.args}"/>
346		<compilerarg line="${build.args}"/>
347		<compilerarg value="-XDignore.symbol.file=true"/>
348	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
349
350		<classpath refid="test.classpath"/>
351
#	Line 393 | Line 385
385		errorProperty="junit.failed"
386		failureProperty="junit.failed"
387		dir="${build.reports.dir}"
388	+	jvm="${java8}"
389		fork="true">
390
391	<	<jvmarg value="${bootclasspath.args}"/>
391	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
392		<jvmarg value="-server"/>
393		<jvmarg value="-showversion"/>
394
#	Line 551 | Line 544
544
545		</javac>
546
554	–	<mkdir dir="${build.4jdk7.lib.dir}"/>
555	–
547		<jar destfile="${4jdk7product.jar}" index="true">
548		<fileset dir="${build.4jdk7.classes.dir}"/>
549		</jar>
#	Line 650 | Line 641
641
642
643		<target name="4jdk7clean"
644	<	description="Removes all build products">
644	>	description="Removes all 4jdk7 build products">
645
646		<delete dir="${build.4jdk7.dir}"/>
647
#	Line 670 | Line 661
661
662		</target>
663
673	–	<!-- jsr166x -->
664
665	+	<!-- jsr166x -->
666
667		<target name="jsr166xcompile"
668		depends="configure-compiler"
#	Line 707 | Line 698
698		depends="jsr166xcompile"
699		description="Builds library jar from compiled sources">
700
710	–	<mkdir dir="${build.jsr166xlib.dir}"/>
711	–
701		<jar destfile="${jsr166x.jar}">
702		<fileset dir="${build.jsr166x.dir}"/>
703		</jar>
#	Line 720 | Line 709
709		<target name="jsr166xdocs"
710		description="Builds javadocs to dist dir">
711
712	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
713	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
712	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
713	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
714
715	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
715	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
716		packagenames="jsr166x.*"
717		link="${jdkapidocs.url}"
718		source="5"
#	Line 736 | Line 725
725
726
727		<target name="jsr166xdist"
728	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
728	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
729		description="Puts all distributable products in single hierarchy"/>
730
731
732
733		<target name="jsr166xclean"
734	<	description="Removes all build products">
734	>	description="Removes all jsr166x build products">
735
736		<delete dir="${build.jsr166x.dir}"/>
748	–	<delete dir="${build.jsr166xlib.dir}"/>
737
738		</target>
739
#	Line 757 | Line 745
745		</target>
746
747
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	–
748		<target name="jsr166xdist-jar"
749		depends="jsr166xclean, jsr166xjar">
750
#	Line 815 | Line 786
786		depends="jsr166ycompile"
787		description="Builds library jar from compiled sources">
788
818	–	<mkdir dir="${build.jsr166ylib.dir}"/>
819	–
789		<jar destfile="${jsr166y.jar}" index="true">
790		<fileset dir="${build.jsr166y.dir}"/>
791		</jar>
#	Line 828 | Line 797
797		<target name="jsr166ydocs"
798		description="Builds javadocs to dist dir">
799
800	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
801	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
800	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
801	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
802
803	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
803	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
804		packagenames="jsr166y.*"
805		link="${jdkapidocs.url}"
806		source="6"
#	Line 844 | Line 813
813
814
815		<target name="jsr166ydist"
816	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
816	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
817		description="Puts all distributable products in single hierarchy"/>
818
819
820
821		<target name="jsr166yclean"
822	<	description="Removes all build products">
822	>	description="Removes all jsr166y build products">
823
824		<delete dir="${build.jsr166y.dir}"/>
856	–	<delete dir="${build.jsr166ylib.dir}"/>
825
826		</target>
827
#	Line 864 | Line 832
832
833		</target>
834
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	–
835		<target name="jsr166ydist-jar"
836		depends="jsr166yclean, jsr166yjar">
837
#	Line 925 | Line 877
877		depends="extra166ycompile"
878		description="Builds library jar from compiled sources">
879
928	–	<mkdir dir="${build.extra166ylib.dir}"/>
929	–
880		<jar destfile="${extra166y.jar}" index="true">
881		<fileset dir="${build.extra166y.dir}"/>
882		</jar>
#	Line 938 | Line 888
888		<target name="extra166ydocs"
889		description="Builds javadocs to build dir">
890
891	<	<delete dir="${build.extra166yjavadocs.dir}"/>
892	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
891	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
892	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
893
894	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
894	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
895		packagenames="extra166y.*"
896		link="${jdkapidocs.url}"
897		source="6"
#	Line 954 | Line 904
904
905
906		<target name="extra166ydist"
907	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
907	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
908		description="Puts all distributable products in single hierarchy"/>
909
910
911
912		<target name="extra166yclean"
913	<	description="Removes all build products">
913	>	description="Removes all extra166y build products">
914
915		<delete dir="${build.extra166y.dir}"/>
966	–	<delete dir="${build.extra166ylib.dir}"/>
916
917		</target>
918
#	Line 974 | Line 923
923
924		</target>
925
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	–
926		<target name="extra166ydist-jar"
927		depends="extra166yclean, extra166yjar">
928
#	Line 1032 | Line 965
965		depends="jsr166ecompile"
966		description="Builds library jar from compiled sources">
967
1035	–	<mkdir dir="${build.jsr166elib.dir}"/>
1036	–
968		<jar destfile="${jsr166e.jar}" index="true">
969		<fileset dir="${build.jsr166e.dir}"/>
970		</jar>
#	Line 1045 | Line 976
976		<target name="jsr166edocs"
977		description="Builds javadocs to build dir">
978
979	<	<delete dir="${build.jsr166ejavadocs.dir}"/>
980	<	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
979	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
980	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
981
982	<	<javadoc destdir="${build.jsr166ejavadocs.dir}"
982	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
983		packagenames="jsr166e.*"
984		link="${jdkapidocs.url}"
985		source="7"
#	Line 1061 | Line 992
992
993
994		<target name="jsr166edist"
995	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
995	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
996		description="Puts all distributable products in single hierarchy"/>
997
998
999
1000		<target name="jsr166eclean"
1001	<	description="Removes all build products">
1001	>	description="Removes all jsr166e build products">
1002
1003		<delete dir="${build.jsr166e.dir}"/>
1073	–	<delete dir="${build.jsr166elib.dir}"/>
1004
1005		</target>
1006
1007
1078	–
1008		<target name="jsr166edist-clean"
1009		description="Removes all build and distribution products">
1010
1011		</target>
1012
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	–
1013		<target name="jsr166edist-jar"
1014		depends="jsr166eclean, jsr166ejar">
1015

Diff Legend

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