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.58 by tim, Mon Sep 15 15:13:35 2003 UTC vs.
Revision 1.62 by tim, Wed Dec 10 01:51:11 2003 UTC

#	Line 22 | Line 22
22
23		<!-- Compilation options -->
24		<property name="build.sourcelevel"    value="1.5"/>
25	–	<property name="build.docsourcelevel" value="1.4"/>
25		<property name="build.debug"          value="true"/>
26		<property name="build.debuglevel"     value="source,lines,vars"/>
27		<property name="build.deprecation"    value="false"/>
#	Line 34 | Line 33
33		<property name="build.lib.dir"        location="${build.dir}/lib"/>
34		<property name="build.ant.dir"        location="${build.dir}/ant"/>
35		<property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
37	–	<property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
38	–	<property name="build.stripped.dir"   location="${build.dir}/stripped"/>
36		<property name="build.reports.dir"    location="${build.dir}/reports"/>
37	+	<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
38		<property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
39		<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
40		<property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
43	–	<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
41
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 56 | Line 55
55		<!-- Jar locations -->
56		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
57		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
58	<	<property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
59	<	<property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
60	<
58	>
59	>	<!-- Bootclasspath argument -->
60	>	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
61
62	<	<!-- Files excluded from dist-docs -->
63	<	<patternset id="docs.exclusion">
64	<	<exclude name="java/util/Random.*"/>
65	<	<exclude name="sun/misc/Unsafe.*"/>
66	<	</patternset>
62	>	<!-- Test classpath -->
63	>	<path id="test.classpath">
64	>	<pathelement location="${build.testcases.dir}"/>
65	>	<pathelement location="${junit.jar}"/>
66	>	</path>
67
68
69
70		<!-- Main targets -->
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	–	<property name="prepare.src.dir" value="${src.dir}"/>
78	–
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 93 | Line 91
91		</target>
92
93
96	–	<target name="jar"
97	–	depends="init-jar, native-jar"
98	–	description="Builds library jar from compiled sources"/>
99	–
94
95	<	<target name="test"
96	<	depends="init, configure-tests, report-tests"
97	<	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
104	<
105	<
106	<	<target name="checkstyle"
107	<	depends="filter-src"
108	<	description="Reports on style errors in Java source (verbose, mostly chaff)">
95	>	<target name="jar"
96	>	depends="compile"
97	>	description="Builds library jar from compiled sources">
98
99	<	<taskdef resource="checkstyletask.properties"
111	<	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
99	>	<mkdir dir="${build.lib.dir}"/>
100
101	<	<mkdir dir="${build.checkstyle.dir}"/>
102	<
103	<	<checkstyle config="etc/checkstyle/sun_checks.xml"
116	<	failOnViolation="false">
117	<	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
118	<	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119	<	</checkstyle>
120	<
121	<	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
122	<	out="${build.checkstyle.dir}/checkstyle-report.html"
123	<	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
101	>	<jar destfile="${product.jar}">
102	>	<fileset dir="${build.classes.dir}"/>
103	>	</jar>
104
105		</target>
106
107
128	–	<target name="doccheck"
129	–	depends="filter-doccheck"
130	–	description="Reports on javadoc style errors">
131	–
132	–	<delete dir="${build.doccheck.dir}"/>
133	–	<mkdir dir="${build.doccheck.dir}"/>
108
109	<	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
110	<	docletpath="${lib.dir}/doccheck.jar"
111	<	destdir="${build.doccheck.dir}">
138	<	<packageset dir="${build.dc-filter.dir}"/>
139	<	</javadoc>
140	<
141	<	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
109	>	<target name="test"
110	>	depends="init, configure-tests, report-tests"
111	>	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
112
143	–	</target>
113
114
115		<target name="docs"
147	–	depends="filter-src"
116		description="Builds javadocs with custom tags to build folder">
117
118		<delete dir="${build.javadocs.dir}"/>
#	Line 153 | Line 121
121		<javadoc destdir="${build.javadocs.dir}"
122		link="http://java.sun.com/j2se/1.4.1/docs/api"
123		overview="${src.dir}/intro.html"
124	<	source="${build.docsourcelevel}">
124	>	source="${build.sourcelevel}">
125
126		<tag name="revised" description="Last revised:"/>
127		<tag name="spec"    description="Specified by:"/>
128
129	<	<packageset dir="${build.filter.src.dir}"/>
129	>	<packageset dir="${src.dir}"/>
130
131		</javadoc>
132
133		</target>
134
135
168	–	<target name="sinjdocs"
169	–	depends="configure-tests"
170	–	description="Builds javadocs with custom tags to build folder">
136
137	<	<delete dir="${build.sinjdocs.dir}"/>
138	<	<mkdir dir="${build.sinjdocs.dir}"/>
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	<	<java classname="net.cscott.sinjdoc.Main" fork="true">
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	<	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
150	>	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
151
152	<	<classpath>
180	<	<pathelement location="${sinjdoc.jar}"/>
181	<	<pathelement location="${lib.dir}/jutil.jar"/>
182	<	<pathelement location="${lib.dir}/cup.jar"/>
183	<	<path refid="test.classpath"/>
184	<	</classpath>
185	<
186	<	<!-- <arg value="-help"/> -->
187	<	<!-- <arg value="-verbose"/> -->
188	<	<!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
189	<
190	<	<arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
191	<	<arg value="-sourcepath"/> <arg value="${src.dir}"/>
192	<	<arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
193	<	<arg value="-source"/>     <arg value="${build.sourcelevel}"/>
194	<
195	<	<arg value="java.lang"/>
196	<	<arg value="java.util"/>
197	<	<arg value="java.util.concurrent"/>
198	<	<arg value="java.util.concurrent.atomic"/>
199	<	<arg value="java.util.concurrent.locks"/>
152	>	</target>
153
154
155	<	</java>
155	>
156	>	<target name="checkstyle"
157	>	depends="filter-src"
158	>	description="Reports on style errors in Java source (verbose, mostly chaff)">
159	>
160	>	<taskdef resource="checkstyletask.properties"
161	>	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
162	>
163	>	<mkdir dir="${build.checkstyle.dir}"/>
164	>
165	>	<checkstyle config="etc/checkstyle/sun_checks.xml"
166	>	failOnViolation="false">
167	>	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
168	>	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
169	>	</checkstyle>
170	>
171	>	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
172	>	out="${build.checkstyle.dir}/checkstyle-report.html"
173	>	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
174
175		</target>
176
177	+
178
179		<target name="dist"
180		depends="init, dist-clean, dist-jar, dist-docs"
181		description="Puts all distributable products in single hierarchy"/>
182
183
184	+
185		<target name="release"
186		depends="dist"
187		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 227 | Line 200
200
201		</target>
202
203	+
204	+
205		<target name="clean"
206		description="Removes all build products">
207
#	Line 237 | Line 212
212		</target>
213
214
215	+
216		<target name="dist-clean"
217		description="Removes all build and distribution products">
218
#	Line 245 | Line 221
221		</target>
222
223
224	+
225		<target name="dist-docs"
249	–	depends="filter-src"
226		description="Builds javadocs without custom tags to dist folder">
227
228		<delete dir="${dist.javadocs.dir}"/>
229		<mkdir dir="${dist.javadocs.dir}"/>
230
231		<javadoc destdir="${dist.javadocs.dir}"
232	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
232	>	link="http://java.sun.com/j2se/1.4.2/docs/api"
233		overview="${src.dir}/intro.html"
234	<	source="${build.docsourcelevel}">
234	>	source="${build.sourcelevel}">
235
236	<	<packageset dir="${build.filter.src.dir}"/>
236	>	<packageset dir="${src.dir}"/>
237
238		</javadoc>
239
#	Line 276 | Line 252
252		<echo>java.home is ${java.home}</echo>
253
254		</target>
255	<
256	<
281	<	<target name="init-jar">
282	<
283	<	<mkdir dir="${build.lib.dir}"/>
284	<
285	<	</target>
286	<
287	<
288	<	<target name="native-jar"
289	<	depends="compile">
290	<
291	<	<jar destfile="${product.jar}">
292	<	<fileset dir="${build.classes.dir}"/>
293	<	</jar>
294	<
295	<	</target>
296	<
297	<
255	>
256	>
257		<target name="dist-jar"
258		depends="clean, jar">
259
#	Line 330 | Line 289
289		<copy todir="${build.filter.src.dir}">
290		<fileset dir="${src.dir}">
291		<exclude name="**/*.html"/>
292	<	<patternset refid="docs.exclusion"/>
292	>	<!-- Files excluded from dist-docs -->
293	>	<exclude name="java/util/Random.*"/>
294	>	<exclude name="sun/misc/Unsafe.*"/>
295		</fileset>
296	+	<!--
297		<filterchain>
298	+	-->
299
300		<!--
301		# This filter gets rid of angle-bracketed type parameters
#	Line 346 | Line 309
309		#   tweaking.)
310		-->
311
312	+	<!--
313		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
314		classpath="${build.ant.dir}">
315		<param name="notmatching" value="^\s+\*\s.*$"/>
316		<param name="pattern"     value="&lt;[^|>()]+?>+"/>
317		<param name="replacement" value=" "/>
318		</filterreader>
319	+	-->
320
321	+	<!--
322		</filterchain>
323	+	-->
324		</copy>
325
326		</target>
#	Line 412 | Line 379
379
380		<mkdir dir="${build.testcases.dir}"/>
381
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}"
#	Line 420 | Line 402
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}"
419	+	deprecation="${build.deprecation}"
420	+	source="${build.sourcelevel}"
421	+	fork="true">
422	+
423	+	<compilerarg value="${bootclasspath.args}"/>
424	+	<compilerarg line="${build.args}"/>
425
426	<	<include name="java/**"/>
427	<	<include name="jsr166/**"/>
426	>	<classpath refid="test.classpath"/>
427
428		</javac>
429	+	-->
430
431		</target>
432
#	Line 446 | Line 446
446		dir="${build.reports.dir}"
447		fork="true">
448
449	<	<jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
449	>	<jvmarg value="${bootclasspath.args}"/>
450	>
451	>	<classpath refid="test.classpath"/>
452
453		<formatter type="xml"/>
454
455	<	<batchtest todir="${build.reports.dir}">
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="java/**/${testcase}Test.java"/>
456	<	<include name="jsr166/**/${testcase}Test.java"/>
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
477		</target>
#	Line 497 | Line 512
512		</condition>
513
514		<property name="warnunchecked.arg" value=""/>
500	–
501	–	<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
502	–	<istrue value="${build.nothreads}"/>
503	–	</condition>
515
516
517		<!-- Common options in javac invocations -->
#	Line 509 | Line 520
520		</target>
521
522
512	–	<target name="prepare-src"
513	–	depends="configure-compiler"
514	–	if="prepare.src.dir">
515	–
516	–	<mkdir dir="${prepare.src.dir}"/>
517	–	<copy todir="${prepare.src.dir}">
518	–	<fileset dir="${src.dir}">
519	–	<exclude name="java/lang/**"/>
520	–	</fileset>
521	–	</copy>
522	–
523	–	</target>
524	–
525	–
523		<target name="configure-tests"
524		depends="configure-compiler">
525
#	Line 530 | Line 527
527		<available property="junit.available"
528		classname="junit.framework.Protectable"/>
529
533	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
534	–	unless="junit.available"/>
535	–
530		<!-- Xalan -->
531		<available property="xalan.available"
532		classname="org.apache.xalan.Version"/>
533
534	+
535	+	<!-- Ant 1.6beta and later don't need or want this check -->
536	+	<!--
537	+	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
538	+	unless="junit.available"/>
539	+
540		<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
541		unless="xalan.available"/>
542	<
543	<
544	<	<!--
545	<	! Bootclasspath munging for testing, so JUnit can test our local
546	<	! modifications to java.*.
547	<	-->
548	<
549	<	<path id="test.classpath">
550	<	<pathelement location="${product.jar}"/>
551	<	<pathelement location="${rt.jar}"/>
552	<	<pathelement location="${junit.jar}"/>
553	<	<pathelement location="${build.testcases.dir}"/>
554	<	</path>
555	<
556	<	<path id="test.bootclasspath">
557	<	<path refid="test.classpath"/>
558	<	</path>
559	<
560	<	<!-- Flatten test classpaths into platform-appropriate strings -->
561	<	<property name="test.classpath"         refid="test.classpath"/>
562	<	<property name="test.bootclasspath"     refid="test.bootclasspath"/>
542	>	-->
543
544		</target>
545
#	Line 611 | Line 591
591		</target>
592
593
594	<	<target name="ng" depends="test">
595	<	<java classname="SuperfluousAbstract" fork="true">
594	>	<!-- Standalone sample program -->
595	>
596	>	<target name="sample" depends="jar">
597	>
598	>	<mkdir dir="${build.testcases.dir}"/>
599	>
600	>	<javac srcdir="${test.src.dir}"
601	>	destdir="${build.testcases.dir}"
602	>	debug="${build.debug}"
603	>	debuglevel="${build.debuglevel}"
604	>	deprecation="${build.deprecation}"
605	>	source="${build.sourcelevel}"
606	>	fork="true">
607	>
608	>	<compilerarg value="${bootclasspath.args}"/>
609	>	<compilerarg line="${build.args}"/>
610	>
611	>	<classpath refid="test.classpath"/>
612	>
613	>	<include name="jsr166/test/Sample.java"/>
614	>
615	>	</javac>
616	>
617	>
618	>	<java classname="jsr166.test.Sample" fork="true">
619	>	<jvmarg value="${bootclasspath.args}"/>
620	>	<classpath refid="test.classpath"/>
621	>	</java>
622	>	</target>
623
617	–	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
624
625	<	</java>
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"/>
633	>	<property name="pretiger.sourcelevel" value="1.4"/>
634	>
635	>	<target name="defang"
636	>	depends="init"
637	>	description="Generates pre-Tiger compatible source">
638	>
639	>	<delete dir="${pretiger.src.dir}"/>
640	>	<mkdir dir="${pretiger.src.dir}"/>
641	>
642	>	<exec executable="perl">
643	>	<arg file="etc/defang.pl"/>
644	>	<!-- <arg value="-v"/> -->
645	>	<arg value="-s"/> <arg file="${src.dir}"/>
646	>	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
647	>	</exec>
648	>
649		</target>
650
651	+	<target name="compile-pretiger"
652	+	depends="init, configure-compiler, defang"
653	+	description="Compiles pre-Tiger sources to build folder">
654	+
655	+	<mkdir dir="${build.pretiger.dir}"/>
656	+
657	+	<javac srcdir="${pretiger.src.dir}"
658	+	destdir="${build.pretiger.dir}"
659	+	debug="${build.debug}"
660	+	debuglevel="${build.debuglevel}"
661	+	deprecation="${build.deprecation}"
662	+	source="${pretiger.sourcelevel}"
663	+	fork="true">
664	+
665	+	<compilerarg line="${build.args}"/>
666	+	<exclude name="**/Thread.java"/>
667	+
668	+	</javac>
669	+
670	+	</target>
671	+
672	+	<target name="pretiger" depends="compile-pretiger">
673	+
674	+	<mkdir dir="${build.lib.dir}"/>
675	+
676	+	<jar destfile="${pretiger.jar}">
677	+	<fileset dir="${build.pretiger.dir}">
678	+	</fileset>
679	+	</jar>
680	+
681	+	</target>
682
683		</project>

Diff Legend

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