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.41 by tim, Fri Jun 6 20:48:55 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 272 | Line 285
285		source="${build.sourcelevel}"
286		fork="true">
287
288	<	<bootclasspath refid="javac.bootclasspath"/>
289	<	<compilerarg line="${build.javac.args}"/>
288	>	<compilerarg    line="${gjc.args}"/>
289	>	<bootclasspath refid="compile.bootclasspath"/>
290
291		</javac>
292
#	Line 287 | Line 300
300
301		<jar destfile="${product.jar}" duplicate="add">
302		<fileset dir="${build.classes.dir}">
303	<	<patternset refid="emulation.excludes"/>
303	>	<patternset refid="atomic.exclusion"/>
304	>	<patternset refid="unsafe.exclusion"/>
305		</fileset>
306		<fileset dir="${build.emulation.dir}"/>
307		</jar>
#	Line 336 | Line 350
350		<copy todir="${build.filter.src.dir}">
351		<fileset dir="${src.dir}">
352		<exclude name="**/*.html"/>
353	<	<patternset refid="emulation.excludes"/>
353	>	<patternset refid="unsafe.exclusion"/>
354		</fileset>
355		<filterchain>
356
#	Line 411 | Line 425
425
426		<mkdir dir="${build.testcases.dir}"/>
427
428	+	<!--
429	+	<echo>javac ${gjc.args}</echo>
430	+	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
431	+	<echo>classpath="${test.classpath}"</echo>
432	+	-->
433	+
434		<javac srcdir="${test.src.dir}"
435		destdir="${build.testcases.dir}"
436		debug="${build.debug}"
#	Line 419 | Line 439
439		source="${build.sourcelevel}"
440		fork="true">
441
442	<	<classpath refid="test.classpath"/>
443	<	<bootclasspath refid="javac.bootclasspath"/>
444	<	<compilerarg line="${build.javac.args}"/>
442	>	<compilerarg    line="${gjc.args}"/>
443	>	<bootclasspath refid="test.compile.bootclasspath"/>
444	>	<classpath     refid="test.classpath"/>
445
446		</javac>
447
#	Line 443 | Line 463
463		dir="${build.reports.dir}"
464		fork="true">
465
466	<	<jvmarg value="${test.bootclasspath.arg}"/>
466	>	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
467
468		<formatter type="xml"/>
469
#	Line 489 | Line 509
509		<property name="gjc.version"
510		value="2.0"/>
511
512	<	<condition property="build.novariance" value="-novariance">
512	>	<condition property="novariance.arg" value="-novariance">
513		<and>
514		<equals arg1="${gjc.version}" arg2="2.0"/>
515		<or>
#	Line 499 | Line 519
519		</and>
520		</condition>
521
522	<	<property name="build.novariance"
522	>	<property name="novariance.arg"
523		value=""/>
524
525		<property name="gjc.dir"
#	Line 509 | Line 529
529		location="${gjc.dir}/${gjc.version}/javac.jar"/>
530
531		<property name="collect.jar"
532	<	location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
532	>	location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
533
534
535	<	<condition property="build.warnunchecked" value="-warnunchecked">
535	>	<condition property="warnunchecked.arg" value="-warnunchecked">
536		<istrue value="${gjc.warnunchecked}"/>
537		</condition>
538
539	<	<property name="build.warnunchecked" value=""/>
539	>	<property name="warnunchecked.arg" value=""/>
540
541		<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
542		<istrue value="${build.nothreads}"/>
#	Line 527 | Line 547
547		! Bootclasspath munging for source compilation.
548		-->
549
550	<	<path id="javac.bootclasspath.prefix">
531	<	<!-- <pathelement location="${src.dir}"/> -->
550	>	<path id="pre.bootclasspath">
551		<pathelement location="${javac.jar}"/>
552		</path>
553
554	<	<path id="javac.bootclasspath">
555	<	<!-- <pathelement location="${src.dir}"/> -->
554	>	<path id="compile.bootclasspath">
555	>	<pathelement location="${build.classes.dir}"/>
556		<pathelement location="${collect.jar}"/>
557		<pathelement location="${rt.jar}"/>
558		</path>
559
560	<	<!-- Flatten bootclasspath prefix into a platform-appropriate string -->
561	<	<property name="javac.bootclasspath.prefix"
562	<	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"/>
560	>	<!-- Flatten paths into platform-appropriate strings -->
561	>	<property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
562	>	<property name="compile.bootclasspath" refid="compile.bootclasspath"/>
563
553	–	<!-- Common options in javac invocations -->
554	–	<property name="build.javac.args"
555	–	value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
564
565	<	<echo>javac ${build.javac.args}</echo>
566	<	<echo>bootclasspath=${javac.bootclasspath}</echo>
565	>	<!-- Common options in javac invocations -->
566	>	<property name="gjc.args"
567	>	value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
568	>	/>
569
570		</target>
571
#	Line 591 | Line 601
601		</target>
602
603
604	<	<target name="configure-tests">
604	>	<target name="configure-tests"
605	>	depends="configure-compiler">
606
607		<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
608		<available property="junit.available"
#	Line 612 | Line 623
623		<pathelement location="${junit.jar}"/>
624		</path>
625
626	<	<!-- Flatten test classpath into a platform-appropriate string -->
627	<	<property name="test.classpath" refid="test.classpath"/>
626	>	<path id="test.compile.bootclasspath">
627	>	<pathelement location="${javac.jar}"/>
628	>	<pathelement location="${collect.jar}"/>
629	>	<pathelement location="${rt.jar}"/>
630	>	</path>
631	>
632	>	<path id="test.run.bootclasspath">
633	>	<pathelement location="${javac.jar}"/>
634	>	<path refid="test.classpath"/>
635	>	</path>
636
637	<	<!-- Turn the flattened test classpath into a javac argument -->
638	<	<property name="test.bootclasspath.arg"
639	<	value='-Xbootclasspath/p:${test.classpath}'/>
637	>	<!-- Flatten test classpaths into platform-appropriate strings -->
638	>	<property name="test.classpath"             refid="test.classpath"/>
639	>	<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
640	>	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
641
642		</target>
643

Diff Legend

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