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.81 by jsr166, Sun Aug 2 00:11:59 2009 UTC vs.
Revision 1.90 by dl, Fri Jul 15 13:21:07 2011 UTC

#	Line 42 | Line 42
42		<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
43		<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
44
45	+	<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
46	+	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
47	+	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
48	+
49		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
50		<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
51		<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
#	Line 57 | Line 61
61		<property name="topsrc.dir"           location="${basedir}/src"/>
62		<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
63		<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
64	+	<property name="jsr166esrc.dir"       location="${basedir}/src/jsr166e"/>
65		<property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
66		<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
67		<!-- Distribution locations -->
68		<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
69		<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
70		<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
71	+	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
72		<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
73
74		<!-- Jar locations -->
75		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
76		<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
77		<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
78	+	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
79		<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
80		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
81
#	Line 90 | Line 97
97		<!-- Main targets -->
98
99		<target name="dists"
100	<	depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
100	>	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
101		description="Builds all public jars and docs"/>
102
103		<target name="compile"
#	Line 108 | Line 115
115		fork="true">
116
117		<include name="**/*.java"/>
118	<	<compilerarg value="-XDignore.symbol.file"/>
118	>	<compilerarg value="-XDignore.symbol.file=true"/>
119
120		<!--
121		<exclude name="java/lang/**"/>
#	Line 148 | Line 155
155		<delete dir="${build.javadocs.dir}"/>
156		<mkdir dir="${build.javadocs.dir}"/>
157
158	<	<javadoc destdir="${build.javadocs.dir}"
159	<	link="http://java.sun.com/javase/6/docs/api/"
153	<	overview="${src.dir}/intro.html"
154	<	sourcepath="${src.dir}:${jdksrc.dir}"
155	<	>
156	<
157	<	<packageset dir="${src.dir}"/>
158	>	<!-- the packagenames="none" hack below prevents scanning the -->
159	>	<!-- sourcepath for packages -->
160
161	+	<javadoc destdir="${build.javadocs.dir}"
162	+	packagenames="none"
163	+	link="http://download.oracle.com/javase/7/docs/api/"
164	+	overview="${src.dir}/intro.html"
165	+	sourcepath="${src.dir}:${jdksrc.dir}"
166	+	additionalparam="-XDignore.symbol.file=true" >
167	+	<fileset dir="${src.dir}" defaultexcludes="yes">
168	+	<include name="**/*.java"/>
169	+	</fileset>
170		</javadoc>
171
172		</target>
#	Line 213 | Line 224
224		<delete dir="${dist.javadocs.dir}"/>
225		<mkdir dir="${dist.javadocs.dir}"/>
226
227	<	<javadoc destdir="${dist.javadocs.dir}"
228	<	link="http://java.sun.com/javase/6/docs/api/"
218	<	overview="${src.dir}/intro.html"
227	>	<!-- the packagenames="none" hack below prevents scanning the -->
228	>	<!-- sourcepath for packages -->
229
230	<	sourcepath="${src.dir}:${jdksrc.dir}"
231	<	>
232	<	<!--
233	<	<packageset dir="${src.dir}" defaultexcludes="yes">
234	<	<include name="java/util/concurrent"/>
235	<	<include name="java/util/concurrent/atomic"/>
236	<	<include name="java/util/concurrent/locks"/>
237	<	</packageset>
228	<	-->
229	<	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
230	<	<include name="main/java/util/concurrent/*.java"/>
231	<	<include name="main/java/util/concurrent/atomic/*.java"/>
232	<	<include name="main/java/util/concurrent/locks/*.java"/>
233	<	<include name="main/java/util/*.java"/>
234	<	<!--
235	<	<include name="main/java/util/concurrent/*.html"/>
236	<	<include name="main/java/util/concurrent/atomic/*.html"/>
237	<	<include name="main/java/util/concurrent/locks/*.html"/>
238	<	<include name="main/java/util/*.html"/>
239	<	-->
240	<	<!--      <include name="jsr166x/*.java"/> -->
230	>	<javadoc destdir="${dist.javadocs.dir}"
231	>	packagenames="none"
232	>	link="http://download.oracle.com/javase/7/docs/api/"
233	>	overview="${src.dir}/intro.html"
234	>	sourcepath="${src.dir}:${jdksrc.dir}"
235	>	additionalparam="-XDignore.symbol.file=true" >
236	>	<fileset dir="${src.dir}" defaultexcludes="yes">
237	>	<include name="**/*.java"/>
238		</fileset>
239		</javadoc>
240
#	Line 281 | Line 278
278
279		<compilerarg value="${bootclasspath.args}"/>
280		<compilerarg line="${build.args}"/>
281	+	<compilerarg value="-XDignore.symbol.file=true"/>
282
283		<classpath refid="test.classpath"/>
284
#	Line 298 | Line 296
296
297		<compilerarg value="${bootclasspath.args}"/>
298		<compilerarg line="${build.args}"/>
299	+	<compilerarg value="-XDignore.symbol.file=true"/>
300
301		<classpath refid="test.classpath"/>
302
#	Line 314 | Line 313
313
314		<compilerarg value="${bootclasspath.args}"/>
315		<compilerarg line="${build.args}"/>
316	+	<compilerarg value="-XDignore.symbol.file=true"/>
317
318		<classpath refid="test.classpath"/>
319
#	Line 454 | Line 454
454
455		<compilerarg line="${build.args}"/>
456		<classpath refid="loops.classpath"/>
457	+	<compilerarg value="-XDignore.symbol.file=true"/>
458
459		</javac>
460
#	Line 483 | Line 484
484
485		<include name="**/*.java"/>
486		<compilerarg line="${build.args}"/>
487	+	<compilerarg value="-XDignore.symbol.file=true"/>
488
489		</javac>
490
#	Line 511 | Line 513
513		<mkdir dir="${build.jsr166xjavadocs.dir}"/>
514
515		<javadoc destdir="${build.jsr166xjavadocs.dir}"
516	<	link="http://java.sun.com/javase/6/docs/api/"
517	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
518	<	>
519	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
520	<	<include name="jsr166x"/>
519	<	</packageset>
520	<
521	<
522	<	</javadoc>
516	>	packagenames="jsr166x"
517	>	link="http://download.oracle.com/javase/7/docs/api/"
518	>	source="${build.sourcelevel}"
519	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
520	>	additionalparam="-XDignore.symbol.file=true" />
521
522		</target>
523
#	Line 554 | Line 552
552		<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
553
554		<javadoc destdir="${dist.jsr166xjavadocs.dir}"
555	<	link="http://java.sun.com/javase/6/docs/api/"
556	<	source="${build.sourcelevel}">
557	<
558	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
559	<	<include name="jsr166x"/>
562	<	</packageset>
563	<
564	<	</javadoc>
555	>	packagenames="jsr166x"
556	>	link="http://download.oracle.com/javase/7/docs/api/"
557	>	source="${build.sourcelevel}"
558	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
559	>	additionalparam="-XDignore.symbol.file=true" />
560
561		</target>
562
#	Line 591 | Line 586
586
587		<include name="**/*.java"/>
588		<compilerarg line="${build.args}"/>
589	+	<compilerarg value="-XDignore.symbol.file=true"/>
590		<compilerarg value="${bootclasspath.args}"/>
591
592		<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
#	Line 622 | Line 618
618		<mkdir dir="${build.jsr166yjavadocs.dir}"/>
619
620		<javadoc destdir="${build.jsr166yjavadocs.dir}"
621	<	link="http://java.sun.com/javase/6/docs/api/"
622	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
623	<	>
624	<	<packageset dir="${topsrc.dir}" defaultexcludes="no">
625	<	<include name="jsr166y"/>
630	<	</packageset>
631	<
632	<
633	<	</javadoc>
621	>	packagenames="jsr166y"
622	>	link="http://download.oracle.com/javase/7/docs/api/"
623	>	source="${build.sourcelevel}"
624	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
625	>	additionalparam="-XDignore.symbol.file=true" />
626
627		</target>
628
#	Line 663 | Line 655
655		<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
656
657		<javadoc destdir="${dist.jsr166yjavadocs.dir}"
658	<	link="http://java.sun.com/javase/6/docs/api/"
659	<	source="${build.sourcelevel}"
660	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
661	<	>
662	<	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
671	<	<include name="jsr166y/*.java"/>
672	<	</fileset>
673	<	</javadoc>
658	>	packagenames="jsr166y"
659	>	link="http://download.oracle.com/javase/7/docs/api/"
660	>	source="${build.sourcelevel}"
661	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
662	>	additionalparam="-XDignore.symbol.file=true" />
663
664		</target>
665
#	Line 681 | Line 670
670
671		</target>
672
673	+
674		<!-- extra166y -->
675
676
#	Line 701 | Line 691
691
692		<include name="**/*.java"/>
693		<compilerarg line="${build.args}"/>
694	+	<compilerarg value="-XDignore.symbol.file=true"/>
695		<compilerarg value="${bootclasspath.args}"/>
696
697		<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
#	Line 732 | Line 723
723		<mkdir dir="${build.extra166yjavadocs.dir}"/>
724
725		<javadoc destdir="${build.extra166yjavadocs.dir}"
726	<	link="http://java.sun.com/javase/6/docs/api/"
727	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
728	<	>
729	<	<packageset dir="${topsrc.dir}" defaultexcludes="no">
730	<	<include name="extra166y"/>
740	<	</packageset>
741	<
742	<
743	<	</javadoc>
726	>	packagenames="extra166y"
727	>	link="http://download.oracle.com/javase/7/docs/api/"
728	>	source="${build.sourcelevel}"
729	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
730	>	additionalparam="-XDignore.symbol.file=true" />
731
732		</target>
733
#	Line 773 | Line 760
760		<mkdir dir="${dist.extra166yjavadocs.dir}"/>
761
762		<javadoc destdir="${dist.extra166yjavadocs.dir}"
763	<	link="http://java.sun.com/javase/6/docs/api/"
764	<	source="${build.sourcelevel}"
765	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
766	<	>
767	<	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
781	<	<include name="extra166y/*.java"/>
782	<	</fileset>
783	<	</javadoc>
763	>	packagenames="extra166y"
764	>	link="http://download.oracle.com/javase/7/docs/api/"
765	>	source="${build.sourcelevel}"
766	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
767	>	additionalparam="-XDignore.symbol.file=true" />
768
769		</target>
770
#	Line 791 | Line 775
775
776		</target>
777
778	+	<!-- jsr166e -->
779	+
780	+
781	+	<target name="jsr166ecompile"
782	+	depends="init, configure-compiler"
783	+	description="Compiles jsr166e sources">
784	+
785	+	<mkdir dir="${build.jsr166e.dir}"/>
786	+
787	+	<javac srcdir="${jsr166esrc.dir}"
788	+	destdir="${build.jsr166e.dir}"
789	+	debug="${build.debug}"
790	+	debuglevel="${build.debuglevel}"
791	+	deprecation="${build.deprecation}"
792	+	source="1.7"
793	+	fork="true">
794	+
795	+	<include name="**/*.java"/>
796	+	<compilerarg line="${build.args}"/>
797	+	<compilerarg value="-XDignore.symbol.file=true"/>
798	+	<compilerarg value="${bootclasspath.args}"/>
799	+
800	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
801	+
802	+	</javac>
803	+
804	+	</target>
805	+
806	+
807	+
808	+	<target name="jsr166ejar"
809	+	depends="jsr166ecompile"
810	+	description="Builds library jar from compiled sources">
811	+
812	+	<mkdir dir="${build.jsr166elib.dir}"/>
813	+
814	+	<jar destfile="${jsr166eproduct.jar}" index="true">
815	+	<fileset dir="${build.jsr166e.dir}"/>
816	+	</jar>
817	+
818	+	</target>
819	+
820	+
821	+
822	+	<target name="jsr166edocs"
823	+	description="Builds javadocs with custom tags to build folder">
824	+
825	+	<delete dir="${build.jsr166ejavadocs.dir}"/>
826	+	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
827	+
828	+	<javadoc destdir="${build.jsr166ejavadocs.dir}"
829	+	packagenames="jsr166e,jsr166e.extra"
830	+	link="http://download.oracle.com/javase/7/docs/api/"
831	+	source="1.7"
832	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
833	+	additionalparam="-XDignore.symbol.file=true" />
834	+
835	+	</target>
836	+
837	+
838	+	<target name="jsr166edist"
839	+	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
840	+	description="Puts all distributable products in single hierarchy"/>
841	+
842	+
843	+
844	+	<target name="jsr166eclean"
845	+	description="Removes all build products">
846	+
847	+	<delete dir="${build.jsr166e.dir}"/>
848	+	<delete dir="${build.jsr166elib.dir}"/>
849	+
850	+	</target>
851	+
852	+
853	+
854	+	<target name="jsr166edist-clean"
855	+	description="Removes all build and distribution products">
856	+
857	+	</target>
858	+
859	+	<target name="jsr166edist-docs"
860	+	description="Builds javadocs without custom tags to dist folder">
861	+
862	+	<delete dir="${dist.jsr166ejavadocs.dir}"/>
863	+	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
864	+
865	+	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
866	+	packagenames="jsr166e,jsr166e.extra"
867	+	link="http://download.oracle.com/javase/7/docs/api/"
868	+	source="1.7"
869	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
870	+	additionalparam="-XDignore.symbol.file=true" />
871	+
872	+	</target>
873	+
874	+	<target name="jsr166edist-jar"
875	+	depends="jsr166eclean, jsr166ejar">
876	+
877	+	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
878	+
879	+	</target>
880	+
881		</project>

Diff Legend

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