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.83 by dl, Sat Nov 13 13:20:12 2010 UTC

#	Line 21 | Line 21
21
22
23		<!-- Compilation options -->
24	<	<property name="build.sourcelevel"    value="1.5"/>
24	>	<property name="build.sourcelevel"    value="1.6"/>
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.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"/>
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	<
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	>	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
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"/>
74	<
74	>
75		<!-- Bootclasspath argument -->
76		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
77
#	Line 63 | Line 81
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	+	<target name="dists"
93	+	depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
94	+	description="Builds all public jars and docs"/>
95
96		<target name="compile"
97	<	depends="init, configure-compiler, prepare-src"
97	>	depends="init, configure-compiler"
98		description="Compiles main sources to build folder">
99
100		<mkdir dir="${build.classes.dir}"/>
101
102	<	<javac srcdir="${prepare.src.dir}"
102	>	<javac srcdir="${src.dir}"
103		destdir="${build.classes.dir}"
104		debug="${build.debug}"
105		debuglevel="${build.debuglevel}"
#	Line 82 | Line 107
107		source="${build.sourcelevel}"
108		fork="true">
109
110	+	<include name="**/*.java"/>
111	+	<compilerarg value="-XDignore.symbol.file=true"/>
112	+
113	+	<!--
114	+	<exclude name="java/lang/**"/>
115		<compilerarg line="${build.args}"/>
116	+	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
117	+	-->
118
119		</javac>
120
#	Line 117 | Line 149
149		<mkdir dir="${build.javadocs.dir}"/>
150
151		<javadoc destdir="${build.javadocs.dir}"
152	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
152	>	link="http://download.oracle.com/javase/6/docs/api/"
153		overview="${src.dir}/intro.html"
154	<	source="${build.sourcelevel}">
155	<
124	<	<tag name="revised" description="Last revised:"/>
125	<	<tag name="spec"    description="Specified by:"/>
154	>	sourcepath="${src.dir}:${jdksrc.dir}"
155	>	>
156
157		<packageset dir="${src.dir}"/>
158
#	Line 132 | Line 162
162
163
164
135	–	<target name="checkstyle"
136	–	depends="filter-src"
137	–	description="Reports on style errors in Java source (verbose, mostly chaff)">
138	–
139	–	<taskdef resource="checkstyletask.properties"
140	–	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
141	–
142	–	<mkdir dir="${build.checkstyle.dir}"/>
143	–
144	–	<checkstyle config="etc/checkstyle/sun_checks.xml"
145	–	failOnViolation="false">
146	–	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
147	–	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
148	–	</checkstyle>
149	–
150	–	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
151	–	out="${build.checkstyle.dir}/checkstyle-report.html"
152	–	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
153	–
154	–	</target>
155	–
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	–
175	–
176	–
165		<target name="dist"
166		depends="init, dist-clean, dist-jar, dist-docs"
167		description="Puts all distributable products in single hierarchy"/>
168
169
182	–
170		<target name="release"
171		depends="dist"
172		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 227 | Line 214
214		<mkdir dir="${dist.javadocs.dir}"/>
215
216		<javadoc destdir="${dist.javadocs.dir}"
217	<	link="http://java.sun.com/j2se/1.4.2/docs/api"
217	>	link="http://download.oracle.com/javase/6/docs/api/"
218		overview="${src.dir}/intro.html"
232	–	source="${build.sourcelevel}">
233	–
234	–	<packageset dir="${src.dir}"/>
219
220	+	sourcepath="${src.dir}:${jdksrc.dir}"
221	+	>
222	+	<!--
223	+	<packageset dir="${src.dir}" defaultexcludes="yes">
224	+	<include name="java/util/concurrent"/>
225	+	<include name="java/util/concurrent/atomic"/>
226	+	<include name="java/util/concurrent/locks"/>
227	+	</packageset>
228	+	-->
229	+	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
230	+	<include name="main/java/util/concurrent/*.java"/>
231	+	<include name="main/java/util/concurrent/atomic/*.java"/>
232	+	<include name="main/java/util/concurrent/locks/*.java"/>
233	+	<include name="main/java/util/*.java"/>
234	+	<!--
235	+	<include name="main/java/util/concurrent/*.html"/>
236	+	<include name="main/java/util/concurrent/atomic/*.html"/>
237	+	<include name="main/java/util/concurrent/locks/*.html"/>
238	+	<include name="main/java/util/*.html"/>
239	+	-->
240	+	<!--      <include name="jsr166x/*.java"/> -->
241	+	</fileset>
242		</javadoc>
243
244		</target>
#	Line 260 | Line 266
266		</target>
267
268
269	<	<target name="compile-ant-filter"
270	<	depends="init">
265	<
266	<	<mkdir dir="${build.ant.dir}"/>
267	<
268	<	<javac srcdir="${ant.src.dir}"
269	<	destdir="${build.ant.dir}"
270	<	source="1.4"
271	<	/>
272	<
273	<	</target>
274	<
275	<
276	<	<target name="filter-src"
277	<	depends="compile-ant-filter">
278	<
279	<	<mkdir dir="${build.filter.src.dir}"/>
280	<
281	<	<copy todir="${build.filter.src.dir}">
282	<	<fileset dir="${src.dir}">
283	<	<include name="**/*.html"/>
284	<	</fileset>
285	<	</copy>
286	<
287	<	<copy todir="${build.filter.src.dir}">
288	<	<fileset dir="${src.dir}">
289	<	<exclude name="**/*.html"/>
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
300	<	# so that javadoc can run on the result. The following
301	<	# heuristic seems to work:
302	<	#
303	<	# For all lines not starting with space(s)-asterisk-space(s),
304	<	#   replace <something> with a space, where there may be more
305	<	#   than one right angle bracket at the end, and "something"
306	<	#   must not contain parens or pipes. (This may need some
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>
269	>	<target name="compile-tests"
270	>	depends="jar">
271
272	<	</target>
272	>	<mkdir dir="${build.testcases.dir}"/>
273
274	+	<javac srcdir="${tck.src.dir}"
275	+	destdir="${build.testcases.dir}"
276	+	debug="${build.debug}"
277	+	debuglevel="${build.debuglevel}"
278	+	deprecation="${build.deprecation}"
279	+	source="${build.sourcelevel}"
280	+	fork="true">
281
282	<	<target name="filter-doccheck"
283	<	depends="filter-src">
329	<
330	<	<mkdir dir="${build.dc-filter.dir}"/>
331	<
332	<	<copy todir="${build.dc-filter.dir}">
333	<	<fileset dir="${build.filter.src.dir}">
334	<	<include name="**/*.html"/>
335	<	</fileset>
336	<	</copy>
282	>	<compilerarg value="${bootclasspath.args}"/>
283	>	<compilerarg line="${build.args}"/>
284
285	<	<property name="generic.declarations"
339	<	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 {}"
340	<	/>
285	>	<classpath refid="test.classpath"/>
286
287	<	<copy todir="${build.dc-filter.dir}">
343	<	<fileset dir="${build.filter.src.dir}">
344	<	<exclude name="**/*.html"/>
345	<	</fileset>
346	<	<filterchain>
347	<	<!--
348	<	# These two filters try to make the source look like
349	<	# something that doccheck can process. The first removes
350	<	# -source 1.4 assertions and the second adds in a bunch
351	<	# of single letter public nested marker interfaces so that
352	<	# the generic type parameters are recognized.
353	<	-->
354	<
355	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
356	<	classpath="${build.ant.dir}">
357	<	<param name="matching"    value="^\s*assert[\s ].*$"/>
358	<	<param name="pattern"     value="assert"/>
359	<	<param name="replacement" value="//assert"/>
360	<	</filterreader>
361	<
362	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
363	<	classpath="${build.ant.dir}">
364	<	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
365	<	<param name="pattern"     value="$"/>
366	<	<param name="replacement" value=" ${generic.declarations}"/>
367	<	</filterreader>
287	>	</javac>
288
289	<	</filterchain>
290	<	</copy>
289	>	<javac srcdir="${test.src.dir}"
290	>	destdir="${build.testcases.dir}"
291	>	debug="${build.debug}"
292	>	debuglevel="${build.debuglevel}"
293	>	deprecation="${build.deprecation}"
294	>	source="${build.sourcelevel}"
295	>	fork="true">
296
297	<	</target>
297	>	<include name="jsr166/test/**"/>
298
299	+	<compilerarg value="${bootclasspath.args}"/>
300	+	<compilerarg line="${build.args}"/>
301
302	<	<target name="compile-tests"
376	<	depends="jar">
302	>	<classpath refid="test.classpath"/>
303
304	<	<mkdir dir="${build.testcases.dir}"/>
304	>	</javac>
305
306	<	<javac srcdir="${test.src.dir}/tck"
306	>	<!--
307	>	<javac srcdir="${jtreg.src.dir}"
308		destdir="${build.testcases.dir}"
309		debug="${build.debug}"
310		debuglevel="${build.debuglevel}"
#	Line 387 | Line 314
314
315		<compilerarg value="${bootclasspath.args}"/>
316		<compilerarg line="${build.args}"/>
317	<
317	>
318		<classpath refid="test.classpath"/>
319
320		</javac>
321	+	-->
322
323		</target>
324
#	Line 411 | Line 339
339		fork="true">
340
341		<jvmarg value="${bootclasspath.args}"/>
342	<
342	>	<jvmarg value="-server"/>
343	>	<jvmarg value="-showversion"/>
344	>
345		<classpath refid="test.classpath"/>
346
347		<formatter type="xml"/>
348
349	<	<batchtest todir="${build.reports.dir}">
350	<	<fileset dir="${test.src.dir}/tck">
351	<	<include name="${testcase}Test.java"/>
349	>	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
350	>	<fileset dir="${tck.src.dir}">
351	>	<include name="**/${testcase}Test.java"/>
352		</fileset>
353		</batchtest>
354
355	+	<batchtest todir="${build.reports.dir}" if="do.test.old">
356	+	<fileset dir="${test.src.dir}">
357	+	<include name="jsr166/test/**/${testcase}Test.java"/>
358	+	</fileset>
359	+	</batchtest>
360	+
361	+	<!--
362	+	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
363	+	<fileset dir="${jtreg.src.dir}">
364	+	<include name="**/${testcase}Test.java"/>
365	+	</fileset>
366	+	</batchtest>
367	+	-->
368	+
369		</junit>
370
371		</target>
#	Line 442 | Line 386
386		<fileset dir="${build.reports.dir}">
387		<include name="TEST-*.xml"/>
388		</fileset>
389	<	<report styledir="${stylesheet.dir}"
446	<	format="${junit.report.format}"
447	<	todir="${build.reports.dir}"
389	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
390		/>
391		</junitreport>
392
#	Line 462 | Line 404
404		</condition>
405
406		<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}"/>
407
408
409		<!-- Common options in javac invocations -->
#	Line 476 | Line 412
412		</target>
413
414
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	–
415		<target name="configure-tests"
416		depends="configure-compiler">
417
#	Line 501 | Line 423
423		<available property="xalan.available"
424		classname="org.apache.xalan.Version"/>
425
426	<
426	>
427		<!-- Ant 1.6beta and later don't need or want this check -->
428	<	<!--
428	>	<!--
429		<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
430		unless="junit.available"/>
431
#	Line 514 | Line 436
436		</target>
437
438
439	+	<!-- Various demos and test programs -->
440
518	–	<!-- Anthill targets -->
441
442	<	<target name="anthill-build">
443	<
444	<	<!-- Override this in user.properties -->
445	<	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
446	<
447	<	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
448	<	<arg value="-Xmx256000000"/>
449	<	<!-- classpath of new JVM -->
450	<	<arg value="-classpath"/> <arg path="${java.class.path}"/>
451	<	<!-- location of Ant home directory -->
452	<	<arg value="-Dant.home=${ant.home}"/>
453	<	<!-- the Ant main class -->
454	<	<arg value="org.apache.tools.ant.Main"/>
455	<	<!-- The build file -->
456	<	<arg value="-buildfile"/>  <arg value="build.xml"/>
457	<	<!-- the target to build on the new Ant instance -->
458	<	<arg value="-DJAVA_HOME=${tiger.home}"/>
459	<	<arg value="do-anthill-build"/>
460	<	</exec>
442	>	<target name="loops" depends="init, configure-compiler"
443	>	description="Benchmark from Doug Lea's AQS paper">
444	>
445	>	<mkdir dir="${build.loops.dir}"/>
446	>
447	>	<javac srcdir="${loops.src.dir}"
448	>	destdir="${build.loops.dir}"
449	>	debug="${build.debug}"
450	>	debuglevel="${build.debuglevel}"
451	>	deprecation="${build.deprecation}"
452	>	source="${build.sourcelevel}"
453	>	fork="true">
454	>
455	>	<compilerarg line="${build.args}"/>
456	>	<classpath refid="loops.classpath"/>
457	>
458	>	</javac>
459	>
460	>	<java classname="ALoops" fork="true">
461	>	<classpath refid="loops.classpath"/>
462	>	</java>
463	>
464		</target>
540	–
541	–	<target name="do-anthill-build"
542	–	depends="jar, test, docs, dist-docs"/>
465
544	–	<target name="anthill-publish">
466
467	<	<copy todir="${deployDir}/docs/private">
547	<	<fileset dir="${build.javadocs.dir}"/>
548	<	</copy>
467	>	<!-- jsr166x -->
468
550	–	<copy todir="${deployDir}/docs/public">
551	–	<fileset dir="${dist.javadocs.dir}"/>
552	–	</copy>
469
470	<	<copy tofile="${deployDir}/index.html"
471	<	file="${basedir}/etc/anthill-index.html"/>
470	>	<target name="jsr166xcompile"
471	>	depends="init, configure-compiler"
472	>	description="Compiles jsr166x sources">
473
474	<	<copy todir="${deployDir}/notes">
475	<	<fileset dir="${basedir}/etc/notes"/>
476	<	</copy>
474	>	<mkdir dir="${build.jsr166x.dir}"/>
475	>
476	>	<javac srcdir="${jsr166xsrc.dir}"
477	>	destdir="${build.jsr166x.dir}"
478	>	debug="${build.debug}"
479	>	debuglevel="${build.debuglevel}"
480	>	deprecation="${build.deprecation}"
481	>	source="${build.sourcelevel}"
482	>	fork="true">
483	>
484	>	<include name="**/*.java"/>
485	>	<compilerarg line="${build.args}"/>
486	>
487	>	</javac>
488
489		</target>
490
491
492
493	<	<!-- Backward compatibility, work in progress -->
493	>	<target name="jsr166xjar"
494	>	depends="jsr166xcompile"
495	>	description="Builds library jar from compiled sources">
496
497	+	<mkdir dir="${build.jsr166xlib.dir}"/>
498
499	<	<target name="compat" depends="jar">
500	<
501	<	<mkdir dir="${build.testcases.dir}"/>
502	<
503	<	<javac srcdir="${test.src.dir}"
504	<	destdir="${build.testcases.dir}"
499	>	<jar destfile="${jsr166xproduct.jar}">
500	>	<fileset dir="${build.jsr166x.dir}"/>
501	>	</jar>
502	>
503	>	</target>
504	>
505	>
506	>
507	>	<target name="jsr166xdocs"
508	>	description="Builds javadocs with custom tags to build folder">
509	>
510	>	<delete dir="${build.jsr166xjavadocs.dir}"/>
511	>	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
512	>
513	>	<javadoc destdir="${build.jsr166xjavadocs.dir}"
514	>	link="http://download.oracle.com/javase/6/docs/api/"
515	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
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://download.oracle.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	<	<compilerarg value="${bootclasspath.args}"/>
591	>
592	>	<include name="**/*.java"/>
593		<compilerarg line="${build.args}"/>
594	<
595	<	<classpath refid="test.classpath"/>
596	<
597	<	<include name="Compatibility.java"/>
598	<
594	>	<compilerarg value="-XDignore.symbol.file=true"/>
595	>	<compilerarg value="${bootclasspath.args}"/>
596	>
597	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
598	>
599		</javac>
600	<
601	<
602	<	<java classname="Compatibility" fork="true">
603	<	<jvmarg value="${bootclasspath.args}"/>
604	<	<classpath refid="test.classpath"/>
605	<	</java>
600	>
601	>	</target>
602	>
603	>
604	>
605	>	<target name="jsr166yjar"
606	>	depends="jsr166ycompile"
607	>	description="Builds library jar from compiled sources">
608	>
609	>	<mkdir dir="${build.jsr166ylib.dir}"/>
610	>
611	>	<jar destfile="${jsr166yproduct.jar}" index="true">
612	>	<fileset dir="${build.jsr166y.dir}"/>
613	>	</jar>
614	>
615	>	</target>
616	>
617	>
618	>
619	>	<target name="jsr166ydocs"
620	>	description="Builds javadocs with custom tags to build folder">
621	>
622	>	<delete dir="${build.jsr166yjavadocs.dir}"/>
623	>	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
624	>
625	>	<javadoc destdir="${build.jsr166yjavadocs.dir}"
626	>	link="http://download.oracle.com/javase/6/docs/api/"
627	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
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
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">
643
623	–	<mkdir dir="${build.pretiger.dir}"/>
644
645	<	<javac srcdir="${pretiger.src.dir}"
646	<	destdir="${build.pretiger.dir}"
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://download.oracle.com/javase/6/docs/api/"
668	>	source="${build.sourcelevel}"
669	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
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="${pretiger.sourcelevel}"
700	>	source="${build.sourcelevel}"
701		fork="true">
702
703	+	<include name="**/*.java"/>
704		<compilerarg line="${build.args}"/>
705	<	<exclude name="**/Thread.java"/>
705	>	<compilerarg value="-XDignore.symbol.file=true"/>
706	>	<compilerarg value="${bootclasspath.args}"/>
707	>
708	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
709
710		</javac>
711
712		</target>
639	–
640	–	<target name="pretiger" depends="compile-pretiger">
713
714	<	<mkdir dir="${build.lib.dir}"/>
715	<
716	<	<jar destfile="${pretiger.jar}">
717	<	<fileset dir="${build.pretiger.dir}">
718	<	</fileset>
714	>
715	>
716	>	<target name="extra166yjar"
717	>	depends="extra166ycompile"
718	>	description="Builds library jar from compiled sources">
719	>
720	>	<mkdir dir="${build.extra166ylib.dir}"/>
721	>
722	>	<jar destfile="${extra166yproduct.jar}" index="true">
723	>	<fileset dir="${build.extra166y.dir}"/>
724		</jar>
725	<
725	>
726	>	</target>
727	>
728	>
729	>
730	>	<target name="extra166ydocs"
731	>	description="Builds javadocs with custom tags to build folder">
732	>
733	>	<delete dir="${build.extra166yjavadocs.dir}"/>
734	>	<mkdir dir="${build.extra166yjavadocs.dir}"/>
735	>
736	>	<javadoc destdir="${build.extra166yjavadocs.dir}"
737	>	link="http://download.oracle.com/javase/6/docs/api/"
738	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
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://download.oracle.com/javase/6/docs/api/"
779	>	source="${build.sourcelevel}"
780	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
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