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.36 by tim, Thu May 29 17:29:08 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 30 | Line 29
29		<!-- Build locations -->
30		<property name="build.dir"            location="build"/>
31		<property name="build.classes.dir"    location="${build.dir}/classes"/>
33	–	<property name="build.emulation.dir"  location="${build.dir}/emulation"/>
32		<property name="build.testcases.dir"  location="${build.dir}/testcases"/>
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"/>
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.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
41
42		<!-- Source locations -->
43		<property name="src.dir"              location="${basedir}/src/main"/>
45	–	<property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
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	<
59	<
60	<
61	<	<!-- Files excluded from emulation and dist-docs -->
62	<	<patternset id="emulation.excludes">
63	<	<exclude name="java/util/Random.*"/>
64	<	<exclude name="sun/misc/Unsafe.*"/>
65	<	</patternset>
57	>
58	>	<!-- Bootclasspath argument -->
59	>	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
60	>
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	<	<javac srcdir="${prepare.src.dir}"
78	>	<javac srcdir="${src.dir}"
79		destdir="${build.classes.dir}"
80		debug="${build.debug}"
81		debuglevel="${build.debuglevel}"
#	Line 85 | Line 83
83		source="${build.sourcelevel}"
84		fork="true">
85
86	<	<bootclasspath refid="javac.bootclasspath"/>
89	<	<compilerarg line="${build.javac.args}"/>
86	>	<compilerarg line="${build.args}"/>
87
88		</javac>
89
90		</target>
91
92
96	–	<target name="jar"
97	–	depends="configure-emulation, init-jar, native-jar, emulation-jar"
98	–	description="Builds library jar from compiled sources"/>
99	–
100	–
101	–	<target name="test"
102	–	depends="init, configure-tests, report-tests"
103	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
104	–
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"
111	<	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"/>
116	<	</checkstyle>
100	>	<jar destfile="${product.jar}">
101	>	<fileset dir="${build.classes.dir}"/>
102	>	</jar>
103
104		</target>
105
106
121	–	<target name="doccheck"
122	–	depends="filter-src"
123	–	description="Reports on javadoc style errors (not working yet)">
124	–
125	–	<delete dir="${build.doccheck.dir}"/>
126	–	<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}">
131	<	<packageset dir="${build.filter.src.dir}"/>
132	<	</javadoc>
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
134	–	</target>
112
113
114		<target name="docs"
138	–	depends="filter-src"
115		description="Builds javadocs with custom tags to build folder">
116
117		<delete dir="${build.javadocs.dir}"/>
#	Line 144 | 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:"/>
151	–	<tag name="editor"  description="Last edited by:"/>
152	–	<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
161	–	<target name="strip"
162	–	depends="init, configure-compiler"
163	–	description="Strip generics from java source (not working yet)">
135
136	<	<mkdir dir="${build.stripped.dir}"/>
136	>	<target name="doccheck"
137	>	depends="filter-doccheck"
138	>	description="Reports on javadoc style errors">
139	>
140	>	<delete dir="${build.doccheck.dir}"/>
141	>	<mkdir dir="${build.doccheck.dir}"/>
142
143	<	<!--
144	<	# javac -s doesn't reliably generate compilable code. It generates
145	<	# bridge methods (marked as "synthetic") that can have identical
146	<	# signatures to existing methods except for the return value.
147	<	-->
172	<	<javac srcdir="${src.dir}"
173	<	destdir="${build.stripped.dir}"
174	<	debug="${build.debug}"
175	<	debuglevel="${build.debuglevel}"
176	<	deprecation="${build.deprecation}"
177	<	source="${build.sourcelevel}"
178	<	fork="true">
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	<	<bootclasspath refid="javac.bootclasspath"/>
181	<	<compilerarg line="${build.javac.args} -s"/>
149	>	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
150
151	<	</javac>
151	>	</target>
152	>
153	>
154	>
155	>	<target name="checkstyle"
156	>	depends="filter-src"
157	>	description="Reports on style errors in Java source (verbose, mostly chaff)">
158	>
159	>	<taskdef resource="checkstyletask.properties"
160	>	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
161	>
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	+
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 200 | Line 211
211		</target>
212
213
214	+
215		<target name="dist-clean"
216		description="Removes all build and distribution products">
217
#	Line 208 | Line 220
220		</target>
221
222
223	+
224		<target name="dist-docs"
212	–	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 236 | Line 248
248		<!-- Version is kept in a separate file -->
249		<loadfile property="version" srcFile="version.properties"/>
250		<echo>Building JSR-166 version ${version}</echo>
251	<
240	<	</target>
241	<
242	<
243	<	<target name="init-jar">
244	<
245	<	<mkdir dir="${build.lib.dir}"/>
246	<
247	<	</target>
248	<
249	<
250	<	<target name="native-jar"
251	<	depends="compile"
252	<	unless="build.emulation.true">
253	<
254	<	<jar destfile="${product.jar}">
255	<	<fileset dir="${build.classes.dir}"/>
256	<	</jar>
257	<
258	<	</target>
259	<
260	<
261	<	<target name="compile-emulation"
262	<	depends="init, configure-compiler"
263	<	if="build.emulation.true">
264	<
265	<	<mkdir dir="${build.emulation.dir}"/>
266	<
267	<	<javac srcdir="${emulation.src.dir}"
268	<	destdir="${build.emulation.dir}"
269	<	debug="${build.debug}"
270	<	debuglevel="${build.debuglevel}"
271	<	deprecation="${build.deprecation}"
272	<	source="${build.sourcelevel}"
273	<	fork="true">
274	<
275	<	<bootclasspath refid="javac.bootclasspath"/>
276	<	<compilerarg line="${build.javac.args}"/>
277	<
278	<	</javac>
279	<
280	<	</target>
281	<
282	<
283	<	<target name="emulation-jar"
284	<	depends="compile-emulation"
285	<	if="build.emulation.true">
286	<
287	<
288	<	<jar destfile="${product.jar}" duplicate="add">
289	<	<fileset dir="${build.classes.dir}">
290	<	<patternset refid="emulation.excludes"/>
291	<	</fileset>
292	<	<fileset dir="${build.emulation.dir}"/>
293	<	</jar>
251	>	<echo>java.home is ${java.home}</echo>
252
253		</target>
254
#	Line 327 | Line 285
285		</fileset>
286		</copy>
287
330	–	<!-- Not needed now, used for doccheck filtering:
331	–	<property name="generic.declarations"
332	–	value="public interface E {} public interface T {} public interface K {} public interface V {}"
333	–	/>
334	–	-->
335	–
288		<copy todir="${build.filter.src.dir}">
289		<fileset dir="${src.dir}">
290		<exclude name="**/*.html"/>
291	<	<patternset refid="emulation.excludes"/>
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 352 | 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	<	<!--
364	<	# This filter uncomments lines beginning with "//@" so that
365	<	# javadoc can see imports that are needed to resolve links
366	<	# but that shouldn't be in the compiled code.
367	<	-->
325	>	</target>
326
369	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
370	–	classpath="${build.ant.dir}">
371	–	<param name="matching"    value="^//@.*$"/>
372	–	<param name="pattern"     value="^//@"/>
373	–	<param name="replacement" value=""/>
374	–	</filterreader>
327
328	+	<target name="filter-doccheck"
329	+	depends="filter-src">
330	+
331	+	<mkdir dir="${build.dc-filter.dir}"/>
332	+
333	+	<copy todir="${build.dc-filter.dir}">
334	+	<fileset dir="${build.filter.src.dir}">
335	+	<include name="**/*.html"/>
336	+	</fileset>
337	+	</copy>
338
339	+	<property name="generic.declarations"
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.dc-filter.dir}">
344	+	<fileset dir="${build.filter.src.dir}">
345	+	<exclude name="**/*.html"/>
346	+	</fileset>
347	+	<filterchain>
348		<!--
349	<	# The next two filters try to make the source look like
349	>	# These two filters try to make the source look like
350		# something that doccheck can process. The first removes
351		# -source 1.4 assertions and the second adds in a bunch
352		# of single letter public nested marker interfaces so that
353		# the generic type parameters are recognized.
383	–	#
384	–	# Currently commented out because doccheck doesn't work. :-(
354		-->
355
387	–	<!--
356		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
357		classpath="${build.ant.dir}">
358		<param name="matching"    value="^\s*assert[\s ].*$"/>
#	Line 394 | Line 362
362
363		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
364		classpath="${build.ant.dir}">
365	<	<param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
365	>	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
366		<param name="pattern"     value="$"/>
367		<param name="replacement" value=" ${generic.declarations}"/>
368		</filterreader>
401	–	-->
369
370		</filterchain>
371		</copy>
#	Line 411 | Line 378
378
379		<mkdir dir="${build.testcases.dir}"/>
380
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}"
398		debug="${build.debug}"
#	Line 419 | 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}"/>
408	+
409		<classpath refid="test.classpath"/>
423	–	<bootclasspath refid="javac.bootclasspath"/>
424	–	<compilerarg line="${build.javac.args}"/>
410
411		</javac>
412
#	Line 443 | Line 428
428		dir="${build.reports.dir}"
429		fork="true">
430
431	<	<jvmarg value="${test.bootclasspath.arg}"/>
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="${test.src.dir}">
438	>	<fileset dir="${tck.src.dir}">
439		<include name="**/${testcase}Test.java"/>
440		</fileset>
441	+	<fileset dir="${test.src.dir}">
442	+	<include name="jsr166/test/**/${testcase}Test.java"/>
443	+	</fileset>
444		</batchtest>
445
446		</junit>
#	Line 461 | Line 451
451		<target name="report-tests"
452		depends="run-tests">
453
454	<	<!-- Sets junit.report.format to frames if Xalan is present,
454	>	<!-- Sets junit.report.format to frames if redirection is present,
455		otherwise sets it to noframes. -->
456		<available property="junit.report.format"
457		value="frames"
#	Line 486 | Line 476
476
477		<target name="configure-compiler">
478
479	<	<property name="gjc.version"
490	<	value="2.0"/>
491	<
492	<	<condition property="build.novariance" value="-novariance">
493	<	<and>
494	<	<equals arg1="${gjc.version}" arg2="2.0"/>
495	<	<or>
496	<	<not><isset property="gjc.novariance"/></not>
497	<	<istrue value="${gjc.novariance}"/>
498	<	</or>
499	<	</and>
500	<	</condition>
501	<
502	<	<property name="build.novariance"
503	<	value=""/>
504	<
505	<	<property name="gjc.dir"
506	<	value="${lib.dir}/gjc"/>
507	<
508	<	<property name="javac.jar"
509	<	location="${gjc.dir}/${gjc.version}/javac.jar"/>
479	>	<property name="unchecked.option" value="-Xlint:unchecked"/>
480
481	<	<property name="collect.jar"
482	<	location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
513	<
514	<
515	<	<condition property="build.warnunchecked" value="-warnunchecked">
516	<	<istrue value="${gjc.warnunchecked}"/>
481	>	<condition property="warnunchecked.arg" value="${unchecked.option}">
482	>	<istrue value="${build.warnunchecked}"/>
483		</condition>
484
485	<	<property name="build.warnunchecked" value=""/>
485	>	<property name="warnunchecked.arg" value=""/>
486
521	–	<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
522	–	<istrue value="${build.nothreads}"/>
523	–	</condition>
524	–
525	–
526	–	<!--
527	–	! Bootclasspath munging for source compilation.
528	–	-->
529	–
530	–	<path id="javac.bootclasspath.prefix">
531	–	<!-- <pathelement location="${src.dir}"/> -->
532	–	<pathelement location="${javac.jar}"/>
533	–	</path>
534	–
535	–	<path id="javac.bootclasspath">
536	–	<!-- <pathelement location="${src.dir}"/> -->
537	–	<pathelement location="${collect.jar}"/>
538	–	<pathelement location="${rt.jar}"/>
539	–	</path>
540	–
541	–	<!-- Flatten bootclasspath prefix into a platform-appropriate string -->
542	–	<property name="javac.bootclasspath.prefix"
543	–	refid="javac.bootclasspath.prefix"/>
544	–
545	–	<!-- Turn the flattened bootclasspath prefix into a javac argument -->
546	–	<property name="build.bootclasspath.arg"
547	–	value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
548	–
549	–	<!-- Flatten bootclasspath for trace message -->
550	–	<property name="javac.bootclasspath"
551	–	refid="javac.bootclasspath"/>
487
488		<!-- Common options in javac invocations -->
489	<	<property name="build.javac.args"
555	<	value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
556	<
557	<	<echo>javac ${build.javac.args}</echo>
558	<	<echo>bootclasspath=${javac.bootclasspath}</echo>
559	<
560	<	</target>
561	<
562	<
563	<	<target name="prepare-src"
564	<	depends="configure-compiler"
565	<	if="prepare.src.dir">
566	<
567	<	<mkdir dir="${prepare.src.dir}"/>
568	<	<copy todir="${prepare.src.dir}">
569	<	<fileset dir="${src.dir}">
570	<	<exclude name="java/lang/**"/>
571	<	</fileset>
572	<	</copy>
573	<
574	<	</target>
575	<
576	<
577	<	<target name="configure-emulation">
578	<
579	<	<condition property="build.emulation.true">
580	<	<or>
581	<	<and>
582	<	<os family="windows"/>
583	<	<not>
584	<	<isset property="build.emulation"/>
585	<	</not>
586	<	</and>
587	<	<istrue value="${build.emulation}"/>
588	<	</or>
589	<	</condition>
489	>	<property name="build.args" value="${warnunchecked.arg}"/>
490
491		</target>
492
493
494	<	<target name="configure-tests">
494	>	<target name="configure-tests"
495	>	depends="configure-compiler">
496
497		<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
498		<available property="junit.available"
499		classname="junit.framework.Protectable"/>
500
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	<
512	<	<!--
513	<	! Bootclasspath munging for testing, so JUnit can test our local
606	<	! modifications to java.*.
607	<	-->
608	<
609	<	<path id="test.classpath">
610	<	<pathelement location="${product.jar}"/>
611	<	<pathelement location="${build.testcases.dir}"/>
612	<	<pathelement location="${junit.jar}"/>
613	<	</path>
614	<
615	<	<!-- Flatten test classpath into a platform-appropriate string -->
616	<	<property name="test.classpath" refid="test.classpath"/>
617	<
618	<	<!-- Turn the flattened test classpath into a javac argument -->
619	<	<property name="test.bootclasspath.arg"
620	<	value='-Xbootclasspath/p:${test.classpath}'/>
511	>	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
512	>	unless="xalan.available"/>
513	>	-->
514
515		</target>
516
#	Line 625 | Line 518
518
519		<!-- Anthill targets -->
520
521	<	<target name="anthill-build"
521	>	<target name="anthill-build">
522	>
523	>	<!-- Override this in user.properties -->
524	>	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
525	>
526	>	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
527	>	<arg value="-Xmx256000000"/>
528	>	<!-- classpath of new JVM -->
529	>	<arg value="-classpath"/> <arg path="${java.class.path}"/>
530	>	<!-- location of Ant home directory -->
531	>	<arg value="-Dant.home=${ant.home}"/>
532	>	<!-- the Ant main class -->
533	>	<arg value="org.apache.tools.ant.Main"/>
534	>	<!-- The build file -->
535	>	<arg value="-buildfile"/>  <arg value="build.xml"/>
536	>	<!-- the target to build on the new Ant instance -->
537	>	<arg value="-DJAVA_HOME=${tiger.home}"/>
538	>	<arg value="do-anthill-build"/>
539	>	</exec>
540	>	</target>
541	>
542	>	<target name="do-anthill-build"
543		depends="jar, test, docs, dist-docs"/>
544
545		<target name="anthill-publish">
#	Line 648 | Line 562
562		</target>
563
564
565	+
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