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.37 by tim, Fri May 30 03:24:18 2003 UTC vs.
Revision 1.57 by tim, Mon Sep 15 14:07:36 2003 UTC

#	Line 30 | Line 30
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"/>
33		<property name="build.testcases.dir"  location="${build.dir}/testcases"/>
34		<property name="build.lib.dir"        location="${build.dir}/lib"/>
35		<property name="build.ant.dir"        location="${build.dir}/ant"/>
36		<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"/>
39		<property name="build.reports.dir"    location="${build.dir}/reports"/>
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"/>
43
44		<!-- Source locations -->
45		<property name="src.dir"              location="${basedir}/src/main"/>
45	–	<property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
46		<property name="test.src.dir"         location="${basedir}/src/test"/>
47		<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
48		<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
#	Line 56 | Line 56
56		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
57		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
58		<property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
59	+	<property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
60
61
62	<
63	<	<!-- Files excluded from emulation and dist-docs -->
63	<	<patternset id="emulation.excludes">
62	>	<!-- Files excluded from dist-docs -->
63	>	<patternset id="docs.exclusion">
64		<exclude name="java/util/Random.*"/>
65		<exclude name="sun/misc/Unsafe.*"/>
66		</patternset>
#	Line 78 | Line 78
78		<mkdir dir="${build.classes.dir}"/>
79
80		<!--
81	<	<echo>javac ${gjc.args}</echo>
82	<	<echo>bootclasspath=${compile.bootclasspath}</echo>
81	>	<echo>javac ${build.args}</echo>
82		-->
83
84		<javac srcdir="${prepare.src.dir}"
#	Line 90 | Line 89
89		source="${build.sourcelevel}"
90		fork="true">
91
92	<	<compilerarg    line="${gjc.args}"/>
94	<	<bootclasspath refid="compile.bootclasspath"/>
92	>	<compilerarg    line="${build.args}"/>
93
94		</javac>
95
#	Line 99 | Line 97
97
98
99		<target name="jar"
100	<	depends="configure-emulation, init-jar, native-jar, emulation-jar"
100	>	depends="init-jar, native-jar"
101		description="Builds library jar from compiled sources"/>
102
103
#	Line 124 | Line 122
122
123
124		<target name="doccheck"
125	<	depends="filter-src"
126	<	description="Reports on javadoc style errors (not working yet)">
125	>	depends="filter-doccheck"
126	>	description="Reports on javadoc style errors">
127
128		<delete dir="${build.doccheck.dir}"/>
129		<mkdir dir="${build.doccheck.dir}"/>
#	Line 133 | Line 131
131		<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
132		docletpath="${lib.dir}/doccheck.jar"
133		destdir="${build.doccheck.dir}">
134	<	<packageset dir="${build.filter.src.dir}"/>
134	>	<packageset dir="${build.filter.doccheck.dir}"/>
135		</javadoc>
136
137	+	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
138	+
139		</target>
140
141
#	Line 163 | Line 163
163		</target>
164
165
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}"/>
172	+
173	+	<java classname="net.cscott.sinjdoc.Main" fork="true">
174	+
175	+	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
176	+
177	+	<classpath>
178	+	<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"/>
198	+
199	+
200	+	</java>
201	+
202	+	</target>
203	+
204	+
205		<target name="strip"
206		depends="init, configure-compiler"
207		description="Strip generics from java source (not working yet)">
#	Line 182 | Line 221
221		source="${build.sourcelevel}"
222		fork="true">
223
224	<	<compilerarg    line="${gjc.args} -s"/>
186	<	<bootclasspath refid="compile.bootclasspath"/>
224	>	<compilerarg    line="${build.args} -s"/>
225
226		</javac>
227
#	Line 194 | Line 232
232		depends="init, dist-clean, dist-jar, dist-docs"
233		description="Puts all distributable products in single hierarchy"/>
234
235	+	<target name="release"
236	+	depends="dist"
237	+	description="Puts entire CVS tree, plus distribution productions, in a jar">
238	+
239	+	<!--
240	+	#keep build dir? - dl
241	+	<delete dir="${build.dir}"/>
242	+	-->
243	+	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
244	+
245	+	<jar basedir="${basedir}" destfile="${release.jar}">
246	+	<exclude name="${release.jar}"/>
247	+	<exclude name="user.properties"/>
248	+	<exclude name="etc/notes/**"/>
249	+	<exclude name="**/SyntaxTest.java"/>
250	+	</jar>
251	+
252	+	</target>
253
254		<target name="clean"
255		description="Removes all build products">
#	Line 241 | Line 297
297		<!-- Version is kept in a separate file -->
298		<loadfile property="version" srcFile="version.properties"/>
299		<echo>Building JSR-166 version ${version}</echo>
300	+	<echo>java.home is ${java.home}</echo>
301
302		</target>
303
#	Line 253 | Line 310
310
311
312		<target name="native-jar"
313	<	depends="compile"
257	<	unless="build.emulation.true">
313	>	depends="compile">
314
315		<jar destfile="${product.jar}">
316		<fileset dir="${build.classes.dir}"/>
#	Line 263 | Line 319
319		</target>
320
321
266	–	<target name="compile-emulation"
267	–	depends="init, configure-compiler"
268	–	if="build.emulation.true">
269	–
270	–	<mkdir dir="${build.emulation.dir}"/>
271	–
272	–	<javac srcdir="${emulation.src.dir}"
273	–	destdir="${build.emulation.dir}"
274	–	debug="${build.debug}"
275	–	debuglevel="${build.debuglevel}"
276	–	deprecation="${build.deprecation}"
277	–	source="${build.sourcelevel}"
278	–	fork="true">
279	–
280	–	<compilerarg    line="${gjc.args}"/>
281	–	<bootclasspath refid="compile.bootclasspath"/>
282	–
283	–	</javac>
284	–
285	–	</target>
286	–
287	–
288	–	<target name="emulation-jar"
289	–	depends="compile-emulation"
290	–	if="build.emulation.true">
291	–
292	–
293	–	<jar destfile="${product.jar}" duplicate="add">
294	–	<fileset dir="${build.classes.dir}">
295	–	<patternset refid="emulation.excludes"/>
296	–	</fileset>
297	–	<fileset dir="${build.emulation.dir}"/>
298	–	</jar>
299	–
300	–	</target>
301	–
302	–
322		<target name="dist-jar"
323		depends="clean, jar">
324
#	Line 332 | Line 351
351		</fileset>
352		</copy>
353
335	–	<!-- Not needed now, used for doccheck filtering:
336	–	<property name="generic.declarations"
337	–	value="public interface E {} public interface T {} public interface K {} public interface V {}"
338	–	/>
339	–	-->
340	–
354		<copy todir="${build.filter.src.dir}">
355		<fileset dir="${src.dir}">
356		<exclude name="**/*.html"/>
357	<	<patternset refid="emulation.excludes"/>
357	>	<patternset refid="docs.exclusion"/>
358		</fileset>
359		<filterchain>
360
#	Line 364 | Line 377
377		<param name="replacement" value=" "/>
378		</filterreader>
379
380	+	</filterchain>
381	+	</copy>
382
383	<	<!--
369	<	# This filter uncomments lines beginning with "//@" so that
370	<	# javadoc can see imports that are needed to resolve links
371	<	# but that shouldn't be in the compiled code.
372	<	-->
383	>	</target>
384
374	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
375	–	classpath="${build.ant.dir}">
376	–	<param name="matching"    value="^//@.*$"/>
377	–	<param name="pattern"     value="^//@"/>
378	–	<param name="replacement" value=""/>
379	–	</filterreader>
385
386
387	+
388	+	<target name="filter-doccheck"
389	+	depends="filter-src">
390	+
391	+	<mkdir dir="${build.filter.doccheck.dir}"/>
392	+
393	+	<copy todir="${build.filter.doccheck.dir}">
394	+	<fileset dir="${build.filter.src.dir}">
395	+	<include name="**/*.html"/>
396	+	</fileset>
397	+	</copy>
398	+
399	+	<property name="generic.declarations"
400	+	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 {}"
401	+	/>
402	+
403	+	<copy todir="${build.filter.doccheck.dir}">
404	+	<fileset dir="${build.filter.src.dir}">
405	+	<exclude name="**/*.html"/>
406	+	</fileset>
407	+	<filterchain>
408		<!--
409	<	# The next two filters try to make the source look like
409	>	# These two filters try to make the source look like
410		# something that doccheck can process. The first removes
411		# -source 1.4 assertions and the second adds in a bunch
412		# of single letter public nested marker interfaces so that
413		# the generic type parameters are recognized.
388	–	#
389	–	# Currently commented out because doccheck doesn't work. :-(
414		-->
415
392	–	<!--
416		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
417		classpath="${build.ant.dir}">
418		<param name="matching"    value="^\s*assert[\s ].*$"/>
#	Line 399 | Line 422
422
423		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
424		classpath="${build.ant.dir}">
425	<	<param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
425	>	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
426		<param name="pattern"     value="$"/>
427		<param name="replacement" value=" ${generic.declarations}"/>
428		</filterreader>
406	–	-->
429
430		</filterchain>
431		</copy>
#	Line 417 | Line 439
439		<mkdir dir="${build.testcases.dir}"/>
440
441		<!--
442	<	<echo>javac ${gjc.args}</echo>
421	<	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
442	>	<echo>javac ${build.args}</echo>
443		<echo>classpath="${test.classpath}"</echo>
444		-->
445
#	Line 430 | Line 451
451		source="${build.sourcelevel}"
452		fork="true">
453
454	<	<compilerarg    line="${gjc.args}"/>
455	<	<bootclasspath refid="test.compile.bootclasspath"/>
456	<	<classpath     refid="test.classpath"/>
454	>	<compilerarg line="${build.args}"/>
455	>	<classpath refid="test.classpath"/>
456	>
457	>	<include name="java/**"/>
458	>	<include name="jsr166/**"/>
459
460		</javac>
461
#	Line 454 | Line 477
477		dir="${build.reports.dir}"
478		fork="true">
479
480	<	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
480	>	<jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
481
482		<formatter type="xml"/>
483
484		<batchtest todir="${build.reports.dir}">
485		<fileset dir="${test.src.dir}">
486	<	<include name="**/${testcase}Test.java"/>
486	>	<include name="java/**/${testcase}Test.java"/>
487	>	<include name="jsr166/**/${testcase}Test.java"/>
488		</fileset>
489		</batchtest>
490
#	Line 472 | Line 496
496		<target name="report-tests"
497		depends="run-tests">
498
499	<	<!-- Sets junit.report.format to frames if Xalan is present,
499	>	<!-- Sets junit.report.format to frames if redirection is present,
500		otherwise sets it to noframes. -->
501		<available property="junit.report.format"
502		value="frames"
#	Line 497 | Line 521
521
522		<target name="configure-compiler">
523
524	<	<property name="gjc.version"
501	<	value="2.0"/>
502	<
503	<	<condition property="novariance.arg" value="-novariance">
504	<	<and>
505	<	<equals arg1="${gjc.version}" arg2="2.0"/>
506	<	<or>
507	<	<not><isset property="gjc.novariance"/></not>
508	<	<istrue value="${gjc.novariance}"/>
509	<	</or>
510	<	</and>
511	<	</condition>
512	<
513	<	<property name="novariance.arg"
514	<	value=""/>
515	<
516	<	<property name="gjc.dir"
517	<	value="${lib.dir}/gjc"/>
518	<
519	<	<property name="javac.jar"
520	<	location="${gjc.dir}/${gjc.version}/javac.jar"/>
524	>	<property name="unchecked.option" value="-Xlint:unchecked"/>
525
526	<	<property name="collect.jar"
527	<	location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
524	<
525	<
526	<	<condition property="warnunchecked.arg" value="-warnunchecked">
527	<	<istrue value="${gjc.warnunchecked}"/>
526	>	<condition property="warnunchecked.arg" value="${unchecked.option}">
527	>	<istrue value="${build.warnunchecked}"/>
528		</condition>
529
530		<property name="warnunchecked.arg" value=""/>
531	<
531	>
532		<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
533		<istrue value="${build.nothreads}"/>
534		</condition>
535
536
537	–	<!--
538	–	! Bootclasspath munging for source compilation.
539	–	-->
540	–
541	–	<path id="pre.bootclasspath">
542	–	<!-- <pathelement location="${src.dir}"/> -->
543	–	<pathelement location="${javac.jar}"/>
544	–	</path>
545	–
546	–	<path id="compile.bootclasspath">
547	–	<!-- <pathelement location="${src.dir}"/> -->
548	–	<pathelement location="${collect.jar}"/>
549	–	<pathelement location="${rt.jar}"/>
550	–	</path>
551	–
552	–	<!-- Flatten paths into platform-appropriate strings -->
553	–	<property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
554	–	<property name="compile.bootclasspath" refid="compile.bootclasspath"/>
555	–
556	–
537		<!-- Common options in javac invocations -->
538	<	<property name="gjc.args"
559	<	value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
560	<	/>
538	>	<property name="build.args" value="${warnunchecked.arg}"/>
539
540		</target>
541
#	Line 576 | Line 554
554		</target>
555
556
579	–	<target name="configure-emulation">
580	–
581	–	<condition property="build.emulation.true">
582	–	<or>
583	–	<and>
584	–	<os family="windows"/>
585	–	<not>
586	–	<isset property="build.emulation"/>
587	–	</not>
588	–	</and>
589	–	<istrue value="${build.emulation}"/>
590	–	</or>
591	–	</condition>
592	–
593	–	</target>
594	–
595	–
557		<target name="configure-tests"
558		depends="configure-compiler">
559
#	Line 603 | Line 564
564		<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
565		unless="junit.available"/>
566
567	+	<!-- Xalan -->
568	+	<available property="xalan.available"
569	+	classname="org.apache.xalan.Version"/>
570	+
571	+	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
572	+	unless="xalan.available"/>
573	+
574
575		<!--
576		! Bootclasspath munging for testing, so JUnit can test our local
#	Line 611 | Line 579
579
580		<path id="test.classpath">
581		<pathelement location="${product.jar}"/>
614	–	<pathelement location="${build.testcases.dir}"/>
615	–	<pathelement location="${junit.jar}"/>
616	–	</path>
617	–
618	–	<path id="test.compile.bootclasspath">
619	–	<pathelement location="${javac.jar}"/>
620	–	<pathelement location="${collect.jar}"/>
582		<pathelement location="${rt.jar}"/>
583	+	<pathelement location="${junit.jar}"/>
584	+	<pathelement location="${build.testcases.dir}"/>
585		</path>
586
587	<	<path id="test.run.bootclasspath">
625	<	<pathelement location="${javac.jar}"/>
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.compile.bootclasspath" refid="test.compile.bootclasspath"/>
632	<	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
592	>	<property name="test.classpath"         refid="test.classpath"/>
593	>	<property name="test.bootclasspath"     refid="test.bootclasspath"/>
594
595		</target>
596
#	Line 637 | Line 598
598
599		<!-- Anthill targets -->
600
601	<	<target name="anthill-build"
601	>	<target name="anthill-build">
602	>
603	>	<!-- Override this in user.properties -->
604	>	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
605	>
606	>	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
607	>	<arg value="-Xmx256000000"/>
608	>	<!-- classpath of new JVM -->
609	>	<arg value="-classpath"/> <arg path="${java.class.path}"/>
610	>	<!-- location of Ant home directory -->
611	>	<arg value="-Dant.home=${ant.home}"/>
612	>	<!-- the Ant main class -->
613	>	<arg value="org.apache.tools.ant.Main"/>
614	>	<!-- The build file -->
615	>	<arg value="-buildfile"/>  <arg value="build.xml"/>
616	>	<!-- the target to build on the new Ant instance -->
617	>	<arg value="-DJAVA_HOME=${tiger.home}"/>
618	>	<arg value="do-anthill-build"/>
619	>	</exec>
620	>	</target>
621	>
622	>	<target name="do-anthill-build"
623		depends="jar, test, docs, dist-docs"/>
624
625		<target name="anthill-publish">
#	Line 660 | Line 642
642		</target>
643
644
645	+	<target name="ng" depends="test">
646	+	<java classname="SuperfluousAbstract" fork="true">
647	+
648	+	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
649	+
650	+	</java>
651	+	</target>
652	+
653	+
654		</project>

Diff Legend

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