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.40 by tim, Fri Jun 6 18:34:44 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/AtomicInteger*"/>
71	+	<exclude name="java/util/concurrent/atomic/AtomicLong*"/>
72	+	<exclude name="java/util/concurrent/atomic/AtomicReference*"/>
73	+	</patternset>
74	+
75
76
77		<!-- Main targets -->
#	Line 77 | Line 84
84
85		<mkdir dir="${build.classes.dir}"/>
86
87	+	<!--
88	+	<echo>javac ${gjc.args}</echo>
89	+	<echo>bootclasspath=${compile.bootclasspath}</echo>
90	+	-->
91	+
92		<javac srcdir="${prepare.src.dir}"
93		destdir="${build.classes.dir}"
94		debug="${build.debug}"
#	Line 85 | Line 97
97		source="${build.sourcelevel}"
98		fork="true">
99
100	<	<bootclasspath refid="javac.bootclasspath"/>
101	<	<compilerarg line="${build.javac.args}"/>
100	>	<compilerarg    line="${gjc.args}"/>
101	>	<bootclasspath refid="compile.bootclasspath"/>
102
103		</javac>
104
#	Line 177 | Line 189
189		source="${build.sourcelevel}"
190		fork="true">
191
192	<	<bootclasspath refid="javac.bootclasspath"/>
193	<	<compilerarg line="${build.javac.args} -s"/>
192	>	<compilerarg    line="${gjc.args} -s"/>
193	>	<bootclasspath refid="compile.bootclasspath"/>
194
195		</javac>
196
#	Line 272 | Line 284
284		source="${build.sourcelevel}"
285		fork="true">
286
287	<	<bootclasspath refid="javac.bootclasspath"/>
288	<	<compilerarg line="${build.javac.args}"/>
287	>	<compilerarg    line="${gjc.args}"/>
288	>	<bootclasspath refid="compile.bootclasspath"/>
289
290		</javac>
291
#	Line 287 | Line 299
299
300		<jar destfile="${product.jar}" duplicate="add">
301		<fileset dir="${build.classes.dir}">
302	<	<patternset refid="emulation.excludes"/>
302	>	<patternset refid="atomic.exclusion"/>
303	>	<patternset refid="unsafe.exclusion"/>
304		</fileset>
305		<fileset dir="${build.emulation.dir}"/>
306		</jar>
#	Line 336 | Line 349
349		<copy todir="${build.filter.src.dir}">
350		<fileset dir="${src.dir}">
351		<exclude name="**/*.html"/>
352	<	<patternset refid="emulation.excludes"/>
352	>	<patternset refid="unsafe.exclusion"/>
353		</fileset>
354		<filterchain>
355
#	Line 411 | Line 424
424
425		<mkdir dir="${build.testcases.dir}"/>
426
427	+	<!--
428	+	<echo>javac ${gjc.args}</echo>
429	+	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
430	+	<echo>classpath="${test.classpath}"</echo>
431	+	-->
432	+
433		<javac srcdir="${test.src.dir}"
434		destdir="${build.testcases.dir}"
435		debug="${build.debug}"
#	Line 419 | Line 438
438		source="${build.sourcelevel}"
439		fork="true">
440
441	<	<classpath refid="test.classpath"/>
442	<	<bootclasspath refid="javac.bootclasspath"/>
443	<	<compilerarg line="${build.javac.args}"/>
441	>	<compilerarg    line="${gjc.args}"/>
442	>	<bootclasspath refid="test.compile.bootclasspath"/>
443	>	<classpath     refid="test.classpath"/>
444
445		</javac>
446
#	Line 443 | Line 462
462		dir="${build.reports.dir}"
463		fork="true">
464
465	<	<jvmarg value="${test.bootclasspath.arg}"/>
465	>	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
466
467		<formatter type="xml"/>
468
#	Line 489 | Line 508
508		<property name="gjc.version"
509		value="2.0"/>
510
511	<	<condition property="build.novariance" value="-novariance">
511	>	<condition property="novariance.arg" value="-novariance">
512		<and>
513		<equals arg1="${gjc.version}" arg2="2.0"/>
514		<or>
#	Line 499 | Line 518
518		</and>
519		</condition>
520
521	<	<property name="build.novariance"
521	>	<property name="novariance.arg"
522		value=""/>
523
524		<property name="gjc.dir"
#	Line 509 | Line 528
528		location="${gjc.dir}/${gjc.version}/javac.jar"/>
529
530		<property name="collect.jar"
531	<	location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/>
531	>	location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
532
533
534	<	<condition property="build.warnunchecked" value="-warnunchecked">
534	>	<condition property="warnunchecked.arg" value="-warnunchecked">
535		<istrue value="${gjc.warnunchecked}"/>
536		</condition>
537
538	<	<property name="build.warnunchecked" value=""/>
538	>	<property name="warnunchecked.arg" value=""/>
539
540		<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
541		<istrue value="${build.nothreads}"/>
#	Line 527 | Line 546
546		! Bootclasspath munging for source compilation.
547		-->
548
549	<	<path id="javac.bootclasspath.prefix">
531	<	<!-- <pathelement location="${src.dir}"/> -->
549	>	<path id="pre.bootclasspath">
550		<pathelement location="${javac.jar}"/>
551		</path>
552
553	<	<path id="javac.bootclasspath">
554	<	<!-- <pathelement location="${src.dir}"/> -->
553	>	<path id="compile.bootclasspath">
554	>	<pathelement location="${build.classes.dir}"/>
555		<pathelement location="${collect.jar}"/>
556		<pathelement location="${rt.jar}"/>
557		</path>
558
559	<	<!-- Flatten bootclasspath prefix into a platform-appropriate string -->
560	<	<property name="javac.bootclasspath.prefix"
561	<	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"/>
559	>	<!-- Flatten paths into platform-appropriate strings -->
560	>	<property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
561	>	<property name="compile.bootclasspath" refid="compile.bootclasspath"/>
562
553	–	<!-- Common options in javac invocations -->
554	–	<property name="build.javac.args"
555	–	value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/>
563
564	<	<echo>javac ${build.javac.args}</echo>
565	<	<echo>bootclasspath=${javac.bootclasspath}</echo>
564	>	<!-- Common options in javac invocations -->
565	>	<property name="gjc.args"
566	>	value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
567	>	/>
568
569		</target>
570
#	Line 591 | Line 600
600		</target>
601
602
603	<	<target name="configure-tests">
603	>	<target name="configure-tests"
604	>	depends="configure-compiler">
605
606		<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
607		<available property="junit.available"
#	Line 612 | Line 622
622		<pathelement location="${junit.jar}"/>
623		</path>
624
625	<	<!-- Flatten test classpath into a platform-appropriate string -->
626	<	<property name="test.classpath" refid="test.classpath"/>
625	>	<path id="test.compile.bootclasspath">
626	>	<pathelement location="${javac.jar}"/>
627	>	<pathelement location="${collect.jar}"/>
628	>	<pathelement location="${rt.jar}"/>
629	>	</path>
630	>
631	>	<path id="test.run.bootclasspath">
632	>	<pathelement location="${javac.jar}"/>
633	>	<path refid="test.classpath"/>
634	>	</path>
635
636	<	<!-- Turn the flattened test classpath into a javac argument -->
637	<	<property name="test.bootclasspath.arg"
638	<	value='-Xbootclasspath/p:${test.classpath}'/>
636	>	<!-- Flatten test classpaths into platform-appropriate strings -->
637	>	<property name="test.classpath"             refid="test.classpath"/>
638	>	<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
639	>	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
640
641		</target>
642

Diff Legend

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