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.57 by tim, Mon Sep 15 14:07:36 2003 UTC vs.
Revision 1.79 by jsr166, Sat Aug 1 17:23:51 2009 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"/>
28
29		<!-- Build locations -->
30	<	<property name="build.dir"            location="build"/>
31	<	<property name="build.classes.dir"    location="${build.dir}/classes"/>
32	<	<property name="build.testcases.dir"  location="${build.dir}/testcases"/>
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"/>
36	<	<property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
37	<	<property name="build.stripped.dir"   location="${build.dir}/stripped"/>
38	<	<property name="build.reports.dir"    location="${build.dir}/reports"/>
39	<	<property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
40	<	<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
41	<	<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
30	>	<property name="build.dir"                   location="build"/>
31	>	<property name="build.classes.dir"           location="${build.dir}/classes"/>
32	>	<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
33	>	<property name="build.loops.dir"             location="${build.dir}/loops"/>
34	>	<property name="build.lib.dir"               location="${build.dir}/lib"/>
35	>	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36	>	<property name="build.reports.dir"           location="${build.dir}/reports"/>
37	>	<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38	>	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39	>	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
40	>
41	>	<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
42	>	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
43	>	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
44	>
45	>	<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
46	>	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
47	>	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
48
49		<!-- Source locations -->
50		<property name="src.dir"              location="${basedir}/src/main"/>
51		<property name="test.src.dir"         location="${basedir}/src/test"/>
52	<	<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
53	<	<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
52	>	<property name="loops.src.dir"        location="${basedir}/src/loops"/>
53	>	<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54	>	<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
55		<property name="lib.dir"              location="${basedir}/lib"/>
56		<property name="dist.dir"             location="${basedir}/dist"/>
57	+	<property name="topsrc.dir"           location="${basedir}/src"/>
58	+	<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
59	+	<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
60	+	<property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
61
62		<!-- Distribution locations -->
63	<	<property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
63	>	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
64	>	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
65	>	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
66	>	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
67
68		<!-- Jar locations -->
69		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
70	+	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
71	+	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
72	+	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
73		<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"/>
74
75	+	<!-- Bootclasspath argument -->
76	+	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
77
78	<	<!-- Files excluded from dist-docs -->
79	<	<patternset id="docs.exclusion">
80	<	<exclude name="java/util/Random.*"/>
81	<	<exclude name="sun/misc/Unsafe.*"/>
82	<	</patternset>
83	<
78	>	<!-- Test classpath -->
79	>	<path id="test.classpath">
80	>	<pathelement location="${build.testcases.dir}"/>
81	>	<pathelement location="${junit.jar}"/>
82	>	</path>
83	>
84	>	<!-- ALoops classpath -->
85	>	<path id="loops.classpath">
86	>	<pathelement location="${build.loops.dir}"/>
87	>	</path>
88
89
90		<!-- Main targets -->
91
92	+
93		<target name="compile"
94	<	depends="init, configure-compiler, prepare-src"
94	>	depends="init, configure-compiler"
95		description="Compiles main sources to build folder">
96
76	–	<property name="prepare.src.dir" value="${src.dir}"/>
77	–
97		<mkdir dir="${build.classes.dir}"/>
98
99	<	<!--
81	<	<echo>javac ${build.args}</echo>
82	<	-->
83	<
84	<	<javac srcdir="${prepare.src.dir}"
99	>	<javac srcdir="${src.dir}"
100		destdir="${build.classes.dir}"
101		debug="${build.debug}"
102		debuglevel="${build.debuglevel}"
#	Line 89 | Line 104
104		source="${build.sourcelevel}"
105		fork="true">
106
107	<	<compilerarg    line="${build.args}"/>
107	>	<include name="**/*.java"/>
108	>	<compilerarg value="-XDignore.symbol.file"/>
109	>
110	>	<!--
111	>	<exclude name="java/lang/**"/>
112	>	<compilerarg line="${build.args}"/>
113	>	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
114	>	-->
115
116		</javac>
117
118		</target>
119
120
99	–	<target name="jar"
100	–	depends="init-jar, native-jar"
101	–	description="Builds library jar from compiled sources"/>
102	–
103	–
104	–	<target name="test"
105	–	depends="init, configure-tests, report-tests"
106	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
121
122	+	<target name="jar"
123	+	depends="compile"
124	+	description="Builds library jar from compiled sources">
125
126	<	<target name="checkstyle"
110	<	depends="filter-src"
111	<	description="Reports on style errors in Java source (verbose, mostly chaff)">
112	<
113	<	<taskdef resource="checkstyletask.properties"
114	<	classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
126	>	<mkdir dir="${build.lib.dir}"/>
127
128	<	<checkstyle>
129	<	<formatter type="plain"/>  <!-- also available: type="xml" -->
130	<	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119	<	</checkstyle>
128	>	<jar destfile="${product.jar}">
129	>	<fileset dir="${build.classes.dir}"/>
130	>	</jar>
131
132		</target>
133
134
124	–	<target name="doccheck"
125	–	depends="filter-doccheck"
126	–	description="Reports on javadoc style errors">
127	–
128	–	<delete dir="${build.doccheck.dir}"/>
129	–	<mkdir dir="${build.doccheck.dir}"/>
130	–
131	–	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
132	–	docletpath="${lib.dir}/doccheck.jar"
133	–	destdir="${build.doccheck.dir}">
134	–	<packageset dir="${build.filter.doccheck.dir}"/>
135	–	</javadoc>
135
136	<	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
136	>	<target name="test"
137	>	depends="init, configure-tests, report-tests"
138	>	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
139
139	–	</target>
140
141
142		<target name="docs"
143	–	depends="filter-src"
143		description="Builds javadocs with custom tags to build folder">
144
145		<delete dir="${build.javadocs.dir}"/>
146		<mkdir dir="${build.javadocs.dir}"/>
147
148		<javadoc destdir="${build.javadocs.dir}"
149	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
149	>	link="http://java.sun.com/javase/6/docs/api/"
150		overview="${src.dir}/intro.html"
151	<	source="${build.docsourcelevel}">
152	<
154	<	<tag name="revised" description="Last revised:"/>
155	<	<tag name="spec"    description="Specified by:"/>
156	<	<tag name="editor"  description="Last edited by:"/>
157	<	<tag name="fixme"   description="FIX ME:"/>
151	>	sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
152	>	>
153
154	<	<packageset dir="${build.filter.src.dir}"/>
154	>	<packageset dir="${src.dir}"/>
155
156		</javadoc>
157
158		</target>
159
160
166	–	<target name="sinjdocs"
167	–	depends="configure-tests"
168	–	description="Builds javadocs with custom tags to build folder">
169	–
170	–	<delete dir="${build.sinjdocs.dir}"/>
171	–	<mkdir dir="${build.sinjdocs.dir}"/>
172	–
173	–	<java classname="net.cscott.sinjdoc.Main" fork="true">
174	–
175	–	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
176	–
177	–	<classpath>
178	–	<pathelement location="${sinjdoc.jar}"/>
179	–	<pathelement location="${lib.dir}/jutil.jar"/>
180	–	<pathelement location="${lib.dir}/cup.jar"/>
181	–	<path refid="test.classpath"/>
182	–	</classpath>
183	–
184	–	<!-- <arg value="-help"/> -->
185	–	<!-- <arg value="-verbose"/> -->
186	–	<!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
187	–
188	–	<arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
189	–	<arg value="-sourcepath"/> <arg value="${src.dir}"/>
190	–	<arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
191	–	<arg value="-source"/>     <arg value="${build.sourcelevel}"/>
192	–
193	–	<arg value="java.lang"/>
194	–	<arg value="java.util"/>
195	–	<arg value="java.util.concurrent"/>
196	–	<arg value="java.util.concurrent.atomic"/>
197	–	<arg value="java.util.concurrent.locks"/>
198	–
199	–
200	–	</java>
201	–
202	–	</target>
203	–
204	–
205	–	<target name="strip"
206	–	depends="init, configure-compiler"
207	–	description="Strip generics from java source (not working yet)">
208	–
209	–	<mkdir dir="${build.stripped.dir}"/>
210	–
211	–	<!--
212	–	# javac -s doesn't reliably generate compilable code. It generates
213	–	# bridge methods (marked as "synthetic") that can have identical
214	–	# signatures to existing methods except for the return value.
215	–	-->
216	–	<javac srcdir="${src.dir}"
217	–	destdir="${build.stripped.dir}"
218	–	debug="${build.debug}"
219	–	debuglevel="${build.debuglevel}"
220	–	deprecation="${build.deprecation}"
221	–	source="${build.sourcelevel}"
222	–	fork="true">
223	–
224	–	<compilerarg    line="${build.args} -s"/>
225	–
226	–	</javac>
227	–
228	–	</target>
229	–
161
162		<target name="dist"
163		depends="init, dist-clean, dist-jar, dist-docs"
164		description="Puts all distributable products in single hierarchy"/>
165
166	+
167	+
168		<target name="release"
169		depends="dist"
170		description="Puts entire CVS tree, plus distribution productions, in a jar">
171
239	–	<!--
240	–	#keep build dir? - dl
241	–	<delete dir="${build.dir}"/>
242	–	-->
172		<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
173
174		<jar basedir="${basedir}" destfile="${release.jar}">
175	+	<!-- <exclude name="build/**"/> -->
176		<exclude name="${release.jar}"/>
177		<exclude name="user.properties"/>
178		<exclude name="etc/notes/**"/>
179	+	<exclude name="src/emulation/**"/>
180		<exclude name="**/SyntaxTest.java"/>
181	+	<exclude name="**/SuperfluousAbstract.java"/>
182		</jar>
183
184		</target>
185
186	+
187	+
188		<target name="clean"
189		description="Removes all build products">
190
#	Line 261 | Line 195
195		</target>
196
197
198	+
199		<target name="dist-clean"
200		description="Removes all build and distribution products">
201
#	Line 269 | Line 204
204		</target>
205
206
207	+
208		<target name="dist-docs"
273	–	depends="filter-src"
209		description="Builds javadocs without custom tags to dist folder">
210
211		<delete dir="${dist.javadocs.dir}"/>
212		<mkdir dir="${dist.javadocs.dir}"/>
213
214		<javadoc destdir="${dist.javadocs.dir}"
215	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
215	>	link="http://java.sun.com/javase/6/docs/api/"
216		overview="${src.dir}/intro.html"
282	–	source="${build.docsourcelevel}">
283	–
284	–	<packageset dir="${build.filter.src.dir}"/>
217
218	+	sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
219	+	>
220	+	<!--
221	+	<packageset dir="${src.dir}" defaultexcludes="yes">
222	+	<include name="java/util/concurrent"/>
223	+	<include name="java/util/concurrent/atomic"/>
224	+	<include name="java/util/concurrent/locks"/>
225	+	</packageset>
226	+	-->
227	+	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
228	+	<include name="main/java/util/concurrent/*.java"/>
229	+	<include name="main/java/util/concurrent/atomic/*.java"/>
230	+	<include name="main/java/util/concurrent/locks/*.java"/>
231	+	<include name="main/java/util/*.java"/>
232	+	<!--
233	+	<include name="main/java/util/concurrent/*.html"/>
234	+	<include name="main/java/util/concurrent/atomic/*.html"/>
235	+	<include name="main/java/util/concurrent/locks/*.html"/>
236	+	<include name="main/java/util/*.html"/>
237	+	-->
238	+	<!--      <include name="jsr166x/*.java"/> -->
239	+	</fileset>
240		</javadoc>
241
242		</target>
#	Line 302 | Line 256
256		</target>
257
258
305	–	<target name="init-jar">
306	–
307	–	<mkdir dir="${build.lib.dir}"/>
308	–
309	–	</target>
310	–
311	–
312	–	<target name="native-jar"
313	–	depends="compile">
314	–
315	–	<jar destfile="${product.jar}">
316	–	<fileset dir="${build.classes.dir}"/>
317	–	</jar>
318	–
319	–	</target>
320	–
321	–
259		<target name="dist-jar"
260		depends="clean, jar">
261
#	Line 327 | Line 264
264		</target>
265
266
267	<	<target name="compile-ant-filter"
268	<	depends="init">
332	<
333	<	<mkdir dir="${build.ant.dir}"/>
334	<
335	<	<javac srcdir="${ant.src.dir}"
336	<	destdir="${build.ant.dir}"
337	<	source="1.4"
338	<	/>
339	<
340	<	</target>
341	<
342	<
343	<	<target name="filter-src"
344	<	depends="compile-ant-filter">
345	<
346	<	<mkdir dir="${build.filter.src.dir}"/>
347	<
348	<	<copy todir="${build.filter.src.dir}">
349	<	<fileset dir="${src.dir}">
350	<	<include name="**/*.html"/>
351	<	</fileset>
352	<	</copy>
353	<
354	<	<copy todir="${build.filter.src.dir}">
355	<	<fileset dir="${src.dir}">
356	<	<exclude name="**/*.html"/>
357	<	<patternset refid="docs.exclusion"/>
358	<	</fileset>
359	<	<filterchain>
360	<
361	<	<!--
362	<	# This filter gets rid of angle-bracketed type parameters
363	<	# so that javadoc can run on the result. The following
364	<	# heuristic seems to work:
365	<	#
366	<	# For all lines not starting with space(s)-asterisk-space(s),
367	<	#   replace <something> with a space, where there may be more
368	<	#   than one right angle bracket at the end, and "something"
369	<	#   must not contain parens or pipes. (This may need some
370	<	#   tweaking.)
371	<	-->
372	<
373	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
374	<	classpath="${build.ant.dir}">
375	<	<param name="notmatching" value="^\s+\*\s.*$"/>
376	<	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
377	<	<param name="replacement" value=" "/>
378	<	</filterreader>
379	<
380	<	</filterchain>
381	<	</copy>
382	<
383	<	</target>
384	<
385	<
386	<
267	>	<target name="compile-tests"
268	>	depends="jar">
269
270	<	<target name="filter-doccheck"
389	<	depends="filter-src">
270	>	<mkdir dir="${build.testcases.dir}"/>
271
272	<	<mkdir dir="${build.filter.doccheck.dir}"/>
272	>	<javac srcdir="${tck.src.dir}"
273	>	destdir="${build.testcases.dir}"
274	>	debug="${build.debug}"
275	>	debuglevel="${build.debuglevel}"
276	>	deprecation="${build.deprecation}"
277	>	source="${build.sourcelevel}"
278	>	fork="true">
279
280	<	<copy todir="${build.filter.doccheck.dir}">
281	<	<fileset dir="${build.filter.src.dir}">
395	<	<include name="**/*.html"/>
396	<	</fileset>
397	<	</copy>
280	>	<compilerarg value="${bootclasspath.args}"/>
281	>	<compilerarg line="${build.args}"/>
282
283	<	<property name="generic.declarations"
400	<	value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
401	<	/>
283	>	<classpath refid="test.classpath"/>
284
285	<	<copy todir="${build.filter.doccheck.dir}">
404	<	<fileset dir="${build.filter.src.dir}">
405	<	<exclude name="**/*.html"/>
406	<	</fileset>
407	<	<filterchain>
408	<	<!--
409	<	# These two filters try to make the source look like
410	<	# something that doccheck can process. The first removes
411	<	# -source 1.4 assertions and the second adds in a bunch
412	<	# of single letter public nested marker interfaces so that
413	<	# the generic type parameters are recognized.
414	<	-->
415	<
416	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
417	<	classpath="${build.ant.dir}">
418	<	<param name="matching"    value="^\s*assert[\s ].*$"/>
419	<	<param name="pattern"     value="assert"/>
420	<	<param name="replacement" value="//assert"/>
421	<	</filterreader>
422	<
423	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
424	<	classpath="${build.ant.dir}">
425	<	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
426	<	<param name="pattern"     value="$"/>
427	<	<param name="replacement" value=" ${generic.declarations}"/>
428	<	</filterreader>
285	>	</javac>
286
287	<	</filterchain>
288	<	</copy>
287	>	<javac srcdir="${test.src.dir}"
288	>	destdir="${build.testcases.dir}"
289	>	debug="${build.debug}"
290	>	debuglevel="${build.debuglevel}"
291	>	deprecation="${build.deprecation}"
292	>	source="${build.sourcelevel}"
293	>	fork="true">
294
295	<	</target>
295	>	<include name="jsr166/test/**"/>
296
297	+	<compilerarg value="${bootclasspath.args}"/>
298	+	<compilerarg line="${build.args}"/>
299
300	<	<target name="compile-tests"
437	<	depends="jar">
300	>	<classpath refid="test.classpath"/>
301
302	<	<mkdir dir="${build.testcases.dir}"/>
302	>	</javac>
303
304		<!--
305	<	<echo>javac ${build.args}</echo>
443	<	<echo>classpath="${test.classpath}"</echo>
444	<	-->
445	<
446	<	<javac srcdir="${test.src.dir}"
305	>	<javac srcdir="${jtreg.src.dir}"
306		destdir="${build.testcases.dir}"
307		debug="${build.debug}"
308		debuglevel="${build.debuglevel}"
#	Line 451 | Line 310
310		source="${build.sourcelevel}"
311		fork="true">
312
313	+	<compilerarg value="${bootclasspath.args}"/>
314		<compilerarg line="${build.args}"/>
315	+
316		<classpath refid="test.classpath"/>
456	–
457	–	<include name="java/**"/>
458	–	<include name="jsr166/**"/>
317
318		</javac>
319	+	-->
320
321		</target>
322
#	Line 477 | Line 336
336		dir="${build.reports.dir}"
337		fork="true">
338
339	<	<jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
339	>	<jvmarg value="${bootclasspath.args}"/>
340	>	<jvmarg value="-server"/>
341	>	<jvmarg value="-showversion"/>
342	>
343	>	<classpath refid="test.classpath"/>
344
345		<formatter type="xml"/>
346
347	<	<batchtest todir="${build.reports.dir}">
347	>	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
348	>	<fileset dir="${tck.src.dir}">
349	>	<include name="**/${testcase}Test.java"/>
350	>	</fileset>
351	>	</batchtest>
352	>
353	>	<batchtest todir="${build.reports.dir}" if="do.test.old">
354		<fileset dir="${test.src.dir}">
355	<	<include name="java/**/${testcase}Test.java"/>
487	<	<include name="jsr166/**/${testcase}Test.java"/>
355	>	<include name="jsr166/test/**/${testcase}Test.java"/>
356		</fileset>
357		</batchtest>
358
359	+	<!--
360	+	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
361	+	<fileset dir="${jtreg.src.dir}">
362	+	<include name="**/${testcase}Test.java"/>
363	+	</fileset>
364	+	</batchtest>
365	+	-->
366	+
367		</junit>
368
369		</target>
#	Line 508 | Line 384
384		<fileset dir="${build.reports.dir}">
385		<include name="TEST-*.xml"/>
386		</fileset>
387	<	<report styledir="${stylesheet.dir}"
512	<	format="${junit.report.format}"
513	<	todir="${build.reports.dir}"
387	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
388		/>
389		</junitreport>
390
#	Line 528 | Line 402
402		</condition>
403
404		<property name="warnunchecked.arg" value=""/>
531	–
532	–	<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
533	–	<istrue value="${build.nothreads}"/>
534	–	</condition>
405
406
407		<!-- Common options in javac invocations -->
#	Line 540 | Line 410
410		</target>
411
412
543	–	<target name="prepare-src"
544	–	depends="configure-compiler"
545	–	if="prepare.src.dir">
546	–
547	–	<mkdir dir="${prepare.src.dir}"/>
548	–	<copy todir="${prepare.src.dir}">
549	–	<fileset dir="${src.dir}">
550	–	<exclude name="java/lang/**"/>
551	–	</fileset>
552	–	</copy>
553	–
554	–	</target>
555	–
556	–
413		<target name="configure-tests"
414		depends="configure-compiler">
415
#	Line 561 | Line 417
417		<available property="junit.available"
418		classname="junit.framework.Protectable"/>
419
564	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
565	–	unless="junit.available"/>
566	–
420		<!-- Xalan -->
421		<available property="xalan.available"
422		classname="org.apache.xalan.Version"/>
423
424	+
425	+	<!-- Ant 1.6beta and later don't need or want this check -->
426	+	<!--
427	+	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
428	+	unless="junit.available"/>
429	+
430		<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
431		unless="xalan.available"/>
432	+	-->
433
434	+	</target>
435
575	–	<!--
576	–	! Bootclasspath munging for testing, so JUnit can test our local
577	–	! modifications to java.*.
578	–	-->
436
437	<	<path id="test.classpath">
438	<	<pathelement location="${product.jar}"/>
582	<	<pathelement location="${rt.jar}"/>
583	<	<pathelement location="${junit.jar}"/>
584	<	<pathelement location="${build.testcases.dir}"/>
585	<	</path>
437	>	<!-- Various demos and test programs -->
438	>
439
440	<	<path id="test.bootclasspath">
441	<	<path refid="test.classpath"/>
589	<	</path>
440	>	<target name="loops" depends="init, configure-compiler"
441	>	description="Benchmark from Doug Lea's AQS paper">
442
443	<	<!-- Flatten test classpaths into platform-appropriate strings -->
444	<	<property name="test.classpath"         refid="test.classpath"/>
445	<	<property name="test.bootclasspath"     refid="test.bootclasspath"/>
443	>	<mkdir dir="${build.loops.dir}"/>
444	>
445	>	<javac srcdir="${loops.src.dir}"
446	>	destdir="${build.loops.dir}"
447	>	debug="${build.debug}"
448	>	debuglevel="${build.debuglevel}"
449	>	deprecation="${build.deprecation}"
450	>	source="${build.sourcelevel}"
451	>	fork="true">
452	>
453	>	<compilerarg line="${build.args}"/>
454	>	<classpath refid="loops.classpath"/>
455	>
456	>	</javac>
457	>
458	>	<java classname="ALoops" fork="true">
459	>	<classpath refid="loops.classpath"/>
460	>	</java>
461
462		</target>
463
464
465	+	<!-- jsr166x -->
466	+
467	+
468	+	<target name="jsr166xcompile"
469	+	depends="init, configure-compiler"
470	+	description="Compiles jsr166x sources">
471	+
472	+	<mkdir dir="${build.jsr166x.dir}"/>
473	+
474	+	<javac srcdir="${jsr166xsrc.dir}"
475	+	destdir="${build.jsr166x.dir}"
476	+	debug="${build.debug}"
477	+	debuglevel="${build.debuglevel}"
478	+	deprecation="${build.deprecation}"
479	+	source="${build.sourcelevel}"
480	+	fork="true">
481
482	<	<!-- Anthill targets -->
482	>	<include name="**/*.java"/>
483	>	<compilerarg line="${build.args}"/>
484	>
485	>	</javac>
486
601	–	<target name="anthill-build">
602	–
603	–	<!-- Override this in user.properties -->
604	–	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
605	–
606	–	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
607	–	<arg value="-Xmx256000000"/>
608	–	<!-- classpath of new JVM -->
609	–	<arg value="-classpath"/> <arg path="${java.class.path}"/>
610	–	<!-- location of Ant home directory -->
611	–	<arg value="-Dant.home=${ant.home}"/>
612	–	<!-- the Ant main class -->
613	–	<arg value="org.apache.tools.ant.Main"/>
614	–	<!-- The build file -->
615	–	<arg value="-buildfile"/>  <arg value="build.xml"/>
616	–	<!-- the target to build on the new Ant instance -->
617	–	<arg value="-DJAVA_HOME=${tiger.home}"/>
618	–	<arg value="do-anthill-build"/>
619	–	</exec>
487		</target>
621	–
622	–	<target name="do-anthill-build"
623	–	depends="jar, test, docs, dist-docs"/>
488
625	–	<target name="anthill-publish">
489
627	–	<copy todir="${deployDir}/docs/private">
628	–	<fileset dir="${build.javadocs.dir}"/>
629	–	</copy>
490
491	<	<copy todir="${deployDir}/docs/public">
492	<	<fileset dir="${dist.javadocs.dir}"/>
493	<	</copy>
491	>	<target name="jsr166xjar"
492	>	depends="jsr166xcompile"
493	>	description="Builds library jar from compiled sources">
494
495	<	<copy tofile="${deployDir}/index.html"
636	<	file="${basedir}/etc/anthill-index.html"/>
495	>	<mkdir dir="${build.jsr166xlib.dir}"/>
496
497	<	<copy todir="${deployDir}/notes">
498	<	<fileset dir="${basedir}/etc/notes"/>
499	<	</copy>
497	>	<jar destfile="${jsr166xproduct.jar}">
498	>	<fileset dir="${build.jsr166x.dir}"/>
499	>	</jar>
500
501		</target>
502
503
645	–	<target name="ng" depends="test">
646	–	<java classname="SuperfluousAbstract" fork="true">
504
505	<	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
505	>	<target name="jsr166xdocs"
506	>	description="Builds javadocs with custom tags to build folder">
507	>
508	>	<delete dir="${build.jsr166xjavadocs.dir}"/>
509	>	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
510	>
511	>	<javadoc destdir="${build.jsr166xjavadocs.dir}"
512	>	link="http://java.sun.com/javase/6/docs/api/"
513	>
514	>	sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
515	>
516	>	>
517	>	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
518	>	<include name="jsr166x"/>
519	>	</packageset>
520	>
521	>
522	>	</javadoc>
523	>
524	>	</target>
525	>
526	>
527	>	<target name="jsr166xdist"
528	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
529	>	description="Puts all distributable products in single hierarchy"/>
530	>
531	>
532	>
533	>	<target name="jsr166xclean"
534	>	description="Removes all build products">
535	>
536	>	<delete dir="${build.jsr166x.dir}"/>
537	>	<delete dir="${build.jsr166xlib.dir}"/>
538	>
539	>	</target>
540	>
541	>
542	>
543	>	<target name="jsr166xdist-clean"
544	>	description="Removes all build and distribution products">
545	>
546	>	</target>
547	>
548	>
549	>
550	>	<target name="jsr166xdist-docs"
551	>	description="Builds javadocs without custom tags to dist folder">
552	>
553	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
554	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
555	>
556	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
557	>	link="http://java.sun.com/javase/6/docs/api/"
558	>	source="${build.sourcelevel}">
559	>
560	>	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
561	>	<include name="jsr166x"/>
562	>	</packageset>
563	>
564	>	</javadoc>
565	>
566	>	</target>
567	>
568	>	<target name="jsr166xdist-jar"
569	>	depends="jsr166xclean, jsr166xjar">
570	>
571	>	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
572	>
573	>	</target>
574	>
575	>	<!-- jsr166y -->
576	>
577	>
578	>	<target name="jsr166ycompile"
579	>	depends="init, configure-compiler"
580	>	description="Compiles jsr166y sources">
581	>
582	>	<mkdir dir="${build.jsr166y.dir}"/>
583	>
584	>	<javac srcdir="${jsr166ysrc.dir}"
585	>	destdir="${build.jsr166y.dir}"
586	>	debug="${build.debug}"
587	>	debuglevel="${build.debuglevel}"
588	>	deprecation="${build.deprecation}"
589	>	source="${build.sourcelevel}"
590	>	fork="true">
591	>
592	>	<include name="**/*.java"/>
593	>	<compilerarg line="${build.args}"/>
594	>	<compilerarg value="${bootclasspath.args}"/>
595	>
596	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
597	>
598	>	</javac>
599	>
600	>	</target>
601	>
602	>
603	>
604	>	<target name="jsr166yjar"
605	>	depends="jsr166ycompile"
606	>	description="Builds library jar from compiled sources">
607	>
608	>	<mkdir dir="${build.jsr166ylib.dir}"/>
609	>
610	>	<jar destfile="${jsr166yproduct.jar}" index="true">
611	>	<fileset dir="${build.jsr166y.dir}"/>
612	>	</jar>
613	>
614	>	</target>
615	>
616	>
617	>
618	>	<target name="jsr166ydocs"
619	>	description="Builds javadocs with custom tags to build folder">
620	>
621	>	<delete dir="${build.jsr166yjavadocs.dir}"/>
622	>	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
623	>
624	>	<javadoc destdir="${build.jsr166yjavadocs.dir}"
625	>	link="http://java.sun.com/javase/6/docs/api/"
626	>	sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
627	>
628	>	>
629	>	<packageset dir="${topsrc.dir}" defaultexcludes="no">
630	>	<include name="jsr166y"/>
631	>	</packageset>
632	>
633	>
634	>	</javadoc>
635	>
636	>	</target>
637	>
638	>
639	>	<target name="jsr166ydist"
640	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
641	>	description="Puts all distributable products in single hierarchy"/>
642	>
643	>
644	>
645	>	<target name="jsr166yclean"
646	>	description="Removes all build products">
647	>
648	>	<delete dir="${build.jsr166y.dir}"/>
649	>	<delete dir="${build.jsr166ylib.dir}"/>
650	>
651	>	</target>
652	>
653	>
654	>
655	>	<target name="jsr166ydist-clean"
656	>	description="Removes all build and distribution products">
657	>
658	>	</target>
659	>
660	>	<target name="jsr166ydist-docs"
661	>	description="Builds javadocs without custom tags to dist folder">
662	>
663	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
664	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
665	>
666	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
667	>	link="http://java.sun.com/javase/6/docs/api/"
668	>	source="${build.sourcelevel}"
669	>	sourcepath="${src.dir}:${jsr166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
670	>	>
671	>	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
672	>	<include name="jsr166y/*.java"/>
673	>	</fileset>
674	>	</javadoc>
675	>
676	>	</target>
677	>
678	>	<target name="jsr166ydist-jar"
679	>	depends="jsr166yclean, jsr166yjar">
680	>
681	>	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
682	>
683	>	</target>
684	>
685	>	<!-- extra166y -->
686	>
687	>
688	>	<target name="extra166ycompile"
689	>	depends="init, configure-compiler, jsr166ycompile"
690	>	description="Compiles extra166y sources">
691	>
692	>	<mkdir dir="${build.extra166y.dir}"/>
693	>
694	>	<javac srcdir="${extra166ysrc.dir}"
695	>	destdir="${build.extra166y.dir}"
696	>	debug="${build.debug}"
697	>	classpath="${jsr166yproduct.jar}"
698	>	debuglevel="${build.debuglevel}"
699	>	deprecation="${build.deprecation}"
700	>	source="${build.sourcelevel}"
701	>	fork="true">
702	>
703	>	<include name="**/*.java"/>
704	>	<compilerarg line="${build.args}"/>
705	>	<compilerarg value="${bootclasspath.args}"/>
706	>
707	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
708	>
709	>	</javac>
710
650	–	</java>
711		</target>
712
713
714	+
715	+	<target name="extra166yjar"
716	+	depends="extra166ycompile"
717	+	description="Builds library jar from compiled sources">
718	+
719	+	<mkdir dir="${build.extra166ylib.dir}"/>
720	+
721	+	<jar destfile="${extra166yproduct.jar}" index="true">
722	+	<fileset dir="${build.extra166y.dir}"/>
723	+	</jar>
724	+
725	+	</target>
726	+
727	+
728	+
729	+	<target name="extra166ydocs"
730	+	description="Builds javadocs with custom tags to build folder">
731	+
732	+	<delete dir="${build.extra166yjavadocs.dir}"/>
733	+	<mkdir dir="${build.extra166yjavadocs.dir}"/>
734	+
735	+	<javadoc destdir="${build.extra166yjavadocs.dir}"
736	+	link="http://java.sun.com/javase/6/docs/api/"
737	+	sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
738	+
739	+	>
740	+	<packageset dir="${topsrc.dir}" defaultexcludes="no">
741	+	<include name="extra166y"/>
742	+	</packageset>
743	+
744	+
745	+	</javadoc>
746	+
747	+	</target>
748	+
749	+
750	+	<target name="extra166ydist"
751	+	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
752	+	description="Puts all distributable products in single hierarchy"/>
753	+
754	+
755	+
756	+	<target name="extra166yclean"
757	+	description="Removes all build products">
758	+
759	+	<delete dir="${build.extra166y.dir}"/>
760	+	<delete dir="${build.extra166ylib.dir}"/>
761	+
762	+	</target>
763	+
764	+
765	+
766	+	<target name="extra166ydist-clean"
767	+	description="Removes all build and distribution products">
768	+
769	+	</target>
770	+
771	+	<target name="extra166ydist-docs"
772	+	description="Builds javadocs without custom tags to dist folder">
773	+
774	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
775	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
776	+
777	+	<javadoc destdir="${dist.extra166yjavadocs.dir}"
778	+	link="http://java.sun.com/javase/6/docs/api/"
779	+	source="${build.sourcelevel}"
780	+	sourcepath="${src.dir}:${jsr166ysrc.dir}:${extra166ysrc.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
781	+	>
782	+	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
783	+	<include name="extra166y/*.java"/>
784	+	</fileset>
785	+	</javadoc>
786	+
787	+	</target>
788	+
789	+	<target name="extra166ydist-jar"
790	+	depends="extra166yclean, extra166yjar">
791	+
792	+	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
793	+
794	+	</target>
795	+
796		</project>

Diff Legend

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