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.61 by tim, Tue Dec 9 18:38:28 2003 UTC vs.
Revision 1.81 by jsr166, Sun Aug 2 00:11:59 2009 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="loops.src.dir"        location="${basedir}/src/loops"/>
53		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54	<	<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
47	<	<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
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 64 | 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"
#	Line 83 | Line 107
107		source="${build.sourcelevel}"
108		fork="true">
109
110	+	<include name="**/*.java"/>
111	+	<compilerarg value="-XDignore.symbol.file"/>
112	+
113	+	<!--
114	+	<exclude name="java/lang/**"/>
115		<compilerarg line="${build.args}"/>
116	+	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
117	+	-->
118
119		</javac>
120
#	Line 118 | 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://java.sun.com/javase/6/docs/api/"
153		overview="${src.dir}/intro.html"
154	<	source="${build.sourcelevel}">
155	<
125	<	<tag name="revised" description="Last revised:"/>
126	<	<tag name="spec"    description="Specified by:"/>
154	>	sourcepath="${src.dir}:${jdksrc.dir}"
155	>	>
156
157		<packageset dir="${src.dir}"/>
158
#	Line 133 | Line 162
162
163
164
136	–	<target name="doccheck"
137	–	depends="filter-doccheck"
138	–	description="Reports on javadoc style errors">
139	–
140	–	<delete dir="${build.doccheck.dir}"/>
141	–	<mkdir dir="${build.doccheck.dir}"/>
142	–
143	–	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
144	–	docletpath="${lib.dir}/doccheck.jar"
145	–	destdir="${build.doccheck.dir}">
146	–	<packageset dir="${build.dc-filter.dir}"/>
147	–	</javadoc>
148	–
149	–	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
150	–
151	–	</target>
152	–
153	–
154	–
155	–	<target name="checkstyle"
156	–	depends="filter-src"
157	–	description="Reports on style errors in Java source (verbose, mostly chaff)">
158	–
159	–	<taskdef resource="checkstyletask.properties"
160	–	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
161	–
162	–	<mkdir dir="${build.checkstyle.dir}"/>
163	–
164	–	<checkstyle config="etc/checkstyle/sun_checks.xml"
165	–	failOnViolation="false">
166	–	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
167	–	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
168	–	</checkstyle>
169	–
170	–	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
171	–	out="${build.checkstyle.dir}/checkstyle-report.html"
172	–	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
173	–
174	–	</target>
175	–
176	–
177	–
165		<target name="dist"
166		depends="init, dist-clean, dist-jar, dist-docs"
167		description="Puts all distributable products in single hierarchy"/>
168
169
183	–
170		<target name="release"
171		depends="dist"
172		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 228 | 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://java.sun.com/javase/6/docs/api/"
218		overview="${src.dir}/intro.html"
233	–	source="${build.sourcelevel}">
234	–
235	–	<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 251 | Line 256
256		<echo>java.home is ${java.home}</echo>
257
258		</target>
259	<
260	<
259	>
260	>
261		<target name="dist-jar"
262		depends="clean, jar">
263
#	Line 261 | Line 266
266		</target>
267
268
264	–	<target name="compile-ant-filter"
265	–	depends="init">
266	–
267	–	<mkdir dir="${build.ant.dir}"/>
268	–
269	–	<javac srcdir="${ant.src.dir}"
270	–	destdir="${build.ant.dir}"
271	–	source="1.4"
272	–	/>
273	–
274	–	</target>
275	–
276	–
277	–	<target name="filter-src"
278	–	depends="compile-ant-filter">
279	–
280	–	<mkdir dir="${build.filter.src.dir}"/>
281	–
282	–	<copy todir="${build.filter.src.dir}">
283	–	<fileset dir="${src.dir}">
284	–	<include name="**/*.html"/>
285	–	</fileset>
286	–	</copy>
287	–
288	–	<copy todir="${build.filter.src.dir}">
289	–	<fileset dir="${src.dir}">
290	–	<exclude name="**/*.html"/>
291	–	<!-- Files excluded from dist-docs -->
292	–	<exclude name="java/util/Random.*"/>
293	–	<exclude name="sun/misc/Unsafe.*"/>
294	–	</fileset>
295	–	<!--
296	–	<filterchain>
297	–	-->
298	–
299	–	<!--
300	–	# This filter gets rid of angle-bracketed type parameters
301	–	# so that javadoc can run on the result. The following
302	–	# heuristic seems to work:
303	–	#
304	–	# For all lines not starting with space(s)-asterisk-space(s),
305	–	#   replace <something> with a space, where there may be more
306	–	#   than one right angle bracket at the end, and "something"
307	–	#   must not contain parens or pipes. (This may need some
308	–	#   tweaking.)
309	–	-->
310	–
311	–	<!--
312	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
313	–	classpath="${build.ant.dir}">
314	–	<param name="notmatching" value="^\s+\*\s.*$"/>
315	–	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
316	–	<param name="replacement" value=" "/>
317	–	</filterreader>
318	–	-->
319	–
320	–	<!--
321	–	</filterchain>
322	–	-->
323	–	</copy>
324	–
325	–	</target>
326	–
327	–
328	–	<target name="filter-doccheck"
329	–	depends="filter-src">
330	–
331	–	<mkdir dir="${build.dc-filter.dir}"/>
332	–
333	–	<copy todir="${build.dc-filter.dir}">
334	–	<fileset dir="${build.filter.src.dir}">
335	–	<include name="**/*.html"/>
336	–	</fileset>
337	–	</copy>
338	–
339	–	<property name="generic.declarations"
340	–	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 {}"
341	–	/>
342	–
343	–	<copy todir="${build.dc-filter.dir}">
344	–	<fileset dir="${build.filter.src.dir}">
345	–	<exclude name="**/*.html"/>
346	–	</fileset>
347	–	<filterchain>
348	–	<!--
349	–	# These two filters try to make the source look like
350	–	# something that doccheck can process. The first removes
351	–	# -source 1.4 assertions and the second adds in a bunch
352	–	# of single letter public nested marker interfaces so that
353	–	# the generic type parameters are recognized.
354	–	-->
355	–
356	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
357	–	classpath="${build.ant.dir}">
358	–	<param name="matching"    value="^\s*assert[\s ].*$"/>
359	–	<param name="pattern"     value="assert"/>
360	–	<param name="replacement" value="//assert"/>
361	–	</filterreader>
362	–
363	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
364	–	classpath="${build.ant.dir}">
365	–	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
366	–	<param name="pattern"     value="$"/>
367	–	<param name="replacement" value=" ${generic.declarations}"/>
368	–	</filterreader>
369	–
370	–	</filterchain>
371	–	</copy>
372	–
373	–	</target>
374	–
375	–
269		<target name="compile-tests"
270		depends="jar">
271
#	Line 388 | Line 281
281
282		<compilerarg value="${bootclasspath.args}"/>
283		<compilerarg line="${build.args}"/>
284	<
284	>
285		<classpath refid="test.classpath"/>
286
287		</javac>
#	Line 402 | Line 295
295		fork="true">
296
297		<include name="jsr166/test/**"/>
298	<
298	>
299		<compilerarg value="${bootclasspath.args}"/>
300		<compilerarg line="${build.args}"/>
301	<
301	>
302		<classpath refid="test.classpath"/>
303
304		</javac>
305
306	+	<!--
307	+	<javac srcdir="${jtreg.src.dir}"
308	+	destdir="${build.testcases.dir}"
309	+	debug="${build.debug}"
310	+	debuglevel="${build.debuglevel}"
311	+	deprecation="${build.deprecation}"
312	+	source="${build.sourcelevel}"
313	+	fork="true">
314	+
315	+	<compilerarg value="${bootclasspath.args}"/>
316	+	<compilerarg line="${build.args}"/>
317	+
318	+	<classpath refid="test.classpath"/>
319	+
320	+	</javac>
321	+	-->
322	+
323		</target>
324
325
#	Line 429 | 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}">
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 463 | Line 386
386		<fileset dir="${build.reports.dir}">
387		<include name="TEST-*.xml"/>
388		</fileset>
389	<	<report styledir="${stylesheet.dir}"
467	<	format="${junit.report.format}"
468	<	todir="${build.reports.dir}"
389	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
390		/>
391		</junitreport>
392
#	Line 502 | 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 515 | Line 436
436		</target>
437
438
439	+	<!-- Various demos and test programs -->
440	+
441	+
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	<	<!-- Anthill targets -->
458	>	</javac>
459
460	<	<target name="anthill-build">
461	<
462	<	<!-- Override this in user.properties -->
524	<	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
525	<
526	<	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
527	<	<arg value="-Xmx256000000"/>
528	<	<!-- classpath of new JVM -->
529	<	<arg value="-classpath"/> <arg path="${java.class.path}"/>
530	<	<!-- location of Ant home directory -->
531	<	<arg value="-Dant.home=${ant.home}"/>
532	<	<!-- the Ant main class -->
533	<	<arg value="org.apache.tools.ant.Main"/>
534	<	<!-- The build file -->
535	<	<arg value="-buildfile"/>  <arg value="build.xml"/>
536	<	<!-- the target to build on the new Ant instance -->
537	<	<arg value="-DJAVA_HOME=${tiger.home}"/>
538	<	<arg value="do-anthill-build"/>
539	<	</exec>
540	<	</target>
541	<
542	<	<target name="do-anthill-build"
543	<	depends="jar, test, docs, dist-docs"/>
544	<
545	<	<target name="anthill-publish">
546	<
547	<	<copy todir="${deployDir}/docs/private">
548	<	<fileset dir="${build.javadocs.dir}"/>
549	<	</copy>
550	<
551	<	<copy todir="${deployDir}/docs/public">
552	<	<fileset dir="${dist.javadocs.dir}"/>
553	<	</copy>
554	<
555	<	<copy tofile="${deployDir}/index.html"
556	<	file="${basedir}/etc/anthill-index.html"/>
557	<
558	<	<copy todir="${deployDir}/notes">
559	<	<fileset dir="${basedir}/etc/notes"/>
560	<	</copy>
460	>	<java classname="ALoops" fork="true">
461	>	<classpath refid="loops.classpath"/>
462	>	</java>
463
464		</target>
465
466
467	<	<!-- Standalone sample program -->
468	<
469	<	<target name="sample" depends="jar">
470	<
471	<	<mkdir dir="${build.testcases.dir}"/>
472	<
473	<	<javac srcdir="${test.src.dir}"
474	<	destdir="${build.testcases.dir}"
467	>	<!-- jsr166x -->
468	>
469	>
470	>	<target name="jsr166xcompile"
471	>	depends="init, configure-compiler"
472	>	description="Compiles jsr166x sources">
473	>
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	<	<compilerarg value="${bootclasspath.args}"/>
483	>
484	>	<include name="**/*.java"/>
485		<compilerarg line="${build.args}"/>
486	<
582	<	<classpath refid="test.classpath"/>
583	<
584	<	<include name="jsr166/test/Sample.java"/>
585	<
486	>
487		</javac>
488	<
489	<
490	<	<java classname="jsr166.test.Sample" fork="true">
491	<	<jvmarg value="${bootclasspath.args}"/>
492	<	<classpath refid="test.classpath"/>
493	<	</java>
488	>
489	>	</target>
490	>
491	>
492	>
493	>	<target name="jsr166xjar"
494	>	depends="jsr166xcompile"
495	>	description="Builds library jar from compiled sources">
496	>
497	>	<mkdir dir="${build.jsr166xlib.dir}"/>
498	>
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://java.sun.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://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	<	<!-- Backward compatibility, work in progress (some files not checked in) -->
573	>	</target>
574
575	+	<!-- jsr166y -->
576
577
578	<	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
579	<	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
580	<	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
604	<	<property name="pretiger.sourcelevel" value="1.4"/>
605	<
606	<	<target name="defang"
607	<	depends="init"
608	<	description="Generates pre-Tiger compatible source">
609	<
610	<	<delete dir="${pretiger.src.dir}"/>
611	<	<mkdir dir="${pretiger.src.dir}"/>
612	<
613	<	<exec executable="perl">
614	<	<arg file="etc/defang.pl"/>
615	<	<!-- <arg value="-v"/> -->
616	<	<arg value="-s"/> <arg file="${src.dir}"/>
617	<	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
618	<	</exec>
619	<
620	<	</target>
621	<
622	<	<target name="compile-pretiger"
623	<	depends="init, configure-compiler, defang"
624	<	description="Compiles pre-Tiger sources to build folder">
578	>	<target name="jsr166ycompile"
579	>	depends="init, configure-compiler"
580	>	description="Compiles jsr166y sources">
581
582	<	<mkdir dir="${build.pretiger.dir}"/>
582	>	<mkdir dir="${build.jsr166y.dir}"/>
583
584	<	<javac srcdir="${pretiger.src.dir}"
585	<	destdir="${build.pretiger.dir}"
584	>	<javac srcdir="${jsr166ysrc.dir}"
585	>	destdir="${build.jsr166y.dir}"
586		debug="${build.debug}"
587		debuglevel="${build.debuglevel}"
588		deprecation="${build.deprecation}"
589	<	source="${pretiger.sourcelevel}"
589	>	source="${build.sourcelevel}"
590		fork="true">
591
592	+	<include name="**/*.java"/>
593		<compilerarg line="${build.args}"/>
594	<	<exclude name="**/Thread.java"/>
594	>	<compilerarg value="${bootclasspath.args}"/>
595	>
596	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
597
598		</javac>
599
600		</target>
642	–
643	–	<target name="pretiger" depends="compile-pretiger">
601
602	<	<mkdir dir="${build.lib.dir}"/>
603	<
604	<	<jar destfile="${pretiger.jar}">
605	<	<fileset dir="${build.pretiger.dir}">
606	<	</fileset>
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	<
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="${topsrc.dir}:${jdksrc.dir}"
627	>	>
628	>	<packageset dir="${topsrc.dir}" defaultexcludes="no">
629	>	<include name="jsr166y"/>
630	>	</packageset>
631	>
632	>
633	>	</javadoc>
634	>
635	>	</target>
636	>
637	>
638	>	<target name="jsr166ydist"
639	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
640	>	description="Puts all distributable products in single hierarchy"/>
641	>
642	>
643	>
644	>	<target name="jsr166yclean"
645	>	description="Removes all build products">
646	>
647	>	<delete dir="${build.jsr166y.dir}"/>
648	>	<delete dir="${build.jsr166ylib.dir}"/>
649	>
650	>	</target>
651	>
652	>
653	>
654	>	<target name="jsr166ydist-clean"
655	>	description="Removes all build and distribution products">
656	>
657	>	</target>
658	>
659	>	<target name="jsr166ydist-docs"
660	>	description="Builds javadocs without custom tags to dist folder">
661	>
662	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
663	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
664	>
665	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
666	>	link="http://java.sun.com/javase/6/docs/api/"
667	>	source="${build.sourcelevel}"
668	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
669	>	>
670	>	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
671	>	<include name="jsr166y/*.java"/>
672	>	</fileset>
673	>	</javadoc>
674	>
675	>	</target>
676	>
677	>	<target name="jsr166ydist-jar"
678	>	depends="jsr166yclean, jsr166yjar">
679	>
680	>	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
681	>
682	>	</target>
683	>
684	>	<!-- extra166y -->
685	>
686	>
687	>	<target name="extra166ycompile"
688	>	depends="init, configure-compiler, jsr166ycompile"
689	>	description="Compiles extra166y sources">
690	>
691	>	<mkdir dir="${build.extra166y.dir}"/>
692	>
693	>	<javac srcdir="${extra166ysrc.dir}"
694	>	destdir="${build.extra166y.dir}"
695	>	debug="${build.debug}"
696	>	classpath="${jsr166yproduct.jar}"
697	>	debuglevel="${build.debuglevel}"
698	>	deprecation="${build.deprecation}"
699	>	source="${build.sourcelevel}"
700	>	fork="true">
701	>
702	>	<include name="**/*.java"/>
703	>	<compilerarg line="${build.args}"/>
704	>	<compilerarg value="${bootclasspath.args}"/>
705	>
706	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
707	>
708	>	</javac>
709	>
710	>	</target>
711	>
712	>
713	>
714	>	<target name="extra166yjar"
715	>	depends="extra166ycompile"
716	>	description="Builds library jar from compiled sources">
717	>
718	>	<mkdir dir="${build.extra166ylib.dir}"/>
719	>
720	>	<jar destfile="${extra166yproduct.jar}" index="true">
721	>	<fileset dir="${build.extra166y.dir}"/>
722	>	</jar>
723	>
724	>	</target>
725	>
726	>
727	>
728	>	<target name="extra166ydocs"
729	>	description="Builds javadocs with custom tags to build folder">
730	>
731	>	<delete dir="${build.extra166yjavadocs.dir}"/>
732	>	<mkdir dir="${build.extra166yjavadocs.dir}"/>
733	>
734	>	<javadoc destdir="${build.extra166yjavadocs.dir}"
735	>	link="http://java.sun.com/javase/6/docs/api/"
736	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
737	>	>
738	>	<packageset dir="${topsrc.dir}" defaultexcludes="no">
739	>	<include name="extra166y"/>
740	>	</packageset>
741	>
742	>
743	>	</javadoc>
744	>
745	>	</target>
746	>
747	>
748	>	<target name="extra166ydist"
749	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
750	>	description="Puts all distributable products in single hierarchy"/>
751	>
752	>
753	>
754	>	<target name="extra166yclean"
755	>	description="Removes all build products">
756	>
757	>	<delete dir="${build.extra166y.dir}"/>
758	>	<delete dir="${build.extra166ylib.dir}"/>
759	>
760	>	</target>
761	>
762	>
763	>
764	>	<target name="extra166ydist-clean"
765	>	description="Removes all build and distribution products">
766	>
767	>	</target>
768	>
769	>	<target name="extra166ydist-docs"
770	>	description="Builds javadocs without custom tags to dist folder">
771	>
772	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
773	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
774	>
775	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
776	>	link="http://java.sun.com/javase/6/docs/api/"
777	>	source="${build.sourcelevel}"
778	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
779	>	>
780	>	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
781	>	<include name="extra166y/*.java"/>
782	>	</fileset>
783	>	</javadoc>
784	>
785	>	</target>
786	>
787	>	<target name="extra166ydist-jar"
788	>	depends="extra166yclean, extra166yjar">
789	>
790	>	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
791	>
792		</target>
793
794		</project>

Diff Legend

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