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.62 by tim, Wed Dec 10 01:51:11 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="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
47		<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
48		<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
49		<property name="lib.dir"              location="${basedir}/lib"/>
#	Line 69 | Line 71
71
72
73		<target name="compile"
74	<	depends="init, configure-compiler, prepare-src"
74	>	depends="init, configure-compiler"
75		description="Compiles main sources to build folder">
76
77		<mkdir dir="${build.classes.dir}"/>
78
79	<	<javac srcdir="${prepare.src.dir}"
79	>	<javac srcdir="${src.dir}"
80		destdir="${build.classes.dir}"
81		debug="${build.debug}"
82		debuglevel="${build.debuglevel}"
#	Line 132 | Line 134
134
135
136
137	+	<target name="doccheck"
138	+	depends="filter-doccheck"
139	+	description="Reports on javadoc style errors">
140	+
141	+	<delete dir="${build.doccheck.dir}"/>
142	+	<mkdir dir="${build.doccheck.dir}"/>
143	+
144	+	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
145	+	docletpath="${lib.dir}/doccheck.jar"
146	+	destdir="${build.doccheck.dir}">
147	+	<packageset dir="${build.dc-filter.dir}"/>
148	+	</javadoc>
149	+
150	+	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
151	+
152	+	</target>
153	+
154	+
155	+
156		<target name="checkstyle"
157		depends="filter-src"
158		description="Reports on style errors in Java source (verbose, mostly chaff)">
#	Line 153 | Line 174
174
175		</target>
176
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	–
177
178
179		<target name="dist"
#	Line 250 | Line 252
252		<echo>java.home is ${java.home}</echo>
253
254		</target>
255	<
256	<
255	>
256	>
257		<target name="dist-jar"
258		depends="clean, jar">
259
#	Line 377 | Line 379
379
380		<mkdir dir="${build.testcases.dir}"/>
381
382	<	<javac srcdir="${test.src.dir}/tck"
382	>	<javac srcdir="${tck.src.dir}"
383	>	destdir="${build.testcases.dir}"
384	>	debug="${build.debug}"
385	>	debuglevel="${build.debuglevel}"
386	>	deprecation="${build.deprecation}"
387	>	source="${build.sourcelevel}"
388	>	fork="true">
389	>
390	>	<compilerarg value="${bootclasspath.args}"/>
391	>	<compilerarg line="${build.args}"/>
392	>
393	>	<classpath refid="test.classpath"/>
394	>
395	>	</javac>
396	>
397	>	<javac srcdir="${test.src.dir}"
398	>	destdir="${build.testcases.dir}"
399	>	debug="${build.debug}"
400	>	debuglevel="${build.debuglevel}"
401	>	deprecation="${build.deprecation}"
402	>	source="${build.sourcelevel}"
403	>	fork="true">
404	>
405	>	<include name="jsr166/test/**"/>
406	>
407	>	<compilerarg value="${bootclasspath.args}"/>
408	>	<compilerarg line="${build.args}"/>
409	>
410	>	<classpath refid="test.classpath"/>
411	>
412	>	</javac>
413	>
414	>	<!--
415	>	<javac srcdir="${jtreg.src.dir}"
416		destdir="${build.testcases.dir}"
417		debug="${build.debug}"
418		debuglevel="${build.debuglevel}"
#	Line 391 | Line 426
426		<classpath refid="test.classpath"/>
427
428		</javac>
429	+	-->
430
431		</target>
432
#	Line 416 | Line 452
452
453		<formatter type="xml"/>
454
455	<	<batchtest todir="${build.reports.dir}">
456	<	<fileset dir="${test.src.dir}/tck">
457	<	<include name="${testcase}Test.java"/>
455	>	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
456	>	<fileset dir="${tck.src.dir}">
457	>	<include name="**/${testcase}Test.java"/>
458		</fileset>
459		</batchtest>
460	+
461	+	<batchtest todir="${build.reports.dir}" if="do.test.old">
462	+	<fileset dir="${test.src.dir}">
463	+	<include name="jsr166/test/**/${testcase}Test.java"/>
464	+	</fileset>
465	+	</batchtest>
466	+
467	+	<!--
468	+	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
469	+	<fileset dir="${jtreg.src.dir}">
470	+	<include name="**/${testcase}Test.java"/>
471	+	</fileset>
472	+	</batchtest>
473	+	-->
474
475		</junit>
476
#	Line 462 | Line 512
512		</condition>
513
514		<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}"/>
515
516
517		<!-- Common options in javac invocations -->
#	Line 476 | Line 520
520		</target>
521
522
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	–
523		<target name="configure-tests"
524		depends="configure-compiler">
525
#	Line 561 | Line 591
591		</target>
592
593
594	<
595	<	<!-- Backward compatibility, work in progress -->
596	<
567	<
568	<	<target name="compat" depends="jar">
594	>	<!-- Standalone sample program -->
595	>
596	>	<target name="sample" depends="jar">
597
598		<mkdir dir="${build.testcases.dir}"/>
599
#	Line 582 | Line 610
610
611		<classpath refid="test.classpath"/>
612
613	<	<include name="Compatibility.java"/>
613	>	<include name="jsr166/test/Sample.java"/>
614
615		</javac>
616
617
618	<	<java classname="Compatibility" fork="true">
618	>	<java classname="jsr166.test.Sample" fork="true">
619		<jvmarg value="${bootclasspath.args}"/>
620		<classpath refid="test.classpath"/>
621		</java>
#	Line 595 | Line 623
623
624
625
626	+	<!-- Backward compatibility, work in progress (some files not checked in) -->
627	+
628	+
629	+
630		<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
631		<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
632		<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>

Diff Legend

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