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.101 by jsr166, Sat Jan 19 17:30:36 2013 UTC vs.
Revision 1.106 by jsr166, Sat Jan 19 22:23:57 2013 UTC

#	Line 127 | Line 127
127		<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
128
129		<!-- Distribution locations -->
130	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
131	<	<property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134	<	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
135	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
130	>	<property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
131	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
132	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
133	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
134	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
135	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
136
137		<!-- Jar locations -->
138	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139	<	<property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142	<	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
143	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
144	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
138	>	<property name="product.jar"      location="${build.lib.dir}/jsr166.jar"/>
139	>	<property name="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140	>	<property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141	>	<property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142	>	<property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
143	>	<property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
144	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
145
146		<!-- Bootclasspath argument -->
147		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
#	Line 182 | Line 182
182
183		<target name="compile"
184		depends="configure-compiler"
185	<	description="Compiles src/main sources to build folder">
185	>	description="Compiles src/main sources to build dir">
186
187		<mkdir dir="${build.classes.dir}"/>
188
#	Line 229 | Line 229
229
230
231		<target name="test"
232	<	depends="init, configure-tests, report-tests"
232	>	depends="configure-tests, report-tests"
233		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
234
235
236
237		<target name="docs"
238	<	description="Builds javadocs for src/main">
238	>	description="Builds javadocs for src/main to dist dir">
239
240		<delete dir="${dist.javadocs.dir}"/>
241		<mkdir dir="${dist.javadocs.dir}"/>
#	Line 263 | Line 263
263
264
265		<target name="dist"
266	<	depends="init, dist-clean, dist-jar, docs"
266	>	depends="dist-clean, dist-jar, docs"
267		description="Puts all distributable products in single hierarchy"/>
268
269
#	Line 310 | Line 310
310		<!-- Internal targets -->
311
312
313	–	<target name="init">
314	–
315	–	<!-- Version is kept in a separate file -->
316	–	<loadfile property="version" srcFile="version.properties"/>
317	–	<echo>Building JSR-166 version ${version}</echo>
318	–	<echo>java.home is ${java.home}</echo>
319	–
320	–	</target>
321	–
322	–
313		<target name="dist-jar"
314		depends="clean, jar">
315
#	Line 504 | Line 494
494		<!-- Various demos and test programs -->
495
496
497	<	<target name="loops" depends="init, configure-compiler"
497	>	<target name="loops" depends="configure-compiler"
498		description="Benchmark from Doug Lea's AQS paper">
499
500		<mkdir dir="${build.loops.dir}"/>
#	Line 630 | Line 620
620
621
622		<target name="4jdk7docs"
623	<	description="Builds javadocs with custom tags to build folder">
623	>	description="Builds javadocs for src/jdk7 to dist dir">
624
625	<	<delete dir="${build.4jdk7.docs.dir}"/>
626	<	<mkdir dir="${build.4jdk7.docs.dir}"/>
625	>	<delete dir="${dist.4jdk7.docs.dir}"/>
626	>	<mkdir dir="${dist.4jdk7.docs.dir}"/>
627
628	<	<javadoc destdir="${build.4jdk7.docs.dir}"
628	>	<javadoc destdir="${dist.4jdk7.docs.dir}"
629		packagenames="none"
630		link="${jdkapi7docs.url}"
631		overview="${4jdk7src.dir}/intro.html"
#	Line 652 | Line 642
642
643
644		<target name="4jdk7dist"
645	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
645	>	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
646		description="Puts all distributable products in single hierarchy"/>
647
648
#	Line 671 | Line 661
661
662		</target>
663
674	–	<target name="4jdk7dist-docs"
675	–	description="Builds javadocs without custom tags to dist folder">
676	–
677	–	<delete dir="${dist.4jdk7.docs.dir}"/>
678	–	<mkdir dir="${dist.4jdk7.docs.dir}"/>
679	–
680	–	<javadoc destdir="${dist.4jdk7.docs.dir}"
681	–	packagenames="none"
682	–	link="${jdkapi7docs.url}"
683	–	overview="${4jdk7src.dir}/intro.html"
684	–	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
685	–	classpath=""
686	–	executable="${javadoc7}">
687	–	<arg value="-XDignore.symbol.file=true"/>
688	–	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
689	–	<include name="**/*.java"/>
690	–	</fileset>
691	–	</javadoc>
692	–
693	–	</target>
694	–
664		<target name="4jdk7dist-jar"
665		depends="4jdk7clean, 4jdk7compile">
666
#	Line 703 | Line 672
672
673
674		<target name="jsr166xcompile"
675	<	depends="init, configure-compiler"
676	<	description="Compiles jsr166x sources">
675	>	depends="configure-compiler"
676	>	description="Compiles jsr166x sources to build dir">
677
678		<mkdir dir="${build.jsr166x.dir}"/>
679
680	<	<javac srcdir="${jsr166xsrc.dir}"
681	<	destdir="${build.jsr166x.dir}"
682	<	debug="${build.debug}"
683	<	debuglevel="${build.debuglevel}"
684	<	deprecation="${build.deprecation}"
685	<	source="${build.sourcelevel}"
686	<	fork="true">
680	>	<javac srcdir="${topsrc.dir}"
681	>	destdir="${build.jsr166x.dir}"
682	>	debug="${build.debug}"
683	>	debuglevel="${build.debuglevel}"
684	>	deprecation="${build.deprecation}"
685	>	classpath=""
686	>	source="1.5"
687	>	bootclasspath="${bootclasspath6}"
688	>	includeAntRuntime="false"
689	>	includeJavaRuntime="false"
690	>	executable="${javac7}"
691	>	fork="true">
692
693	<	<include name="**/*.java"/>
693	>	<include name="jsr166x/**/*.java"/>
694		<compilerarg line="${build.args}"/>
695		<compilerarg value="-XDignore.symbol.file=true"/>
696	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
697
698		</javac>
699
#	Line 732 | Line 707
707
708		<mkdir dir="${build.jsr166xlib.dir}"/>
709
710	<	<jar destfile="${jsr166xproduct.jar}">
710	>	<jar destfile="${jsr166x.jar}">
711		<fileset dir="${build.jsr166x.dir}"/>
712		</jar>
713
#	Line 741 | Line 716
716
717
718		<target name="jsr166xdocs"
719	<	description="Builds javadocs with custom tags to build folder">
719	>	description="Builds javadocs to dist dir">
720
721		<delete dir="${build.jsr166xjavadocs.dir}"/>
722		<mkdir dir="${build.jsr166xjavadocs.dir}"/>
#	Line 780 | Line 755
755
756
757		<target name="jsr166xdist-docs"
758	<	description="Builds javadocs without custom tags to dist folder">
758	>	description="Builds javadocs to dist dir">
759
760		<delete dir="${dist.jsr166xjavadocs.dir}"/>
761		<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
#	Line 797 | Line 772
772		<target name="jsr166xdist-jar"
773		depends="jsr166xclean, jsr166xjar">
774
775	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
775	>	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
776
777		</target>
778
#	Line 805 | Line 780
780
781
782		<target name="jsr166ycompile"
783	<	depends="init, configure-compiler"
783	>	depends="configure-compiler"
784		description="Compiles jsr166y sources">
785
786		<mkdir dir="${build.jsr166y.dir}"/>
787
788	<	<javac srcdir="${jsr166ysrc.dir}"
789	<	destdir="${build.jsr166y.dir}"
790	<	debug="${build.debug}"
791	<	debuglevel="${build.debuglevel}"
792	<	deprecation="${build.deprecation}"
793	<	source="${build.sourcelevel}"
794	<	fork="true">
788	>	<javac srcdir="${topsrc.dir}"
789	>	destdir="${build.jsr166y.dir}"
790	>	debug="${build.debug}"
791	>	debuglevel="${build.debuglevel}"
792	>	deprecation="${build.deprecation}"
793	>	source="1.6"
794	>	classpath=""
795	>	bootclasspath="${bootclasspath6}"
796	>	includeAntRuntime="false"
797	>	includeJavaRuntime="false"
798	>	executable="${javac7}"
799	>	fork="true">
800
801	<	<include name="**/*.java"/>
801	>	<include name="jsr166y/**/*.java"/>
802		<compilerarg line="${build.args}"/>
803		<compilerarg value="-XDignore.symbol.file=true"/>
804	<	<compilerarg value="${bootclasspath.args}"/>
825	<
826	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
827	<
804	>	<compilerarg value="-Xlint:all"/>
805		</javac>
829	–
806		</target>
807
808
833	–
809		<target name="jsr166yjar"
810		depends="jsr166ycompile"
811		description="Builds library jar from compiled sources">
812
813		<mkdir dir="${build.jsr166ylib.dir}"/>
814
815	<	<jar destfile="${jsr166yproduct.jar}" index="true">
815	>	<jar destfile="${jsr166y.jar}" index="true">
816		<fileset dir="${build.jsr166y.dir}"/>
817		</jar>
818
#	Line 846 | Line 821
821
822
823		<target name="jsr166ydocs"
824	<	description="Builds javadocs with custom tags to build folder">
824	>	description="Builds javadocs to dist dir">
825
826		<delete dir="${build.jsr166yjavadocs.dir}"/>
827		<mkdir dir="${build.jsr166yjavadocs.dir}"/>
#	Line 883 | Line 858
858		</target>
859
860		<target name="jsr166ydist-docs"
861	<	description="Builds javadocs without custom tags to dist folder">
861	>	description="Builds javadocs to dist dir">
862
863		<delete dir="${dist.jsr166yjavadocs.dir}"/>
864		<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
#	Line 900 | Line 875
875		<target name="jsr166ydist-jar"
876		depends="jsr166yclean, jsr166yjar">
877
878	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
878	>	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
879
880		</target>
881
#	Line 909 | Line 884
884
885
886		<target name="extra166ycompile"
887	<	depends="init, configure-compiler, jsr166ycompile"
887	>	depends="configure-compiler, jsr166yjar"
888		description="Compiles extra166y sources">
889
890		<mkdir dir="${build.extra166y.dir}"/>
891
892	<	<javac srcdir="${extra166ysrc.dir}"
893	<	destdir="${build.extra166y.dir}"
894	<	debug="${build.debug}"
895	<	classpath="${jsr166yproduct.jar}"
896	<	debuglevel="${build.debuglevel}"
897	<	deprecation="${build.deprecation}"
898	<	source="${build.sourcelevel}"
899	<	fork="true">
892	>	<javac srcdir="${topsrc.dir}"
893	>	destdir="${build.extra166y.dir}"
894	>	debug="${build.debug}"
895	>	debuglevel="${build.debuglevel}"
896	>	deprecation="${build.deprecation}"
897	>	classpath=""
898	>	source="1.6"
899	>	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
900	>	includeAntRuntime="false"
901	>	includeJavaRuntime="false"
902	>	executable="${javac7}"
903	>	fork="true">
904
905	<	<include name="**/*.java"/>
905	>	<include name="extra166y/**/*.java"/>
906		<compilerarg line="${build.args}"/>
907		<compilerarg value="-XDignore.symbol.file=true"/>
908	<	<compilerarg value="${bootclasspath.args}"/>
930	<
931	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
908	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
909
910		</javac>
911
#	Line 942 | Line 919
919
920		<mkdir dir="${build.extra166ylib.dir}"/>
921
922	<	<jar destfile="${extra166yproduct.jar}" index="true">
922	>	<jar destfile="${extra166y.jar}" index="true">
923		<fileset dir="${build.extra166y.dir}"/>
924		</jar>
925
#	Line 951 | Line 928
928
929
930		<target name="extra166ydocs"
931	<	description="Builds javadocs with custom tags to build folder">
931	>	description="Builds javadocs with custom tags to build dir">
932
933		<delete dir="${build.extra166yjavadocs.dir}"/>
934		<mkdir dir="${build.extra166yjavadocs.dir}"/>
#	Line 988 | Line 965
965		</target>
966
967		<target name="extra166ydist-docs"
968	<	description="Builds javadocs without custom tags to dist folder">
968	>	description="Builds javadocs to dist dir">
969
970		<delete dir="${dist.extra166yjavadocs.dir}"/>
971		<mkdir dir="${dist.extra166yjavadocs.dir}"/>
#	Line 1005 | Line 982
982		<target name="extra166ydist-jar"
983		depends="extra166yclean, extra166yjar">
984
985	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
985	>	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
986
987		</target>
988
#	Line 1046 | Line 1023
1023
1024		<mkdir dir="${build.jsr166elib.dir}"/>
1025
1026	<	<jar destfile="${jsr166eproduct.jar}" index="true">
1026	>	<jar destfile="${jsr166e.jar}" index="true">
1027		<fileset dir="${build.jsr166e.dir}"/>
1028		</jar>
1029
#	Line 1055 | Line 1032
1032
1033
1034		<target name="jsr166edocs"
1035	<	description="Builds javadocs with custom tags to build folder">
1035	>	description="Builds javadocs with custom tags to build dir">
1036
1037		<delete dir="${build.jsr166ejavadocs.dir}"/>
1038		<mkdir dir="${build.jsr166ejavadocs.dir}"/>
#	Line 1097 | Line 1074
1074		</target>
1075
1076		<target name="jsr166edist-docs"
1077	<	description="Builds javadocs without custom tags to dist folder">
1077	>	description="Builds javadocs to dist dir">
1078
1079		<delete dir="${dist.jsr166ejavadocs.dir}"/>
1080		<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
#	Line 1114 | Line 1091
1091		<target name="jsr166edist-jar"
1092		depends="jsr166eclean, jsr166ejar">
1093
1094	<	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1094	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1095
1096		</target>
1097

Diff Legend

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