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.48 by tim, Fri Aug 1 19:41:06 2003 UTC vs.
Revision 1.58 by tim, Mon Sep 15 15:13:35 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"/>
42	>	<property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
43	>	<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
44
45		<!-- Source locations -->
46		<property name="src.dir"              location="${basedir}/src/main"/>
46	–	<property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
47		<property name="test.src.dir"         location="${basedir}/src/test"/>
48		<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
49		<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
#	Line 57 | Line 57
57		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
58		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
59		<property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
60	+	<property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
61
62
63	<
64	<	<!-- Files excluded from dist-docs and emulation jar -->
64	<	<patternset id="unsafe.exclusion">
63	>	<!-- Files excluded from dist-docs -->
64	>	<patternset id="docs.exclusion">
65		<exclude name="java/util/Random.*"/>
66		<exclude name="sun/misc/Unsafe.*"/>
67		</patternset>
68
69	–	<!-- Files excludes from emulation jar -->
70	–	<patternset id="atomic.exclusion">
71	–	<exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
72	–	<exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
73	–	<exclude name="java/util/concurrent/atomic/AtomicLong*"/>
74	–	<exclude name="java/util/concurrent/atomic/AtomicReference*"/>
75	–	</patternset>
76	–
69
70
71		<!-- Main targets -->
#	Line 86 | Line 78
78
79		<mkdir dir="${build.classes.dir}"/>
80
89	–	<!--
90	–	<echo>javac ${gjc.args}</echo>
91	–	<echo>bootclasspath=${compile.bootclasspath}</echo>
92	–	-->
93	–
81		<javac srcdir="${prepare.src.dir}"
82		destdir="${build.classes.dir}"
83		debug="${build.debug}"
#	Line 99 | Line 86
86		source="${build.sourcelevel}"
87		fork="true">
88
89	<	<compilerarg    line="${gjc.args}"/>
103	<	<bootclasspath refid="compile.bootclasspath"/>
89	>	<compilerarg line="${build.args}"/>
90
91		</javac>
92
#	Line 108 | Line 94
94
95
96		<target name="jar"
97	<	depends="configure-emulation, init-jar, native-jar, emulation-jar"
97	>	depends="init-jar, native-jar"
98		description="Builds library jar from compiled sources"/>
99
100
#	Line 122 | Line 108
108		description="Reports on style errors in Java source (verbose, mostly chaff)">
109
110		<taskdef resource="checkstyletask.properties"
111	<	classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
111	>	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
112
113	<	<checkstyle>
114	<	<formatter type="plain"/>  <!-- also available: type="xml" -->
113	>	<mkdir dir="${build.checkstyle.dir}"/>
114	>
115	>	<checkstyle config="etc/checkstyle/sun_checks.xml"
116	>	failOnViolation="false">
117	>	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
118		<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119		</checkstyle>
120	+
121	+	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
122	+	out="${build.checkstyle.dir}/checkstyle-report.html"
123	+	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
124
125		</target>
126
#	Line 142 | Line 135
135		<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
136		docletpath="${lib.dir}/doccheck.jar"
137		destdir="${build.doccheck.dir}">
138	<	<packageset dir="${build.filter.doccheck.dir}"/>
138	>	<packageset dir="${build.dc-filter.dir}"/>
139		</javadoc>
140
141		<echo>DocCheck output is in ${build.doccheck.dir}</echo>
#	Line 164 | Line 157
157
158		<tag name="revised" description="Last revised:"/>
159		<tag name="spec"    description="Specified by:"/>
167	–	<tag name="editor"  description="Last edited by:"/>
168	–	<tag name="fixme"   description="FIX ME:"/>
160
161		<packageset dir="${build.filter.src.dir}"/>
162
#	Line 174 | Line 165
165		</target>
166
167
168	<	<target name="strip"
169	<	depends="init, configure-compiler"
170	<	description="Strip generics from java source (not working yet)">
168	>	<target name="sinjdocs"
169	>	depends="configure-tests"
170	>	description="Builds javadocs with custom tags to build folder">
171
172	<	<mkdir dir="${build.stripped.dir}"/>
172	>	<delete dir="${build.sinjdocs.dir}"/>
173	>	<mkdir dir="${build.sinjdocs.dir}"/>
174
175	<	<!--
184	<	# javac -s doesn't reliably generate compilable code. It generates
185	<	# bridge methods (marked as "synthetic") that can have identical
186	<	# signatures to existing methods except for the return value.
187	<	-->
188	<	<javac srcdir="${src.dir}"
189	<	destdir="${build.stripped.dir}"
190	<	debug="${build.debug}"
191	<	debuglevel="${build.debuglevel}"
192	<	deprecation="${build.deprecation}"
193	<	source="${build.sourcelevel}"
194	<	fork="true">
175	>	<java classname="net.cscott.sinjdoc.Main" fork="true">
176
177	<	<compilerarg    line="${gjc.args} -s"/>
197	<	<bootclasspath refid="compile.bootclasspath"/>
177	>	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
178
179	<	</javac>
179	>	<classpath>
180	>	<pathelement location="${sinjdoc.jar}"/>
181	>	<pathelement location="${lib.dir}/jutil.jar"/>
182	>	<pathelement location="${lib.dir}/cup.jar"/>
183	>	<path refid="test.classpath"/>
184	>	</classpath>
185	>
186	>	<!-- <arg value="-help"/> -->
187	>	<!-- <arg value="-verbose"/> -->
188	>	<!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
189	>
190	>	<arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
191	>	<arg value="-sourcepath"/> <arg value="${src.dir}"/>
192	>	<arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
193	>	<arg value="-source"/>     <arg value="${build.sourcelevel}"/>
194	>
195	>	<arg value="java.lang"/>
196	>	<arg value="java.util"/>
197	>	<arg value="java.util.concurrent"/>
198	>	<arg value="java.util.concurrent.atomic"/>
199	>	<arg value="java.util.concurrent.locks"/>
200	>
201	>
202	>	</java>
203
204		</target>
205
#	Line 205 | Line 208
208		depends="init, dist-clean, dist-jar, dist-docs"
209		description="Puts all distributable products in single hierarchy"/>
210
211	+
212		<target name="release"
213		depends="dist"
214		description="Puts entire CVS tree, plus distribution productions, in a jar">
215
212	–	<!--
213	–	#keep build dir? - dl
214	–	<delete dir="${build.dir}"/>
215	–	-->
216		<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
217
218		<jar basedir="${basedir}" destfile="${release.jar}">
219	+	<!-- <exclude name="build/**"/> -->
220		<exclude name="${release.jar}"/>
221		<exclude name="user.properties"/>
222		<exclude name="etc/notes/**"/>
223	<	<exclude name="lib/gjc/2.1/**"/>
223	>	<exclude name="src/emulation/**"/>
224		<exclude name="**/SyntaxTest.java"/>
225	+	<exclude name="**/SuperfluousAbstract.java"/>
226		</jar>
227
228		</target>
#	Line 271 | Line 273
273		<!-- Version is kept in a separate file -->
274		<loadfile property="version" srcFile="version.properties"/>
275		<echo>Building JSR-166 version ${version}</echo>
276	+	<echo>java.home is ${java.home}</echo>
277
278		</target>
279
#	Line 283 | Line 286
286
287
288		<target name="native-jar"
289	<	depends="compile"
287	<	unless="build.emulation.true">
289	>	depends="compile">
290
291		<jar destfile="${product.jar}">
292		<fileset dir="${build.classes.dir}"/>
#	Line 293 | Line 295
295		</target>
296
297
296	–	<target name="compile-emulation"
297	–	depends="init, configure-compiler"
298	–	if="build.emulation.true">
299	–
300	–	<mkdir dir="${build.emulation.dir}"/>
301	–
302	–	<javac srcdir="${emulation.src.dir}"
303	–	destdir="${build.emulation.dir}"
304	–	debug="${build.debug}"
305	–	debuglevel="${build.debuglevel}"
306	–	deprecation="${build.deprecation}"
307	–	source="${build.sourcelevel}"
308	–	fork="true">
309	–
310	–	<compilerarg    line="${gjc.args}"/>
311	–	<bootclasspath refid="compile.bootclasspath"/>
312	–
313	–	</javac>
314	–
315	–	</target>
316	–
317	–
318	–	<target name="emulation-jar"
319	–	depends="compile-emulation"
320	–	if="build.emulation.true">
321	–
322	–
323	–	<jar destfile="${product.jar}" duplicate="add">
324	–	<fileset dir="${build.classes.dir}">
325	–	<patternset refid="atomic.exclusion"/>
326	–	<patternset refid="unsafe.exclusion"/>
327	–	</fileset>
328	–	<fileset dir="${build.emulation.dir}"/>
329	–	</jar>
330	–
331	–	</target>
332	–
333	–
298		<target name="dist-jar"
299		depends="clean, jar">
300
#	Line 366 | Line 330
330		<copy todir="${build.filter.src.dir}">
331		<fileset dir="${src.dir}">
332		<exclude name="**/*.html"/>
333	<	<patternset refid="unsafe.exclusion"/>
333	>	<patternset refid="docs.exclusion"/>
334		</fileset>
335		<filterchain>
336
#	Line 389 | Line 353
353		<param name="replacement" value=" "/>
354		</filterreader>
355
392	–
393	–	<!--
394	–	# This filter uncomments lines beginning with "//@" so that
395	–	# javadoc can see imports that are needed to resolve links
396	–	# but that shouldn't be in the compiled code.
397	–	-->
398	–
399	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
400	–	classpath="${build.ant.dir}">
401	–	<param name="matching"    value="^//@.*$"/>
402	–	<param name="pattern"     value="^//@"/>
403	–	<param name="replacement" value=""/>
404	–	</filterreader>
356		</filterchain>
357		</copy>
358
359		</target>
360
361
411	–
412	–
362		<target name="filter-doccheck"
363		depends="filter-src">
364
365	<	<mkdir dir="${build.filter.doccheck.dir}"/>
365	>	<mkdir dir="${build.dc-filter.dir}"/>
366
367	<	<copy todir="${build.filter.doccheck.dir}">
367	>	<copy todir="${build.dc-filter.dir}">
368		<fileset dir="${build.filter.src.dir}">
369		<include name="**/*.html"/>
370		</fileset>
#	Line 425 | Line 374
374		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 {}"
375		/>
376
377	<	<copy todir="${build.filter.doccheck.dir}">
377	>	<copy todir="${build.dc-filter.dir}">
378		<fileset dir="${build.filter.src.dir}">
379		<exclude name="**/*.html"/>
380		</fileset>
#	Line 463 | Line 412
412
413		<mkdir dir="${build.testcases.dir}"/>
414
466	–	<!--
467	–	<echo>javac ${gjc.args}</echo>
468	–	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
469	–	<echo>classpath="${test.classpath}"</echo>
470	–	-->
471	–
415		<javac srcdir="${test.src.dir}"
416		destdir="${build.testcases.dir}"
417		debug="${build.debug}"
#	Line 477 | Line 420
420		source="${build.sourcelevel}"
421		fork="true">
422
423	<	<compilerarg    line="${gjc.args}"/>
424	<	<bootclasspath refid="test.compile.bootclasspath"/>
425	<	<classpath     refid="test.classpath"/>
423	>	<compilerarg line="${build.args}"/>
424	>	<classpath refid="test.classpath"/>
425	>
426	>	<include name="java/**"/>
427	>	<include name="jsr166/**"/>
428
429		</javac>
430
#	Line 501 | Line 446
446		dir="${build.reports.dir}"
447		fork="true">
448
449	<	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
449	>	<jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
450
451		<formatter type="xml"/>
452
453		<batchtest todir="${build.reports.dir}">
454		<fileset dir="${test.src.dir}">
455	<	<include name="**/${testcase}Test.java"/>
455	>	<include name="java/**/${testcase}Test.java"/>
456	>	<include name="jsr166/**/${testcase}Test.java"/>
457		</fileset>
458		</batchtest>
459
#	Line 519 | Line 465
465		<target name="report-tests"
466		depends="run-tests">
467
468	<	<!-- Sets junit.report.format to frames if Xalan is present,
468	>	<!-- Sets junit.report.format to frames if redirection is present,
469		otherwise sets it to noframes. -->
470		<available property="junit.report.format"
471		value="frames"
#	Line 544 | Line 490
490
491		<target name="configure-compiler">
492
493	<	<property name="gjc.version"
548	<	value="2.2"/>
493	>	<property name="unchecked.option" value="-Xlint:unchecked"/>
494
495	<	<condition property="novariance.arg" value="-novariance">
496	<	<and>
552	<	<equals arg1="${gjc.version}" arg2="2.0"/>
553	<	<or>
554	<	<not><isset property="gjc.novariance"/></not>
555	<	<istrue value="${gjc.novariance}"/>
556	<	</or>
557	<	</and>
558	<	</condition>
559	<
560	<	<property name="novariance.arg"
561	<	value=""/>
562	<
563	<	<property name="gjc.dir"
564	<	value="${lib.dir}/gjc"/>
565	<
566	<	<property name="javac.jar"
567	<	location="${gjc.dir}/${gjc.version}/javac.jar"/>
568	<
569	<	<property name="collect.jar"
570	<	location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
571	<
572	<
573	<	<condition property="warnunchecked.arg" value="-warnunchecked">
574	<	<istrue value="${gjc.warnunchecked}"/>
495	>	<condition property="warnunchecked.arg" value="${unchecked.option}">
496	>	<istrue value="${build.warnunchecked}"/>
497		</condition>
498
499		<property name="warnunchecked.arg" value=""/>
500	<
500	>
501		<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
502		<istrue value="${build.nothreads}"/>
503		</condition>
504
505
584	–	<!--
585	–	! Bootclasspath munging for source compilation.
586	–	-->
587	–
588	–	<path id="pre.bootclasspath">
589	–	<pathelement location="${javac.jar}"/>
590	–	</path>
591	–
592	–	<path id="compile.bootclasspath">
593	–	<pathelement location="${build.classes.dir}"/>
594	–	<pathelement location="${collect.jar}"/>
595	–	<pathelement location="${rt.jar}"/>
596	–	</path>
597	–
598	–	<!-- Flatten paths into platform-appropriate strings -->
599	–	<property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
600	–	<property name="compile.bootclasspath" refid="compile.bootclasspath"/>
601	–
602	–
506		<!-- Common options in javac invocations -->
507	<	<property name="gjc.args"
605	<	value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
606	<	/>
507	>	<property name="build.args" value="${warnunchecked.arg}"/>
508
509		</target>
510
#	Line 622 | Line 523
523		</target>
524
525
625	–	<target name="configure-emulation">
626	–
627	–	<condition property="build.emulation.true">
628	–	<or>
629	–	<and>
630	–	<os family="windows"/>
631	–	<not>
632	–	<isset property="build.emulation"/>
633	–	</not>
634	–	</and>
635	–	<istrue value="${build.emulation}"/>
636	–	</or>
637	–	</condition>
638	–
639	–	</target>
640	–
641	–
526		<target name="configure-tests"
527		depends="configure-compiler">
528
#	Line 649 | Line 533
533		<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
534		unless="junit.available"/>
535
536	+	<!-- Xalan -->
537	+	<available property="xalan.available"
538	+	classname="org.apache.xalan.Version"/>
539	+
540	+	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
541	+	unless="xalan.available"/>
542	+
543
544		<!--
545		! Bootclasspath munging for testing, so JUnit can test our local
#	Line 657 | Line 548
548
549		<path id="test.classpath">
550		<pathelement location="${product.jar}"/>
660	–	<pathelement location="${build.testcases.dir}"/>
661	–	<pathelement location="${junit.jar}"/>
662	–	</path>
663	–
664	–	<path id="test.compile.bootclasspath">
665	–	<pathelement location="${javac.jar}"/>
666	–	<pathelement location="${collect.jar}"/>
551		<pathelement location="${rt.jar}"/>
552	+	<pathelement location="${junit.jar}"/>
553	+	<pathelement location="${build.testcases.dir}"/>
554		</path>
555
556	<	<path id="test.run.bootclasspath">
671	<	<pathelement location="${javac.jar}"/>
556	>	<path id="test.bootclasspath">
557		<path refid="test.classpath"/>
558		</path>
559
560		<!-- Flatten test classpaths into platform-appropriate strings -->
561	<	<property name="test.classpath"             refid="test.classpath"/>
562	<	<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
678	<	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
561	>	<property name="test.classpath"         refid="test.classpath"/>
562	>	<property name="test.bootclasspath"     refid="test.bootclasspath"/>
563
564		</target>
565
#	Line 683 | Line 567
567
568		<!-- Anthill targets -->
569
570	<	<target name="anthill-build"
570	>	<target name="anthill-build">
571	>
572	>	<!-- Override this in user.properties -->
573	>	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
574	>
575	>	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
576	>	<arg value="-Xmx256000000"/>
577	>	<!-- classpath of new JVM -->
578	>	<arg value="-classpath"/> <arg path="${java.class.path}"/>
579	>	<!-- location of Ant home directory -->
580	>	<arg value="-Dant.home=${ant.home}"/>
581	>	<!-- the Ant main class -->
582	>	<arg value="org.apache.tools.ant.Main"/>
583	>	<!-- The build file -->
584	>	<arg value="-buildfile"/>  <arg value="build.xml"/>
585	>	<!-- the target to build on the new Ant instance -->
586	>	<arg value="-DJAVA_HOME=${tiger.home}"/>
587	>	<arg value="do-anthill-build"/>
588	>	</exec>
589	>	</target>
590	>
591	>	<target name="do-anthill-build"
592		depends="jar, test, docs, dist-docs"/>
593
594		<target name="anthill-publish">
#	Line 709 | Line 614
614		<target name="ng" depends="test">
615		<java classname="SuperfluousAbstract" fork="true">
616
617	<	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
617	>	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
618
619		</java>
620		</target>

Diff Legend

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