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.57 by tim, Mon Sep 15 14:07:36 2003 UTC vs.
Revision 1.60 by tim, Mon Dec 8 03:10:54 2003 UTC

#	Line 22 | Line 22
22
23		<!-- Compilation options -->
24		<property name="build.sourcelevel"    value="1.5"/>
25	–	<property name="build.docsourcelevel" value="1.4"/>
25		<property name="build.debug"          value="true"/>
26		<property name="build.debuglevel"     value="source,lines,vars"/>
27		<property name="build.deprecation"    value="false"/>
#	Line 34 | Line 33
33		<property name="build.lib.dir"        location="${build.dir}/lib"/>
34		<property name="build.ant.dir"        location="${build.dir}/ant"/>
35		<property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
37	–	<property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
38	–	<property name="build.stripped.dir"   location="${build.dir}/stripped"/>
36		<property name="build.reports.dir"    location="${build.dir}/reports"/>
37	+	<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
38		<property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
39		<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
40	<	<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
40	>	<property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
41
42		<!-- Source locations -->
43		<property name="src.dir"              location="${basedir}/src/main"/>
44		<property name="test.src.dir"         location="${basedir}/src/test"/>
45	+	<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
46		<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
47		<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
48		<property name="lib.dir"              location="${basedir}/lib"/>
#	Line 55 | Line 54
54		<!-- Jar locations -->
55		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
56		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
57	<	<property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
58	<	<property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
59	<
57	>
58	>	<!-- Bootclasspath argument -->
59	>	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
60
61	<	<!-- Files excluded from dist-docs -->
62	<	<patternset id="docs.exclusion">
63	<	<exclude name="java/util/Random.*"/>
64	<	<exclude name="sun/misc/Unsafe.*"/>
65	<	</patternset>
61	>	<!-- Test classpath -->
62	>	<path id="test.classpath">
63	>	<pathelement location="${build.testcases.dir}"/>
64	>	<pathelement location="${junit.jar}"/>
65	>	</path>
66
67
68
69		<!-- Main targets -->
70
71	+
72		<target name="compile"
73	<	depends="init, configure-compiler, prepare-src"
73	>	depends="init, configure-compiler"
74		description="Compiles main sources to build folder">
75
76	–	<property name="prepare.src.dir" value="${src.dir}"/>
77	–
76		<mkdir dir="${build.classes.dir}"/>
77
78	<	<!--
81	<	<echo>javac ${build.args}</echo>
82	<	-->
83	<
84	<	<javac srcdir="${prepare.src.dir}"
78	>	<javac srcdir="${src.dir}"
79		destdir="${build.classes.dir}"
80		debug="${build.debug}"
81		debuglevel="${build.debuglevel}"
#	Line 89 | Line 83
83		source="${build.sourcelevel}"
84		fork="true">
85
86	<	<compilerarg    line="${build.args}"/>
86	>	<compilerarg line="${build.args}"/>
87
88		</javac>
89
90		</target>
91
92
99	–	<target name="jar"
100	–	depends="init-jar, native-jar"
101	–	description="Builds library jar from compiled sources"/>
102	–
103	–
104	–	<target name="test"
105	–	depends="init, configure-tests, report-tests"
106	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
107	–
93
94	<	<target name="checkstyle"
95	<	depends="filter-src"
96	<	description="Reports on style errors in Java source (verbose, mostly chaff)">
94	>	<target name="jar"
95	>	depends="compile"
96	>	description="Builds library jar from compiled sources">
97
98	<	<taskdef resource="checkstyletask.properties"
114	<	classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
98	>	<mkdir dir="${build.lib.dir}"/>
99
100	<	<checkstyle>
101	<	<formatter type="plain"/>  <!-- also available: type="xml" -->
102	<	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119	<	</checkstyle>
100	>	<jar destfile="${product.jar}">
101	>	<fileset dir="${build.classes.dir}"/>
102	>	</jar>
103
104		</target>
105
106
124	–	<target name="doccheck"
125	–	depends="filter-doccheck"
126	–	description="Reports on javadoc style errors">
127	–
128	–	<delete dir="${build.doccheck.dir}"/>
129	–	<mkdir dir="${build.doccheck.dir}"/>
107
108	<	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
109	<	docletpath="${lib.dir}/doccheck.jar"
110	<	destdir="${build.doccheck.dir}">
134	<	<packageset dir="${build.filter.doccheck.dir}"/>
135	<	</javadoc>
136	<
137	<	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
108	>	<target name="test"
109	>	depends="init, configure-tests, report-tests"
110	>	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
111
139	–	</target>
112
113
114		<target name="docs"
143	–	depends="filter-src"
115		description="Builds javadocs with custom tags to build folder">
116
117		<delete dir="${build.javadocs.dir}"/>
#	Line 149 | Line 120
120		<javadoc destdir="${build.javadocs.dir}"
121		link="http://java.sun.com/j2se/1.4.1/docs/api"
122		overview="${src.dir}/intro.html"
123	<	source="${build.docsourcelevel}">
123	>	source="${build.sourcelevel}">
124
125		<tag name="revised" description="Last revised:"/>
126		<tag name="spec"    description="Specified by:"/>
156	–	<tag name="editor"  description="Last edited by:"/>
157	–	<tag name="fixme"   description="FIX ME:"/>
127
128	<	<packageset dir="${build.filter.src.dir}"/>
128	>	<packageset dir="${src.dir}"/>
129
130		</javadoc>
131
132		</target>
133
134
166	–	<target name="sinjdocs"
167	–	depends="configure-tests"
168	–	description="Builds javadocs with custom tags to build folder">
169	–
170	–	<delete dir="${build.sinjdocs.dir}"/>
171	–	<mkdir dir="${build.sinjdocs.dir}"/>
135
136	<	<java classname="net.cscott.sinjdoc.Main" fork="true">
137	<
138	<	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
136	>	<target name="doccheck"
137	>	depends="filter-doccheck"
138	>	description="Reports on javadoc style errors">
139
140	<	<classpath>
141	<	<pathelement location="${sinjdoc.jar}"/>
179	<	<pathelement location="${lib.dir}/jutil.jar"/>
180	<	<pathelement location="${lib.dir}/cup.jar"/>
181	<	<path refid="test.classpath"/>
182	<	</classpath>
183	<
184	<	<!-- <arg value="-help"/> -->
185	<	<!-- <arg value="-verbose"/> -->
186	<	<!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
187	<
188	<	<arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
189	<	<arg value="-sourcepath"/> <arg value="${src.dir}"/>
190	<	<arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
191	<	<arg value="-source"/>     <arg value="${build.sourcelevel}"/>
192	<
193	<	<arg value="java.lang"/>
194	<	<arg value="java.util"/>
195	<	<arg value="java.util.concurrent"/>
196	<	<arg value="java.util.concurrent.atomic"/>
197	<	<arg value="java.util.concurrent.locks"/>
140	>	<delete dir="${build.doccheck.dir}"/>
141	>	<mkdir dir="${build.doccheck.dir}"/>
142
143	+	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
144	+	docletpath="${lib.dir}/doccheck.jar"
145	+	destdir="${build.doccheck.dir}">
146	+	<packageset dir="${build.dc-filter.dir}"/>
147	+	</javadoc>
148
149	<	</java>
149	>	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
150
151		</target>
152
153
205	–	<target name="strip"
206	–	depends="init, configure-compiler"
207	–	description="Strip generics from java source (not working yet)">
208	–
209	–	<mkdir dir="${build.stripped.dir}"/>
154
155	<	<!--
156	<	# javac -s doesn't reliably generate compilable code. It generates
157	<	# bridge methods (marked as "synthetic") that can have identical
214	<	# signatures to existing methods except for the return value.
215	<	-->
216	<	<javac srcdir="${src.dir}"
217	<	destdir="${build.stripped.dir}"
218	<	debug="${build.debug}"
219	<	debuglevel="${build.debuglevel}"
220	<	deprecation="${build.deprecation}"
221	<	source="${build.sourcelevel}"
222	<	fork="true">
155	>	<target name="checkstyle"
156	>	depends="filter-src"
157	>	description="Reports on style errors in Java source (verbose, mostly chaff)">
158
159	<	<compilerarg    line="${build.args} -s"/>
159	>	<taskdef resource="checkstyletask.properties"
160	>	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
161
162	<	</javac>
162	>	<mkdir dir="${build.checkstyle.dir}"/>
163	>
164	>	<checkstyle config="etc/checkstyle/sun_checks.xml"
165	>	failOnViolation="false">
166	>	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
167	>	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
168	>	</checkstyle>
169	>
170	>	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
171	>	out="${build.checkstyle.dir}/checkstyle-report.html"
172	>	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
173
174		</target>
175
176	+
177
178		<target name="dist"
179		depends="init, dist-clean, dist-jar, dist-docs"
180		description="Puts all distributable products in single hierarchy"/>
181
182	+
183	+
184		<target name="release"
185		depends="dist"
186		description="Puts entire CVS tree, plus distribution productions, in a jar">
187
239	–	<!--
240	–	#keep build dir? - dl
241	–	<delete dir="${build.dir}"/>
242	–	-->
188		<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
189
190		<jar basedir="${basedir}" destfile="${release.jar}">
191	+	<!-- <exclude name="build/**"/> -->
192		<exclude name="${release.jar}"/>
193		<exclude name="user.properties"/>
194		<exclude name="etc/notes/**"/>
195	+	<exclude name="src/emulation/**"/>
196		<exclude name="**/SyntaxTest.java"/>
197	+	<exclude name="**/SuperfluousAbstract.java"/>
198		</jar>
199
200		</target>
201
202	+
203	+
204		<target name="clean"
205		description="Removes all build products">
206
#	Line 261 | Line 211
211		</target>
212
213
214	+
215		<target name="dist-clean"
216		description="Removes all build and distribution products">
217
#	Line 269 | Line 220
220		</target>
221
222
223	+
224		<target name="dist-docs"
273	–	depends="filter-src"
225		description="Builds javadocs without custom tags to dist folder">
226
227		<delete dir="${dist.javadocs.dir}"/>
228		<mkdir dir="${dist.javadocs.dir}"/>
229
230		<javadoc destdir="${dist.javadocs.dir}"
231	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
231	>	link="http://java.sun.com/j2se/1.4.2/docs/api"
232		overview="${src.dir}/intro.html"
233	<	source="${build.docsourcelevel}">
233	>	source="${build.sourcelevel}">
234
235	<	<packageset dir="${build.filter.src.dir}"/>
235	>	<packageset dir="${src.dir}"/>
236
237		</javadoc>
238
#	Line 302 | Line 253
253		</target>
254
255
305	–	<target name="init-jar">
306	–
307	–	<mkdir dir="${build.lib.dir}"/>
308	–
309	–	</target>
310	–
311	–
312	–	<target name="native-jar"
313	–	depends="compile">
314	–
315	–	<jar destfile="${product.jar}">
316	–	<fileset dir="${build.classes.dir}"/>
317	–	</jar>
318	–
319	–	</target>
320	–
321	–
256		<target name="dist-jar"
257		depends="clean, jar">
258
#	Line 354 | Line 288
288		<copy todir="${build.filter.src.dir}">
289		<fileset dir="${src.dir}">
290		<exclude name="**/*.html"/>
291	<	<patternset refid="docs.exclusion"/>
291	>	<!-- Files excluded from dist-docs -->
292	>	<exclude name="java/util/Random.*"/>
293	>	<exclude name="sun/misc/Unsafe.*"/>
294		</fileset>
295	+	<!--
296		<filterchain>
297	+	-->
298
299		<!--
300		# This filter gets rid of angle-bracketed type parameters
#	Line 370 | Line 308
308		#   tweaking.)
309		-->
310
311	+	<!--
312		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
313		classpath="${build.ant.dir}">
314		<param name="notmatching" value="^\s+\*\s.*$"/>
315		<param name="pattern"     value="&lt;[^|>()]+?>+"/>
316		<param name="replacement" value=" "/>
317		</filterreader>
318	+	-->
319
320	+	<!--
321		</filterchain>
322	+	-->
323		</copy>
324
325		</target>
326
327
386	–
387	–
328		<target name="filter-doccheck"
329		depends="filter-src">
330
331	<	<mkdir dir="${build.filter.doccheck.dir}"/>
331	>	<mkdir dir="${build.dc-filter.dir}"/>
332
333	<	<copy todir="${build.filter.doccheck.dir}">
333	>	<copy todir="${build.dc-filter.dir}">
334		<fileset dir="${build.filter.src.dir}">
335		<include name="**/*.html"/>
336		</fileset>
#	Line 400 | Line 340
340		value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
341		/>
342
343	<	<copy todir="${build.filter.doccheck.dir}">
343	>	<copy todir="${build.dc-filter.dir}">
344		<fileset dir="${build.filter.src.dir}">
345		<exclude name="**/*.html"/>
346		</fileset>
#	Line 438 | Line 378
378
379		<mkdir dir="${build.testcases.dir}"/>
380
381	<	<!--
382	<	<echo>javac ${build.args}</echo>
383	<	<echo>classpath="${test.classpath}"</echo>
384	<	-->
381	>	<javac srcdir="${tck.src.dir}"
382	>	destdir="${build.testcases.dir}"
383	>	debug="${build.debug}"
384	>	debuglevel="${build.debuglevel}"
385	>	deprecation="${build.deprecation}"
386	>	source="${build.sourcelevel}"
387	>	fork="true">
388	>
389	>	<compilerarg value="${bootclasspath.args}"/>
390	>	<compilerarg line="${build.args}"/>
391	>
392	>	<classpath refid="test.classpath"/>
393	>
394	>	</javac>
395
396		<javac srcdir="${test.src.dir}"
397		destdir="${build.testcases.dir}"
#	Line 451 | Line 401
401		source="${build.sourcelevel}"
402		fork="true">
403
404	+	<include name="jsr166/test/**"/>
405	+
406	+	<compilerarg value="${bootclasspath.args}"/>
407		<compilerarg line="${build.args}"/>
455	–	<classpath refid="test.classpath"/>
408
409	<	<include name="java/**"/>
458	<	<include name="jsr166/**"/>
409	>	<classpath refid="test.classpath"/>
410
411		</javac>
412
#	Line 477 | Line 428
428		dir="${build.reports.dir}"
429		fork="true">
430
431	<	<jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
431	>	<jvmarg value="${bootclasspath.args}"/>
432	>
433	>	<classpath refid="test.classpath"/>
434
435		<formatter type="xml"/>
436
437		<batchtest todir="${build.reports.dir}">
438	+	<fileset dir="${tck.src.dir}">
439	+	<include name="**/${testcase}Test.java"/>
440	+	</fileset>
441		<fileset dir="${test.src.dir}">
442	<	<include name="java/**/${testcase}Test.java"/>
487	<	<include name="jsr166/**/${testcase}Test.java"/>
442	>	<include name="jsr166/test/**/${testcase}Test.java"/>
443		</fileset>
444		</batchtest>
445
#	Line 528 | Line 483
483		</condition>
484
485		<property name="warnunchecked.arg" value=""/>
531	–
532	–	<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
533	–	<istrue value="${build.nothreads}"/>
534	–	</condition>
486
487
488		<!-- Common options in javac invocations -->
#	Line 540 | Line 491
491		</target>
492
493
543	–	<target name="prepare-src"
544	–	depends="configure-compiler"
545	–	if="prepare.src.dir">
546	–
547	–	<mkdir dir="${prepare.src.dir}"/>
548	–	<copy todir="${prepare.src.dir}">
549	–	<fileset dir="${src.dir}">
550	–	<exclude name="java/lang/**"/>
551	–	</fileset>
552	–	</copy>
553	–
554	–	</target>
555	–
556	–
494		<target name="configure-tests"
495		depends="configure-compiler">
496
#	Line 561 | Line 498
498		<available property="junit.available"
499		classname="junit.framework.Protectable"/>
500
564	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
565	–	unless="junit.available"/>
566	–
501		<!-- Xalan -->
502		<available property="xalan.available"
503		classname="org.apache.xalan.Version"/>
504
505	+
506	+	<!-- Ant 1.6beta and later don't need or want this check -->
507	+	<!--
508	+	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
509	+	unless="junit.available"/>
510	+
511		<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
512		unless="xalan.available"/>
513	<
574	<
575	<	<!--
576	<	! Bootclasspath munging for testing, so JUnit can test our local
577	<	! modifications to java.*.
578	<	-->
579	<
580	<	<path id="test.classpath">
581	<	<pathelement location="${product.jar}"/>
582	<	<pathelement location="${rt.jar}"/>
583	<	<pathelement location="${junit.jar}"/>
584	<	<pathelement location="${build.testcases.dir}"/>
585	<	</path>
586	<
587	<	<path id="test.bootclasspath">
588	<	<path refid="test.classpath"/>
589	<	</path>
590	<
591	<	<!-- Flatten test classpaths into platform-appropriate strings -->
592	<	<property name="test.classpath"         refid="test.classpath"/>
593	<	<property name="test.bootclasspath"     refid="test.bootclasspath"/>
513	>	-->
514
515		</target>
516
#	Line 642 | Line 562
562		</target>
563
564
645	–	<target name="ng" depends="test">
646	–	<java classname="SuperfluousAbstract" fork="true">
565
566	<	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
566	>	<!-- Backward compatibility, work in progress (some files not checked in) -->
567	>
568
569	+	<target name="compat" depends="jar">
570	+
571	+	<mkdir dir="${build.testcases.dir}"/>
572	+
573	+	<javac srcdir="${test.src.dir}"
574	+	destdir="${build.testcases.dir}"
575	+	debug="${build.debug}"
576	+	debuglevel="${build.debuglevel}"
577	+	deprecation="${build.deprecation}"
578	+	source="${build.sourcelevel}"
579	+	fork="true">
580	+
581	+	<compilerarg value="${bootclasspath.args}"/>
582	+	<compilerarg line="${build.args}"/>
583	+
584	+	<classpath refid="test.classpath"/>
585	+
586	+	<include name="Compatibility.java"/>
587	+
588	+	</javac>
589	+
590	+
591	+	<java classname="Compatibility" fork="true">
592	+	<jvmarg value="${bootclasspath.args}"/>
593	+	<classpath refid="test.classpath"/>
594		</java>
595		</target>
596
597
598	+
599	+	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
600	+	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
601	+	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
602	+	<property name="pretiger.sourcelevel" value="1.4"/>
603	+
604	+	<target name="defang"
605	+	depends="init"
606	+	description="Generates pre-Tiger compatible source">
607	+
608	+	<delete dir="${pretiger.src.dir}"/>
609	+	<mkdir dir="${pretiger.src.dir}"/>
610	+
611	+	<exec executable="perl">
612	+	<arg file="etc/defang.pl"/>
613	+	<!-- <arg value="-v"/> -->
614	+	<arg value="-s"/> <arg file="${src.dir}"/>
615	+	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
616	+	</exec>
617	+
618	+	</target>
619	+
620	+	<target name="compile-pretiger"
621	+	depends="init, configure-compiler, defang"
622	+	description="Compiles pre-Tiger sources to build folder">
623	+
624	+	<mkdir dir="${build.pretiger.dir}"/>
625	+
626	+	<javac srcdir="${pretiger.src.dir}"
627	+	destdir="${build.pretiger.dir}"
628	+	debug="${build.debug}"
629	+	debuglevel="${build.debuglevel}"
630	+	deprecation="${build.deprecation}"
631	+	source="${pretiger.sourcelevel}"
632	+	fork="true">
633	+
634	+	<compilerarg line="${build.args}"/>
635	+	<exclude name="**/Thread.java"/>
636	+
637	+	</javac>
638	+
639	+	</target>
640	+
641	+	<target name="pretiger" depends="compile-pretiger">
642	+
643	+	<mkdir dir="${build.lib.dir}"/>
644	+
645	+	<jar destfile="${pretiger.jar}">
646	+	<fileset dir="${build.pretiger.dir}">
647	+	</fileset>
648	+	</jar>
649	+
650	+	</target>
651	+
652		</project>

Diff Legend

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