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.22 by tim, Wed May 14 21:30:37 2003 UTC vs.
Revision 1.55 by tim, Mon Sep 1 04:14:47 2003 UTC

#	Line 1 | Line 1
1		<project name="jsr166" default="usage">
2
3		<description>
4	<	Build file for JSR-166
4	>	------------------------------------------------------------------------------
5	>	Build file for JSR-166
6
7	<	JUnit 1.8 must be in ${ant.home}/lib for the test target to work.
7	<	</description>
7	>	Usage: ant [target]
8
9	+	User-specific settings are read from user.properties.
10	+	See user.properties.sample for an explanation of some useful settings.
11	+	------------------------------------------------------------------------------
12	+	</description>
13
14	<	<target name="usage" description="Prints this message">
15	<	<echo>
12	<	ant [target], where target is one of:
13	<
14	<	usage       (default) Prints this message
15	<	compile     Compiles all sources to build folder
16	<	jar         Builds library jar from compiled sources
17	<	test        Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)
18	<	docs        Builds javadocs with custom tags to build folder
19	<	dist-docs   Builds javadocs without custom tags to dist folder
20	<	dist        Puts all distributable products in single hierarchy
21	<
22	<	clean       Removes all build products
23	<	dist-clean  Removes all build and distribution products
24	<
25	<	checkstyle  Reports on style errors in Java source (verbose, mostly chaff)
26	<	doccheck    Reports on javadoc style errors (not working yet)
27	<	</echo>
14	>	<target name="usage" description="Advises user to run with -projecthelp">
15	>	<echo>Run "ant -projecthelp" for full usage information.</echo>
16		</target>
17
18
19	+	<!-- User-specific settings -->
20	+	<property file="user.properties"/>
21	+
22	+
23		<!-- Compilation options -->
24		<property name="build.sourcelevel"    value="1.5"/>
25	+	<property name="build.docsourcelevel" value="1.4"/>
26		<property name="build.debug"          value="true"/>
27		<property name="build.debuglevel"     value="source,lines,vars"/>
28		<property name="build.deprecation"    value="false"/>
36	–	<!--
37	–	<property name="build.warnings"       value="true"/>
38	–	-->
29
30		<!-- Build locations -->
31		<property name="build.dir"            location="build"/>
32		<property name="build.classes.dir"    location="${build.dir}/classes"/>
33	+	<property name="build.emulation.dir"  location="${build.dir}/emulation"/>
34		<property name="build.testcases.dir"  location="${build.dir}/testcases"/>
35		<property name="build.lib.dir"        location="${build.dir}/lib"/>
36		<property name="build.ant.dir"        location="${build.dir}/ant"/>
37		<property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
38	+	<property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
39		<property name="build.stripped.dir"   location="${build.dir}/stripped"/>
40		<property name="build.reports.dir"    location="${build.dir}/reports"/>
41		<property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
42		<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
43	+	<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
44
45		<!-- Source locations -->
46		<property name="src.dir"              location="${basedir}/src/main"/>
47	+	<property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
48		<property name="test.src.dir"         location="${basedir}/src/test"/>
49		<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
50		<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
#	Line 62 | Line 56 | ant [target], where target is one of:
56
57		<!-- Jar locations -->
58		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
65	–	<property name="javac.jar"            location="${lib.dir}/javac.jar"/>
66	–	<property name="collect.jar"          location="${lib.dir}/collect.jar"/>
59		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
60		<property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
61	+	<property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
62
70	–	<property name="javac.args"           value='-J-Xbootclasspath/p:${javac.jar}'/>
63
64	<	<path id="javac.bootclasspath">
65	<	<pathelement location="${collect.jar}"/>
66	<	<pathelement location="${rt.jar}"/>
67	<	</path>
68	<
69	<	<path id="test.classpath">
70	<	<pathelement location="${product.jar}"/>
71	<	</path>
64	>	<!-- Files excluded from dist-docs and emulation jar -->
65	>	<patternset id="unsafe.exclusion">
66	>	<exclude name="java/util/Random.*"/>
67	>	<exclude name="sun/misc/Unsafe.*"/>
68	>	</patternset>
69	>
70	>	<!-- Files excludes from emulation jar -->
71	>	<patternset id="atomic.exclusion">
72	>	<exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
73	>	<exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
74	>	<exclude name="java/util/concurrent/atomic/AtomicLong*"/>
75	>	<exclude name="java/util/concurrent/atomic/AtomicReference*"/>
76	>	<exclude name="java/util/concurrent/locks/LockSupport*"/>
77	>	<exclude name="java/util/concurrent/locks/ReentrantLock*"/>
78	>	</patternset>
79	>
80
81
82		<!-- Main targets -->
83
84	<	<target name="compile" depends="init"
85	<	description="Compiles all sources to build folder">
84	>	<target name="compile"
85	>	depends="init, configure-compiler, prepare-src"
86	>	description="Compiles main sources to build folder">
87	>
88	>	<property name="prepare.src.dir" value="${src.dir}"/>
89	>
90		<mkdir dir="${build.classes.dir}"/>
91	<	<javac srcdir="${src.dir}"
91	>
92	>	<!--
93	>	<echo>javac ${gjc.args}</echo>
94	>	<echo>bootclasspath=${compile.bootclasspath}</echo>
95	>	-->
96	>
97	>	<javac srcdir="${prepare.src.dir}"
98		destdir="${build.classes.dir}"
99		debug="${build.debug}"
100		debuglevel="${build.debuglevel}"
#	Line 92 | Line 102 | ant [target], where target is one of:
102		source="${build.sourcelevel}"
103		fork="true">
104
105	<	<bootclasspath refid="javac.bootclasspath"/>
106	<	<compilerarg line="${javac.args} ${build.warnings.option}"/>
105	>	<compilerarg    line="${gjc.args}"/>
106	>	<!--
107	>	<bootclasspath refid="compile.bootclasspath"/>
108	>	-->
109
110		</javac>
111	+
112		</target>
113
114
115	<	<target name="jar" depends="compile"
116	<	description="Builds library jar from compiled sources">
117	<	<mkdir dir="${build.lib.dir}"/>
105	<	<jar basedir="${build.classes.dir}"
106	<	destfile="${product.jar}"
107	<	/>
108	<	</target>
115	>	<target name="jar"
116	>	depends="configure-emulation, init-jar, native-jar, emulation-jar"
117	>	description="Builds library jar from compiled sources"/>
118
119
120	<	<target name="test" depends="init, check-junit, report-tests"
121	<	description="Runs all tests (requires JUnit 1.8 in ${ant.home}/lib)"/>
120	>	<target name="test"
121	>	depends="init, configure-tests, report-tests"
122	>	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
123
124
125	<	<target name="checkstyle" depends="filter-src"
125	>	<target name="checkstyle"
126	>	depends="filter-src"
127		description="Reports on style errors in Java source (verbose, mostly chaff)">
128	+
129		<taskdef resource="checkstyletask.properties"
130		classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
131
#	Line 121 | Line 133 | ant [target], where target is one of:
133		<formatter type="plain"/>  <!-- also available: type="xml" -->
134		<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
135		</checkstyle>
136	+
137		</target>
138
139
140	<	<target name="doccheck" depends="filter-src"
141	<	description="Reports on javadoc style errors (not working yet)">
140	>	<target name="doccheck"
141	>	depends="filter-doccheck"
142	>	description="Reports on javadoc style errors">
143	>
144		<delete dir="${build.doccheck.dir}"/>
145		<mkdir dir="${build.doccheck.dir}"/>
146	+
147		<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
148		docletpath="${lib.dir}/doccheck.jar"
149		destdir="${build.doccheck.dir}">
150	<	<packageset dir="${build.filter.src.dir}"/>
150	>	<packageset dir="${build.filter.doccheck.dir}"/>
151		</javadoc>
152	+
153	+	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
154	+
155		</target>
156
157
158	<	<target name="docs" depends="filter-src"
158	>	<target name="docs"
159	>	depends="filter-src"
160		description="Builds javadocs with custom tags to build folder">
161	+
162		<delete dir="${build.javadocs.dir}"/>
163		<mkdir dir="${build.javadocs.dir}"/>
164	+
165		<javadoc destdir="${build.javadocs.dir}"
166		link="http://java.sun.com/j2se/1.4.1/docs/api"
167		overview="${src.dir}/intro.html"
168	<	source="${build.sourcelevel}">
168	>	source="${build.docsourcelevel}">
169
170		<tag name="revised" description="Last revised:"/>
171	<	<tag name="spec" description="Specified by:"/>
172	<	<tag name="editor" description="Last edited by:"/>
173	<	<tag name="fixme" description="FIX ME:"/>
171	>	<tag name="spec"    description="Specified by:"/>
172	>	<tag name="editor"  description="Last edited by:"/>
173	>	<tag name="fixme"   description="FIX ME:"/>
174	>
175		<packageset dir="${build.filter.src.dir}"/>
176
177		</javadoc>
178	+
179	+	</target>
180	+
181	+
182	+	<target name="sinjdocs"
183	+	depends="configure-tests"
184	+	description="Builds javadocs with custom tags to build folder">
185	+
186	+	<delete dir="${build.sinjdocs.dir}"/>
187	+	<mkdir dir="${build.sinjdocs.dir}"/>
188	+
189	+	<java classname="net.cscott.sinjdoc.Main" fork="true">
190	+
191	+	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
192	+
193	+	<classpath>
194	+	<pathelement location="${sinjdoc.jar}"/>
195	+	<pathelement location="${lib.dir}/jutil.jar"/>
196	+	<pathelement location="${lib.dir}/cup.jar"/>
197	+	<path refid="test.classpath"/>
198	+	</classpath>
199	+
200	+
201	+	<arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
202	+	<arg value="-sourcepath"/> <arg value="${src.dir}"/>
203	+	<arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
204	+	<arg value="-source"/>     <arg value="${build.sourcelevel}"/>
205	+	<!-- <arg value="-verbose"/> -->
206	+	<!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
207	+	<arg value="java.lang"/>
208	+	<arg value="java.util"/>
209	+	<arg value="java.util.concurrent"/>
210	+	<arg value="java.util.concurrent.atomic"/>
211	+	<arg value="java.util.concurrent.locks"/>
212	+
213	+	<!--
214	+	<arg value="-help"/>
215	+	-->
216	+
217	+	</java>
218	+
219		</target>
220
221
222	<	<!--
223	<	# javac -s doesn't reliably generate compilable code. It generates
224	<	# bridge methods (marked as "synthetic") that can have identical
225	<	# signatures to existing methods except for the return value.
162	<	-->
163	<	<target name="strip" depends="init">
222	>	<target name="strip"
223	>	depends="init, configure-compiler"
224	>	description="Strip generics from java source (not working yet)">
225	>
226		<mkdir dir="${build.stripped.dir}"/>
227	+
228	+	<!--
229	+	# javac -s doesn't reliably generate compilable code. It generates
230	+	# bridge methods (marked as "synthetic") that can have identical
231	+	# signatures to existing methods except for the return value.
232	+	-->
233		<javac srcdir="${src.dir}"
234		destdir="${build.stripped.dir}"
235		debug="${build.debug}"
#	Line 170 | Line 238 | ant [target], where target is one of:
238		source="${build.sourcelevel}"
239		fork="true">
240
241	<	<bootclasspath refid="javac.bootclasspath"/>
242	<	<compilerarg line="${javac.args} ${build.warnings.option} -s"/>
241	>	<compilerarg    line="${gjc.args} -s"/>
242	>	<!--
243	>	<bootclasspath refid="compile.bootclasspath"/>
244	>	-->
245
246		</javac>
247	+
248		</target>
249
250
251	<	<target name="dist" depends="init, dist-clean, dist-jar, dist-docs"
251	>	<target name="dist"
252	>	depends="init, dist-clean, dist-jar, dist-docs"
253		description="Puts all distributable products in single hierarchy"/>
254
255	+	<target name="release"
256	+	depends="dist"
257	+	description="Puts entire CVS tree, plus distribution productions, in a jar">
258	+
259	+	<!--
260	+	#keep build dir? - dl
261	+	<delete dir="${build.dir}"/>
262	+	-->
263	+	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
264	+
265	+	<jar basedir="${basedir}" destfile="${release.jar}">
266	+	<exclude name="${release.jar}"/>
267	+	<exclude name="user.properties"/>
268	+	<exclude name="etc/notes/**"/>
269	+	<exclude name="lib/gjc/2.1/**"/>
270	+	<exclude name="**/SyntaxTest.java"/>
271	+	</jar>
272	+
273	+	</target>
274
275		<target name="clean"
276		description="Removes all build products">
277	+
278		<delete dir="${build.dir}"/>
279		<delete dir="${build.classes.dir}"/>
280		<delete dir="${build.lib.dir}"/>
281	+
282		</target>
283
284
285		<target name="dist-clean"
286		description="Removes all build and distribution products">
287	+
288		<delete dir="${dist.dir}"/>
289	+
290		</target>
291
292
293	<	<!-- Anthill targets -->
293	>	<target name="dist-docs"
294	>	depends="filter-src"
295	>	description="Builds javadocs without custom tags to dist folder">
296
297	<	<!-- Should really run the tests instead of just the jar target -->
298	<	<target name="anthill-build" depends="jar, docs, dist-docs"/>
297	>	<delete dir="${dist.javadocs.dir}"/>
298	>	<mkdir dir="${dist.javadocs.dir}"/>
299
300	<	<target name="anthill-publish">
301	<	<copy todir="${deployDir}/docs/private">
302	<	<fileset dir="${build.javadocs.dir}"/>
303	<	</copy>
207	<	<copy todir="${deployDir}/docs/public">
208	<	<fileset dir="${dist.javadocs.dir}"/>
209	<	</copy>
210	<	<copy tofile="${deployDir}/index.html"
211	<	file="${basedir}/etc/anthill-index.html"/>
212	<	<copy todir="${deployDir}/notes">
213	<	<fileset dir="${basedir}/etc/notes"/>
214	<	</copy>
215	<	</target>
300	>	<javadoc destdir="${dist.javadocs.dir}"
301	>	link="http://java.sun.com/j2se/1.4.1/docs/api"
302	>	overview="${src.dir}/intro.html"
303	>	source="${build.docsourcelevel}">
304
305	+	<packageset dir="${build.filter.src.dir}"/>
306
307	<	<!-- Internal targets -->
307	>	</javadoc>
308
220	–	<target name="set-warnings-if" if="build.warnings">
221	–	<property name="build.warnings.option" value="-warnunchecked"/>
309		</target>
310
311
225	–	<target name="set-warnings-unless" unless="build.warnings">
226	–	<property name="build.warnings.option" value=""/>
227	–	</target>
312
313	+	<!-- Internal targets -->
314	+
315	+
316	+	<target name="init">
317
230	–	<target name="init" depends="set-warnings-if, set-warnings-unless">
318		<!-- Version is kept in a separate file -->
319		<loadfile property="version" srcFile="version.properties"/>
320		<echo>Building JSR-166 version ${version}</echo>
321	+	<echo>java.home is ${java.home}</echo>
322	+
323		</target>
324
325
326	<	<target name="dist-jar" depends="clean, jar">
327	<	<copy file="${product.jar}" todir="${dist.dir}"/>
326	>	<target name="init-jar">
327	>
328	>	<mkdir dir="${build.lib.dir}"/>
329	>
330		</target>
331
332
333	<	<target name="dist-docs" depends="filter-src"
334	<	description="Builds javadocs without custom tags to dist folder">
335	<	<delete dir="${dist.javadocs.dir}"/>
245	<	<mkdir dir="${dist.javadocs.dir}"/>
246	<	<javadoc destdir="${dist.javadocs.dir}"
247	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
248	<	overview="${src.dir}/intro.html"
249	<	source="${build.sourcelevel}">
333	>	<target name="native-jar"
334	>	depends="compile"
335	>	unless="build.emulation.true">
336
337	<	<packageset dir="${build.filter.src.dir}"/>
337	>	<jar destfile="${product.jar}">
338	>	<fileset dir="${build.classes.dir}"/>
339	>	</jar>
340	>
341	>	</target>
342	>
343	>
344	>	<target name="compile-emulation"
345	>	depends="init, configure-compiler"
346	>	if="build.emulation.true">
347	>
348	>	<mkdir dir="${build.emulation.dir}"/>
349	>
350	>	<javac srcdir="${emulation.src.dir}"
351	>	destdir="${build.emulation.dir}"
352	>	debug="${build.debug}"
353	>	debuglevel="${build.debuglevel}"
354	>	deprecation="${build.deprecation}"
355	>	source="${build.sourcelevel}"
356	>	fork="true">
357	>
358	>	<compilerarg    line="${gjc.args}"/>
359	>	<!--
360	>	<bootclasspath refid="compile.bootclasspath"/>
361	>	-->
362	>
363	>	</javac>
364	>
365	>	</target>
366	>
367	>
368	>	<target name="emulation-jar"
369	>	depends="compile-emulation"
370	>	if="build.emulation.true">
371	>
372	>
373	>	<jar destfile="${product.jar}" duplicate="add">
374	>	<fileset dir="${build.classes.dir}">
375	>	<patternset refid="atomic.exclusion"/>
376	>	<patternset refid="unsafe.exclusion"/>
377	>	</fileset>
378	>	<fileset dir="${build.emulation.dir}"/>
379	>	</jar>
380	>
381	>	</target>
382	>
383	>
384	>	<target name="dist-jar"
385	>	depends="clean, jar">
386	>
387	>	<copy file="${product.jar}" todir="${dist.dir}"/>
388
253	–	</javadoc>
389		</target>
390
391
392	<	<target name="compile-ant-filter" depends="init">
392	>	<target name="compile-ant-filter"
393	>	depends="init">
394	>
395		<mkdir dir="${build.ant.dir}"/>
396	+
397		<javac srcdir="${ant.src.dir}"
398		destdir="${build.ant.dir}"
399		source="1.4"
400		/>
401	+
402		</target>
403
404
405	<	<target name="filter-src" depends="compile-ant-filter">
405	>	<target name="filter-src"
406	>	depends="compile-ant-filter">
407	>
408		<mkdir dir="${build.filter.src.dir}"/>
409	+
410	+	<copy todir="${build.filter.src.dir}">
411	+	<fileset dir="${src.dir}">
412	+	<include name="**/*.html"/>
413	+	</fileset>
414	+	</copy>
415	+
416		<copy todir="${build.filter.src.dir}">
417		<fileset dir="${src.dir}">
418	<	<include name="**/*.java"/>
418	>	<exclude name="**/*.html"/>
419	>	<patternset refid="unsafe.exclusion"/>
420		</fileset>
421		<filterchain>
422	+
423	+	<!--
424	+	# This filter gets rid of angle-bracketed type parameters
425	+	# so that javadoc can run on the result. The following
426	+	# heuristic seems to work:
427	+	#
428	+	# For all lines not starting with space(s)-asterisk-space(s),
429	+	#   replace <something> with a space, where there may be more
430	+	#   than one right angle bracket at the end, and "something"
431	+	#   must not contain parens or pipes. (This may need some
432	+	#   tweaking.)
433	+	-->
434	+
435		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
436		classpath="${build.ant.dir}">
275	–	<!--
276	–	# These arguments are to get rid of angle-bracketed type
277	–	# parameters so that javadoc can run on the result. The
278	–	# following heuristic that seems to work:
279	–	#
280	–	# For all lines not starting with space(s)-asterisk-space(s),
281	–	#   replace <something> with a space, where there may be more
282	–	#   than one right angle bracket at the end, and "something"
283	–	#   must not contain parens or pipes. (This may need some
284	–	#   tweaking.)
285	–	-->
437		<param name="notmatching" value="^\s+\*\s.*$"/>
438	<	<param name="pattern" value="&lt;[^|>()]+?>+"/>
438	>	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
439		<param name="replacement" value=" "/>
440		</filterreader>
441	+
442	+
443	+	<!--
444	+	# This filter uncomments lines beginning with "//@" so that
445	+	# javadoc can see imports that are needed to resolve links
446	+	# but that shouldn't be in the compiled code.
447	+	-->
448	+
449		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
450		classpath="${build.ant.dir}">
451	<	<!--
452	<	# These arguments are to uncomment lines beginning with
294	<	# "//@" so that javadoc can see imports that are needed
295	<	# to resolve links but that shouldn't be in the compiled
296	<	# code.
297	<	-->
298	<	<param name="matching" value="^//@.*$"/>
299	<	<param name="pattern" value="^//@"/>
451	>	<param name="matching"    value="^//@.*$"/>
452	>	<param name="pattern"     value="^//@"/>
453		<param name="replacement" value=""/>
454		</filterreader>
455		</filterchain>
456		</copy>
457	+
458	+	</target>
459	+
460	+
461	+
462	+
463	+	<target name="filter-doccheck"
464	+	depends="filter-src">
465	+
466	+	<mkdir dir="${build.filter.doccheck.dir}"/>
467	+
468	+	<copy todir="${build.filter.doccheck.dir}">
469	+	<fileset dir="${build.filter.src.dir}">
470	+	<include name="**/*.html"/>
471	+	</fileset>
472	+	</copy>
473	+
474	+	<property name="generic.declarations"
475	+	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 {}"
476	+	/>
477	+
478	+	<copy todir="${build.filter.doccheck.dir}">
479	+	<fileset dir="${build.filter.src.dir}">
480	+	<exclude name="**/*.html"/>
481	+	</fileset>
482	+	<filterchain>
483	+	<!--
484	+	# These two filters try to make the source look like
485	+	# something that doccheck can process. The first removes
486	+	# -source 1.4 assertions and the second adds in a bunch
487	+	# of single letter public nested marker interfaces so that
488	+	# the generic type parameters are recognized.
489	+	-->
490	+
491	+	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
492	+	classpath="${build.ant.dir}">
493	+	<param name="matching"    value="^\s*assert[\s ].*$"/>
494	+	<param name="pattern"     value="assert"/>
495	+	<param name="replacement" value="//assert"/>
496	+	</filterreader>
497	+
498	+	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
499	+	classpath="${build.ant.dir}">
500	+	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
501	+	<param name="pattern"     value="$"/>
502	+	<param name="replacement" value=" ${generic.declarations}"/>
503	+	</filterreader>
504	+
505	+	</filterchain>
506	+	</copy>
507	+
508		</target>
509
510
511	<	<target name="compile-tests" depends="jar">
511	>	<target name="compile-tests"
512	>	depends="jar">
513	>
514		<mkdir dir="${build.testcases.dir}"/>
515	+
516	+	<!--
517	+	<echo>javac ${gjc.args}</echo>
518	+	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
519	+	<echo>classpath="${test.classpath}"</echo>
520	+	-->
521	+
522		<javac srcdir="${test.src.dir}"
523		destdir="${build.testcases.dir}"
524		debug="${build.debug}"
#	Line 314 | Line 527 | ant [target], where target is one of:
527		source="${build.sourcelevel}"
528		fork="true">
529
530	<	<bootclasspath refid="javac.bootclasspath"/>
531	<	<compilerarg line="${javac.args} ${build.warnings.option}"/>
532	<	<classpath refid="test.classpath"/>
530	>	<compilerarg    line="${gjc.args}"/>
531	>	<!--
532	>	<bootclasspath refid="test.compile.bootclasspath"/>
533	>	-->
534	>	<classpath     refid="test.classpath"/>
535	>
536	>	<include name="java/**"/>
537	>	<include name="jsr166/**"/>
538
539		</javac>
540	+
541		</target>
542
543
544	<	<target name="run-tests" depends="compile-tests">
544	>	<target name="run-tests"
545	>	depends="compile-tests">
546	>
547	>	<!-- May be overridden by user.properties -->
548	>	<property name="testcase" value="*"/>
549	>
550		<mkdir dir="${build.reports.dir}"/>
551	+
552		<junit printsummary="true"
553		showoutput="true"
554		errorProperty="junit.failed"
#	Line 331 | Line 556 | ant [target], where target is one of:
556		dir="${build.reports.dir}"
557		fork="true">
558
559	<	<!--
335	<	! This nastiness is so JUnit can test classes we are inserting
336	<	! into the java.* packages.
337	<	-->
338	<	<jvmarg value="-Xbootclasspath/p:${product.jar};${build.testcases.dir};${junit.jar}"/>
559	>	<jvmarg value="-Xbootclasspath:${test.run.bootclasspath}"/>
560
561		<formatter type="xml"/>
562
563		<batchtest todir="${build.reports.dir}">
564		<fileset dir="${test.src.dir}">
565	<	<include name="**/*Test.java"/>
565	>	<include name="java/**/${testcase}Test.java"/>
566	>	<include name="jsr166/**/${testcase}Test.java"/>
567		</fileset>
568		</batchtest>
569
570		</junit>
571	+
572		</target>
573
574
575	<	<target name="report-tests" depends="run-tests">
576	<	<!-- Sets junit.report.format to frames if Xalan is present,
575	>	<target name="report-tests"
576	>	depends="run-tests">
577	>
578	>	<!-- Sets junit.report.format to frames if redirection is present,
579		otherwise sets it to noframes. -->
580		<available property="junit.report.format"
581		value="frames"
#	Line 369 | Line 594 | ant [target], where target is one of:
594		</junitreport>
595
596		<fail message="Test Cases Failed" if="junit.failed"/>
597	+
598	+	</target>
599	+
600	+
601	+	<target name="configure-compiler">
602	+
603	+	<property name="gjc.version"
604	+	value="2.2"/>
605	+
606	+	<condition property="novariance.arg" value="-novariance">
607	+	<and>
608	+	<equals arg1="${gjc.version}" arg2="2.0"/>
609	+	<or>
610	+	<not><isset property="gjc.novariance"/></not>
611	+	<istrue value="${gjc.novariance}"/>
612	+	</or>
613	+	</and>
614	+	</condition>
615	+
616	+	<property name="novariance.arg"
617	+	value=""/>
618	+
619	+	<property name="gjc.dir"
620	+	value="${lib.dir}/gjc"/>
621	+
622	+	<property name="javac.jar"
623	+	location="${gjc.dir}/${gjc.version}/javac.jar"/>
624	+
625	+	<property name="collect.jar"
626	+	location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
627	+
628	+	<!--
629	+	<property name="unchecked.option" value="-warnunchecked"/>
630	+	-->
631	+
632	+	<property name="unchecked.option" value="-Xlint:unchecked"/>
633	+
634	+	<condition property="warnunchecked.arg" value="${unchecked.option}">
635	+	<istrue value="${gjc.warnunchecked}"/>
636	+	</condition>
637	+
638	+	<property name="warnunchecked.arg" value=""/>
639	+
640	+	<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
641	+	<istrue value="${build.nothreads}"/>
642	+	</condition>
643	+
644	+
645	+	<!--
646	+	! Bootclasspath munging for source compilation.
647	+	-->
648	+
649	+	<path id="pre.bootclasspath">
650	+	<!--
651	+	<pathelement location="${javac.jar}"/>
652	+	-->
653	+	</path>
654	+
655	+	<path id="compile.bootclasspath">
656	+	<pathelement location="${build.classes.dir}"/>
657	+	<!--
658	+	<pathelement location="${collect.jar}"/>
659	+	-->
660	+	<pathelement location="${rt.jar}"/>
661	+	</path>
662	+
663	+	<!-- Flatten paths into platform-appropriate strings -->
664	+	<property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
665	+	<property name="compile.bootclasspath" refid="compile.bootclasspath"/>
666	+
667	+
668	+	<!-- Common options in javac invocations -->
669	+	<!--
670	+	<property name="gjc.args"
671	+	value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
672	+	/>
673	+	-->
674	+	<property name="gjc.args" value="${warnunchecked.arg} ${novariance.arg}"/>
675	+
676	+	</target>
677	+
678	+
679	+	<target name="prepare-src"
680	+	depends="configure-compiler"
681	+	if="prepare.src.dir">
682	+
683	+	<mkdir dir="${prepare.src.dir}"/>
684	+	<copy todir="${prepare.src.dir}">
685	+	<fileset dir="${src.dir}">
686	+	<exclude name="java/lang/**"/>
687	+	</fileset>
688	+	</copy>
689	+
690	+	</target>
691	+
692	+
693	+	<target name="configure-emulation">
694	+
695	+	<condition property="build.emulation.true">
696	+	<or>
697	+	<and>
698	+	<os family="windows"/>
699	+	<not>
700	+	<isset property="build.emulation"/>
701	+	</not>
702	+	</and>
703	+	<istrue value="${build.emulation}"/>
704	+	</or>
705	+	</condition>
706	+
707		</target>
708
709
710	<	<target name="check-junit">
711	<	<!-- FIXME: this test isn't specific enough -->
710	>	<target name="configure-tests"
711	>	depends="configure-compiler">
712	>
713	>	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
714		<available property="junit.available"
715	<	classname="junit.framework.TestCase"/>
716	<	<fail message="Need JUnit 3.8 to run tests" unless="junit.available"/>
715	>	classname="junit.framework.Protectable"/>
716	>
717	>	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
718	>	unless="junit.available"/>
719	>
720	>	<!-- Xalan -->
721	>	<available property="xalan.available"
722	>	classname="org.apache.xalan.Version"/>
723	>
724	>	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
725	>	unless="xalan.available"/>
726	>
727	>
728	>	<!--
729	>	! Bootclasspath munging for testing, so JUnit can test our local
730	>	! modifications to java.*.
731	>	-->
732	>
733	>	<path id="test.classpath">
734	>	<pathelement location="${product.jar}"/>
735	>	<pathelement location="${rt.jar}"/>
736	>	<pathelement location="${build.testcases.dir}"/>
737	>	<pathelement location="${junit.jar}"/>
738	>	</path>
739	>
740	>	<path id="test.compile.bootclasspath">
741	>	<pathelement location="${javac.jar}"/>
742	>	<pathelement location="${collect.jar}"/>
743	>	<pathelement location="${rt.jar}"/>
744	>	</path>
745	>
746	>	<path id="test.run.bootclasspath">
747	>	<!--
748	>	<pathelement location="${javac.jar}"/>
749	>	-->
750	>	<path refid="test.classpath"/>
751	>	</path>
752	>
753	>	<!-- Flatten test classpaths into platform-appropriate strings -->
754	>	<property name="test.classpath"             refid="test.classpath"/>
755	>	<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
756	>	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
757	>
758	>	</target>
759	>
760	>
761	>
762	>	<!-- Anthill targets -->
763	>
764	>	<target name="anthill-build">
765	>
766	>	<!-- Override this in user.properties -->
767	>	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
768	>
769	>	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
770	>	<arg value="-Xmx256000000"/>
771	>	<!-- classpath of new JVM -->
772	>	<arg value="-classpath"/> <arg path="${java.class.path}"/>
773	>	<!-- location of Ant home directory -->
774	>	<arg value="-Dant.home=${ant.home}"/>
775	>	<!-- the Ant main class -->
776	>	<arg value="org.apache.tools.ant.Main"/>
777	>	<!-- The build file -->
778	>	<arg value="-buildfile"/>  <arg value="build.xml"/>
779	>	<!-- the target to build on the new Ant instance -->
780	>	<arg value="-DJAVA_HOME=${tiger.home}"/>
781	>	<arg value="do-anthill-build"/>
782	>	</exec>
783	>	</target>
784	>
785	>	<target name="do-anthill-build"
786	>	depends="jar, test, docs, dist-docs"/>
787	>
788	>	<target name="anthill-publish">
789	>
790	>	<copy todir="${deployDir}/docs/private">
791	>	<fileset dir="${build.javadocs.dir}"/>
792	>	</copy>
793	>
794	>	<copy todir="${deployDir}/docs/public">
795	>	<fileset dir="${dist.javadocs.dir}"/>
796	>	</copy>
797	>
798	>	<copy tofile="${deployDir}/index.html"
799	>	file="${basedir}/etc/anthill-index.html"/>
800	>
801	>	<copy todir="${deployDir}/notes">
802	>	<fileset dir="${basedir}/etc/notes"/>
803	>	</copy>
804	>
805	>	</target>
806	>
807	>
808	>	<target name="ng" depends="test">
809	>	<java classname="SuperfluousAbstract" fork="true">
810	>
811	>	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
812	>
813	>	</java>
814		</target>
815
816

Diff Legend

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