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.74 by dl, Thu Sep 13 11:19:25 2007 UTC vs.
Revision 1.90 by dl, Fri Jul 15 13:21:07 2011 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.j1.dir"         location="${build.dir}/j1"/>
34	<	<property name="build.loops.dir"      location="${build.dir}/loops"/>
35	<	<property name="build.lib.dir"        location="${build.dir}/lib"/>
36	<	<property name="build.ant.dir"        location="${build.dir}/ant"/>
37	<	<property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
38	<	<property name="build.reports.dir"    location="${build.dir}/reports"/>
39	<	<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
40	<	<property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
41	<	<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
42	<	<property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
43	<	<property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
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"/>
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.jsr166e.dir"           location="${build.dir}/jsr166e"/>
46	+	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
47	+	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
48	+
49	+	<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
50	+	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
51	+	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
52	+
53		<!-- Source locations -->
54		<property name="src.dir"              location="${basedir}/src/main"/>
55		<property name="test.src.dir"         location="${basedir}/src/test"/>
54	–	<property name="j1.src.dir"           location="${basedir}/src/javaone"/>
56		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
57		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
58		<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
58	–	<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
59	–	<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
59		<property name="lib.dir"              location="${basedir}/lib"/>
60		<property name="dist.dir"             location="${basedir}/dist"/>
61		<property name="topsrc.dir"           location="${basedir}/src"/>
62		<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
63		<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
64	<
64	>	<property name="jsr166esrc.dir"       location="${basedir}/src/jsr166e"/>
65	>	<property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
66	>	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
67		<!-- Distribution locations -->
68	<	<property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
68	>	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
69		<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
70		<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
71	+	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
72	+	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
73
74		<!-- Jar locations -->
75		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
76		<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
77		<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
78	+	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
79	+	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
80		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
76	–	<property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
81
82		<!-- Bootclasspath argument -->
83		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
#	Line 89 | Line 93
93		<pathelement location="${build.loops.dir}"/>
94		</path>
95
92	–	<!-- J1 classpath -->
93	–	<path id="j1.classpath">
94	–	<pathelement location="${build.classes.dir}"/>
95	–	<pathelement location="${build.j1.dir}"/>
96	–	<pathelement location="${junit.jar}"/>
97	–
98	–	<!-- Include dl.u.c for BoundedBuffer comparison -->
99	–	<pathelement location="${concurrent.jar}"/>
100	–	</path>
101	–
96
97		<!-- Main targets -->
98
99	+	<target name="dists"
100	+	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
101	+	description="Builds all public jars and docs"/>
102
103		<target name="compile"
104		depends="init, configure-compiler"
#	Line 118 | Line 115
115		fork="true">
116
117		<include name="**/*.java"/>
118	<	<compilerarg value="-XDignore.symbol.file"/>
118	>	<compilerarg value="-XDignore.symbol.file=true"/>
119
120		<!--
121		<exclude name="java/lang/**"/>
#	Line 158 | Line 155
155		<delete dir="${build.javadocs.dir}"/>
156		<mkdir dir="${build.javadocs.dir}"/>
157
158	<	<javadoc destdir="${build.javadocs.dir}"
159	<	link="http://java.sun.com/javase/6/docs/api/"
163	<	overview="${src.dir}/intro.html"
164	<	sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
165	<	>
166	<
167	<	<packageset dir="${src.dir}"/>
168	<
169	<	</javadoc>
170	<
171	<	</target>
172	<
158	>	<!-- the packagenames="none" hack below prevents scanning the -->
159	>	<!-- sourcepath for packages -->
160
161	<
162	<	<target name="doccheck"
163	<	depends="filter-doccheck"
164	<	description="Reports on javadoc style errors">
165	<
166	<	<delete dir="${build.doccheck.dir}"/>
167	<	<mkdir dir="${build.doccheck.dir}"/>
168	<
169	<	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
183	<	docletpath="${lib.dir}/doccheck.jar"
184	<	destdir="${build.doccheck.dir}">
185	<	<packageset dir="${build.dc-filter.dir}"/>
161	>	<javadoc destdir="${build.javadocs.dir}"
162	>	packagenames="none"
163	>	link="http://download.oracle.com/javase/7/docs/api/"
164	>	overview="${src.dir}/intro.html"
165	>	sourcepath="${src.dir}:${jdksrc.dir}"
166	>	additionalparam="-XDignore.symbol.file=true" >
167	>	<fileset dir="${src.dir}" defaultexcludes="yes">
168	>	<include name="**/*.java"/>
169	>	</fileset>
170		</javadoc>
171
188	–	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
189	–
190	–	</target>
191	–
192	–
193	–
194	–	<target name="checkstyle"
195	–	depends="filter-src"
196	–	description="Reports on style errors in Java source (verbose, mostly chaff)">
197	–
198	–	<taskdef resource="checkstyletask.properties"
199	–	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
200	–
201	–	<mkdir dir="${build.checkstyle.dir}"/>
202	–
203	–	<checkstyle config="etc/checkstyle/sun_checks.xml"
204	–	failOnViolation="false">
205	–	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
206	–	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
207	–	</checkstyle>
208	–
209	–	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
210	–	out="${build.checkstyle.dir}/checkstyle-report.html"
211	–	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
212	–
172		</target>
173
174
#	Line 219 | Line 178
178		description="Puts all distributable products in single hierarchy"/>
179
180
222	–
181		<target name="release"
182		depends="dist"
183		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 266 | Line 224
224		<delete dir="${dist.javadocs.dir}"/>
225		<mkdir dir="${dist.javadocs.dir}"/>
226
227	<	<javadoc destdir="${dist.javadocs.dir}"
228	<	link="http://java.sun.com/javase/6/docs/api/"
271	<	overview="${src.dir}/intro.html"
227	>	<!-- the packagenames="none" hack below prevents scanning the -->
228	>	<!-- sourcepath for packages -->
229
230	<	sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
231	<	>
232	<	<!--
233	<	<packageset dir="${src.dir}" defaultexcludes="yes">
234	<	<include name="java/util/concurrent"/>
235	<	<include name="java/util/concurrent/atomic"/>
236	<	<include name="java/util/concurrent/locks"/>
237	<	</packageset>
281	<	-->
282	<	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
283	<	<include name="main/java/util/concurrent/*.java"/>
284	<	<include name="main/java/util/concurrent/atomic/*.java"/>
285	<	<include name="main/java/util/concurrent/locks/*.java"/>
286	<	<include name="main/java/util/*.java"/>
287	<	<!--
288	<	<include name="main/java/util/concurrent/*.html"/>
289	<	<include name="main/java/util/concurrent/atomic/*.html"/>
290	<	<include name="main/java/util/concurrent/locks/*.html"/>
291	<	<include name="main/java/util/*.html"/>
292	<	-->
293	<	<!--      <include name="jsr166x/*.java"/> -->
230	>	<javadoc destdir="${dist.javadocs.dir}"
231	>	packagenames="none"
232	>	link="http://download.oracle.com/javase/7/docs/api/"
233	>	overview="${src.dir}/intro.html"
234	>	sourcepath="${src.dir}:${jdksrc.dir}"
235	>	additionalparam="-XDignore.symbol.file=true" >
236	>	<fileset dir="${src.dir}" defaultexcludes="yes">
237	>	<include name="**/*.java"/>
238		</fileset>
239		</javadoc>
240
#	Line 319 | Line 263
263		</target>
264
265
322	–	<target name="compile-ant-filter"
323	–	depends="init">
324	–
325	–	<mkdir dir="${build.ant.dir}"/>
326	–
327	–	<javac srcdir="${ant.src.dir}"
328	–	destdir="${build.ant.dir}"
329	–	source="1.4"/>
330	–
331	–	</target>
332	–
333	–
334	–	<target name="filter-src"
335	–	depends="compile-ant-filter">
336	–
337	–	<mkdir dir="${build.filter.src.dir}"/>
338	–
339	–	<copy todir="${build.filter.src.dir}">
340	–	<fileset dir="${src.dir}">
341	–	<include name="**/*.html"/>
342	–	</fileset>
343	–	</copy>
344	–
345	–	<copy todir="${build.filter.src.dir}">
346	–	<fileset dir="${src.dir}">
347	–	<exclude name="**/*.html"/>
348	–	<!-- Files excluded from dist-docs -->
349	–	<exclude name="java/util/Random.*"/>
350	–	<exclude name="sun/misc/Unsafe.*"/>
351	–	</fileset>
352	–	<!--
353	–	<filterchain>
354	–	-->
355	–
356	–	<!--
357	–	# This filter gets rid of angle-bracketed type parameters
358	–	# so that javadoc can run on the result. The following
359	–	# heuristic seems to work:
360	–	#
361	–	# For all lines not starting with space(s)-asterisk-space(s),
362	–	#   replace <something> with a space, where there may be more
363	–	#   than one right angle bracket at the end, and "something"
364	–	#   must not contain parens or pipes. (This may need some
365	–	#   tweaking.)
366	–	-->
367	–
368	–	<!--
369	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
370	–	classpath="${build.ant.dir}">
371	–	<param name="notmatching" value="^\s+\*\s.*$"/>
372	–	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
373	–	<param name="replacement" value=" "/>
374	–	</filterreader>
375	–	-->
376	–
377	–	<!--
378	–	</filterchain>
379	–	-->
380	–	</copy>
381	–
382	–	</target>
383	–
384	–
385	–	<target name="filter-doccheck"
386	–	depends="filter-src">
387	–
388	–	<mkdir dir="${build.dc-filter.dir}"/>
389	–
390	–	<copy todir="${build.dc-filter.dir}">
391	–	<fileset dir="${build.filter.src.dir}">
392	–	<include name="**/*.html"/>
393	–	</fileset>
394	–	</copy>
395	–
396	–	<property name="generic.declarations"
397	–	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 {}"
398	–	/>
399	–
400	–	<copy todir="${build.dc-filter.dir}">
401	–	<fileset dir="${build.filter.src.dir}">
402	–	<exclude name="**/*.html"/>
403	–	</fileset>
404	–	<filterchain>
405	–	<!--
406	–	# These two filters try to make the source look like
407	–	# something that doccheck can process. The first removes
408	–	# -source 1.4 assertions and the second adds in a bunch
409	–	# of single letter public nested marker interfaces so that
410	–	# the generic type parameters are recognized.
411	–	-->
412	–
413	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
414	–	classpath="${build.ant.dir}">
415	–	<param name="matching"    value="^\s*assert[\s ].*$"/>
416	–	<param name="pattern"     value="assert"/>
417	–	<param name="replacement" value="//assert"/>
418	–	</filterreader>
419	–
420	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
421	–	classpath="${build.ant.dir}">
422	–	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
423	–	<param name="pattern"     value="$"/>
424	–	<param name="replacement" value=" ${generic.declarations}"/>
425	–	</filterreader>
426	–
427	–	</filterchain>
428	–	</copy>
429	–
430	–	</target>
431	–
432	–
266		<target name="compile-tests"
267		depends="jar">
268
#	Line 445 | Line 278
278
279		<compilerarg value="${bootclasspath.args}"/>
280		<compilerarg line="${build.args}"/>
281	+	<compilerarg value="-XDignore.symbol.file=true"/>
282
283		<classpath refid="test.classpath"/>
284
#	Line 462 | Line 296
296
297		<compilerarg value="${bootclasspath.args}"/>
298		<compilerarg line="${build.args}"/>
299	+	<compilerarg value="-XDignore.symbol.file=true"/>
300
301		<classpath refid="test.classpath"/>
302
#	Line 478 | Line 313
313
314		<compilerarg value="${bootclasspath.args}"/>
315		<compilerarg line="${build.args}"/>
316	+	<compilerarg value="-XDignore.symbol.file=true"/>
317
318		<classpath refid="test.classpath"/>
319
#	Line 550 | Line 386
386		<fileset dir="${build.reports.dir}">
387		<include name="TEST-*.xml"/>
388		</fileset>
389	<	<report styledir="${stylesheet.dir}"
554	<	format="${junit.report.format}"
555	<	todir="${build.reports.dir}"
389	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
390		/>
391		</junitreport>
392
#	Line 602 | Line 436
436		</target>
437
438
605	–
606	–	<!-- Anthill targets -->
607	–
608	–	<target name="anthill-build">
609	–
610	–	<!-- Override this in user.properties -->
611	–	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
612	–
613	–	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
614	–	<arg value="-Xmx256000000"/>
615	–	<!-- classpath of new JVM -->
616	–	<arg value="-classpath"/> <arg path="${java.class.path}"/>
617	–	<!-- location of Ant home directory -->
618	–	<arg value="-Dant.home=${ant.home}"/>
619	–	<!-- the Ant main class -->
620	–	<arg value="org.apache.tools.ant.Main"/>
621	–	<!-- The build file -->
622	–	<arg value="-buildfile"/>  <arg value="build.xml"/>
623	–	<!-- the target to build on the new Ant instance -->
624	–	<arg value="-DJAVA_HOME=${tiger.home}"/>
625	–	<arg value="do-anthill-build"/>
626	–	</exec>
627	–	</target>
628	–
629	–	<target name="do-anthill-build"
630	–	depends="jar, test, docs, dist-docs"/>
631	–
632	–	<target name="anthill-publish">
633	–
634	–	<copy todir="${deployDir}/docs/private">
635	–	<fileset dir="${build.javadocs.dir}"/>
636	–	</copy>
637	–
638	–	<copy todir="${deployDir}/docs/public">
639	–	<fileset dir="${dist.javadocs.dir}"/>
640	–	</copy>
641	–
642	–	<copy tofile="${deployDir}/index.html"
643	–	file="${basedir}/etc/anthill-index.html"/>
644	–
645	–	<copy todir="${deployDir}/notes">
646	–	<fileset dir="${basedir}/etc/notes"/>
647	–	</copy>
648	–
649	–	</target>
650	–
651	–
652	–
439		<!-- Various demos and test programs -->
440
441
656	–	<target name="sample" depends="init, configure-compiler"
657	–	description="Standalone demo program">
658	–
659	–	<mkdir dir="${build.testcases.dir}"/>
660	–
661	–	<javac srcdir="${test.src.dir}"
662	–	destdir="${build.testcases.dir}"
663	–	debug="${build.debug}"
664	–	debuglevel="${build.debuglevel}"
665	–	deprecation="${build.deprecation}"
666	–	source="${build.sourcelevel}"
667	–	fork="true">
668	–
669	–	<include name="jsr166/test/Sample.java"/>
670	–
671	–	</javac>
672	–
673	–	<copy todir="${build.testcases.dir}">
674	–	<fileset dir="${test.src.dir}">
675	–	<include name="**/*.properties"/>
676	–	</fileset>
677	–	</copy>
678	–
679	–
680	–	<java classname="jsr166.test.Sample" fork="true">
681	–	<classpath refid="test.classpath"/>
682	–	<!-- <jvmarg value="-ea"/> -->
683	–	<!-- <jvmarg value="-server"/> -->
684	–	<!-- <arg value="1000"/> -->
685	–	</java>
686	–	</target>
687	–
688	–
442		<target name="loops" depends="init, configure-compiler"
443		description="Benchmark from Doug Lea's AQS paper">
444
#	Line 701 | Line 454
454
455		<compilerarg line="${build.args}"/>
456		<classpath refid="loops.classpath"/>
457	+	<compilerarg value="-XDignore.symbol.file=true"/>
458
459		</javac>
460
#	Line 711 | Line 465
465		</target>
466
467
468	<	<target name="compile-j1" depends="init, configure-compiler, compile">
468	>	<!-- jsr166x -->
469	>
470	>
471	>	<target name="jsr166xcompile"
472	>	depends="init, configure-compiler"
473	>	description="Compiles jsr166x sources">
474
475	<	<mkdir dir="${build.j1.dir}"/>
475	>	<mkdir dir="${build.jsr166x.dir}"/>
476
477	<	<javac srcdir="${j1.src.dir}"
478	<	destdir="${build.j1.dir}"
477	>	<javac srcdir="${jsr166xsrc.dir}"
478	>	destdir="${build.jsr166x.dir}"
479		debug="${build.debug}"
480		debuglevel="${build.debuglevel}"
481		deprecation="${build.deprecation}"
482	<	source="${build.sourcelevel}" >
482	>	source="${build.sourcelevel}"
483	>	fork="true">
484
485		<include name="**/*.java"/>
726	–	<exclude name="**/dijkstra/**"/>
727	–
486		<compilerarg line="${build.args}"/>
487	<	<classpath refid="j1.classpath"/>
487	>	<compilerarg value="-XDignore.symbol.file=true"/>
488
489		</javac>
490
491		</target>
492
493
736	–	<target name="sw" depends="compile-j1"
737	–	description="Runs the SwingWorker demo">
494
495	<	<!--
496	<	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
497	<	<classpath refid="j1.classpath"/>
742	<	</java>
743	<	-->
495	>	<target name="jsr166xjar"
496	>	depends="jsr166xcompile"
497	>	description="Builds library jar from compiled sources">
498
499	<	<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
499	>	<mkdir dir="${build.jsr166xlib.dir}"/>
500
501	<	<exec dir="${build.j1.dir}" executable="appletviewer.exe">
502	<	<arg value="${build.j1.dir}/SwingWorker.html"/>
503	<	</exec>
501	>	<jar destfile="${jsr166xproduct.jar}">
502	>	<fileset dir="${build.jsr166x.dir}"/>
503	>	</jar>
504
505		</target>
506
753	–	<target name="j1" depends="compile-j1"
754	–	description="Runs a standalone JavaOne program">
507
756	–	<java classname="${j1.test}" fork="true">
757	–	<classpath refid="j1.classpath"/>
758	–	<jvmarg value="-client"/>
508
509	<	<!-- TestPseudoRandom args -->
510	<	<arg value="2"/>
762	<	<arg value="25"/>
763	<	<arg value="100000"/>
509	>	<target name="jsr166xdocs"
510	>	description="Builds javadocs with custom tags to build folder">
511
512	<	<!-- WebCrawler args -->
513	<	<!--
767	<	<arg value="jsr166.webcrawler.WebCrawler3"/>
768	<	<arg value="http://www.priorartisans.com"/>
769	<	<arg value="25"/>
770	<	-->
512	>	<delete dir="${build.jsr166xjavadocs.dir}"/>
513	>	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
514
515	<	</java>
515	>	<javadoc destdir="${build.jsr166xjavadocs.dir}"
516	>	packagenames="jsr166x"
517	>	link="http://download.oracle.com/javase/7/docs/api/"
518	>	source="${build.sourcelevel}"
519	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
520	>	additionalparam="-XDignore.symbol.file=true" />
521
522		</target>
523
524
525	<	<target name="test-j1" depends="compile-j1"
526	<	description="Runs testcases from the JavaOne source directories">
527	<
780	<	<junit printsummary="true"
781	<	showoutput="true"
782	<	errorProperty="junit.failed"
783	<	failureProperty="junit.failed"
784	<	dir="${build.j1.dir}"
785	<	fork="true">
786	<
787	<	<!-- <jvmarg value="-server"/> -->
788	<	<classpath refid="j1.classpath"/>
789	<	<formatter type="xml"/>
790	<
791	<	<batchtest todir="${build.j1.dir}">
792	<	<fileset dir="${j1.src.dir}">
793	<	<include name="**/*Test.java"/>
794	<	</fileset>
795	<	</batchtest>
525	>	<target name="jsr166xdist"
526	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
527	>	description="Puts all distributable products in single hierarchy"/>
528
797	–	</junit>
529
799	–	<available property="junit.report.format"
800	–	value="frames"
801	–	classname="org.apache.xalan.lib.Redirect"/>
802	–	<property name="junit.report.format" value="noframes"/>
530
531	<	<junitreport todir="${build.j1.dir}">
532	<	<fileset dir="${build.j1.dir}">
806	<	<include name="TEST-*.xml"/>
807	<	</fileset>
808	<	<report styledir="${stylesheet.dir}"
809	<	format="${junit.report.format}"
810	<	todir="${build.j1.dir}"
811	<	/>
812	<	</junitreport>
531	>	<target name="jsr166xclean"
532	>	description="Removes all build products">
533
534	<	<fail message="Test Cases Failed" if="junit.failed"/>
534	>	<delete dir="${build.jsr166x.dir}"/>
535	>	<delete dir="${build.jsr166xlib.dir}"/>
536
537		</target>
538
539
540
541	<	<!-- C++ and JNI definitions and demos -->
542	<
822	<	<target name="configure-cpp">
541	>	<target name="jsr166xdist-clean"
542	>	description="Removes all build and distribution products">
543
544	<	<!-- Define tasks and types -->
544	>	</target>
545
826	–	<path id="cpptasks.path">
827	–	<pathelement location="${lib.dir}/cpptasks.jar"/>
828	–	</path>
829	–	<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
830	–	<typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
546
832	–	<!-- Set platform property for JNI includes -->
547
548	<	<condition property="platform" value="linux">
549	<	<os name="Linux"/>
836	<	</condition>
837	<	<condition property="platform" value="win32">
838	<	<os family="windows"/>
839	<	</condition>
840	<	<condition property="platform" value="solaris">
841	<	<os name="SunOS"/>
842	<	</condition>
843	<
844	<	</target>
548	>	<target name="jsr166xdist-docs"
549	>	description="Builds javadocs without custom tags to dist folder">
550
551	+	<delete dir="${dist.jsr166xjavadocs.dir}"/>
552	+	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
553
554	<	<target name="cppdemo" depends="configure-cpp">
554	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
555	>	packagenames="jsr166x"
556	>	link="http://download.oracle.com/javase/7/docs/api/"
557	>	source="${build.sourcelevel}"
558	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
559	>	additionalparam="-XDignore.symbol.file=true" />
560
561	<	<mkdir dir="${build.dir}"/>
561	>	</target>
562
563	<	<cc multithreaded="true"
564	<	name="g++"
853	<	objdir="${build.dir}"
854	<	outfile="${build.dir}/CppDemo">
855	<	<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
856	<	<libset libs="stdc++"/>
857	<	</cc>
563	>	<target name="jsr166xdist-jar"
564	>	depends="jsr166xclean, jsr166xjar">
565
566	<	<exec executable="${build.dir}/CppDemo">
860	<	<arg line="count in word frequency of word in command line count"/>
861	<	</exec>
566	>	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
567
568		</target>
569
570	+	<!-- jsr166y -->
571
866	–	<target name="jnidemo" depends="init, configure-compiler, configure-cpp">
572
573	<	<mkdir dir="${build.testcases.dir}"/>
573	>	<target name="jsr166ycompile"
574	>	depends="init, configure-compiler"
575	>	description="Compiles jsr166y sources">
576
577	<	<javac srcdir="${test.src.dir}"
578	<	destdir="${build.testcases.dir}"
577	>	<mkdir dir="${build.jsr166y.dir}"/>
578	>
579	>	<javac srcdir="${jsr166ysrc.dir}"
580	>	destdir="${build.jsr166y.dir}"
581		debug="${build.debug}"
582		debuglevel="${build.debuglevel}"
583		deprecation="${build.deprecation}"
584		source="${build.sourcelevel}"
585		fork="true">
586	<	<compilerarg value="${bootclasspath.args}"/>
586	>
587	>	<include name="**/*.java"/>
588		<compilerarg line="${build.args}"/>
589	<	<classpath refid="test.classpath"/>
590	<	<include name="JniDemo.java"/>
881	<	</javac>
589	>	<compilerarg value="-XDignore.symbol.file=true"/>
590	>	<compilerarg value="${bootclasspath.args}"/>
591
592	<	<javah destdir="${build.testcases.dir}"
593	<	classpathref="test.classpath">
594	<	<class name="JniDemo"/>
886	<	</javah>
887	<
888	<	<cc multithreaded="true"
889	<	name="g++"
890	<	objdir="${build.dir}"
891	<	outfile="${build.dir}/JniDemo"
892	<	outtype="shared">
893	<
894	<	<compiler>
895	<	<defineset>
896	<	<define name="__int64" value="long long"/>
897	<	</defineset>
898	<	<includepath location="${java.home}/../include"/>
899	<	<includepath location="${java.home}/../include/${platform}"/>
900	<	<compilerarg value="-mno-cygwin"/>
901	<	</compiler>
902	<
903	<	<linker>
904	<	<linkerarg value="--add-stdcall-alias"/>
905	<	</linker>
906	<
907	<	<includepath location="${build.testcases.dir}"/>
908	<
909	<	<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
910	<
911	<	<libset libs="stdc++"/>
912	<
913	<	</cc>
914	<
915	<	<!-- Necessary if windows, harmless if not -->
916	<	<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
917	<
918	<	<java classname="JniDemo" fork="true">
919	<	<!-- Watch out: path separator hardwired to semicolon here! -->
920	<	<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
921	<	<classpath refid="test.classpath"/>
922	<	<arg line="count in word frequency of word in command line count"/>
923	<	</java>
592	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
593	>
594	>	</javac>
595
596		</target>
597
598
599
600	<	<!-- Backward compatibility, work in progress (some files not checked in) -->
600	>	<target name="jsr166yjar"
601	>	depends="jsr166ycompile"
602	>	description="Builds library jar from compiled sources">
603	>
604	>	<mkdir dir="${build.jsr166ylib.dir}"/>
605
606	+	<jar destfile="${jsr166yproduct.jar}" index="true">
607	+	<fileset dir="${build.jsr166y.dir}"/>
608	+	</jar>
609	+
610	+	</target>
611
612
933	–	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
934	–	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
935	–	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
936	–	<property name="pretiger.sourcelevel" value="1.4"/>
613
614	<	<target name="defang"
615	<	depends="init"
940	<	description="Generates pre-Tiger compatible source">
614	>	<target name="jsr166ydocs"
615	>	description="Builds javadocs with custom tags to build folder">
616
617	<	<delete dir="${pretiger.src.dir}"/>
618	<	<mkdir dir="${pretiger.src.dir}"/>
617	>	<delete dir="${build.jsr166yjavadocs.dir}"/>
618	>	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
619
620	<	<exec executable="perl">
621	<	<arg file="etc/defang.pl"/>
622	<	<!-- <arg value="-v"/> -->
623	<	<arg value="-s"/> <arg file="${src.dir}"/>
624	<	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
625	<	</exec>
620	>	<javadoc destdir="${build.jsr166yjavadocs.dir}"
621	>	packagenames="jsr166y"
622	>	link="http://download.oracle.com/javase/7/docs/api/"
623	>	source="${build.sourcelevel}"
624	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
625	>	additionalparam="-XDignore.symbol.file=true" />
626
627		</target>
628
954	–	<target name="compile-pretiger"
955	–	depends="init, configure-compiler, defang"
956	–	description="Compiles pre-Tiger sources to build folder">
629
630	<	<mkdir dir="${build.pretiger.dir}"/>
630	>	<target name="jsr166ydist"
631	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
632	>	description="Puts all distributable products in single hierarchy"/>
633
960	–	<javac srcdir="${pretiger.src.dir}"
961	–	destdir="${build.pretiger.dir}"
962	–	debug="${build.debug}"
963	–	debuglevel="${build.debuglevel}"
964	–	deprecation="${build.deprecation}"
965	–	source="${pretiger.sourcelevel}"
966	–	fork="true">
634
968	–	<compilerarg line="${build.args}"/>
969	–	<exclude name="**/Thread.java"/>
635
636	<	</javac>
636	>	<target name="jsr166yclean"
637	>	description="Removes all build products">
638	>
639	>	<delete dir="${build.jsr166y.dir}"/>
640	>	<delete dir="${build.jsr166ylib.dir}"/>
641
642		</target>
643
975	–	<target name="pretiger" depends="compile-pretiger">
644
977	–	<mkdir dir="${build.lib.dir}"/>
645
646	<	<jar destfile="${pretiger.jar}">
647	<	<fileset dir="${build.pretiger.dir}">
981	<	</fileset>
982	<	</jar>
646	>	<target name="jsr166ydist-clean"
647	>	description="Removes all build and distribution products">
648
649		</target>
650
651	<	<!-- jsr166x -->
651	>	<target name="jsr166ydist-docs"
652	>	description="Builds javadocs without custom tags to dist folder">
653
654	+	<delete dir="${dist.jsr166yjavadocs.dir}"/>
655	+	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
656
657	<	<target name="jsr166xcompile"
658	<	depends="init, configure-compiler"
659	<	description="Compiles jsr166x sources">
657	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
658	>	packagenames="jsr166y"
659	>	link="http://download.oracle.com/javase/7/docs/api/"
660	>	source="${build.sourcelevel}"
661	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
662	>	additionalparam="-XDignore.symbol.file=true" />
663
664	<	<mkdir dir="${build.jsr166x.dir}"/>
664	>	</target>
665
666	<	<javac srcdir="${jsr166xsrc.dir}"
667	<	destdir="${build.jsr166x.dir}"
666	>	<target name="jsr166ydist-jar"
667	>	depends="jsr166yclean, jsr166yjar">
668	>
669	>	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
670	>
671	>	</target>
672	>
673	>
674	>	<!-- extra166y -->
675	>
676	>
677	>	<target name="extra166ycompile"
678	>	depends="init, configure-compiler, jsr166ycompile"
679	>	description="Compiles extra166y sources">
680	>
681	>	<mkdir dir="${build.extra166y.dir}"/>
682	>
683	>	<javac srcdir="${extra166ysrc.dir}"
684	>	destdir="${build.extra166y.dir}"
685		debug="${build.debug}"
686	+	classpath="${jsr166yproduct.jar}"
687		debuglevel="${build.debuglevel}"
688		deprecation="${build.deprecation}"
689		source="${build.sourcelevel}"
#	Line 1002 | Line 691
691
692		<include name="**/*.java"/>
693		<compilerarg line="${build.args}"/>
694	+	<compilerarg value="-XDignore.symbol.file=true"/>
695	+	<compilerarg value="${bootclasspath.args}"/>
696	+
697	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
698
699		</javac>
700
#	Line 1009 | Line 702
702
703
704
705	<	<target name="jsr166xjar"
706	<	depends="jsr166xcompile"
705	>	<target name="extra166yjar"
706	>	depends="extra166ycompile"
707		description="Builds library jar from compiled sources">
708
709	<	<mkdir dir="${build.jsr166xlib.dir}"/>
709	>	<mkdir dir="${build.extra166ylib.dir}"/>
710
711	<	<jar destfile="${jsr166xproduct.jar}">
712	<	<fileset dir="${build.jsr166x.dir}"/>
711	>	<jar destfile="${extra166yproduct.jar}" index="true">
712	>	<fileset dir="${build.extra166y.dir}"/>
713		</jar>
714
715		</target>
716
717
718
719	<	<target name="jsr166xdocs"
719	>	<target name="extra166ydocs"
720		description="Builds javadocs with custom tags to build folder">
721
722	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
723	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
1031	<
1032	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
1033	<	link="http://java.sun.com/javase/6/docs/api/"
1034	<
1035	<	sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1036	<
1037	<	>
1038	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
1039	<	<include name="jsr166x"/>
1040	<	</packageset>
722	>	<delete dir="${build.extra166yjavadocs.dir}"/>
723	>	<mkdir dir="${build.extra166yjavadocs.dir}"/>
724
725	<
726	<	</javadoc>
725	>	<javadoc destdir="${build.extra166yjavadocs.dir}"
726	>	packagenames="extra166y"
727	>	link="http://download.oracle.com/javase/7/docs/api/"
728	>	source="${build.sourcelevel}"
729	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
730	>	additionalparam="-XDignore.symbol.file=true" />
731
732		</target>
733
734
735	<	<target name="jsr166xdist"
736	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
735	>	<target name="extra166ydist"
736	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
737		description="Puts all distributable products in single hierarchy"/>
738
739
740
741	<	<target name="jsr166xclean"
741	>	<target name="extra166yclean"
742		description="Removes all build products">
743
744	<	<delete dir="${build.jsr166x.dir}"/>
745	<	<delete dir="${build.jsr166xlib.dir}"/>
744	>	<delete dir="${build.extra166y.dir}"/>
745	>	<delete dir="${build.extra166ylib.dir}"/>
746
747		</target>
748
749
750
751	<	<target name="jsr166xdist-clean"
751	>	<target name="extra166ydist-clean"
752		description="Removes all build and distribution products">
753
754		</target>
755
756	<
1070	<
1071	<	<target name="jsr166xdist-docs"
756	>	<target name="extra166ydist-docs"
757		description="Builds javadocs without custom tags to dist folder">
758
759	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
760	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1076	<
1077	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
1078	<	link="http://java.sun.com/javase/6/docs/api/"
1079	<	source="${build.sourcelevel}">
1080	<
1081	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
1082	<	<include name="jsr166x"/>
1083	<	</packageset>
759	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
760	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
761
762	<	</javadoc>
762	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
763	>	packagenames="extra166y"
764	>	link="http://download.oracle.com/javase/7/docs/api/"
765	>	source="${build.sourcelevel}"
766	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
767	>	additionalparam="-XDignore.symbol.file=true" />
768
769		</target>
770
771	<	<target name="jsr166xdist-jar"
772	<	depends="jsr166xclean, jsr166xjar">
771	>	<target name="extra166ydist-jar"
772	>	depends="extra166yclean, extra166yjar">
773
774	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
774	>	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
775
776		</target>
777
778	<	<!-- jsr166y -->
778	>	<!-- jsr166e -->
779
780
781	<	<target name="jsr166ycompile"
781	>	<target name="jsr166ecompile"
782		depends="init, configure-compiler"
783	<	description="Compiles jsr166y sources">
783	>	description="Compiles jsr166e sources">
784
785	<	<mkdir dir="${build.jsr166y.dir}"/>
785	>	<mkdir dir="${build.jsr166e.dir}"/>
786
787	<	<javac srcdir="${jsr166ysrc.dir}"
788	<	destdir="${build.jsr166y.dir}"
787	>	<javac srcdir="${jsr166esrc.dir}"
788	>	destdir="${build.jsr166e.dir}"
789		debug="${build.debug}"
790		debuglevel="${build.debuglevel}"
791		deprecation="${build.deprecation}"
792	<	source="${build.sourcelevel}"
792	>	source="1.7"
793		fork="true">
794
795		<include name="**/*.java"/>
796		<compilerarg line="${build.args}"/>
797	+	<compilerarg value="-XDignore.symbol.file=true"/>
798		<compilerarg value="${bootclasspath.args}"/>
799
800		<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
#	Line 1122 | Line 805
805
806
807
808	<	<target name="jsr166yjar"
809	<	depends="jsr166ycompile"
808	>	<target name="jsr166ejar"
809	>	depends="jsr166ecompile"
810		description="Builds library jar from compiled sources">
811
812	<	<mkdir dir="${build.jsr166ylib.dir}"/>
812	>	<mkdir dir="${build.jsr166elib.dir}"/>
813
814	<	<jar destfile="${jsr166yproduct.jar}">
815	<	<fileset dir="${build.jsr166y.dir}"/>
814	>	<jar destfile="${jsr166eproduct.jar}" index="true">
815	>	<fileset dir="${build.jsr166e.dir}"/>
816		</jar>
817
818		</target>
819
820
821
822	<	<target name="jsr166ydocs"
822	>	<target name="jsr166edocs"
823		description="Builds javadocs with custom tags to build folder">
824
825	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
826	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
825	>	<delete dir="${build.jsr166ejavadocs.dir}"/>
826	>	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
827
828	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
829	<	link="http://java.sun.com/javase/6/docs/api/"
830	<	sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
831	<
832	<	>
833	<	<packageset dir="${topsrc.dir}" defaultexcludes="no">
1151	<	<include name="jsr166y"/>
1152	<	</packageset>
1153	<
1154	<
1155	<	</javadoc>
828	>	<javadoc destdir="${build.jsr166ejavadocs.dir}"
829	>	packagenames="jsr166e,jsr166e.extra"
830	>	link="http://download.oracle.com/javase/7/docs/api/"
831	>	source="1.7"
832	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
833	>	additionalparam="-XDignore.symbol.file=true" />
834
835		</target>
836
837
838	<	<target name="jsr166ydist"
839	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
838	>	<target name="jsr166edist"
839	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
840		description="Puts all distributable products in single hierarchy"/>
841
842
843
844	<	<target name="jsr166yclean"
844	>	<target name="jsr166eclean"
845		description="Removes all build products">
846
847	<	<delete dir="${build.jsr166y.dir}"/>
848	<	<delete dir="${build.jsr166ylib.dir}"/>
847	>	<delete dir="${build.jsr166e.dir}"/>
848	>	<delete dir="${build.jsr166elib.dir}"/>
849
850		</target>
851
852
853
854	<	<target name="jsr166ydist-clean"
854	>	<target name="jsr166edist-clean"
855		description="Removes all build and distribution products">
856
857		</target>
858
859	<	<target name="jsr166ydist-docs"
859	>	<target name="jsr166edist-docs"
860		description="Builds javadocs without custom tags to dist folder">
861
862	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
863	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
862	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
863	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
864
865	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
866	<	link="http://java.sun.com/javase/6/docs/api/"
867	<	source="${build.sourcelevel}">
868	<	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
869	<	<include name="jsr166y/*.java"/>
870	<	<include name="jsr166y/forkjoin/*.java"/>
1193	<	</fileset>
1194	<	</javadoc>
865	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
866	>	packagenames="jsr166e,jsr166e.extra"
867	>	link="http://download.oracle.com/javase/7/docs/api/"
868	>	source="1.7"
869	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
870	>	additionalparam="-XDignore.symbol.file=true" />
871
872		</target>
873
874	<	<target name="jsr166ydist-jar"
875	<	depends="jsr166yclean, jsr166yjar">
874	>	<target name="jsr166edist-jar"
875	>	depends="jsr166eclean, jsr166ejar">
876
877	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
877	>	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
878
879		</target>
880

Diff Legend

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