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.42 by tim, Mon Jun 9 14:11:43 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	+	</jar>
218	+
219	+	</target>
220
221		<target name="clean"
222		description="Removes all build products">
#	Line 272 | Line 300
300		source="${build.sourcelevel}"
301		fork="true">
302
303	<	<bootclasspath refid="javac.bootclasspath"/>
304	<	<compilerarg line="${build.javac.args}"/>
303	>	<compilerarg    line="${gjc.args}"/>
304	>	<bootclasspath refid="compile.bootclasspath"/>
305
306		</javac>
307
#	Line 287 | Line 315
315
316		<jar destfile="${product.jar}" duplicate="add">
317		<fileset dir="${build.classes.dir}">
318	<	<patternset refid="emulation.excludes"/>
318	>	<patternset refid="atomic.exclusion"/>
319	>	<patternset refid="unsafe.exclusion"/>
320		</fileset>
321		<fileset dir="${build.emulation.dir}"/>
322		</jar>
#	Line 336 | Line 365
365		<copy todir="${build.filter.src.dir}">
366		<fileset dir="${src.dir}">
367		<exclude name="**/*.html"/>
368	<	<patternset refid="emulation.excludes"/>
368	>	<patternset refid="unsafe.exclusion"/>
369		</fileset>
370		<filterchain>
371
#	Line 411 | Line 440
440
441		<mkdir dir="${build.testcases.dir}"/>
442
443	+	<!--
444	+	<echo>javac ${gjc.args}</echo>
445	+	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
446	+	<echo>classpath="${test.classpath}"</echo>
447	+	-->
448	+
449		<javac srcdir="${test.src.dir}"
450		destdir="${build.testcases.dir}"
451		debug="${build.debug}"
#	Line 419 | Line 454
454		source="${build.sourcelevel}"
455		fork="true">
456
457	<	<classpath refid="test.classpath"/>
458	<	<bootclasspath refid="javac.bootclasspath"/>
459	<	<compilerarg line="${build.javac.args}"/>
457	>	<compilerarg    line="${gjc.args}"/>
458	>	<bootclasspath refid="test.compile.bootclasspath"/>
459	>	<classpath     refid="test.classpath"/>
460
461		</javac>
462
#	Line 443 | Line 478
478		dir="${build.reports.dir}"
479		fork="true">
480
481	<	<jvmarg value="${test.bootclasspath.arg}"/>
481	>	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
482
483		<formatter type="xml"/>
484
#	Line 489 | Line 524
524		<property name="gjc.version"
525		value="2.0"/>
526
527	<	<condition property="build.novariance" value="-novariance">
527	>	<condition property="novariance.arg" value="-novariance">
528		<and>
529		<equals arg1="${gjc.version}" arg2="2.0"/>
530		<or>
#	Line 499 | Line 534
534		</and>
535		</condition>
536
537	<	<property name="build.novariance"
537	>	<property name="novariance.arg"
538		value=""/>
539
540		<property name="gjc.dir"
#	Line 509 | Line 544
544		location="${gjc.dir}/${gjc.version}/javac.jar"/>
545
546		<property name="collect.jar"
547	<	location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
547	>	location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
548
549
550	<	<condition property="build.warnunchecked" value="-warnunchecked">
550	>	<condition property="warnunchecked.arg" value="-warnunchecked">
551		<istrue value="${gjc.warnunchecked}"/>
552		</condition>
553
554	<	<property name="build.warnunchecked" value=""/>
554	>	<property name="warnunchecked.arg" value=""/>
555
556		<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
557		<istrue value="${build.nothreads}"/>
#	Line 527 | Line 562
562		! Bootclasspath munging for source compilation.
563		-->
564
565	<	<path id="javac.bootclasspath.prefix">
531	<	<!-- <pathelement location="${src.dir}"/> -->
565	>	<path id="pre.bootclasspath">
566		<pathelement location="${javac.jar}"/>
567		</path>
568
569	<	<path id="javac.bootclasspath">
570	<	<!-- <pathelement location="${src.dir}"/> -->
569	>	<path id="compile.bootclasspath">
570	>	<pathelement location="${build.classes.dir}"/>
571		<pathelement location="${collect.jar}"/>
572		<pathelement location="${rt.jar}"/>
573		</path>
574
575	<	<!-- Flatten bootclasspath prefix into a platform-appropriate string -->
576	<	<property name="javac.bootclasspath.prefix"
577	<	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"/>
575	>	<!-- Flatten paths into platform-appropriate strings -->
576	>	<property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
577	>	<property name="compile.bootclasspath" refid="compile.bootclasspath"/>
578
553	–	<!-- Common options in javac invocations -->
554	–	<property name="build.javac.args"
555	–	value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
579
580	<	<echo>javac ${build.javac.args}</echo>
581	<	<echo>bootclasspath=${javac.bootclasspath}</echo>
580	>	<!-- Common options in javac invocations -->
581	>	<property name="gjc.args"
582	>	value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
583	>	/>
584
585		</target>
586
#	Line 591 | Line 616
616		</target>
617
618
619	<	<target name="configure-tests">
619	>	<target name="configure-tests"
620	>	depends="configure-compiler">
621
622		<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
623		<available property="junit.available"
#	Line 612 | Line 638
638		<pathelement location="${junit.jar}"/>
639		</path>
640
641	<	<!-- Flatten test classpath into a platform-appropriate string -->
642	<	<property name="test.classpath" refid="test.classpath"/>
641	>	<path id="test.compile.bootclasspath">
642	>	<pathelement location="${javac.jar}"/>
643	>	<pathelement location="${collect.jar}"/>
644	>	<pathelement location="${rt.jar}"/>
645	>	</path>
646	>
647	>	<path id="test.run.bootclasspath">
648	>	<pathelement location="${javac.jar}"/>
649	>	<path refid="test.classpath"/>
650	>	</path>
651
652	<	<!-- Turn the flattened test classpath into a javac argument -->
653	<	<property name="test.bootclasspath.arg"
654	<	value='-Xbootclasspath/p:${test.classpath}'/>
652	>	<!-- Flatten test classpaths into platform-appropriate strings -->
653	>	<property name="test.classpath"             refid="test.classpath"/>
654	>	<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
655	>	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
656
657		</target>
658

Diff Legend

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