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.99 by jsr166, Sat Jan 19 01:37:44 2013 UTC vs.
Revision 1.105 by jsr166, Sat Jan 19 21:54:53 2013 UTC

#	Line 167 | Line 167
167		<pathelement location="${build.loops.dir}"/>
168		</path>
169
170	+	<!-- Support @jls tag, used in jdk8+ javadoc -->
171	+	<!-- TODO: How do we get &trade to work? -->
172	+	<!-- TODO: Why isn't @jls a "standard" tag? -->
173	+	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174	+	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
175	+	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
176
177		<!-- Main targets -->
178
#	Line 175 | Line 181
181		description="Builds all public jars and docs"/>
182
183		<target name="compile"
184	<	depends="init, configure-compiler"
185	<	description="Compiles main sources to build folder">
184	>	depends="configure-compiler"
185	>	description="Compiles src/main sources to build dir">
186
187		<mkdir dir="${build.classes.dir}"/>
188
189		<javac srcdir="${src.dir}"
190	<	destdir="${build.classes.dir}"
191	<	debug="${build.debug}"
192	<	debuglevel="${build.debuglevel}"
193	<	deprecation="${build.deprecation}"
194	<	source="${build.sourcelevel}"
195	<	fork="true">
190	>	destdir="${build.classes.dir}"
191	>	debug="${build.debug}"
192	>	debuglevel="${build.debuglevel}"
193	>	deprecation="${build.deprecation}"
194	>	classpath=""
195	>	includeAntRuntime="false"
196	>	includeJavaRuntime="false"
197	>	executable="${javac8}"
198	>	fork="true">
199
200		<include name="**/*.java"/>
201	+	<compilerarg line="${build.args}"/>
202		<compilerarg value="-XDignore.symbol.file=true"/>
203	+	<compilerarg value="-Xlint:all"/>
204
205		<!--
206		<exclude name="java/lang/**"/>
#	Line 218 | 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 with custom tags to build folder">
238	>	description="Builds javadocs for src/main to dist dir">
239
240	<	<delete dir="${build.javadocs.dir}"/>
241	<	<mkdir dir="${build.javadocs.dir}"/>
240	>	<delete dir="${dist.javadocs.dir}"/>
241	>	<mkdir dir="${dist.javadocs.dir}"/>
242
243		<!-- the packagenames="none" hack below prevents scanning the -->
244		<!-- sourcepath for packages -->
245
246	<	<javadoc destdir="${build.javadocs.dir}"
246	>	<javadoc destdir="${dist.javadocs.dir}"
247		packagenames="none"
248	<	link="${jdkapidocs.url}"
248	>	link="${jdkapi8docs.url}"
249		overview="${src.dir}/intro.html"
250	<	sourcepath="${src.dir}:${jdksrc.dir}"
251	<	additionalparam="-XDignore.symbol.file=true" >
250	>	sourcepath="${src.dir}:${jdk8src.dir}"
251	>	classpath=""
252	>	executable="${javadoc8}">
253	>	<arg value="-XDignore.symbol.file=true"/>
254	>	<arg value="-tag"/>
255	>	<arg value="${javadoc.jls.option}"/>
256		<fileset dir="${src.dir}" defaultexcludes="yes">
257		<include name="**/*.java"/>
258		</fileset>
#	Line 248 | Line 263
263
264
265		<target name="dist"
266	<	depends="init, dist-clean, dist-jar, dist-docs"
266	>	depends="dist-clean, dist-jar, docs"
267		description="Puts all distributable products in single hierarchy"/>
268
269
#	Line 292 | Line 307
307
308
309
295	–	<target name="dist-docs"
296	–	description="Builds javadocs without custom tags to dist folder">
297	–
298	–	<delete dir="${dist.javadocs.dir}"/>
299	–	<mkdir dir="${dist.javadocs.dir}"/>
300	–
301	–	<!-- the packagenames="none" hack below prevents scanning the -->
302	–	<!-- sourcepath for packages -->
303	–
304	–	<javadoc destdir="${dist.javadocs.dir}"
305	–	packagenames="none"
306	–	link="${jdkapidocs.url}"
307	–	overview="${src.dir}/intro.html"
308	–	sourcepath="${src.dir}:${jdksrc.dir}"
309	–	additionalparam="-XDignore.symbol.file=true" >
310	–	<fileset dir="${src.dir}" defaultexcludes="yes">
311	–	<include name="**/*.java"/>
312	–	</fileset>
313	–	</javadoc>
314	–
315	–	</target>
316	–
317	–
318	–
310		<!-- Internal targets -->
311
312
322	–	<target name="init">
323	–
324	–	<!-- Version is kept in a separate file -->
325	–	<loadfile property="version" srcFile="version.properties"/>
326	–	<echo>Building JSR-166 version ${version}</echo>
327	–	<echo>java.home is ${java.home}</echo>
328	–
329	–	</target>
330	–
331	–
313		<target name="dist-jar"
314		depends="clean, jar">
315
#	Line 513 | 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 639 | 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 661 | 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 680 | Line 661
661
662		</target>
663
683	–	<target name="4jdk7dist-docs"
684	–	description="Builds javadocs without custom tags to dist folder">
685	–
686	–	<delete dir="${dist.4jdk7.docs.dir}"/>
687	–	<mkdir dir="${dist.4jdk7.docs.dir}"/>
688	–
689	–	<javadoc destdir="${dist.4jdk7.docs.dir}"
690	–	packagenames="none"
691	–	link="${jdkapi7docs.url}"
692	–	overview="${4jdk7src.dir}/intro.html"
693	–	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
694	–	classpath=""
695	–	executable="${javadoc7}">
696	–	<arg value="-XDignore.symbol.file=true"/>
697	–	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
698	–	<include name="**/*.java"/>
699	–	</fileset>
700	–	</javadoc>
701	–
702	–	</target>
703	–
664		<target name="4jdk7dist-jar"
665		depends="4jdk7clean, 4jdk7compile">
666
#	Line 712 | 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 750 | 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 789 | 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 814 | 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}"/>
834	<
835	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
836	<
804	>	<compilerarg value="-Xlint:all"/>
805		</javac>
838	–
806		</target>
807
808
842	–
809		<target name="jsr166yjar"
810		depends="jsr166ycompile"
811		description="Builds library jar from compiled sources">
#	Line 855 | 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 892 | 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 918 | 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="${jsr166yproduct.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}"/>
939	<
940	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
908	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
909
910		</javac>
911
#	Line 960 | 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 997 | 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 1064 | 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 1106 | 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}"/>

Diff Legend

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