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

Diff Legend

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