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.47 by tim, Fri Aug 1 19:34:05 2003 UTC

#	Line 39 | Line 39
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"/>
#	Line 59 | Line 60
60
61
62
63	<	<!-- Files excluded from emulation and dist-docs -->
64	<	<patternset id="emulation.excludes">
63	>	<!-- Files excluded from dist-docs and emulation jar -->
64	>	<patternset id="unsafe.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	+
77
78
79		<!-- Main targets -->
#	Line 77 | Line 86
86
87		<mkdir dir="${build.classes.dir}"/>
88
89	+	<!--
90	+	<echo>javac ${gjc.args}</echo>
91	+	<echo>bootclasspath=${compile.bootclasspath}</echo>
92	+	-->
93	+
94		<javac srcdir="${prepare.src.dir}"
95		destdir="${build.classes.dir}"
96		debug="${build.debug}"
#	Line 85 | Line 99
99		source="${build.sourcelevel}"
100		fork="true">
101
102	<	<bootclasspath refid="javac.bootclasspath"/>
103	<	<compilerarg line="${build.javac.args}"/>
102	>	<compilerarg    line="${gjc.args}"/>
103	>	<bootclasspath refid="compile.bootclasspath"/>
104
105		</javac>
106
#	Line 119 | Line 133
133
134
135		<target name="doccheck"
136	<	depends="filter-src"
137	<	description="Reports on javadoc style errors (not working yet)">
136	>	depends="filter-doccheck"
137	>	description="Reports on javadoc style errors">
138
139		<delete dir="${build.doccheck.dir}"/>
140		<mkdir dir="${build.doccheck.dir}"/>
#	Line 128 | Line 142
142		<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
143		docletpath="${lib.dir}/doccheck.jar"
144		destdir="${build.doccheck.dir}">
145	<	<packageset dir="${build.filter.src.dir}"/>
145	>	<packageset dir="${build.filter.doccheck.dir}"/>
146		</javadoc>
147
148		</target>
#	Line 177 | Line 191
191		source="${build.sourcelevel}"
192		fork="true">
193
194	<	<bootclasspath refid="javac.bootclasspath"/>
195	<	<compilerarg line="${build.javac.args} -s"/>
194	>	<compilerarg    line="${gjc.args} -s"/>
195	>	<bootclasspath refid="compile.bootclasspath"/>
196
197		</javac>
198
#	Line 189 | Line 203
203		depends="init, dist-clean, dist-jar, dist-docs"
204		description="Puts all distributable products in single hierarchy"/>
205
206	+	<target name="release"
207	+	depends="dist"
208	+	description="Puts entire CVS tree, plus distribution productions, in a jar">
209	+
210	+	<!--
211	+	#keep build dir? - dl
212	+	<delete dir="${build.dir}"/>
213	+	-->
214	+	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
215	+
216	+	<jar basedir="${basedir}" destfile="${release.jar}">
217	+	<exclude name="${release.jar}"/>
218	+	<exclude name="user.properties"/>
219	+	<exclude name="etc/notes/**"/>
220	+	<exclude name="lib/gjc/2.1/**"/>
221	+	<exclude name="**/SyntaxTest.java"/>
222	+	</jar>
223	+
224	+	</target>
225
226		<target name="clean"
227		description="Removes all build products">
#	Line 272 | Line 305
305		source="${build.sourcelevel}"
306		fork="true">
307
308	<	<bootclasspath refid="javac.bootclasspath"/>
309	<	<compilerarg line="${build.javac.args}"/>
308	>	<compilerarg    line="${gjc.args}"/>
309	>	<bootclasspath refid="compile.bootclasspath"/>
310
311		</javac>
312
#	Line 287 | Line 320
320
321		<jar destfile="${product.jar}" duplicate="add">
322		<fileset dir="${build.classes.dir}">
323	<	<patternset refid="emulation.excludes"/>
323	>	<patternset refid="atomic.exclusion"/>
324	>	<patternset refid="unsafe.exclusion"/>
325		</fileset>
326		<fileset dir="${build.emulation.dir}"/>
327		</jar>
#	Line 327 | Line 361
361		</fileset>
362		</copy>
363
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	–
364		<copy todir="${build.filter.src.dir}">
365		<fileset dir="${src.dir}">
366		<exclude name="**/*.html"/>
367	<	<patternset refid="emulation.excludes"/>
367	>	<patternset refid="unsafe.exclusion"/>
368		</fileset>
369		<filterchain>
370
#	Line 372 | Line 400
400		<param name="pattern"     value="^//@"/>
401		<param name="replacement" value=""/>
402		</filterreader>
403	+	</filterchain>
404	+	</copy>
405	+
406	+	</target>
407	+
408	+
409	+
410	+
411	+	<target name="filter-doccheck"
412	+	depends="filter-src">
413	+
414	+	<mkdir dir="${build.filter.doccheck.dir}"/>
415	+
416	+	<copy todir="${build.filter.doccheck.dir}">
417	+	<fileset dir="${build.filter.src.dir}">
418	+	<include name="**/*.html"/>
419	+	</fileset>
420	+	</copy>
421
422	+	<property name="generic.declarations"
423	+	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 {}"
424	+	/>
425
426	+	<copy todir="${build.filter.doccheck.dir}">
427	+	<fileset dir="${build.filter.src.dir}">
428	+	<exclude name="**/*.html"/>
429	+	</fileset>
430	+	<filterchain>
431		<!--
432	<	# The next two filters try to make the source look like
432	>	# These two filters try to make the source look like
433		# something that doccheck can process. The first removes
434		# -source 1.4 assertions and the second adds in a bunch
435		# of single letter public nested marker interfaces so that
436		# the generic type parameters are recognized.
383	–	#
384	–	# Currently commented out because doccheck doesn't work. :-(
437		-->
438
387	–	<!--
439		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
440		classpath="${build.ant.dir}">
441		<param name="matching"    value="^\s*assert[\s ].*$"/>
#	Line 394 | Line 445
445
446		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
447		classpath="${build.ant.dir}">
448	<	<param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
448	>	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
449		<param name="pattern"     value="$"/>
450		<param name="replacement" value=" ${generic.declarations}"/>
451		</filterreader>
401	–	-->
452
453		</filterchain>
454		</copy>
#	Line 411 | Line 461
461
462		<mkdir dir="${build.testcases.dir}"/>
463
464	+	<!--
465	+	<echo>javac ${gjc.args}</echo>
466	+	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
467	+	<echo>classpath="${test.classpath}"</echo>
468	+	-->
469	+
470		<javac srcdir="${test.src.dir}"
471		destdir="${build.testcases.dir}"
472		debug="${build.debug}"
#	Line 419 | Line 475
475		source="${build.sourcelevel}"
476		fork="true">
477
478	<	<classpath refid="test.classpath"/>
479	<	<bootclasspath refid="javac.bootclasspath"/>
480	<	<compilerarg line="${build.javac.args}"/>
478	>	<compilerarg    line="${gjc.args}"/>
479	>	<bootclasspath refid="test.compile.bootclasspath"/>
480	>	<classpath     refid="test.classpath"/>
481
482		</javac>
483
#	Line 443 | Line 499
499		dir="${build.reports.dir}"
500		fork="true">
501
502	<	<jvmarg value="${test.bootclasspath.arg}"/>
502	>	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
503
504		<formatter type="xml"/>
505
#	Line 487 | Line 543
543		<target name="configure-compiler">
544
545		<property name="gjc.version"
546	<	value="2.0"/>
546	>	value="2.2"/>
547
548	<	<condition property="build.novariance" value="-novariance">
548	>	<condition property="novariance.arg" value="-novariance">
549		<and>
550		<equals arg1="${gjc.version}" arg2="2.0"/>
551		<or>
#	Line 499 | Line 555
555		</and>
556		</condition>
557
558	<	<property name="build.novariance"
558	>	<property name="novariance.arg"
559		value=""/>
560
561		<property name="gjc.dir"
#	Line 509 | Line 565
565		location="${gjc.dir}/${gjc.version}/javac.jar"/>
566
567		<property name="collect.jar"
568	<	location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
568	>	location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
569
570
571	<	<condition property="build.warnunchecked" value="-warnunchecked">
571	>	<condition property="warnunchecked.arg" value="-warnunchecked">
572		<istrue value="${gjc.warnunchecked}"/>
573		</condition>
574
575	<	<property name="build.warnunchecked" value=""/>
575	>	<property name="warnunchecked.arg" value=""/>
576
577		<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
578		<istrue value="${build.nothreads}"/>
#	Line 527 | Line 583
583		! Bootclasspath munging for source compilation.
584		-->
585
586	<	<path id="javac.bootclasspath.prefix">
531	<	<!-- <pathelement location="${src.dir}"/> -->
586	>	<path id="pre.bootclasspath">
587		<pathelement location="${javac.jar}"/>
588		</path>
589
590	<	<path id="javac.bootclasspath">
591	<	<!-- <pathelement location="${src.dir}"/> -->
590	>	<path id="compile.bootclasspath">
591	>	<pathelement location="${build.classes.dir}"/>
592		<pathelement location="${collect.jar}"/>
593		<pathelement location="${rt.jar}"/>
594		</path>
595
596	<	<!-- Flatten bootclasspath prefix into a platform-appropriate string -->
597	<	<property name="javac.bootclasspath.prefix"
598	<	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"/>
596	>	<!-- Flatten paths into platform-appropriate strings -->
597	>	<property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
598	>	<property name="compile.bootclasspath" refid="compile.bootclasspath"/>
599
553	–	<!-- Common options in javac invocations -->
554	–	<property name="build.javac.args"
555	–	value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
600
601	<	<echo>javac ${build.javac.args}</echo>
602	<	<echo>bootclasspath=${javac.bootclasspath}</echo>
601	>	<!-- Common options in javac invocations -->
602	>	<property name="gjc.args"
603	>	value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
604	>	/>
605
606		</target>
607
#	Line 591 | Line 637
637		</target>
638
639
640	<	<target name="configure-tests">
640	>	<target name="configure-tests"
641	>	depends="configure-compiler">
642
643		<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
644		<available property="junit.available"
#	Line 612 | Line 659
659		<pathelement location="${junit.jar}"/>
660		</path>
661
662	<	<!-- Flatten test classpath into a platform-appropriate string -->
663	<	<property name="test.classpath" refid="test.classpath"/>
662	>	<path id="test.compile.bootclasspath">
663	>	<pathelement location="${javac.jar}"/>
664	>	<pathelement location="${collect.jar}"/>
665	>	<pathelement location="${rt.jar}"/>
666	>	</path>
667	>
668	>	<path id="test.run.bootclasspath">
669	>	<pathelement location="${javac.jar}"/>
670	>	<path refid="test.classpath"/>
671	>	</path>
672
673	<	<!-- Turn the flattened test classpath into a javac argument -->
674	<	<property name="test.bootclasspath.arg"
675	<	value='-Xbootclasspath/p:${test.classpath}'/>
673	>	<!-- Flatten test classpaths into platform-appropriate strings -->
674	>	<property name="test.classpath"             refid="test.classpath"/>
675	>	<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
676	>	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
677
678		</target>
679
#	Line 648 | Line 704
704		</target>
705
706
707	+	<target name="ng" depends="test">
708	+	<java classname="SuperfluousAbstract" fork="true">
709	+
710	+	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
711	+
712	+	</java>
713	+	</target>
714	+
715	+
716		</project>

Diff Legend

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