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.89 by jsr166, Fri Jun 10 18:07:30 2011 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 663 | Line 670
670
671		</target>
672
673	+
674		<!-- extra166y -->
675
676
#	Line 767 | 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