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.49 by tim, Sat Aug 2 02:38:24 2003 UTC vs.
Revision 1.57 by tim, Mon Sep 15 14:07:36 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"/>
#	Line 43 | Line 43
43
44		<!-- Source locations -->
45		<property name="src.dir"              location="${basedir}/src/main"/>
46	–	<property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
46		<property name="test.src.dir"         location="${basedir}/src/test"/>
47		<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
48		<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
#	Line 60 | Line 59
59		<property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
60
61
62	<	<!-- Files excluded from dist-docs and emulation jar -->
63	<	<patternset id="unsafe.exclusion">
62	>	<!-- Files excluded from dist-docs -->
63	>	<patternset id="docs.exclusion">
64		<exclude name="java/util/Random.*"/>
65		<exclude name="sun/misc/Unsafe.*"/>
66		</patternset>
67
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	–
68
69
70		<!-- Main targets -->
#	Line 87 | Line 78
78		<mkdir dir="${build.classes.dir}"/>
79
80		<!--
81	<	<echo>javac ${gjc.args}</echo>
91	<	<echo>bootclasspath=${compile.bootclasspath}</echo>
81	>	<echo>javac ${build.args}</echo>
82		-->
83
84		<javac srcdir="${prepare.src.dir}"
#	Line 99 | Line 89
89		source="${build.sourcelevel}"
90		fork="true">
91
92	<	<compilerarg    line="${gjc.args}"/>
103	<	<bootclasspath refid="compile.bootclasspath"/>
92	>	<compilerarg    line="${build.args}"/>
93
94		</javac>
95
#	Line 108 | Line 97
97
98
99		<target name="jar"
100	<	depends="configure-emulation, init-jar, native-jar, emulation-jar"
100	>	depends="init-jar, native-jar"
101		description="Builds library jar from compiled sources"/>
102
103
#	Line 178 | Line 167
167		depends="configure-tests"
168		description="Builds javadocs with custom tags to build folder">
169
170	<	<delete dir="${build.javadocs.dir}"/>
171	<	<mkdir dir="${build.javadocs.dir}"/>
170	>	<delete dir="${build.sinjdocs.dir}"/>
171	>	<mkdir dir="${build.sinjdocs.dir}"/>
172
173		<java classname="net.cscott.sinjdoc.Main" fork="true">
174
175	<	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
175	>	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
176
177		<classpath>
178		<pathelement location="${sinjdoc.jar}"/>
179	+	<pathelement location="${lib.dir}/jutil.jar"/>
180	+	<pathelement location="${lib.dir}/cup.jar"/>
181		<path refid="test.classpath"/>
182		</classpath>
183
184	<	<!-- <arg value="-link"/>       <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
185	<
186	<	<arg value="-d"/>          <arg value="${build.javadocs.dir}"/>
184	>	<!-- <arg value="-help"/> -->
185	>	<!-- <arg value="-verbose"/> -->
186	>	<!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
187	>
188	>	<arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
189		<arg value="-sourcepath"/> <arg value="${src.dir}"/>
190		<arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
191	<	<arg value="-source"/>     <arg value="1.5"/>
192	<	<arg value="-verbose"/>
191	>	<arg value="-source"/>     <arg value="${build.sourcelevel}"/>
192	>
193	>	<arg value="java.lang"/>
194		<arg value="java.util"/>
195	+	<arg value="java.util.concurrent"/>
196	+	<arg value="java.util.concurrent.atomic"/>
197	+	<arg value="java.util.concurrent.locks"/>
198
202	–	<!--
203	–	<arg value="-help"/>
204	–	-->
199
200		</java>
201
#	Line 227 | Line 221
221		source="${build.sourcelevel}"
222		fork="true">
223
224	<	<compilerarg    line="${gjc.args} -s"/>
231	<	<bootclasspath refid="compile.bootclasspath"/>
224	>	<compilerarg    line="${build.args} -s"/>
225
226		</javac>
227
#	Line 253 | Line 246
246		<exclude name="${release.jar}"/>
247		<exclude name="user.properties"/>
248		<exclude name="etc/notes/**"/>
256	–	<exclude name="lib/gjc/2.1/**"/>
249		<exclude name="**/SyntaxTest.java"/>
250		</jar>
251
#	Line 305 | Line 297
297		<!-- Version is kept in a separate file -->
298		<loadfile property="version" srcFile="version.properties"/>
299		<echo>Building JSR-166 version ${version}</echo>
300	+	<echo>java.home is ${java.home}</echo>
301
302		</target>
303
#	Line 317 | Line 310
310
311
312		<target name="native-jar"
313	<	depends="compile"
321	<	unless="build.emulation.true">
313	>	depends="compile">
314
315		<jar destfile="${product.jar}">
316		<fileset dir="${build.classes.dir}"/>
#	Line 327 | Line 319
319		</target>
320
321
330	–	<target name="compile-emulation"
331	–	depends="init, configure-compiler"
332	–	if="build.emulation.true">
333	–
334	–	<mkdir dir="${build.emulation.dir}"/>
335	–
336	–	<javac srcdir="${emulation.src.dir}"
337	–	destdir="${build.emulation.dir}"
338	–	debug="${build.debug}"
339	–	debuglevel="${build.debuglevel}"
340	–	deprecation="${build.deprecation}"
341	–	source="${build.sourcelevel}"
342	–	fork="true">
343	–
344	–	<compilerarg    line="${gjc.args}"/>
345	–	<bootclasspath refid="compile.bootclasspath"/>
346	–
347	–	</javac>
348	–
349	–	</target>
350	–
351	–
352	–	<target name="emulation-jar"
353	–	depends="compile-emulation"
354	–	if="build.emulation.true">
355	–
356	–
357	–	<jar destfile="${product.jar}" duplicate="add">
358	–	<fileset dir="${build.classes.dir}">
359	–	<patternset refid="atomic.exclusion"/>
360	–	<patternset refid="unsafe.exclusion"/>
361	–	</fileset>
362	–	<fileset dir="${build.emulation.dir}"/>
363	–	</jar>
364	–
365	–	</target>
366	–
367	–
322		<target name="dist-jar"
323		depends="clean, jar">
324
#	Line 400 | Line 354
354		<copy todir="${build.filter.src.dir}">
355		<fileset dir="${src.dir}">
356		<exclude name="**/*.html"/>
357	<	<patternset refid="unsafe.exclusion"/>
357	>	<patternset refid="docs.exclusion"/>
358		</fileset>
359		<filterchain>
360
#	Line 423 | Line 377
377		<param name="replacement" value=" "/>
378		</filterreader>
379
426	–
427	–	<!--
428	–	# This filter uncomments lines beginning with "//@" so that
429	–	# javadoc can see imports that are needed to resolve links
430	–	# but that shouldn't be in the compiled code.
431	–	-->
432	–
433	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
434	–	classpath="${build.ant.dir}">
435	–	<param name="matching"    value="^//@.*$"/>
436	–	<param name="pattern"     value="^//@"/>
437	–	<param name="replacement" value=""/>
438	–	</filterreader>
380		</filterchain>
381		</copy>
382
#	Line 498 | Line 439
439		<mkdir dir="${build.testcases.dir}"/>
440
441		<!--
442	<	<echo>javac ${gjc.args}</echo>
502	<	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
442	>	<echo>javac ${build.args}</echo>
443		<echo>classpath="${test.classpath}"</echo>
444		-->
445
#	Line 511 | Line 451
451		source="${build.sourcelevel}"
452		fork="true">
453
454	<	<compilerarg    line="${gjc.args}"/>
455	<	<bootclasspath refid="test.compile.bootclasspath"/>
456	<	<classpath     refid="test.classpath"/>
454	>	<compilerarg line="${build.args}"/>
455	>	<classpath refid="test.classpath"/>
456	>
457	>	<include name="java/**"/>
458	>	<include name="jsr166/**"/>
459
460		</javac>
461
#	Line 535 | Line 477
477		dir="${build.reports.dir}"
478		fork="true">
479
480	<	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
480	>	<jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
481
482		<formatter type="xml"/>
483
484		<batchtest todir="${build.reports.dir}">
485		<fileset dir="${test.src.dir}">
486	<	<include name="**/${testcase}Test.java"/>
486	>	<include name="java/**/${testcase}Test.java"/>
487	>	<include name="jsr166/**/${testcase}Test.java"/>
488		</fileset>
489		</batchtest>
490
#	Line 553 | Line 496
496		<target name="report-tests"
497		depends="run-tests">
498
499	<	<!-- Sets junit.report.format to frames if Xalan is present,
499	>	<!-- Sets junit.report.format to frames if redirection is present,
500		otherwise sets it to noframes. -->
501		<available property="junit.report.format"
502		value="frames"
#	Line 578 | Line 521
521
522		<target name="configure-compiler">
523
524	<	<property name="gjc.version"
582	<	value="2.2"/>
524	>	<property name="unchecked.option" value="-Xlint:unchecked"/>
525
526	<	<condition property="novariance.arg" value="-novariance">
527	<	<and>
586	<	<equals arg1="${gjc.version}" arg2="2.0"/>
587	<	<or>
588	<	<not><isset property="gjc.novariance"/></not>
589	<	<istrue value="${gjc.novariance}"/>
590	<	</or>
591	<	</and>
592	<	</condition>
593	<
594	<	<property name="novariance.arg"
595	<	value=""/>
596	<
597	<	<property name="gjc.dir"
598	<	value="${lib.dir}/gjc"/>
599	<
600	<	<property name="javac.jar"
601	<	location="${gjc.dir}/${gjc.version}/javac.jar"/>
602	<
603	<	<property name="collect.jar"
604	<	location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
605	<
606	<
607	<	<condition property="warnunchecked.arg" value="-warnunchecked">
608	<	<istrue value="${gjc.warnunchecked}"/>
526	>	<condition property="warnunchecked.arg" value="${unchecked.option}">
527	>	<istrue value="${build.warnunchecked}"/>
528		</condition>
529
530		<property name="warnunchecked.arg" value=""/>
531	<
531	>
532		<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
533		<istrue value="${build.nothreads}"/>
534		</condition>
535
536
618	–	<!--
619	–	! Bootclasspath munging for source compilation.
620	–	-->
621	–
622	–	<path id="pre.bootclasspath">
623	–	<pathelement location="${javac.jar}"/>
624	–	</path>
625	–
626	–	<path id="compile.bootclasspath">
627	–	<pathelement location="${build.classes.dir}"/>
628	–	<pathelement location="${collect.jar}"/>
629	–	<pathelement location="${rt.jar}"/>
630	–	</path>
631	–
632	–	<!-- Flatten paths into platform-appropriate strings -->
633	–	<property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
634	–	<property name="compile.bootclasspath" refid="compile.bootclasspath"/>
635	–
636	–
537		<!-- Common options in javac invocations -->
538	<	<property name="gjc.args"
639	<	value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
640	<	/>
538	>	<property name="build.args" value="${warnunchecked.arg}"/>
539
540		</target>
541
#	Line 656 | Line 554
554		</target>
555
556
659	–	<target name="configure-emulation">
660	–
661	–	<condition property="build.emulation.true">
662	–	<or>
663	–	<and>
664	–	<os family="windows"/>
665	–	<not>
666	–	<isset property="build.emulation"/>
667	–	</not>
668	–	</and>
669	–	<istrue value="${build.emulation}"/>
670	–	</or>
671	–	</condition>
672	–
673	–	</target>
674	–
675	–
557		<target name="configure-tests"
558		depends="configure-compiler">
559
#	Line 683 | Line 564
564		<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
565		unless="junit.available"/>
566
567	+	<!-- Xalan -->
568	+	<available property="xalan.available"
569	+	classname="org.apache.xalan.Version"/>
570	+
571	+	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
572	+	unless="xalan.available"/>
573	+
574
575		<!--
576		! Bootclasspath munging for testing, so JUnit can test our local
#	Line 691 | Line 579
579
580		<path id="test.classpath">
581		<pathelement location="${product.jar}"/>
694	–	<pathelement location="${build.testcases.dir}"/>
695	–	<pathelement location="${junit.jar}"/>
696	–	</path>
697	–
698	–	<path id="test.compile.bootclasspath">
699	–	<pathelement location="${javac.jar}"/>
700	–	<pathelement location="${collect.jar}"/>
582		<pathelement location="${rt.jar}"/>
583	+	<pathelement location="${junit.jar}"/>
584	+	<pathelement location="${build.testcases.dir}"/>
585		</path>
586
587	<	<path id="test.run.bootclasspath">
705	<	<pathelement location="${javac.jar}"/>
587	>	<path id="test.bootclasspath">
588		<path refid="test.classpath"/>
589		</path>
590
591		<!-- Flatten test classpaths into platform-appropriate strings -->
592	<	<property name="test.classpath"             refid="test.classpath"/>
593	<	<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
712	<	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
592	>	<property name="test.classpath"         refid="test.classpath"/>
593	>	<property name="test.bootclasspath"     refid="test.bootclasspath"/>
594
595		</target>
596
#	Line 717 | Line 598
598
599		<!-- Anthill targets -->
600
601	<	<target name="anthill-build"
601	>	<target name="anthill-build">
602	>
603	>	<!-- Override this in user.properties -->
604	>	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
605	>
606	>	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
607	>	<arg value="-Xmx256000000"/>
608	>	<!-- classpath of new JVM -->
609	>	<arg value="-classpath"/> <arg path="${java.class.path}"/>
610	>	<!-- location of Ant home directory -->
611	>	<arg value="-Dant.home=${ant.home}"/>
612	>	<!-- the Ant main class -->
613	>	<arg value="org.apache.tools.ant.Main"/>
614	>	<!-- The build file -->
615	>	<arg value="-buildfile"/>  <arg value="build.xml"/>
616	>	<!-- the target to build on the new Ant instance -->
617	>	<arg value="-DJAVA_HOME=${tiger.home}"/>
618	>	<arg value="do-anthill-build"/>
619	>	</exec>
620	>	</target>
621	>
622	>	<target name="do-anthill-build"
623		depends="jar, test, docs, dist-docs"/>
624
625		<target name="anthill-publish">
#	Line 743 | Line 645
645		<target name="ng" depends="test">
646		<java classname="SuperfluousAbstract" fork="true">
647
648	<	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
648	>	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
649
650		</java>
651		</target>

Diff Legend

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