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.29 by tim, Wed May 28 14:09:03 2003 UTC vs.
Revision 1.31 by tim, Wed May 28 21:15:50 2003 UTC

#	Line 26 | Line 26
26		<property name="build.debug"          value="true"/>
27		<property name="build.debuglevel"     value="source,lines,vars"/>
28		<property name="build.deprecation"    value="false"/>
29	+	<property name="build.novariance.arg" value=""/>
30
31		<!-- Build locations -->
32		<property name="build.dir"            location="build"/>
#	Line 77 | Line 78
78		</path>
79
80		<!-- Flatten bootclasspath prefix into a platform-appropriate string -->
81	<	<property name="javac.bootclasspath.prefix" refid="javac.bootclasspath.prefix"/>
81	>	<property name="javac.bootclasspath.prefix"
82	>	refid="javac.bootclasspath.prefix"/>
83
84		<!-- Turn the flattened bootclasspath prefix into a javac argument -->
85	<	<property name="javac.args" value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
86	<
85	>	<property name="build.bootclasspath.arg"
86	>	value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/>
87
88
89		<!--
#	Line 99 | Line 101
101		<property name="test.classpath" refid="test.classpath"/>
102
103		<!-- Turn the flattened test classpath into a javac argument -->
104	<	<property name="test.javac.args" value='-Xbootclasspath/p:${test.classpath}'/>
104	>	<property name="test.bootclasspath.arg"
105	>	value='-Xbootclasspath/p:${test.classpath}'/>
106
107
108
#	Line 128 | Line 131
131		fork="true">
132
133		<bootclasspath refid="javac.bootclasspath"/>
134	<	<compilerarg line="${javac.args} ${build.warnings.option}"/>
134	>	<compilerarg line="${build.javac.args}"/>
135
136		</javac>
137
#	Line 136 | Line 139
139
140
141		<target name="jar"
142	<	depends="native-jar, emulation-jar"
142	>	depends="check-emulation, init-jar, native-jar, emulation-jar"
143		description="Builds library jar from compiled sources"/>
144
145
#	Line 200 | Line 203
203		</target>
204
205
203	–	<!--
204	–	# javac -s doesn't reliably generate compilable code. It generates
205	–	# bridge methods (marked as "synthetic") that can have identical
206	–	# signatures to existing methods except for the return value.
207	–	-->
206		<target name="strip"
207	<	depends="init">
207	>	depends="init"
208	>	description="Strip generics from java source (not working yet)">
209
210		<mkdir dir="${build.stripped.dir}"/>
211
212	+	<!--
213	+	# javac -s doesn't reliably generate compilable code. It generates
214	+	# bridge methods (marked as "synthetic") that can have identical
215	+	# signatures to existing methods except for the return value.
216	+	-->
217		<javac srcdir="${src.dir}"
218		destdir="${build.stripped.dir}"
219		debug="${build.debug}"
#	Line 219 | Line 223
223		fork="true">
224
225		<bootclasspath refid="javac.bootclasspath"/>
226	<	<compilerarg line="${javac.args} ${build.warnings.option} -s"/>
226	>	<compilerarg line="${build.javac.args} -s"/>
227
228		</javac>
229
#	Line 273 | Line 277
277
278		<target name="set-warnings-if" if="build.warnings">
279
280	<	<property name="build.warnings.option" value="-warnunchecked"/>
280	>	<property name="build.warnings.arg" value="-warnunchecked"/>
281
282		</target>
283
284
285		<target name="set-warnings-unless" unless="build.warnings">
286
287	<	<property name="build.warnings.option" value=""/>
287	>	<property name="build.warnings.arg" value=""/>
288
289		</target>
290
#	Line 292 | Line 296
296		<loadfile property="version" srcFile="version.properties"/>
297		<echo>Building JSR-166 version ${version}</echo>
298
299	+	<!-- Common options in javac invocations -->
300	+	<property name="build.javac.args"
301	+	value="${build.bootclasspath.arg} ${build.warnings.arg} ${build.novariance.arg}"/>
302	+
303		</target>
304
305
#	Line 303 | Line 311
311
312
313		<target name="native-jar"
314	<	depends="compile, init-jar"
315	<	unless="build.emulation">
314	>	depends="compile"
315	>	unless="build.emulation.true">
316
317		<jar destfile="${product.jar}">
318		<fileset dir="${build.classes.dir}"/>
#	Line 313 | Line 321
321		</target>
322
323
316	–	<target name="base-jar"
317	–	depends="compile, init-jar">
318	–
319	–	</target>
320	–
321	–
324		<target name="compile-emulation"
325		depends="init"
326	<	if="build.emulation">
326	>	if="build.emulation.true">
327
328		<mkdir dir="${build.emulation.dir}"/>
329
#	Line 334 | Line 336
336		fork="true">
337
338		<bootclasspath refid="javac.bootclasspath"/>
339	<	<compilerarg line="${javac.args} ${build.warnings.option}"/>
339	>	<compilerarg line="${build.javac.args}"/>
340
341		</javac>
342
#	Line 342 | Line 344
344
345
346		<target name="emulation-jar"
347	<	depends="init-jar, compile-emulation"
348	<	if="build.emulation">
347	>	depends="compile-emulation"
348	>	if="build.emulation.true">
349
350
351		<jar destfile="${product.jar}" duplicate="add">
#	Line 384 | Line 386
386
387		<copy todir="${build.filter.src.dir}">
388		<fileset dir="${src.dir}">
389	+	<include name="**/*.html"/>
390	+	</fileset>
391	+	</copy>
392	+
393	+	<copy todir="${build.filter.src.dir}">
394	+	<fileset dir="${src.dir}">
395	+	<exclude name="**/*.html"/>
396		<patternset refid="emulation.excludes"/>
397		</fileset>
398		<filterchain>
#	Line 435 | Line 444
444		source="${build.sourcelevel}"
445		fork="true">
446
438	–	<bootclasspath refid="javac.bootclasspath"/>
439	–	<compilerarg line="${javac.args} ${build.warnings.option}"/>
447		<classpath refid="test.classpath"/>
448	+	<bootclasspath refid="javac.bootclasspath"/>
449	+	<compilerarg line="${build.javac.args}"/>
450
451		</javac>
452
#	Line 459 | Line 468
468		dir="${build.reports.dir}"
469		fork="true">
470
471	<	<jvmarg value="${test.javac.args}"/>
471	>	<jvmarg value="${test.bootclasspath.arg}"/>
472
473		<formatter type="xml"/>
474
#	Line 512 | Line 521
521		</target>
522
523
524	+	<target name="check-emulation">
525	+	<condition property="build.emulation.true">
526	+	<or>
527	+	<isset property="build.emulation"/>
528	+	<os family="windows"/>
529	+	</or>
530	+	</condition>
531	+	</target>
532	+
533	+
534
535		<!-- Anthill targets -->
536

Diff Legend

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