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.56 by tim, Mon Sep 1 04:21:55 2003 UTC vs.
Revision 1.68 by jsr166, Mon Jun 14 17:22:09 2004 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.j1.dir"         location="${build.dir}/j1"/>
34	+	<property name="build.loops.dir"      location="${build.dir}/loops"/>
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"/>
38		<property name="build.reports.dir"    location="${build.dir}/reports"/>
39	+	<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
40		<property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
41		<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
42	<	<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
42	>	<property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
43
44		<!-- Source locations -->
45		<property name="src.dir"              location="${basedir}/src/main"/>
47	–	<property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
46		<property name="test.src.dir"         location="${basedir}/src/test"/>
47	+	<property name="j1.src.dir"           location="${basedir}/src/javaone"/>
48	+	<property name="loops.src.dir"        location="${basedir}/src/loops"/>
49	+	<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
50	+	<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
51		<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
52		<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
53		<property name="lib.dir"              location="${basedir}/lib"/>
#	Line 57 | Line 59
59		<!-- Jar locations -->
60		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
61		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
62	<	<property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
61	<	<property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
62	>	<property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
63
64	+	<!-- Bootclasspath argument -->
65	+	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
66
67	<	<!-- Files excluded from dist-docs and emulation jar -->
68	<	<patternset id="unsafe.exclusion">
69	<	<exclude name="java/util/Random.*"/>
70	<	<exclude name="sun/misc/Unsafe.*"/>
71	<	</patternset>
72	<
73	<	<!-- Files excludes from emulation jar -->
74	<	<patternset id="atomic.exclusion">
75	<	<exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
76	<	<exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
77	<	<exclude name="java/util/concurrent/atomic/AtomicLong*"/>
78	<	<exclude name="java/util/concurrent/atomic/AtomicReference*"/>
79	<	<exclude name="java/util/concurrent/locks/LockSupport*"/>
80	<	<exclude name="java/util/concurrent/locks/ReentrantLock*"/>
81	<	</patternset>
82	<
67	>	<!-- Test classpath -->
68	>	<path id="test.classpath">
69	>	<pathelement location="${build.testcases.dir}"/>
70	>	<pathelement location="${junit.jar}"/>
71	>	</path>
72	>
73	>	<!-- ALoops classpath -->
74	>	<path id="loops.classpath">
75	>	<pathelement location="${build.loops.dir}"/>
76	>	</path>
77	>
78	>	<!-- J1 classpath -->
79	>	<path id="j1.classpath">
80	>	<pathelement location="${build.j1.dir}"/>
81	>	<pathelement location="${junit.jar}"/>
82	>	<pathelement location="${concurrent.jar}"/>
83	>	</path>
84
85
86		<!-- Main targets -->
87
88	+
89		<target name="compile"
90	<	depends="init, configure-compiler, prepare-src"
90	>	depends="init, configure-compiler"
91		description="Compiles main sources to build folder">
92
88	–	<property name="prepare.src.dir" value="${src.dir}"/>
89	–
93		<mkdir dir="${build.classes.dir}"/>
94
95	<	<!--
93	<	<echo>javac ${gjc.args}</echo>
94	<	<echo>bootclasspath=${compile.bootclasspath}</echo>
95	<	-->
96	<
97	<	<javac srcdir="${prepare.src.dir}"
95	>	<javac srcdir="${src.dir}"
96		destdir="${build.classes.dir}"
97		debug="${build.debug}"
98		debuglevel="${build.debuglevel}"
#	Line 102 | Line 100
100		source="${build.sourcelevel}"
101		fork="true">
102
103	<	<compilerarg    line="${gjc.args}"/>
104	<	<!--
105	<	<bootclasspath refid="compile.bootclasspath"/>
108	<	-->
103	>	<include name="**/*.java"/>
104	>	<exclude name="java/lang/**"/>
105	>	<compilerarg line="${build.args}"/>
106
107		</javac>
108
109		</target>
110
111
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"
121	–	depends="init, configure-tests, report-tests"
122	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
123	–
112
113	<	<target name="checkstyle"
114	<	depends="filter-src"
115	<	description="Reports on style errors in Java source (verbose, mostly chaff)">
113	>	<target name="jar"
114	>	depends="compile"
115	>	description="Builds library jar from compiled sources">
116
117	<	<taskdef resource="checkstyletask.properties"
130	<	classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
117	>	<mkdir dir="${build.lib.dir}"/>
118
119	<	<checkstyle>
120	<	<formatter type="plain"/>  <!-- also available: type="xml" -->
121	<	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
135	<	</checkstyle>
119	>	<jar destfile="${product.jar}">
120	>	<fileset dir="${build.classes.dir}"/>
121	>	</jar>
122
123		</target>
124
125
140	–	<target name="doccheck"
141	–	depends="filter-doccheck"
142	–	description="Reports on javadoc style errors">
126
127	<	<delete dir="${build.doccheck.dir}"/>
128	<	<mkdir dir="${build.doccheck.dir}"/>
129	<
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.doccheck.dir}"/>
151	<	</javadoc>
152	<
153	<	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
127	>	<target name="test"
128	>	depends="init, configure-tests, report-tests"
129	>	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
130
155	–	</target>
131
132
133		<target name="docs"
159	–	depends="filter-src"
134		description="Builds javadocs with custom tags to build folder">
135
136		<delete dir="${build.javadocs.dir}"/>
#	Line 165 | Line 139
139		<javadoc destdir="${build.javadocs.dir}"
140		link="http://java.sun.com/j2se/1.4.1/docs/api"
141		overview="${src.dir}/intro.html"
142	<	source="${build.docsourcelevel}">
142	>	source="${build.sourcelevel}">
143
144		<tag name="revised" description="Last revised:"/>
145		<tag name="spec"    description="Specified by:"/>
172	–	<tag name="editor"  description="Last edited by:"/>
173	–	<tag name="fixme"   description="FIX ME:"/>
146
147	<	<packageset dir="${build.filter.src.dir}"/>
147	>	<packageset dir="${src.dir}"/>
148
149		</javadoc>
150
151		</target>
152
153
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">
154
155	<	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
155	>	<target name="doccheck"
156	>	depends="filter-doccheck"
157	>	description="Reports on javadoc style errors">
158
159	<	<classpath>
160	<	<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"/>
159	>	<delete dir="${build.doccheck.dir}"/>
160	>	<mkdir dir="${build.doccheck.dir}"/>
161
162	<	<!--
163	<	<arg value="-help"/>
164	<	-->
162	>	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
163	>	docletpath="${lib.dir}/doccheck.jar"
164	>	destdir="${build.doccheck.dir}">
165	>	<packageset dir="${build.dc-filter.dir}"/>
166	>	</javadoc>
167
168	<	</java>
168	>	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
169
170		</target>
171
172
222	–	<target name="strip"
223	–	depends="init, configure-compiler"
224	–	description="Strip generics from java source (not working yet)">
173
174	<	<mkdir dir="${build.stripped.dir}"/>
174	>	<target name="checkstyle"
175	>	depends="filter-src"
176	>	description="Reports on style errors in Java source (verbose, mostly chaff)">
177
178	<	<!--
179	<	# 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}"
236	<	debuglevel="${build.debuglevel}"
237	<	deprecation="${build.deprecation}"
238	<	source="${build.sourcelevel}"
239	<	fork="true">
178	>	<taskdef resource="checkstyletask.properties"
179	>	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
180
181	<	<compilerarg    line="${gjc.args} -s"/>
242	<	<!--
243	<	<bootclasspath refid="compile.bootclasspath"/>
244	<	-->
181	>	<mkdir dir="${build.checkstyle.dir}"/>
182
183	<	</javac>
183	>	<checkstyle config="etc/checkstyle/sun_checks.xml"
184	>	failOnViolation="false">
185	>	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
186	>	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
187	>	</checkstyle>
188	>
189	>	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
190	>	out="${build.checkstyle.dir}/checkstyle-report.html"
191	>	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
192
193		</target>
194
195
196	+
197		<target name="dist"
198		depends="init, dist-clean, dist-jar, dist-docs"
199		description="Puts all distributable products in single hierarchy"/>
200
201	+
202	+
203		<target name="release"
204		depends="dist"
205		description="Puts entire CVS tree, plus distribution productions, in a jar">
206
259	–	<!--
260	–	#keep build dir? - dl
261	–	<delete dir="${build.dir}"/>
262	–	-->
207		<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
208
209		<jar basedir="${basedir}" destfile="${release.jar}">
210	+	<!-- <exclude name="build/**"/> -->
211		<exclude name="${release.jar}"/>
212		<exclude name="user.properties"/>
213		<exclude name="etc/notes/**"/>
214	<	<exclude name="lib/gjc/2.1/**"/>
214	>	<exclude name="src/emulation/**"/>
215		<exclude name="**/SyntaxTest.java"/>
216	+	<exclude name="**/SuperfluousAbstract.java"/>
217		</jar>
218
219		</target>
220
221	+
222	+
223		<target name="clean"
224		description="Removes all build products">
225
#	Line 282 | Line 230
230		</target>
231
232
233	+
234		<target name="dist-clean"
235		description="Removes all build and distribution products">
236
#	Line 290 | Line 239
239		</target>
240
241
242	+
243		<target name="dist-docs"
294	–	depends="filter-src"
244		description="Builds javadocs without custom tags to dist folder">
245
246		<delete dir="${dist.javadocs.dir}"/>
247		<mkdir dir="${dist.javadocs.dir}"/>
248
249		<javadoc destdir="${dist.javadocs.dir}"
250	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
250	>	link="http://java.sun.com/j2se/1.4.2/docs/api"
251		overview="${src.dir}/intro.html"
252	<	source="${build.docsourcelevel}">
252	>	source="${build.sourcelevel}">
253
254	<	<packageset dir="${build.filter.src.dir}"/>
254	>	<packageset dir="${src.dir}"/>
255
256		</javadoc>
257
#	Line 323 | Line 272
272		</target>
273
274
326	–	<target name="init-jar">
327	–
328	–	<mkdir dir="${build.lib.dir}"/>
329	–
330	–	</target>
331	–
332	–
333	–	<target name="native-jar"
334	–	depends="compile"
335	–	unless="build.emulation.true">
336	–
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	–
275		<target name="dist-jar"
276		depends="clean, jar">
277
#	Line 396 | Line 287
287
288		<javac srcdir="${ant.src.dir}"
289		destdir="${build.ant.dir}"
290	<	source="1.4"
400	<	/>
290	>	source="1.4"/>
291
292		</target>
293
#	Line 416 | Line 306
306		<copy todir="${build.filter.src.dir}">
307		<fileset dir="${src.dir}">
308		<exclude name="**/*.html"/>
309	<	<patternset refid="unsafe.exclusion"/>
309	>	<!-- Files excluded from dist-docs -->
310	>	<exclude name="java/util/Random.*"/>
311	>	<exclude name="sun/misc/Unsafe.*"/>
312		</fileset>
313	+	<!--
314		<filterchain>
315	+	-->
316
317		<!--
318		# This filter gets rid of angle-bracketed type parameters
#	Line 432 | Line 326
326		#   tweaking.)
327		-->
328
329	+	<!--
330		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
331		classpath="${build.ant.dir}">
332		<param name="notmatching" value="^\s+\*\s.*$"/>
333		<param name="pattern"     value="&lt;[^|>()]+?>+"/>
334		<param name="replacement" value=" "/>
335		</filterreader>
336	+	-->
337
338	<
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	<	<param name="matching"    value="^//@.*$"/>
452	<	<param name="pattern"     value="^//@"/>
453	<	<param name="replacement" value=""/>
454	<	</filterreader>
338	>	<!--
339		</filterchain>
340	+	-->
341		</copy>
342
343		</target>
344
345
461	–
462	–
346		<target name="filter-doccheck"
347		depends="filter-src">
348
349	<	<mkdir dir="${build.filter.doccheck.dir}"/>
349	>	<mkdir dir="${build.dc-filter.dir}"/>
350
351	<	<copy todir="${build.filter.doccheck.dir}">
351	>	<copy todir="${build.dc-filter.dir}">
352		<fileset dir="${build.filter.src.dir}">
353		<include name="**/*.html"/>
354		</fileset>
#	Line 475 | Line 358
358		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 {}"
359		/>
360
361	<	<copy todir="${build.filter.doccheck.dir}">
361	>	<copy todir="${build.dc-filter.dir}">
362		<fileset dir="${build.filter.src.dir}">
363		<exclude name="**/*.html"/>
364		</fileset>
#	Line 513 | Line 396
396
397		<mkdir dir="${build.testcases.dir}"/>
398
399	<	<!--
400	<	<echo>javac ${gjc.args}</echo>
401	<	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
402	<	<echo>classpath="${test.classpath}"</echo>
403	<	-->
399	>	<javac srcdir="${tck.src.dir}"
400	>	destdir="${build.testcases.dir}"
401	>	debug="${build.debug}"
402	>	debuglevel="${build.debuglevel}"
403	>	deprecation="${build.deprecation}"
404	>	source="${build.sourcelevel}"
405	>	fork="true">
406	>
407	>	<compilerarg value="${bootclasspath.args}"/>
408	>	<compilerarg line="${build.args}"/>
409	>
410	>	<classpath refid="test.classpath"/>
411	>
412	>	</javac>
413
414		<javac srcdir="${test.src.dir}"
415		destdir="${build.testcases.dir}"
#	Line 527 | Line 419
419		source="${build.sourcelevel}"
420		fork="true">
421
422	<	<compilerarg    line="${gjc.args}"/>
423	<	<!--
424	<	<bootclasspath refid="test.compile.bootclasspath"/>
425	<	-->
426	<	<classpath     refid="test.classpath"/>
427	<
536	<	<include name="java/**"/>
537	<	<include name="jsr166/**"/>
422	>	<include name="jsr166/test/**"/>
423	>
424	>	<compilerarg value="${bootclasspath.args}"/>
425	>	<compilerarg line="${build.args}"/>
426	>
427	>	<classpath refid="test.classpath"/>
428
429		</javac>
430
431	+	<!--
432	+	<javac srcdir="${jtreg.src.dir}"
433	+	destdir="${build.testcases.dir}"
434	+	debug="${build.debug}"
435	+	debuglevel="${build.debuglevel}"
436	+	deprecation="${build.deprecation}"
437	+	source="${build.sourcelevel}"
438	+	fork="true">
439	+
440	+	<compilerarg value="${bootclasspath.args}"/>
441	+	<compilerarg line="${build.args}"/>
442	+
443	+	<classpath refid="test.classpath"/>
444	+
445	+	</javac>
446	+	-->
447	+
448		</target>
449
450
#	Line 556 | Line 463
463		dir="${build.reports.dir}"
464		fork="true">
465
466	<	<jvmarg value="-Xbootclasspath:${test.run.bootclasspath}"/>
466	>	<jvmarg value="${bootclasspath.args}"/>
467	>	<jvmarg value="-server"/>
468	>	<jvmarg value="-showversion"/>
469	>
470	>	<classpath refid="test.classpath"/>
471
472		<formatter type="xml"/>
473
474	<	<batchtest todir="${build.reports.dir}">
474	>	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
475	>	<fileset dir="${tck.src.dir}">
476	>	<include name="**/${testcase}Test.java"/>
477	>	</fileset>
478	>	</batchtest>
479	>
480	>	<batchtest todir="${build.reports.dir}" if="do.test.old">
481		<fileset dir="${test.src.dir}">
482	<	<include name="java/**/${testcase}Test.java"/>
566	<	<include name="jsr166/**/${testcase}Test.java"/>
482	>	<include name="jsr166/test/**/${testcase}Test.java"/>
483		</fileset>
484		</batchtest>
485
486	+	<!--
487	+	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
488	+	<fileset dir="${jtreg.src.dir}">
489	+	<include name="**/${testcase}Test.java"/>
490	+	</fileset>
491	+	</batchtest>
492	+	-->
493	+
494		</junit>
495
496		</target>
#	Line 600 | Line 524
524
525		<target name="configure-compiler">
526
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	–
527		<property name="unchecked.option" value="-Xlint:unchecked"/>
528
529		<condition property="warnunchecked.arg" value="${unchecked.option}">
530	<	<istrue value="${gjc.warnunchecked}"/>
530	>	<istrue value="${build.warnunchecked}"/>
531		</condition>
532
533		<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"/>
534
535
536		<!-- Common options in javac invocations -->
537	<	<!--
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	<	<istrue value="${build.emulation}"/>
697	<	</condition>
537	>	<property name="build.args" value="${warnunchecked.arg}"/>
538
539		</target>
540
#	Line 706 | Line 546
546		<available property="junit.available"
547		classname="junit.framework.Protectable"/>
548
709	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
710	–	unless="junit.available"/>
711	–
549		<!-- Xalan -->
550		<available property="xalan.available"
551		classname="org.apache.xalan.Version"/>
552
716	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
717	–	unless="xalan.available"/>
718	–
553
554	+	<!-- Ant 1.6beta and later don't need or want this check -->
555		<!--
556	<	! Bootclasspath munging for testing, so JUnit can test our local
557	<	! modifications to java.*.
723	<	-->
724	<
725	<	<path id="test.classpath">
726	<	<pathelement location="${product.jar}"/>
727	<	<pathelement location="${rt.jar}"/>
728	<	<pathelement location="${build.testcases.dir}"/>
729	<	<pathelement location="${junit.jar}"/>
730	<	</path>
731	<
732	<	<path id="test.compile.bootclasspath">
733	<	<pathelement location="${javac.jar}"/>
734	<	<pathelement location="${collect.jar}"/>
735	<	<pathelement location="${rt.jar}"/>
736	<	</path>
737	<
738	<	<path id="test.run.bootclasspath">
739	<	<!--
740	<	<pathelement location="${javac.jar}"/>
741	<	-->
742	<	<path refid="test.classpath"/>
743	<	</path>
556	>	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
557	>	unless="junit.available"/>
558
559	<	<!-- Flatten test classpaths into platform-appropriate strings -->
560	<	<property name="test.classpath"             refid="test.classpath"/>
561	<	<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
748	<	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
559	>	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
560	>	unless="xalan.available"/>
561	>	-->
562
563		</target>
564
#	Line 754 | Line 567
567		<!-- Anthill targets -->
568
569		<target name="anthill-build">
570	<
570	>
571		<!-- Override this in user.properties -->
572		<property name="tiger.home" location="e:/j2sdk1.5.0"/>
573	<
573	>
574		<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
575		<arg value="-Xmx256000000"/>
576		<!-- classpath of new JVM -->
#	Line 773 | Line 586
586		<arg value="do-anthill-build"/>
587		</exec>
588		</target>
589	<
589	>
590		<target name="do-anthill-build"
591		depends="jar, test, docs, dist-docs"/>
592
#	Line 797 | Line 610
610		</target>
611
612
800	–	<target name="ng" depends="test">
801	–	<java classname="SuperfluousAbstract" fork="true">
613
614	<	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
614	>	<!-- Various demos and test programs -->
615	>
616	>
617	>	<target name="sample" depends="init, configure-compiler"
618	>	description="Standalone demo program">
619	>
620	>	<mkdir dir="${build.testcases.dir}"/>
621	>
622	>	<javac srcdir="${test.src.dir}"
623	>	destdir="${build.testcases.dir}"
624	>	debug="${build.debug}"
625	>	debuglevel="${build.debuglevel}"
626	>	deprecation="${build.deprecation}"
627	>	source="${build.sourcelevel}"
628	>	fork="true">
629	>
630	>	<include name="jsr166/test/Sample.java"/>
631	>
632	>	</javac>
633	>
634	>	<copy todir="${build.testcases.dir}">
635	>	<fileset dir="${test.src.dir}">
636	>	<include name="**/*.properties"/>
637	>	</fileset>
638	>	</copy>
639	>
640	>
641	>	<java classname="jsr166.test.Sample" fork="true">
642	>	<classpath refid="test.classpath"/>
643	>	<!-- <jvmarg value="-ea"/> -->
644	>	<!-- <jvmarg value="-server"/> -->
645	>	<!-- <arg value="1000"/> -->
646	>	</java>
647	>	</target>
648	>
649	>
650	>	<target name="loops" depends="init, configure-compiler"
651	>	description="Benchmark from Doug Lea's AQS paper">
652	>
653	>	<mkdir dir="${build.loops.dir}"/>
654	>
655	>	<javac srcdir="${loops.src.dir}"
656	>	destdir="${build.loops.dir}"
657	>	debug="${build.debug}"
658	>	debuglevel="${build.debuglevel}"
659	>	deprecation="${build.deprecation}"
660	>	source="${build.sourcelevel}"
661	>	fork="true">
662	>
663	>	<compilerarg line="${build.args}"/>
664	>	<classpath refid="loops.classpath"/>
665	>
666	>	</javac>
667	>
668	>	<java classname="ALoops" fork="true">
669	>	<classpath refid="loops.classpath"/>
670	>	</java>
671	>
672	>	</target>
673	>
674	>
675	>	<target name="compile-j1" depends="init, configure-compiler">
676	>
677	>	<mkdir dir="${build.j1.dir}"/>
678	>
679	>	<javac srcdir="${j1.src.dir}"
680	>	destdir="${build.j1.dir}"
681	>	debug="${build.debug}"
682	>	debuglevel="${build.debuglevel}"
683	>	deprecation="${build.deprecation}"
684	>	source="${build.sourcelevel}" >
685	>
686	>	<include name="**/*.java"/>
687	>	<exclude name="**/dijkstra/**"/>
688	>
689	>	<compilerarg line="${build.args}"/>
690	>	<classpath refid="j1.classpath"/>
691	>
692	>	</javac>
693	>
694	>	</target>
695	>
696	>
697	>	<target name="sw" depends="compile-j1"
698	>	description="Runs the SwingWorker demo">
699	>
700	>	<!--
701	>	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
702	>	<classpath refid="j1.classpath"/>
703	>	</java>
704	>	-->
705	>
706	>	<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
707	>
708	>	<exec dir="${build.j1.dir}" executable="appletviewer.exe">
709	>	<arg value="${build.j1.dir}/SwingWorker.html"/>
710	>	</exec>
711	>
712	>	</target>
713	>
714	>	<target name="j1" depends="compile-j1"
715	>	description="Runs a standalone JavaOne program">
716	>
717	>	<java classname="${j1.test}" fork="true">
718	>	<classpath refid="j1.classpath"/>
719	>	<jvmarg value="-client"/>
720	>
721	>	<!-- WebCrawler args -->
722	>	<arg value="jsr166.webcrawler.WebCrawler3"/>
723	>	<arg value="http://www.priorartisans.com"/>
724	>	<arg value="25"/>
725	>
726	>	</java>
727	>
728	>	</target>
729	>
730	>
731	>	<target name="test-j1" depends="compile-j1"
732	>	description="Runs testcases from the JavaOne source directories">
733	>
734	>	<junit printsummary="true"
735	>	showoutput="true"
736	>	errorProperty="junit.failed"
737	>	failureProperty="junit.failed"
738	>	dir="${build.j1.dir}"
739	>	fork="true">
740	>
741	>	<!-- <jvmarg value="-server"/> -->
742	>	<classpath refid="j1.classpath"/>
743	>	<formatter type="xml"/>
744	>
745	>	<batchtest todir="${build.j1.dir}">
746	>	<fileset dir="${j1.src.dir}">
747	>	<include name="**/*Test.java"/>
748	>	</fileset>
749	>	</batchtest>
750	>
751	>	</junit>
752	>
753	>	<available property="junit.report.format"
754	>	value="frames"
755	>	classname="org.apache.xalan.lib.Redirect"/>
756	>	<property name="junit.report.format" value="noframes"/>
757	>
758	>	<junitreport todir="${build.j1.dir}">
759	>	<fileset dir="${build.j1.dir}">
760	>	<include name="TEST-*.xml"/>
761	>	</fileset>
762	>	<report styledir="${stylesheet.dir}"
763	>	format="${junit.report.format}"
764	>	todir="${build.j1.dir}"
765	>	/>
766	>	</junitreport>
767	>
768	>	<fail message="Test Cases Failed" if="junit.failed"/>
769	>
770	>	</target>
771	>
772	>
773	>
774	>	<!-- C++ and JNI definitions and demos -->
775	>
776	>	<target name="configure-cpp">
777	>
778	>	<!-- Define tasks and types -->
779	>
780	>	<path id="cpptasks.path">
781	>	<pathelement location="${lib.dir}/cpptasks.jar"/>
782	>	</path>
783	>	<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
784	>	<typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
785	>
786	>	<!-- Set platform property for JNI includes -->
787	>
788	>	<condition property="platform" value="linux">
789	>	<os name="Linux"/>
790	>	</condition>
791	>	<condition property="platform" value="win32">
792	>	<os family="windows"/>
793	>	</condition>
794	>	<condition property="platform" value="solaris">
795	>	<os name="SunOS"/>
796	>	</condition>
797	>
798	>	</target>
799	>
800	>
801	>	<target name="cppdemo" depends="configure-cpp">
802	>
803	>	<mkdir dir="${build.dir}"/>
804
805	+	<cc multithreaded="true"
806	+	name="g++"
807	+	objdir="${build.dir}"
808	+	outfile="${build.dir}/CppDemo">
809	+	<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
810	+	<libset libs="stdc++"/>
811	+	</cc>
812	+
813	+	<exec executable="${build.dir}/CppDemo">
814	+	<arg line="count in word frequency of word in command line count"/>
815	+	</exec>
816	+
817	+	</target>
818	+
819	+
820	+	<target name="jnidemo" depends="init, configure-compiler, configure-cpp">
821	+
822	+	<mkdir dir="${build.testcases.dir}"/>
823	+
824	+	<javac srcdir="${test.src.dir}"
825	+	destdir="${build.testcases.dir}"
826	+	debug="${build.debug}"
827	+	debuglevel="${build.debuglevel}"
828	+	deprecation="${build.deprecation}"
829	+	source="${build.sourcelevel}"
830	+	fork="true">
831	+	<compilerarg value="${bootclasspath.args}"/>
832	+	<compilerarg line="${build.args}"/>
833	+	<classpath refid="test.classpath"/>
834	+	<include name="JniDemo.java"/>
835	+	</javac>
836	+
837	+	<javah destdir="${build.testcases.dir}"
838	+	classpathref="test.classpath">
839	+	<class name="JniDemo"/>
840	+	</javah>
841	+
842	+	<cc multithreaded="true"
843	+	name="g++"
844	+	objdir="${build.dir}"
845	+	outfile="${build.dir}/JniDemo"
846	+	outtype="shared">
847	+
848	+	<compiler>
849	+	<defineset>
850	+	<define name="__int64" value="long long"/>
851	+	</defineset>
852	+	<includepath location="${java.home}/../include"/>
853	+	<includepath location="${java.home}/../include/${platform}"/>
854	+	<compilerarg value="-mno-cygwin"/>
855	+	</compiler>
856	+
857	+	<linker>
858	+	<linkerarg value="--add-stdcall-alias"/>
859	+	</linker>
860	+
861	+	<includepath location="${build.testcases.dir}"/>
862	+
863	+	<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
864	+
865	+	<libset libs="stdc++"/>
866	+
867	+	</cc>
868	+
869	+	<!-- Necessary if windows, harmless if not -->
870	+	<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
871	+
872	+	<java classname="JniDemo" fork="true">
873	+	<!-- Watch out: path separator hardwired to semicolon here! -->
874	+	<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
875	+	<classpath refid="test.classpath"/>
876	+	<arg line="count in word frequency of word in command line count"/>
877		</java>
878	+
879	+	</target>
880	+
881	+
882	+
883	+	<!-- Backward compatibility, work in progress (some files not checked in) -->
884	+
885	+
886	+
887	+	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
888	+	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
889	+	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
890	+	<property name="pretiger.sourcelevel" value="1.4"/>
891	+
892	+	<target name="defang"
893	+	depends="init"
894	+	description="Generates pre-Tiger compatible source">
895	+
896	+	<delete dir="${pretiger.src.dir}"/>
897	+	<mkdir dir="${pretiger.src.dir}"/>
898	+
899	+	<exec executable="perl">
900	+	<arg file="etc/defang.pl"/>
901	+	<!-- <arg value="-v"/> -->
902	+	<arg value="-s"/> <arg file="${src.dir}"/>
903	+	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
904	+	</exec>
905	+
906		</target>
907
908	+	<target name="compile-pretiger"
909	+	depends="init, configure-compiler, defang"
910	+	description="Compiles pre-Tiger sources to build folder">
911	+
912	+	<mkdir dir="${build.pretiger.dir}"/>
913	+
914	+	<javac srcdir="${pretiger.src.dir}"
915	+	destdir="${build.pretiger.dir}"
916	+	debug="${build.debug}"
917	+	debuglevel="${build.debuglevel}"
918	+	deprecation="${build.deprecation}"
919	+	source="${pretiger.sourcelevel}"
920	+	fork="true">
921	+
922	+	<compilerarg line="${build.args}"/>
923	+	<exclude name="**/Thread.java"/>
924	+
925	+	</javac>
926	+
927	+	</target>
928	+
929	+	<target name="pretiger" depends="compile-pretiger">
930	+
931	+	<mkdir dir="${build.lib.dir}"/>
932	+
933	+	<jar destfile="${pretiger.jar}">
934	+	<fileset dir="${build.pretiger.dir}">
935	+	</fileset>
936	+	</jar>
937	+
938	+	</target>
939
940		</project>

Diff Legend

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