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.59 by tim, Sun Dec 7 20:49:10 2003 UTC vs.
Revision 1.61 by tim, Tue Dec 9 18:38:28 2003 UTC

#	Line 42 | Line 42
42		<!-- Source locations -->
43		<property name="src.dir"              location="${basedir}/src/main"/>
44		<property name="test.src.dir"         location="${basedir}/src/test"/>
45	+	<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
46		<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
47		<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
48		<property name="lib.dir"              location="${basedir}/lib"/>
#	Line 69 | Line 70
70
71
72		<target name="compile"
73	<	depends="init, configure-compiler, prepare-src"
73	>	depends="init, configure-compiler"
74		description="Compiles main sources to build folder">
75
76		<mkdir dir="${build.classes.dir}"/>
77
78	<	<javac srcdir="${prepare.src.dir}"
78	>	<javac srcdir="${src.dir}"
79		destdir="${build.classes.dir}"
80		debug="${build.debug}"
81		debuglevel="${build.debuglevel}"
#	Line 132 | Line 133
133
134
135
136	+	<target name="doccheck"
137	+	depends="filter-doccheck"
138	+	description="Reports on javadoc style errors">
139	+
140	+	<delete dir="${build.doccheck.dir}"/>
141	+	<mkdir dir="${build.doccheck.dir}"/>
142	+
143	+	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
144	+	docletpath="${lib.dir}/doccheck.jar"
145	+	destdir="${build.doccheck.dir}">
146	+	<packageset dir="${build.dc-filter.dir}"/>
147	+	</javadoc>
148	+
149	+	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
150	+
151	+	</target>
152	+
153	+
154	+
155		<target name="checkstyle"
156		depends="filter-src"
157		description="Reports on style errors in Java source (verbose, mostly chaff)">
#	Line 153 | Line 173
173
174		</target>
175
156	–
157	–
158	–	<target name="doccheck"
159	–	depends="filter-doccheck"
160	–	description="Reports on javadoc style errors">
161	–
162	–	<delete dir="${build.doccheck.dir}"/>
163	–	<mkdir dir="${build.doccheck.dir}"/>
164	–
165	–	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
166	–	docletpath="${lib.dir}/doccheck.jar"
167	–	destdir="${build.doccheck.dir}">
168	–	<packageset dir="${build.dc-filter.dir}"/>
169	–	</javadoc>
170	–
171	–	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
172	–
173	–	</target>
174	–
176
177
178		<target name="dist"
#	Line 250 | Line 251
251		<echo>java.home is ${java.home}</echo>
252
253		</target>
254	<
255	<
254	>
255	>
256		<target name="dist-jar"
257		depends="clean, jar">
258
#	Line 377 | Line 378
378
379		<mkdir dir="${build.testcases.dir}"/>
380
381	<	<javac srcdir="${test.src.dir}/tck"
381	>	<javac srcdir="${tck.src.dir}"
382		destdir="${build.testcases.dir}"
383		debug="${build.debug}"
384		debuglevel="${build.debuglevel}"
#	Line 392 | Line 393
393
394		</javac>
395
396	+	<javac srcdir="${test.src.dir}"
397	+	destdir="${build.testcases.dir}"
398	+	debug="${build.debug}"
399	+	debuglevel="${build.debuglevel}"
400	+	deprecation="${build.deprecation}"
401	+	source="${build.sourcelevel}"
402	+	fork="true">
403	+
404	+	<include name="jsr166/test/**"/>
405	+
406	+	<compilerarg value="${bootclasspath.args}"/>
407	+	<compilerarg line="${build.args}"/>
408	+
409	+	<classpath refid="test.classpath"/>
410	+
411	+	</javac>
412	+
413		</target>
414
415
#	Line 417 | Line 435
435		<formatter type="xml"/>
436
437		<batchtest todir="${build.reports.dir}">
438	<	<fileset dir="${test.src.dir}/tck">
439	<	<include name="${testcase}Test.java"/>
438	>	<fileset dir="${tck.src.dir}">
439	>	<include name="**/${testcase}Test.java"/>
440	>	</fileset>
441	>	<fileset dir="${test.src.dir}">
442	>	<include name="jsr166/test/**/${testcase}Test.java"/>
443		</fileset>
444		</batchtest>
445
#	Line 462 | Line 483
483		</condition>
484
485		<property name="warnunchecked.arg" value=""/>
465	–
466	–	<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
467	–	<istrue value="${build.nothreads}"/>
468	–	</condition>
469	–
470	–	<property name="prepare.src.dir" value="${src.dir}"/>
486
487
488		<!-- Common options in javac invocations -->
#	Line 476 | Line 491
491		</target>
492
493
479	–	<target name="prepare-src"
480	–	depends="configure-compiler"
481	–	if="prepare.src.dir">
482	–
483	–	<mkdir dir="${prepare.src.dir}"/>
484	–	<copy todir="${prepare.src.dir}">
485	–	<fileset dir="${src.dir}">
486	–	<exclude name="java/lang/**"/>
487	–	</fileset>
488	–	</copy>
489	–
490	–	</target>
491	–
492	–
494		<target name="configure-tests"
495		depends="configure-compiler">
496
#	Line 561 | Line 562
562		</target>
563
564
565	<
566	<	<!-- Backward compatibility, work in progress -->
567	<
567	<
568	<	<target name="compat" depends="jar">
565	>	<!-- Standalone sample program -->
566	>
567	>	<target name="sample" depends="jar">
568
569		<mkdir dir="${build.testcases.dir}"/>
570
#	Line 582 | Line 581
581
582		<classpath refid="test.classpath"/>
583
584	<	<include name="Compatibility.java"/>
584	>	<include name="jsr166/test/Sample.java"/>
585
586		</javac>
587
588
589	<	<java classname="Compatibility" fork="true">
589	>	<java classname="jsr166.test.Sample" fork="true">
590		<jvmarg value="${bootclasspath.args}"/>
591		<classpath refid="test.classpath"/>
592		</java>
#	Line 595 | Line 594
594
595
596
597	+	<!-- Backward compatibility, work in progress (some files not checked in) -->
598	+
599	+
600	+
601		<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
602		<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
603		<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>

Diff Legend

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