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.33 by tim, Thu May 29 12:54:10 2003 UTC vs.
Revision 1.44 by tim, Thu Jun 26 11:55:50 2003 UTC

#	Line 59 | Line 59
59
60
61
62	<	<!-- Files excluded from emulation and dist-docs -->
63	<	<patternset id="emulation.excludes">
62	>	<!-- Files excluded from dist-docs and emulation jar -->
63	>	<patternset id="unsafe.exclusion">
64		<exclude name="java/util/Random.*"/>
65		<exclude name="sun/misc/Unsafe.*"/>
66		</patternset>
67
68	+	<!-- Files excludes from emulation jar -->
69	+	<patternset id="atomic.exclusion">
70	+	<exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
71	+	<exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
72	+	<exclude name="java/util/concurrent/atomic/AtomicLong*"/>
73	+	<exclude name="java/util/concurrent/atomic/AtomicReference*"/>
74	+	</patternset>
75	+
76
77
78		<!-- Main targets -->
#	Line 77 | Line 85
85
86		<mkdir dir="${build.classes.dir}"/>
87
88	+	<!--
89	+	<echo>javac ${gjc.args}</echo>
90	+	<echo>bootclasspath=${compile.bootclasspath}</echo>
91	+	-->
92	+
93		<javac srcdir="${prepare.src.dir}"
94		destdir="${build.classes.dir}"
95		debug="${build.debug}"
#	Line 85 | Line 98
98		source="${build.sourcelevel}"
99		fork="true">
100
101	<	<bootclasspath refid="javac.bootclasspath"/>
102	<	<compilerarg line="${build.javac.args}"/>
101	>	<compilerarg    line="${gjc.args}"/>
102	>	<bootclasspath refid="compile.bootclasspath"/>
103
104		</javac>
105
#	Line 177 | Line 190
190		source="${build.sourcelevel}"
191		fork="true">
192
193	<	<bootclasspath refid="javac.bootclasspath"/>
194	<	<compilerarg line="${build.javac.args} -s"/>
193	>	<compilerarg    line="${gjc.args} -s"/>
194	>	<bootclasspath refid="compile.bootclasspath"/>
195
196		</javac>
197
#	Line 189 | Line 202
202		depends="init, dist-clean, dist-jar, dist-docs"
203		description="Puts all distributable products in single hierarchy"/>
204
205	+	<target name="release"
206	+	depends="dist"
207	+	description="Puts entire CVS tree, plus distribution productions, in a jar">
208	+
209	+	<delete dir="${build.dir}"/>
210	+
211	+	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
212	+
213	+	<jar basedir="${basedir}" destfile="${release.jar}">
214	+	<exclude name="${release.jar}"/>
215	+	<exclude name="user.properties"/>
216	+	<exclude name="etc/notes/**"/>
217	+	<exclude name="lib/gjc/2.1/**"/>
218	+	<exclude name="**/SyntaxTest.java"/>
219	+	</jar>
220	+
221	+	</target>
222
223		<target name="clean"
224		description="Removes all build products">
#	Line 272 | Line 302
302		source="${build.sourcelevel}"
303		fork="true">
304
305	<	<bootclasspath refid="javac.bootclasspath"/>
306	<	<compilerarg line="${build.javac.args}"/>
305	>	<compilerarg    line="${gjc.args}"/>
306	>	<bootclasspath refid="compile.bootclasspath"/>
307
308		</javac>
309
#	Line 287 | Line 317
317
318		<jar destfile="${product.jar}" duplicate="add">
319		<fileset dir="${build.classes.dir}">
320	<	<patternset refid="emulation.excludes"/>
320	>	<patternset refid="atomic.exclusion"/>
321	>	<patternset refid="unsafe.exclusion"/>
322		</fileset>
323		<fileset dir="${build.emulation.dir}"/>
324		</jar>
#	Line 327 | Line 358
358		</fileset>
359		</copy>
360
361	+	<!-- Not needed now, used for doccheck filtering:
362	+	<property name="generic.declarations"
363	+	value="public interface E {} public interface T {} public interface K {} public interface V {}"
364	+	/>
365	+	-->
366	+
367		<copy todir="${build.filter.src.dir}">
368		<fileset dir="${src.dir}">
369		<exclude name="**/*.html"/>
370	<	<patternset refid="emulation.excludes"/>
370	>	<patternset refid="unsafe.exclusion"/>
371		</fileset>
372		<filterchain>
373	+
374	+	<!--
375	+	# This filter gets rid of angle-bracketed type parameters
376	+	# so that javadoc can run on the result. The following
377	+	# heuristic seems to work:
378	+	#
379	+	# For all lines not starting with space(s)-asterisk-space(s),
380	+	#   replace <something> with a space, where there may be more
381	+	#   than one right angle bracket at the end, and "something"
382	+	#   must not contain parens or pipes. (This may need some
383	+	#   tweaking.)
384	+	-->
385	+
386		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
387		classpath="${build.ant.dir}">
338	–	<!--
339	–	# These arguments are to get rid of angle-bracketed type
340	–	# parameters so that javadoc can run on the result. The
341	–	# following heuristic that seems to work:
342	–	#
343	–	# For all lines not starting with space(s)-asterisk-space(s),
344	–	#   replace <something> with a space, where there may be more
345	–	#   than one right angle bracket at the end, and "something"
346	–	#   must not contain parens or pipes. (This may need some
347	–	#   tweaking.)
348	–	-->
388		<param name="notmatching" value="^\s+\*\s.*$"/>
389	<	<param name="pattern" value="&lt;[^|>()]+?>+"/>
389	>	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
390		<param name="replacement" value=" "/>
391		</filterreader>
392	+
393	+
394	+	<!--
395	+	# This filter uncomments lines beginning with "//@" so that
396	+	# javadoc can see imports that are needed to resolve links
397	+	# but that shouldn't be in the compiled code.
398	+	-->
399	+
400		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
401		classpath="${build.ant.dir}">
402	<	<!--
403	<	# These arguments are to uncomment lines beginning with
357	<	# "//@" so that javadoc can see imports that are needed
358	<	# to resolve links but that shouldn't be in the compiled
359	<	# code.
360	<	-->
361	<	<param name="matching" value="^//@.*$"/>
362	<	<param name="pattern" value="^//@"/>
402	>	<param name="matching"    value="^//@.*$"/>
403	>	<param name="pattern"     value="^//@"/>
404		<param name="replacement" value=""/>
405		</filterreader>
406	+
407	+
408	+	<!--
409	+	# The next 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.
414	+	#
415	+	# Currently commented out because doccheck doesn't work. :-(
416	+	-->
417	+
418	+	<!--
419	+	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
420	+	classpath="${build.ant.dir}">
421	+	<param name="matching"    value="^\s*assert[\s ].*$"/>
422	+	<param name="pattern"     value="assert"/>
423	+	<param name="replacement" value="//assert"/>
424	+	</filterreader>
425	+
426	+	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
427	+	classpath="${build.ant.dir}">
428	+	<param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
429	+	<param name="pattern"     value="$"/>
430	+	<param name="replacement" value=" ${generic.declarations}"/>
431	+	</filterreader>
432	+	-->
433	+
434		</filterchain>
435		</copy>
436
#	Line 373 | Line 442
442
443		<mkdir dir="${build.testcases.dir}"/>
444
445	+	<!--
446	+	<echo>javac ${gjc.args}</echo>
447	+	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
448	+	<echo>classpath="${test.classpath}"</echo>
449	+	-->
450	+
451		<javac srcdir="${test.src.dir}"
452		destdir="${build.testcases.dir}"
453		debug="${build.debug}"
#	Line 381 | Line 456
456		source="${build.sourcelevel}"
457		fork="true">
458
459	<	<classpath refid="test.classpath"/>
460	<	<bootclasspath refid="javac.bootclasspath"/>
461	<	<compilerarg line="${build.javac.args}"/>
459	>	<compilerarg    line="${gjc.args}"/>
460	>	<bootclasspath refid="test.compile.bootclasspath"/>
461	>	<classpath     refid="test.classpath"/>
462
463		</javac>
464
#	Line 405 | Line 480
480		dir="${build.reports.dir}"
481		fork="true">
482
483	<	<jvmarg value="${test.bootclasspath.arg}"/>
483	>	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
484
485		<formatter type="xml"/>
486
#	Line 449 | Line 524
524		<target name="configure-compiler">
525
526		<property name="gjc.version"
527	<	value="1.3"/>
527	>	value="2.0"/>
528
529	<	<condition property="build.novariance" value="-novariance">
529	>	<condition property="novariance.arg" value="-novariance">
530		<and>
531		<equals arg1="${gjc.version}" arg2="2.0"/>
532		<or>
#	Line 461 | Line 536
536		</and>
537		</condition>
538
539	<	<property name="build.novariance"
539	>	<property name="novariance.arg"
540		value=""/>
541
542		<property name="gjc.dir"
#	Line 471 | Line 546
546		location="${gjc.dir}/${gjc.version}/javac.jar"/>
547
548		<property name="collect.jar"
549	<	location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
549	>	location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
550
551
552	<	<condition property="build.warnunchecked" value="-warnunchecked">
552	>	<condition property="warnunchecked.arg" value="-warnunchecked">
553		<istrue value="${gjc.warnunchecked}"/>
554		</condition>
555
556	<	<property name="build.warnunchecked" value=""/>
556	>	<property name="warnunchecked.arg" value=""/>
557	>
558	>	<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
559	>	<istrue value="${build.nothreads}"/>
560	>	</condition>
561
562
563		<!--
564		! Bootclasspath munging for source compilation.
565		-->
566
567	<	<path id="javac.bootclasspath.prefix">
489	<	<!-- <pathelement location="${src.dir}"/> -->
567	>	<path id="pre.bootclasspath">
568		<pathelement location="${javac.jar}"/>
569		</path>
570
571	<	<path id="javac.bootclasspath">
572	<	<!-- <pathelement location="${src.dir}"/> -->
571	>	<path id="compile.bootclasspath">
572	>	<pathelement location="${build.classes.dir}"/>
573		<pathelement location="${collect.jar}"/>
574		<pathelement location="${rt.jar}"/>
575		</path>
576
577	<	<!-- Flatten bootclasspath prefix into a platform-appropriate string -->
578	<	<property name="javac.bootclasspath.prefix"
579	<	refid="javac.bootclasspath.prefix"/>
502	<
503	<	<!-- Turn the flattened bootclasspath prefix into a javac argument -->
504	<	<property name="build.bootclasspath.arg"
505	<	value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
506	<
507	<	<!-- Flatten bootclasspath for trace message -->
508	<	<property name="javac.bootclasspath"
509	<	refid="javac.bootclasspath"/>
577	>	<!-- Flatten paths into platform-appropriate strings -->
578	>	<property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
579	>	<property name="compile.bootclasspath" refid="compile.bootclasspath"/>
580
511	–	<!-- Common options in javac invocations -->
512	–	<property name="build.javac.args"
513	–	value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
581
582	<	<echo>javac ${build.javac.args}</echo>
583	<	<echo>bootclasspath=${javac.bootclasspath}</echo>
582	>	<!-- Common options in javac invocations -->
583	>	<property name="gjc.args"
584	>	value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
585	>	/>
586
587		</target>
588
589
521	–	<target name="configure-src">
522	–
523	–	<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
524	–	<istrue value="${build.nothreads}"/>
525	–	</condition>
526	–
527	–	</target>
528	–
590		<target name="prepare-src"
591	<	depends="configure-src"
591	>	depends="configure-compiler"
592		if="prepare.src.dir">
593
594		<mkdir dir="${prepare.src.dir}"/>
#	Line 557 | Line 618
618		</target>
619
620
621	<	<target name="configure-tests">
621	>	<target name="configure-tests"
622	>	depends="configure-compiler">
623
624		<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
625		<available property="junit.available"
#	Line 578 | Line 640
640		<pathelement location="${junit.jar}"/>
641		</path>
642
643	<	<!-- Flatten test classpath into a platform-appropriate string -->
644	<	<property name="test.classpath" refid="test.classpath"/>
643	>	<path id="test.compile.bootclasspath">
644	>	<pathelement location="${javac.jar}"/>
645	>	<pathelement location="${collect.jar}"/>
646	>	<pathelement location="${rt.jar}"/>
647	>	</path>
648
649	<	<!-- Turn the flattened test classpath into a javac argument -->
650	<	<property name="test.bootclasspath.arg"
651	<	value='-Xbootclasspath/p:${test.classpath}'/>
649	>	<path id="test.run.bootclasspath">
650	>	<pathelement location="${javac.jar}"/>
651	>	<path refid="test.classpath"/>
652	>	</path>
653	>
654	>	<!-- Flatten test classpaths into platform-appropriate strings -->
655	>	<property name="test.classpath"             refid="test.classpath"/>
656	>	<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
657	>	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
658
659		</target>
660
#	Line 614 | Line 685
685		</target>
686
687
688	+	<target name="ng" depends="test">
689	+	<java classname="SuperfluousAbstract" fork="true">
690	+
691	+	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
692	+
693	+	</java>
694	+	</target>
695	+
696	+
697		</project>

Diff Legend

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