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.52 by tim, Tue Aug 19 15:10:45 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	>	<compilerarg    line="${gjc.args}"/>
106	>	<bootclasspath refid="compile.bootclasspath"/>
107
108		</javac>
109
#	Line 119 | Line 136
136
137
138		<target name="doccheck"
139	<	depends="filter-src"
140	<	description="Reports on javadoc style errors (not working yet)">
139	>	depends="filter-doccheck"
140	>	description="Reports on javadoc style errors">
141
142		<delete dir="${build.doccheck.dir}"/>
143		<mkdir dir="${build.doccheck.dir}"/>
#	Line 128 | Line 145
145		<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
146		docletpath="${lib.dir}/doccheck.jar"
147		destdir="${build.doccheck.dir}">
148	<	<packageset dir="${build.filter.src.dir}"/>
148	>	<packageset dir="${build.filter.doccheck.dir}"/>
149		</javadoc>
150
151	+	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
152	+
153		</target>
154
155
#	Line 158 | Line 177
177		</target>
178
179
180	+	<target name="sinjdocs"
181	+	depends="configure-tests"
182	+	description="Builds javadocs with custom tags to build folder">
183	+
184	+	<delete dir="${build.sinjdocs.dir}"/>
185	+	<mkdir dir="${build.sinjdocs.dir}"/>
186	+
187	+	<java classname="net.cscott.sinjdoc.Main" fork="true">
188	+
189	+	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
190	+
191	+	<classpath>
192	+	<pathelement location="${sinjdoc.jar}"/>
193	+	<pathelement location="${lib.dir}/jutil.jar"/>
194	+	<pathelement location="${lib.dir}/cup.jar"/>
195	+	<path refid="test.classpath"/>
196	+	</classpath>
197	+
198	+
199	+	<arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
200	+	<arg value="-sourcepath"/> <arg value="${src.dir}"/>
201	+	<arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
202	+	<arg value="-source"/>     <arg value="${build.sourcelevel}"/>
203	+	<!-- <arg value="-verbose"/> -->
204	+	<!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
205	+	<arg value="java.lang"/>
206	+	<arg value="java.util"/>
207	+	<arg value="java.util.concurrent"/>
208	+	<arg value="java.util.concurrent.atomic"/>
209	+	<arg value="java.util.concurrent.locks"/>
210	+
211	+	<!--
212	+	<arg value="-help"/>
213	+	-->
214	+
215	+	</java>
216	+
217	+	</target>
218	+
219	+
220		<target name="strip"
221		depends="init, configure-compiler"
222		description="Strip generics from java source (not working yet)">
#	Line 177 | Line 236
236		source="${build.sourcelevel}"
237		fork="true">
238
239	<	<bootclasspath refid="javac.bootclasspath"/>
240	<	<compilerarg line="${build.javac.args} -s"/>
239	>	<compilerarg    line="${gjc.args} -s"/>
240	>	<bootclasspath refid="compile.bootclasspath"/>
241
242		</javac>
243
#	Line 189 | Line 248
248		depends="init, dist-clean, dist-jar, dist-docs"
249		description="Puts all distributable products in single hierarchy"/>
250
251	+	<target name="release"
252	+	depends="dist"
253	+	description="Puts entire CVS tree, plus distribution productions, in a jar">
254	+
255	+	<!--
256	+	#keep build dir? - dl
257	+	<delete dir="${build.dir}"/>
258	+	-->
259	+	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
260	+
261	+	<jar basedir="${basedir}" destfile="${release.jar}">
262	+	<exclude name="${release.jar}"/>
263	+	<exclude name="user.properties"/>
264	+	<exclude name="etc/notes/**"/>
265	+	<exclude name="lib/gjc/2.1/**"/>
266	+	<exclude name="**/SyntaxTest.java"/>
267	+	</jar>
268	+
269	+	</target>
270
271		<target name="clean"
272		description="Removes all build products">
#	Line 272 | Line 350
350		source="${build.sourcelevel}"
351		fork="true">
352
353	<	<bootclasspath refid="javac.bootclasspath"/>
354	<	<compilerarg line="${build.javac.args}"/>
353	>	<compilerarg    line="${gjc.args}"/>
354	>	<bootclasspath refid="compile.bootclasspath"/>
355
356		</javac>
357
#	Line 287 | Line 365
365
366		<jar destfile="${product.jar}" duplicate="add">
367		<fileset dir="${build.classes.dir}">
368	<	<patternset refid="emulation.excludes"/>
368	>	<patternset refid="atomic.exclusion"/>
369	>	<patternset refid="unsafe.exclusion"/>
370		</fileset>
371		<fileset dir="${build.emulation.dir}"/>
372		</jar>
#	Line 327 | Line 406
406		</fileset>
407		</copy>
408
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	–
409		<copy todir="${build.filter.src.dir}">
410		<fileset dir="${src.dir}">
411		<exclude name="**/*.html"/>
412	<	<patternset refid="emulation.excludes"/>
412	>	<patternset refid="unsafe.exclusion"/>
413		</fileset>
414		<filterchain>
415
#	Line 372 | Line 445
445		<param name="pattern"     value="^//@"/>
446		<param name="replacement" value=""/>
447		</filterreader>
448	+	</filterchain>
449	+	</copy>
450	+
451	+	</target>
452	+
453
454
455	+
456	+	<target name="filter-doccheck"
457	+	depends="filter-src">
458	+
459	+	<mkdir dir="${build.filter.doccheck.dir}"/>
460	+
461	+	<copy todir="${build.filter.doccheck.dir}">
462	+	<fileset dir="${build.filter.src.dir}">
463	+	<include name="**/*.html"/>
464	+	</fileset>
465	+	</copy>
466	+
467	+	<property name="generic.declarations"
468	+	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 {}"
469	+	/>
470	+
471	+	<copy todir="${build.filter.doccheck.dir}">
472	+	<fileset dir="${build.filter.src.dir}">
473	+	<exclude name="**/*.html"/>
474	+	</fileset>
475	+	<filterchain>
476		<!--
477	<	# The next two filters try to make the source look like
477	>	# These two filters try to make the source look like
478		# something that doccheck can process. The first removes
479		# -source 1.4 assertions and the second adds in a bunch
480		# of single letter public nested marker interfaces so that
481		# the generic type parameters are recognized.
383	–	#
384	–	# Currently commented out because doccheck doesn't work. :-(
482		-->
483
387	–	<!--
484		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
485		classpath="${build.ant.dir}">
486		<param name="matching"    value="^\s*assert[\s ].*$"/>
#	Line 394 | Line 490
490
491		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
492		classpath="${build.ant.dir}">
493	<	<param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
493	>	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
494		<param name="pattern"     value="$"/>
495		<param name="replacement" value=" ${generic.declarations}"/>
496		</filterreader>
401	–	-->
497
498		</filterchain>
499		</copy>
#	Line 411 | Line 506
506
507		<mkdir dir="${build.testcases.dir}"/>
508
509	+	<!--
510	+	<echo>javac ${gjc.args}</echo>
511	+	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
512	+	<echo>classpath="${test.classpath}"</echo>
513	+	-->
514	+
515		<javac srcdir="${test.src.dir}"
516		destdir="${build.testcases.dir}"
517		debug="${build.debug}"
#	Line 419 | Line 520
520		source="${build.sourcelevel}"
521		fork="true">
522
523	<	<classpath refid="test.classpath"/>
524	<	<bootclasspath refid="javac.bootclasspath"/>
525	<	<compilerarg line="${build.javac.args}"/>
523	>	<compilerarg    line="${gjc.args}"/>
524	>	<bootclasspath refid="test.compile.bootclasspath"/>
525	>	<classpath     refid="test.classpath"/>
526
527		</javac>
528
#	Line 443 | Line 544
544		dir="${build.reports.dir}"
545		fork="true">
546
547	<	<jvmarg value="${test.bootclasspath.arg}"/>
547	>	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
548
549		<formatter type="xml"/>
550
#	Line 487 | Line 588
588		<target name="configure-compiler">
589
590		<property name="gjc.version"
591	<	value="2.0"/>
591	>	value="2.2"/>
592
593	<	<condition property="build.novariance" value="-novariance">
593	>	<condition property="novariance.arg" value="-novariance">
594		<and>
595		<equals arg1="${gjc.version}" arg2="2.0"/>
596		<or>
#	Line 499 | Line 600
600		</and>
601		</condition>
602
603	<	<property name="build.novariance"
603	>	<property name="novariance.arg"
604		value=""/>
605
606		<property name="gjc.dir"
#	Line 509 | Line 610
610		location="${gjc.dir}/${gjc.version}/javac.jar"/>
611
612		<property name="collect.jar"
613	<	location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
613	>	location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
614
615
616	<	<condition property="build.warnunchecked" value="-warnunchecked">
616	>	<condition property="warnunchecked.arg" value="-warnunchecked">
617		<istrue value="${gjc.warnunchecked}"/>
618		</condition>
619
620	<	<property name="build.warnunchecked" value=""/>
620	>	<property name="warnunchecked.arg" value=""/>
621
622		<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
623		<istrue value="${build.nothreads}"/>
#	Line 527 | Line 628
628		! Bootclasspath munging for source compilation.
629		-->
630
631	<	<path id="javac.bootclasspath.prefix">
531	<	<!-- <pathelement location="${src.dir}"/> -->
631	>	<path id="pre.bootclasspath">
632		<pathelement location="${javac.jar}"/>
633		</path>
634
635	<	<path id="javac.bootclasspath">
636	<	<!-- <pathelement location="${src.dir}"/> -->
635	>	<path id="compile.bootclasspath">
636	>	<pathelement location="${build.classes.dir}"/>
637		<pathelement location="${collect.jar}"/>
638		<pathelement location="${rt.jar}"/>
639		</path>
640
641	<	<!-- Flatten bootclasspath prefix into a platform-appropriate string -->
642	<	<property name="javac.bootclasspath.prefix"
643	<	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"/>
641	>	<!-- Flatten paths into platform-appropriate strings -->
642	>	<property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
643	>	<property name="compile.bootclasspath" refid="compile.bootclasspath"/>
644
553	–	<!-- Common options in javac invocations -->
554	–	<property name="build.javac.args"
555	–	value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
645
646	<	<echo>javac ${build.javac.args}</echo>
647	<	<echo>bootclasspath=${javac.bootclasspath}</echo>
646	>	<!-- Common options in javac invocations -->
647	>	<property name="gjc.args"
648	>	value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
649	>	/>
650
651		</target>
652
#	Line 591 | Line 682
682		</target>
683
684
685	<	<target name="configure-tests">
685	>	<target name="configure-tests"
686	>	depends="configure-compiler">
687
688		<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
689		<available property="junit.available"
#	Line 612 | Line 704
704		<pathelement location="${junit.jar}"/>
705		</path>
706
707	<	<!-- Flatten test classpath into a platform-appropriate string -->
708	<	<property name="test.classpath" refid="test.classpath"/>
707	>	<path id="test.compile.bootclasspath">
708	>	<pathelement location="${javac.jar}"/>
709	>	<pathelement location="${collect.jar}"/>
710	>	<pathelement location="${rt.jar}"/>
711	>	</path>
712
713	<	<!-- Turn the flattened test classpath into a javac argument -->
714	<	<property name="test.bootclasspath.arg"
715	<	value='-Xbootclasspath/p:${test.classpath}'/>
713	>	<path id="test.run.bootclasspath">
714	>	<pathelement location="${javac.jar}"/>
715	>	<path refid="test.classpath"/>
716	>	</path>
717	>
718	>	<!-- Flatten test classpaths into platform-appropriate strings -->
719	>	<property name="test.classpath"             refid="test.classpath"/>
720	>	<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
721	>	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
722
723		</target>
724
#	Line 648 | Line 749
749		</target>
750
751
752	+	<target name="ng" depends="test">
753	+	<java classname="SuperfluousAbstract" fork="true">
754	+
755	+	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
756	+
757	+	</java>
758	+	</target>
759	+
760	+
761		</project>

Diff Legend

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