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.53 by dl, Tue Aug 26 19:59:14 2003 UTC

#	Line 35 | Line 35
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"/>
40		<property name="build.reports.dir"    location="${build.dir}/reports"/>
41		<property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
42		<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
43	+	<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
44
45		<!-- Source locations -->
46		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 56 | Line 58
58		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
59		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
60		<property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
61	+	<property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
62
63
64	<
65	<	<!-- Files excluded from emulation and dist-docs -->
63	<	<patternset id="emulation.excludes">
64	>	<!-- Files excluded from dist-docs and emulation jar -->
65	>	<patternset id="unsafe.exclusion">
66		<exclude name="java/util/Random.*"/>
67		<exclude name="sun/misc/Unsafe.*"/>
68		</patternset>
69
70	+	<!-- Files excludes from emulation jar -->
71	+	<patternset id="atomic.exclusion">
72	+	<exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
73	+	<exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
74	+	<exclude name="java/util/concurrent/atomic/AtomicLong*"/>
75	+	<exclude name="java/util/concurrent/atomic/AtomicReference*"/>
76	+	<exclude name="java/util/concurrent/locks/LockSupport*"/>
77	+	<exclude name="java/util/concurrent/locks/ReentrantLock*"/>
78	+	</patternset>
79	+
80
81
82		<!-- Main targets -->
#	Line 77 | Line 89
89
90		<mkdir dir="${build.classes.dir}"/>
91
92	+	<!--
93	+	<echo>javac ${gjc.args}</echo>
94	+	<echo>bootclasspath=${compile.bootclasspath}</echo>
95	+	-->
96	+
97		<javac srcdir="${prepare.src.dir}"
98		destdir="${build.classes.dir}"
99		debug="${build.debug}"
#	Line 85 | Line 102
102		source="${build.sourcelevel}"
103		fork="true">
104
105	<	<bootclasspath refid="javac.bootclasspath"/>
106	<	<compilerarg line="${build.javac.args}"/>
105	>	<!--
106	>	<compilerarg    line="${gjc.args}"/>
107	>	<bootclasspath refid="compile.bootclasspath"/>
108	>	-->
109
110		</javac>
111
#	Line 119 | Line 138
138
139
140		<target name="doccheck"
141	<	depends="filter-src"
142	<	description="Reports on javadoc style errors (not working yet)">
141	>	depends="filter-doccheck"
142	>	description="Reports on javadoc style errors">
143
144		<delete dir="${build.doccheck.dir}"/>
145		<mkdir dir="${build.doccheck.dir}"/>
#	Line 128 | Line 147
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.src.dir}"/>
150	>	<packageset dir="${build.filter.doccheck.dir}"/>
151		</javadoc>
152
153	+	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
154	+
155		</target>
156
157
#	Line 158 | Line 179
179		</target>
180
181
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">
190	+
191	+	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
192	+
193	+	<classpath>
194	+	<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"/>
212	+
213	+	<!--
214	+	<arg value="-help"/>
215	+	-->
216	+
217	+	</java>
218	+
219	+	</target>
220	+
221	+
222		<target name="strip"
223		depends="init, configure-compiler"
224		description="Strip generics from java source (not working yet)">
#	Line 177 | Line 238
238		source="${build.sourcelevel}"
239		fork="true">
240
241	<	<bootclasspath refid="javac.bootclasspath"/>
242	<	<compilerarg line="${build.javac.args} -s"/>
241	>	<!--
242	>	<compilerarg    line="${gjc.args} -s"/>
243	>	<bootclasspath refid="compile.bootclasspath"/>
244	>	-->
245
246		</javac>
247
#	Line 189 | Line 252
252		depends="init, dist-clean, dist-jar, dist-docs"
253		description="Puts all distributable products in single hierarchy"/>
254
255	+	<target name="release"
256	+	depends="dist"
257	+	description="Puts entire CVS tree, plus distribution productions, in a jar">
258	+
259	+	<!--
260	+	#keep build dir? - dl
261	+	<delete dir="${build.dir}"/>
262	+	-->
263	+	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
264	+
265	+	<jar basedir="${basedir}" destfile="${release.jar}">
266	+	<exclude name="${release.jar}"/>
267	+	<exclude name="user.properties"/>
268	+	<exclude name="etc/notes/**"/>
269	+	<exclude name="lib/gjc/2.1/**"/>
270	+	<exclude name="**/SyntaxTest.java"/>
271	+	</jar>
272	+
273	+	</target>
274
275		<target name="clean"
276		description="Removes all build products">
#	Line 272 | Line 354
354		source="${build.sourcelevel}"
355		fork="true">
356
357	<	<bootclasspath refid="javac.bootclasspath"/>
358	<	<compilerarg line="${build.javac.args}"/>
357	>	<compilerarg    line="${gjc.args}"/>
358	>	<bootclasspath refid="compile.bootclasspath"/>
359
360		</javac>
361
#	Line 287 | Line 369
369
370		<jar destfile="${product.jar}" duplicate="add">
371		<fileset dir="${build.classes.dir}">
372	<	<patternset refid="emulation.excludes"/>
372	>	<patternset refid="atomic.exclusion"/>
373	>	<patternset refid="unsafe.exclusion"/>
374		</fileset>
375		<fileset dir="${build.emulation.dir}"/>
376		</jar>
#	Line 327 | Line 410
410		</fileset>
411		</copy>
412
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	–
413		<copy todir="${build.filter.src.dir}">
414		<fileset dir="${src.dir}">
415		<exclude name="**/*.html"/>
416	<	<patternset refid="emulation.excludes"/>
416	>	<patternset refid="unsafe.exclusion"/>
417		</fileset>
418		<filterchain>
419
#	Line 372 | Line 449
449		<param name="pattern"     value="^//@"/>
450		<param name="replacement" value=""/>
451		</filterreader>
452	+	</filterchain>
453	+	</copy>
454	+
455	+	</target>
456	+
457
458
459	+
460	+	<target name="filter-doccheck"
461	+	depends="filter-src">
462	+
463	+	<mkdir dir="${build.filter.doccheck.dir}"/>
464	+
465	+	<copy todir="${build.filter.doccheck.dir}">
466	+	<fileset dir="${build.filter.src.dir}">
467	+	<include name="**/*.html"/>
468	+	</fileset>
469	+	</copy>
470	+
471	+	<property name="generic.declarations"
472	+	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 {}"
473	+	/>
474	+
475	+	<copy todir="${build.filter.doccheck.dir}">
476	+	<fileset dir="${build.filter.src.dir}">
477	+	<exclude name="**/*.html"/>
478	+	</fileset>
479	+	<filterchain>
480		<!--
481	<	# The next two filters try to make the source look like
481	>	# These two filters try to make the source look like
482		# something that doccheck can process. The first removes
483		# -source 1.4 assertions and the second adds in a bunch
484		# of single letter public nested marker interfaces so that
485		# the generic type parameters are recognized.
383	–	#
384	–	# Currently commented out because doccheck doesn't work. :-(
486		-->
487
387	–	<!--
488		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
489		classpath="${build.ant.dir}">
490		<param name="matching"    value="^\s*assert[\s ].*$"/>
#	Line 394 | Line 494
494
495		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
496		classpath="${build.ant.dir}">
497	<	<param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
497	>	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
498		<param name="pattern"     value="$"/>
499		<param name="replacement" value=" ${generic.declarations}"/>
500		</filterreader>
401	–	-->
501
502		</filterchain>
503		</copy>
#	Line 411 | Line 510
510
511		<mkdir dir="${build.testcases.dir}"/>
512
513	+	<!--
514	+	<echo>javac ${gjc.args}</echo>
515	+	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
516	+	<echo>classpath="${test.classpath}"</echo>
517	+	-->
518	+
519		<javac srcdir="${test.src.dir}"
520		destdir="${build.testcases.dir}"
521		debug="${build.debug}"
#	Line 419 | Line 524
524		source="${build.sourcelevel}"
525		fork="true">
526
527	<	<classpath refid="test.classpath"/>
528	<	<bootclasspath refid="javac.bootclasspath"/>
529	<	<compilerarg line="${build.javac.args}"/>
527	>	<!--
528	>	<compilerarg    line="${gjc.args}"/>
529	>	-->
530	>	<bootclasspath refid="test.compile.bootclasspath"/>
531	>	<classpath     refid="test.classpath"/>
532
533		</javac>
534
#	Line 443 | Line 550
550		dir="${build.reports.dir}"
551		fork="true">
552
553	<	<jvmarg value="${test.bootclasspath.arg}"/>
553	>	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
554
555		<formatter type="xml"/>
556
#	Line 485 | Line 592
592
593
594		<target name="configure-compiler">
595	<
595	>	<!--
596		<property name="gjc.version"
597	<	value="2.0"/>
597	>	value="2.2"/>
598
599	<	<condition property="build.novariance" value="-novariance">
599	>	<condition property="novariance.arg" value="-novariance">
600		<and>
601		<equals arg1="${gjc.version}" arg2="2.0"/>
602		<or>
#	Line 499 | Line 606
606		</and>
607		</condition>
608
609	<	<property name="build.novariance"
609	>	<property name="novariance.arg"
610		value=""/>
611
612		<property name="gjc.dir"
#	Line 509 | Line 616
616		location="${gjc.dir}/${gjc.version}/javac.jar"/>
617
618		<property name="collect.jar"
619	<	location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
619	>	location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
620
621	<
622	<	<condition property="build.warnunchecked" value="-warnunchecked">
621	>	-->
622	>	<condition property="warnunchecked.arg" value="-warnunchecked">
623		<istrue value="${gjc.warnunchecked}"/>
624		</condition>
625
626	<	<property name="build.warnunchecked" value=""/>
626	>	<property name="warnunchecked.arg" value=""/>
627
628		<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
629		<istrue value="${build.nothreads}"/>
#	Line 527 | Line 634
634		! Bootclasspath munging for source compilation.
635		-->
636
637	<	<path id="javac.bootclasspath.prefix">
531	<	<!-- <pathelement location="${src.dir}"/> -->
637	>	<path id="pre.bootclasspath">
638		<pathelement location="${javac.jar}"/>
639		</path>
640
641	<	<path id="javac.bootclasspath">
642	<	<!-- <pathelement location="${src.dir}"/> -->
641	>	<path id="compile.bootclasspath">
642	>	<pathelement location="${build.classes.dir}"/>
643		<pathelement location="${collect.jar}"/>
644		<pathelement location="${rt.jar}"/>
645		</path>
646
647	<	<!-- Flatten bootclasspath prefix into a platform-appropriate string -->
648	<	<property name="javac.bootclasspath.prefix"
649	<	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"/>
647	>	<!-- Flatten paths into platform-appropriate strings -->
648	>	<property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
649	>	<property name="compile.bootclasspath" refid="compile.bootclasspath"/>
650
553	–	<!-- Common options in javac invocations -->
554	–	<property name="build.javac.args"
555	–	value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
651
652	<	<echo>javac ${build.javac.args}</echo>
653	<	<echo>bootclasspath=${javac.bootclasspath}</echo>
652	>	<!-- Common options in javac invocations -->
653	>	<!--
654	>	<property name="gjc.args"
655	>	value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
656	>	/>
657	>	-->
658
659		</target>
660
#	Line 591 | Line 690
690		</target>
691
692
693	<	<target name="configure-tests">
693	>	<target name="configure-tests"
694	>	depends="configure-compiler">
695
696		<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
697		<available property="junit.available"
#	Line 612 | Line 712
712		<pathelement location="${junit.jar}"/>
713		</path>
714
715	<	<!-- Flatten test classpath into a platform-appropriate string -->
716	<	<property name="test.classpath" refid="test.classpath"/>
715	>	<path id="test.compile.bootclasspath">
716	>	<pathelement location="${javac.jar}"/>
717	>	<pathelement location="${collect.jar}"/>
718	>	<pathelement location="${rt.jar}"/>
719	>	</path>
720	>
721	>	<path id="test.run.bootclasspath">
722	>	<pathelement location="${javac.jar}"/>
723	>	<path refid="test.classpath"/>
724	>	</path>
725
726	<	<!-- Turn the flattened test classpath into a javac argument -->
727	<	<property name="test.bootclasspath.arg"
728	<	value='-Xbootclasspath/p:${test.classpath}'/>
726	>	<!-- Flatten test classpaths into platform-appropriate strings -->
727	>	<property name="test.classpath"             refid="test.classpath"/>
728	>	<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
729	>	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
730
731		</target>
732
#	Line 648 | Line 757
757		</target>
758
759
760	+	<target name="ng" depends="test">
761	+	<java classname="SuperfluousAbstract" fork="true">
762	+
763	+	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
764	+
765	+	</java>
766	+	</target>
767	+
768	+
769		</project>

Diff Legend

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