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.103 by jsr166, Sat Jan 19 21:35:40 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
313	<	<target name="init">
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>
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>
320	>	<!--   </target> -->
321
322
323		<target name="dist-jar"
#	Line 513 | Line 504
504		<!-- Various demos and test programs -->
505
506
507	<	<target name="loops" depends="init, configure-compiler"
507	>	<target name="loops" depends="configure-compiler"
508		description="Benchmark from Doug Lea's AQS paper">
509
510		<mkdir dir="${build.loops.dir}"/>
#	Line 639 | Line 630
630
631
632		<target name="4jdk7docs"
633	<	description="Builds javadocs with custom tags to build folder">
633	>	description="Builds javadocs for src/jdk7 to dist dir">
634
635	<	<delete dir="${build.4jdk7.docs.dir}"/>
636	<	<mkdir dir="${build.4jdk7.docs.dir}"/>
635	>	<delete dir="${dist.4jdk7.docs.dir}"/>
636	>	<mkdir dir="${dist.4jdk7.docs.dir}"/>
637
638	<	<javadoc destdir="${build.4jdk7.docs.dir}"
638	>	<javadoc destdir="${dist.4jdk7.docs.dir}"
639		packagenames="none"
640		link="${jdkapi7docs.url}"
641		overview="${4jdk7src.dir}/intro.html"
#	Line 661 | Line 652
652
653
654		<target name="4jdk7dist"
655	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
655	>	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
656		description="Puts all distributable products in single hierarchy"/>
657
658
#	Line 680 | Line 671
671
672		</target>
673
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	–
674		<target name="4jdk7dist-jar"
675		depends="4jdk7clean, 4jdk7compile">
676
#	Line 712 | Line 682
682
683
684		<target name="jsr166xcompile"
685	<	depends="init, configure-compiler"
685	>	depends="configure-compiler"
686		description="Compiles jsr166x sources">
687
688		<mkdir dir="${build.jsr166x.dir}"/>
#	Line 750 | Line 720
720
721
722		<target name="jsr166xdocs"
723	<	description="Builds javadocs with custom tags to build folder">
723	>	description="Builds javadocs to dist dir">
724
725		<delete dir="${build.jsr166xjavadocs.dir}"/>
726		<mkdir dir="${build.jsr166xjavadocs.dir}"/>
#	Line 789 | Line 759
759
760
761		<target name="jsr166xdist-docs"
762	<	description="Builds javadocs without custom tags to dist folder">
762	>	description="Builds javadocs to dist dir">
763
764		<delete dir="${dist.jsr166xjavadocs.dir}"/>
765		<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
#	Line 814 | Line 784
784
785
786		<target name="jsr166ycompile"
787	<	depends="init, configure-compiler"
787	>	depends="configure-compiler"
788		description="Compiles jsr166y sources">
789
790		<mkdir dir="${build.jsr166y.dir}"/>
791
792	<	<javac srcdir="${jsr166ysrc.dir}"
793	<	destdir="${build.jsr166y.dir}"
794	<	debug="${build.debug}"
795	<	debuglevel="${build.debuglevel}"
796	<	deprecation="${build.deprecation}"
797	<	source="${build.sourcelevel}"
798	<	fork="true">
792	>	<javac srcdir="${topsrc.dir}"
793	>	destdir="${build.jsr166y.dir}"
794	>	debug="${build.debug}"
795	>	debuglevel="${build.debuglevel}"
796	>	deprecation="${build.deprecation}"
797	>	source="1.6"
798	>	classpath=""
799	>	bootclasspath="${bootclasspath6}"
800	>	includeAntRuntime="false"
801	>	includeJavaRuntime="false"
802	>	executable="${javac7}"
803	>	fork="true">
804
805	<	<include name="**/*.java"/>
805	>	<include name="jsr166y/**/*.java"/>
806		<compilerarg line="${build.args}"/>
807		<compilerarg value="-XDignore.symbol.file=true"/>
808	<	<compilerarg value="${bootclasspath.args}"/>
834	<
835	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
836	<
808	>	<compilerarg value="-Xlint:all"/>
809		</javac>
838	–
810		</target>
811
812
842	–
813		<target name="jsr166yjar"
814		depends="jsr166ycompile"
815		description="Builds library jar from compiled sources">
#	Line 855 | Line 825
825
826
827		<target name="jsr166ydocs"
828	<	description="Builds javadocs with custom tags to build folder">
828	>	description="Builds javadocs to dist dir">
829
830		<delete dir="${build.jsr166yjavadocs.dir}"/>
831		<mkdir dir="${build.jsr166yjavadocs.dir}"/>
#	Line 892 | Line 862
862		</target>
863
864		<target name="jsr166ydist-docs"
865	<	description="Builds javadocs without custom tags to dist folder">
865	>	description="Builds javadocs to dist dir">
866
867		<delete dir="${dist.jsr166yjavadocs.dir}"/>
868		<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
#	Line 918 | Line 888
888
889
890		<target name="extra166ycompile"
891	<	depends="init, configure-compiler, jsr166ycompile"
891	>	depends="configure-compiler, jsr166yjar"
892		description="Compiles extra166y sources">
893
894		<mkdir dir="${build.extra166y.dir}"/>
895
896	<	<javac srcdir="${extra166ysrc.dir}"
897	<	destdir="${build.extra166y.dir}"
898	<	debug="${build.debug}"
899	<	classpath="${jsr166yproduct.jar}"
900	<	debuglevel="${build.debuglevel}"
901	<	deprecation="${build.deprecation}"
902	<	source="${build.sourcelevel}"
903	<	fork="true">
896	>	<javac srcdir="${topsrc.dir}"
897	>	destdir="${build.extra166y.dir}"
898	>	debug="${build.debug}"
899	>	classpath=""
900	>	debuglevel="${build.debuglevel}"
901	>	deprecation="${build.deprecation}"
902	>	source="1.6"
903	>	bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
904	>	includeAntRuntime="false"
905	>	includeJavaRuntime="false"
906	>	executable="${javac7}"
907	>	fork="true">
908
909	<	<include name="**/*.java"/>
909	>	<include name="extra166y/**/*.java"/>
910		<compilerarg line="${build.args}"/>
911		<compilerarg value="-XDignore.symbol.file=true"/>
912	<	<compilerarg value="${bootclasspath.args}"/>
939	<
940	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
912	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
913
914		</javac>
915
#	Line 960 | Line 932
932
933
934		<target name="extra166ydocs"
935	<	description="Builds javadocs with custom tags to build folder">
935	>	description="Builds javadocs with custom tags to build dir">
936
937		<delete dir="${build.extra166yjavadocs.dir}"/>
938		<mkdir dir="${build.extra166yjavadocs.dir}"/>
#	Line 997 | Line 969
969		</target>
970
971		<target name="extra166ydist-docs"
972	<	description="Builds javadocs without custom tags to dist folder">
972	>	description="Builds javadocs to dist dir">
973
974		<delete dir="${dist.extra166yjavadocs.dir}"/>
975		<mkdir dir="${dist.extra166yjavadocs.dir}"/>
#	Line 1064 | Line 1036
1036
1037
1038		<target name="jsr166edocs"
1039	<	description="Builds javadocs with custom tags to build folder">
1039	>	description="Builds javadocs with custom tags to build dir">
1040
1041		<delete dir="${build.jsr166ejavadocs.dir}"/>
1042		<mkdir dir="${build.jsr166ejavadocs.dir}"/>
#	Line 1106 | Line 1078
1078		</target>
1079
1080		<target name="jsr166edist-docs"
1081	<	description="Builds javadocs without custom tags to dist folder">
1081	>	description="Builds javadocs to dist dir">
1082
1083		<delete dir="${dist.jsr166ejavadocs.dir}"/>
1084		<mkdir dir="${dist.jsr166ejavadocs.dir}"/>

Diff Legend

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