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.59 by tim, Sun Dec 7 20:49:10 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"/>
#	Line 56 | Line 53
53		<!-- Jar locations -->
54		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
55		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
56	<	<property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
57	<	<property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
58	<
56	>
57	>	<!-- Bootclasspath argument -->
58	>	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
59
60	<	<!-- Files excluded from dist-docs -->
61	<	<patternset id="docs.exclusion">
62	<	<exclude name="java/util/Random.*"/>
63	<	<exclude name="sun/misc/Unsafe.*"/>
64	<	</patternset>
60	>	<!-- Test classpath -->
61	>	<path id="test.classpath">
62	>	<pathelement location="${build.testcases.dir}"/>
63	>	<pathelement location="${junit.jar}"/>
64	>	</path>
65
66
67
68		<!-- Main targets -->
69
70	+
71		<target name="compile"
72		depends="init, configure-compiler, prepare-src"
73		description="Compiles main sources to build folder">
74
77	–	<property name="prepare.src.dir" value="${src.dir}"/>
78	–
75		<mkdir dir="${build.classes.dir}"/>
76
77		<javac srcdir="${prepare.src.dir}"
#	Line 93 | Line 89
89		</target>
90
91
92	+
93		<target name="jar"
94	<	depends="init-jar, native-jar"
95	<	description="Builds library jar from compiled sources"/>
94	>	depends="compile"
95	>	description="Builds library jar from compiled sources">
96	>
97	>	<mkdir dir="${build.lib.dir}"/>
98	>
99	>	<jar destfile="${product.jar}">
100	>	<fileset dir="${build.classes.dir}"/>
101	>	</jar>
102	>
103	>	</target>
104	>
105
106
107		<target name="test"
#	Line 103 | Line 109
109		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
110
111
112	+
113	+	<target name="docs"
114	+	description="Builds javadocs with custom tags to build folder">
115	+
116	+	<delete dir="${build.javadocs.dir}"/>
117	+	<mkdir dir="${build.javadocs.dir}"/>
118	+
119	+	<javadoc destdir="${build.javadocs.dir}"
120	+	link="http://java.sun.com/j2se/1.4.1/docs/api"
121	+	overview="${src.dir}/intro.html"
122	+	source="${build.sourcelevel}">
123	+
124	+	<tag name="revised" description="Last revised:"/>
125	+	<tag name="spec"    description="Specified by:"/>
126	+
127	+	<packageset dir="${src.dir}"/>
128	+
129	+	</javadoc>
130	+
131	+	</target>
132	+
133	+
134	+
135		<target name="checkstyle"
136		depends="filter-src"
137		description="Reports on style errors in Java source (verbose, mostly chaff)">
#	Line 125 | Line 154
154		</target>
155
156
157	+
158		<target name="doccheck"
159		depends="filter-doccheck"
160		description="Reports on javadoc style errors">
#	Line 142 | Line 172
172
173		</target>
174
175	<
146	<	<target name="docs"
147	<	depends="filter-src"
148	<	description="Builds javadocs with custom tags to build folder">
149	<
150	<	<delete dir="${build.javadocs.dir}"/>
151	<	<mkdir dir="${build.javadocs.dir}"/>
152	<
153	<	<javadoc destdir="${build.javadocs.dir}"
154	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
155	<	overview="${src.dir}/intro.html"
156	<	source="${build.docsourcelevel}">
157	<
158	<	<tag name="revised" description="Last revised:"/>
159	<	<tag name="spec"    description="Specified by:"/>
160	<
161	<	<packageset dir="${build.filter.src.dir}"/>
162	<
163	<	</javadoc>
164	<
165	<	</target>
166	<
167	<
168	<	<target name="sinjdocs"
169	<	depends="configure-tests"
170	<	description="Builds javadocs with custom tags to build folder">
171	<
172	<	<delete dir="${build.sinjdocs.dir}"/>
173	<	<mkdir dir="${build.sinjdocs.dir}"/>
174	<
175	<	<java classname="net.cscott.sinjdoc.Main" fork="true">
176	<
177	<	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
178	<
179	<	<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"/>
200	<
201	<
202	<	</java>
203	<
204	<	</target>
205	<
175	>
176
177		<target name="dist"
178		depends="init, dist-clean, dist-jar, dist-docs"
179		description="Puts all distributable products in single hierarchy"/>
180
181
182	+
183		<target name="release"
184		depends="dist"
185		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 227 | Line 198
198
199		</target>
200
201	+
202	+
203		<target name="clean"
204		description="Removes all build products">
205
#	Line 237 | Line 210
210		</target>
211
212
213	+
214		<target name="dist-clean"
215		description="Removes all build and distribution products">
216
#	Line 245 | Line 219
219		</target>
220
221
222	+
223		<target name="dist-docs"
249	–	depends="filter-src"
224		description="Builds javadocs without custom tags to dist folder">
225
226		<delete dir="${dist.javadocs.dir}"/>
227		<mkdir dir="${dist.javadocs.dir}"/>
228
229		<javadoc destdir="${dist.javadocs.dir}"
230	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
230	>	link="http://java.sun.com/j2se/1.4.2/docs/api"
231		overview="${src.dir}/intro.html"
232	<	source="${build.docsourcelevel}">
232	>	source="${build.sourcelevel}">
233
234	<	<packageset dir="${build.filter.src.dir}"/>
234	>	<packageset dir="${src.dir}"/>
235
236		</javadoc>
237
#	Line 278 | Line 252
252		</target>
253
254
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		<target name="dist-jar"
256		depends="clean, jar">
257
#	Line 330 | Line 287
287		<copy todir="${build.filter.src.dir}">
288		<fileset dir="${src.dir}">
289		<exclude name="**/*.html"/>
290	<	<patternset refid="docs.exclusion"/>
290	>	<!-- Files excluded from dist-docs -->
291	>	<exclude name="java/util/Random.*"/>
292	>	<exclude name="sun/misc/Unsafe.*"/>
293		</fileset>
294	+	<!--
295		<filterchain>
296	+	-->
297
298		<!--
299		# This filter gets rid of angle-bracketed type parameters
#	Line 346 | Line 307
307		#   tweaking.)
308		-->
309
310	+	<!--
311		<filterreader classname="jsr166.ant.filters.ReplaceFilter"
312		classpath="${build.ant.dir}">
313		<param name="notmatching" value="^\s+\*\s.*$"/>
314		<param name="pattern"     value="&lt;[^|>()]+?>+"/>
315		<param name="replacement" value=" "/>
316		</filterreader>
317	+	-->
318
319	+	<!--
320		</filterchain>
321	+	-->
322		</copy>
323
324		</target>
#	Line 412 | Line 377
377
378		<mkdir dir="${build.testcases.dir}"/>
379
380	<	<javac srcdir="${test.src.dir}"
380	>	<javac srcdir="${test.src.dir}/tck"
381		destdir="${build.testcases.dir}"
382		debug="${build.debug}"
383		debuglevel="${build.debuglevel}"
#	Line 420 | Line 385
385		source="${build.sourcelevel}"
386		fork="true">
387
388	+	<compilerarg value="${bootclasspath.args}"/>
389		<compilerarg line="${build.args}"/>
424	–	<classpath refid="test.classpath"/>
390
391	<	<include name="java/**"/>
427	<	<include name="jsr166/**"/>
391	>	<classpath refid="test.classpath"/>
392
393		</javac>
394
#	Line 446 | Line 410
410		dir="${build.reports.dir}"
411		fork="true">
412
413	<	<jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
413	>	<jvmarg value="${bootclasspath.args}"/>
414	>
415	>	<classpath refid="test.classpath"/>
416
417		<formatter type="xml"/>
418
419		<batchtest todir="${build.reports.dir}">
420	<	<fileset dir="${test.src.dir}">
421	<	<include name="java/**/${testcase}Test.java"/>
456	<	<include name="jsr166/**/${testcase}Test.java"/>
420	>	<fileset dir="${test.src.dir}/tck">
421	>	<include name="${testcase}Test.java"/>
422		</fileset>
423		</batchtest>
424
#	Line 501 | Line 466
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}"/>
471
472
473		<!-- Common options in javac invocations -->
#	Line 530 | Line 497
497		<available property="junit.available"
498		classname="junit.framework.Protectable"/>
499
533	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
534	–	unless="junit.available"/>
535	–
500		<!-- Xalan -->
501		<available property="xalan.available"
502		classname="org.apache.xalan.Version"/>
503
504	+
505	+	<!-- Ant 1.6beta and later don't need or want this check -->
506	+	<!--
507	+	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
508	+	unless="junit.available"/>
509	+
510		<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
511		unless="xalan.available"/>
512	<
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"/>
512	>	-->
513
514		</target>
515
#	Line 611 | Line 561
561		</target>
562
563
614	–	<target name="ng" depends="test">
615	–	<java classname="SuperfluousAbstract" fork="true">
564
565	<	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
565	>	<!-- Backward compatibility, work in progress -->
566	>
567
568	+	<target name="compat" depends="jar">
569	+
570	+	<mkdir dir="${build.testcases.dir}"/>
571	+
572	+	<javac srcdir="${test.src.dir}"
573	+	destdir="${build.testcases.dir}"
574	+	debug="${build.debug}"
575	+	debuglevel="${build.debuglevel}"
576	+	deprecation="${build.deprecation}"
577	+	source="${build.sourcelevel}"
578	+	fork="true">
579	+
580	+	<compilerarg value="${bootclasspath.args}"/>
581	+	<compilerarg line="${build.args}"/>
582	+
583	+	<classpath refid="test.classpath"/>
584	+
585	+	<include name="Compatibility.java"/>
586	+
587	+	</javac>
588	+
589	+
590	+	<java classname="Compatibility" fork="true">
591	+	<jvmarg value="${bootclasspath.args}"/>
592	+	<classpath refid="test.classpath"/>
593		</java>
594		</target>
595
596
597	+
598	+	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
599	+	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
600	+	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
601	+	<property name="pretiger.sourcelevel" value="1.4"/>
602	+
603	+	<target name="defang"
604	+	depends="init"
605	+	description="Generates pre-Tiger compatible source">
606	+
607	+	<delete dir="${pretiger.src.dir}"/>
608	+	<mkdir dir="${pretiger.src.dir}"/>
609	+
610	+	<exec executable="perl">
611	+	<arg file="etc/defang.pl"/>
612	+	<!-- <arg value="-v"/> -->
613	+	<arg value="-s"/> <arg file="${src.dir}"/>
614	+	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
615	+	</exec>
616	+
617	+	</target>
618	+
619	+	<target name="compile-pretiger"
620	+	depends="init, configure-compiler, defang"
621	+	description="Compiles pre-Tiger sources to build folder">
622	+
623	+	<mkdir dir="${build.pretiger.dir}"/>
624	+
625	+	<javac srcdir="${pretiger.src.dir}"
626	+	destdir="${build.pretiger.dir}"
627	+	debug="${build.debug}"
628	+	debuglevel="${build.debuglevel}"
629	+	deprecation="${build.deprecation}"
630	+	source="${pretiger.sourcelevel}"
631	+	fork="true">
632	+
633	+	<compilerarg line="${build.args}"/>
634	+	<exclude name="**/Thread.java"/>
635	+
636	+	</javac>
637	+
638	+	</target>
639	+
640	+	<target name="pretiger" depends="compile-pretiger">
641	+
642	+	<mkdir dir="${build.lib.dir}"/>
643	+
644	+	<jar destfile="${pretiger.jar}">
645	+	<fileset dir="${build.pretiger.dir}">
646	+	</fileset>
647	+	</jar>
648	+
649	+	</target>
650	+
651		</project>

Diff Legend

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