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.71 by peierls, Thu Dec 30 21:43:34 2004 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"/>
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"/>
50	–	<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"/>
54	–	<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55	–	<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	<
63	>	<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
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"/>
69	–	<property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
81
82		<!-- Bootclasspath argument -->
83		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
#	Line 82 | Line 93
93		<pathelement location="${build.loops.dir}"/>
94		</path>
95
85	–	<!-- J1 classpath -->
86	–	<path id="j1.classpath">
87	–	<pathelement location="${build.classes.dir}"/>
88	–	<pathelement location="${build.j1.dir}"/>
89	–	<pathelement location="${junit.jar}"/>
90	–
91	–	<!-- Include dl.u.c for BoundedBuffer comparison -->
92	–	<pathelement location="${concurrent.jar}"/>
93	–	</path>
94	–
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 111 | Line 115
115		fork="true">
116
117		<include name="**/*.java"/>
118	+	<compilerarg value="-XDignore.symbol.file=true"/>
119	+
120	+	<!--
121		<exclude name="java/lang/**"/>
122		<compilerarg line="${build.args}"/>
123	+	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
124	+	-->
125
126		</javac>
127
#	Line 146 | 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/j2se/1.4.1/docs/api"
151	<	overview="${src.dir}/intro.html"
152	<	source="${build.sourcelevel}">
158	>	<!-- the packagenames="none" hack below prevents scanning the -->
159	>	<!-- sourcepath for packages -->
160
161	<	<tag name="revised" description="Last revised:"/>
162	<	<tag name="spec"    description="Specified by:"/>
163	<
164	<	<packageset dir="${src.dir}"/>
165	<
166	<	</javadoc>
167	<
168	<	</target>
169	<
163	<
164	<
165	<	<target name="doccheck"
166	<	depends="filter-doccheck"
167	<	description="Reports on javadoc style errors">
168	<
169	<	<delete dir="${build.doccheck.dir}"/>
170	<	<mkdir dir="${build.doccheck.dir}"/>
171	<
172	<	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
173	<	docletpath="${lib.dir}/doccheck.jar"
174	<	destdir="${build.doccheck.dir}">
175	<	<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
178	–	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
179	–
180	–	</target>
181	–
182	–
183	–
184	–	<target name="checkstyle"
185	–	depends="filter-src"
186	–	description="Reports on style errors in Java source (verbose, mostly chaff)">
187	–
188	–	<taskdef resource="checkstyletask.properties"
189	–	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
190	–
191	–	<mkdir dir="${build.checkstyle.dir}"/>
192	–
193	–	<checkstyle config="etc/checkstyle/sun_checks.xml"
194	–	failOnViolation="false">
195	–	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
196	–	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
197	–	</checkstyle>
198	–
199	–	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
200	–	out="${build.checkstyle.dir}/checkstyle-report.html"
201	–	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
202	–
172		</target>
173
174
#	Line 209 | Line 178
178		description="Puts all distributable products in single hierarchy"/>
179
180
212	–
181		<target name="release"
182		depends="dist"
183		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 256 | 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/j2se/1.4.2/docs/api"
261	<	overview="${src.dir}/intro.html"
262	<	source="${build.sourcelevel}">
263	<
264	<	<packageset dir="${src.dir}"/>
227	>	<!-- the packagenames="none" hack below prevents scanning the -->
228	>	<!-- sourcepath for packages -->
229
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
241		</target>
#	Line 290 | Line 263
263		</target>
264
265
293	–	<target name="compile-ant-filter"
294	–	depends="init">
295	–
296	–	<mkdir dir="${build.ant.dir}"/>
297	–
298	–	<javac srcdir="${ant.src.dir}"
299	–	destdir="${build.ant.dir}"
300	–	source="1.4"/>
301	–
302	–	</target>
303	–
304	–
305	–	<target name="filter-src"
306	–	depends="compile-ant-filter">
307	–
308	–	<mkdir dir="${build.filter.src.dir}"/>
309	–
310	–	<copy todir="${build.filter.src.dir}">
311	–	<fileset dir="${src.dir}">
312	–	<include name="**/*.html"/>
313	–	</fileset>
314	–	</copy>
315	–
316	–	<copy todir="${build.filter.src.dir}">
317	–	<fileset dir="${src.dir}">
318	–	<exclude name="**/*.html"/>
319	–	<!-- Files excluded from dist-docs -->
320	–	<exclude name="java/util/Random.*"/>
321	–	<exclude name="sun/misc/Unsafe.*"/>
322	–	</fileset>
323	–	<!--
324	–	<filterchain>
325	–	-->
326	–
327	–	<!--
328	–	# This filter gets rid of angle-bracketed type parameters
329	–	# so that javadoc can run on the result. The following
330	–	# heuristic seems to work:
331	–	#
332	–	# For all lines not starting with space(s)-asterisk-space(s),
333	–	#   replace <something> with a space, where there may be more
334	–	#   than one right angle bracket at the end, and "something"
335	–	#   must not contain parens or pipes. (This may need some
336	–	#   tweaking.)
337	–	-->
338	–
339	–	<!--
340	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
341	–	classpath="${build.ant.dir}">
342	–	<param name="notmatching" value="^\s+\*\s.*$"/>
343	–	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
344	–	<param name="replacement" value=" "/>
345	–	</filterreader>
346	–	-->
347	–
348	–	<!--
349	–	</filterchain>
350	–	-->
351	–	</copy>
352	–
353	–	</target>
354	–
355	–
356	–	<target name="filter-doccheck"
357	–	depends="filter-src">
358	–
359	–	<mkdir dir="${build.dc-filter.dir}"/>
360	–
361	–	<copy todir="${build.dc-filter.dir}">
362	–	<fileset dir="${build.filter.src.dir}">
363	–	<include name="**/*.html"/>
364	–	</fileset>
365	–	</copy>
366	–
367	–	<property name="generic.declarations"
368	–	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 {}"
369	–	/>
370	–
371	–	<copy todir="${build.dc-filter.dir}">
372	–	<fileset dir="${build.filter.src.dir}">
373	–	<exclude name="**/*.html"/>
374	–	</fileset>
375	–	<filterchain>
376	–	<!--
377	–	# These two filters try to make the source look like
378	–	# something that doccheck can process. The first removes
379	–	# -source 1.4 assertions and the second adds in a bunch
380	–	# of single letter public nested marker interfaces so that
381	–	# the generic type parameters are recognized.
382	–	-->
383	–
384	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
385	–	classpath="${build.ant.dir}">
386	–	<param name="matching"    value="^\s*assert[\s ].*$"/>
387	–	<param name="pattern"     value="assert"/>
388	–	<param name="replacement" value="//assert"/>
389	–	</filterreader>
390	–
391	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
392	–	classpath="${build.ant.dir}">
393	–	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
394	–	<param name="pattern"     value="$"/>
395	–	<param name="replacement" value=" ${generic.declarations}"/>
396	–	</filterreader>
397	–
398	–	</filterchain>
399	–	</copy>
400	–
401	–	</target>
402	–
403	–
266		<target name="compile-tests"
267		depends="jar">
268
#	Line 416 | 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 433 | 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 449 | 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 521 | Line 386
386		<fileset dir="${build.reports.dir}">
387		<include name="TEST-*.xml"/>
388		</fileset>
389	<	<report styledir="${stylesheet.dir}"
525	<	format="${junit.report.format}"
526	<	todir="${build.reports.dir}"
389	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
390		/>
391		</junitreport>
392
#	Line 573 | Line 436
436		</target>
437
438
576	–
577	–	<!-- Anthill targets -->
578	–
579	–	<target name="anthill-build">
580	–
581	–	<!-- Override this in user.properties -->
582	–	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
583	–
584	–	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
585	–	<arg value="-Xmx256000000"/>
586	–	<!-- classpath of new JVM -->
587	–	<arg value="-classpath"/> <arg path="${java.class.path}"/>
588	–	<!-- location of Ant home directory -->
589	–	<arg value="-Dant.home=${ant.home}"/>
590	–	<!-- the Ant main class -->
591	–	<arg value="org.apache.tools.ant.Main"/>
592	–	<!-- The build file -->
593	–	<arg value="-buildfile"/>  <arg value="build.xml"/>
594	–	<!-- the target to build on the new Ant instance -->
595	–	<arg value="-DJAVA_HOME=${tiger.home}"/>
596	–	<arg value="do-anthill-build"/>
597	–	</exec>
598	–	</target>
599	–
600	–	<target name="do-anthill-build"
601	–	depends="jar, test, docs, dist-docs"/>
602	–
603	–	<target name="anthill-publish">
604	–
605	–	<copy todir="${deployDir}/docs/private">
606	–	<fileset dir="${build.javadocs.dir}"/>
607	–	</copy>
608	–
609	–	<copy todir="${deployDir}/docs/public">
610	–	<fileset dir="${dist.javadocs.dir}"/>
611	–	</copy>
612	–
613	–	<copy tofile="${deployDir}/index.html"
614	–	file="${basedir}/etc/anthill-index.html"/>
615	–
616	–	<copy todir="${deployDir}/notes">
617	–	<fileset dir="${basedir}/etc/notes"/>
618	–	</copy>
619	–
620	–	</target>
621	–
622	–
623	–
439		<!-- Various demos and test programs -->
440
441
627	–	<target name="sample" depends="init, configure-compiler"
628	–	description="Standalone demo program">
629	–
630	–	<mkdir dir="${build.testcases.dir}"/>
631	–
632	–	<javac srcdir="${test.src.dir}"
633	–	destdir="${build.testcases.dir}"
634	–	debug="${build.debug}"
635	–	debuglevel="${build.debuglevel}"
636	–	deprecation="${build.deprecation}"
637	–	source="${build.sourcelevel}"
638	–	fork="true">
639	–
640	–	<include name="jsr166/test/Sample.java"/>
641	–
642	–	</javac>
643	–
644	–	<copy todir="${build.testcases.dir}">
645	–	<fileset dir="${test.src.dir}">
646	–	<include name="**/*.properties"/>
647	–	</fileset>
648	–	</copy>
649	–
650	–
651	–	<java classname="jsr166.test.Sample" fork="true">
652	–	<classpath refid="test.classpath"/>
653	–	<!-- <jvmarg value="-ea"/> -->
654	–	<!-- <jvmarg value="-server"/> -->
655	–	<!-- <arg value="1000"/> -->
656	–	</java>
657	–	</target>
658	–
659	–
442		<target name="loops" depends="init, configure-compiler"
443		description="Benchmark from Doug Lea's AQS paper">
444
#	Line 672 | 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 682 | Line 465
465		</target>
466
467
468	<	<target name="compile-j1" depends="init, configure-compiler, compile">
468	>	<!-- jsr166x -->
469	>
470
471	<	<mkdir dir="${build.j1.dir}"/>
471	>	<target name="jsr166xcompile"
472	>	depends="init, configure-compiler"
473	>	description="Compiles jsr166x sources">
474
475	<	<javac srcdir="${j1.src.dir}"
476	<	destdir="${build.j1.dir}"
475	>	<mkdir dir="${build.jsr166x.dir}"/>
476	>
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"/>
697	–	<exclude name="**/dijkstra/**"/>
698	–
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
707	–	<target name="sw" depends="compile-j1"
708	–	description="Runs the SwingWorker demo">
494
495	<	<!--
496	<	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
497	<	<classpath refid="j1.classpath"/>
713	<	</java>
714	<	-->
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
724	–	<target name="j1" depends="compile-j1"
725	–	description="Runs a standalone JavaOne program">
507
727	–	<java classname="${j1.test}" fork="true">
728	–	<classpath refid="j1.classpath"/>
729	–	<jvmarg value="-client"/>
508
509	<	<!-- TestPseudoRandom args -->
510	<	<arg value="2"/>
733	<	<arg value="25"/>
734	<	<arg value="100000"/>
509	>	<target name="jsr166xdocs"
510	>	description="Builds javadocs with custom tags to build folder">
511
512	<	<!-- WebCrawler args -->
513	<	<!--
738	<	<arg value="jsr166.webcrawler.WebCrawler3"/>
739	<	<arg value="http://www.priorartisans.com"/>
740	<	<arg value="25"/>
741	<	-->
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	<
751	<	<junit printsummary="true"
752	<	showoutput="true"
753	<	errorProperty="junit.failed"
754	<	failureProperty="junit.failed"
755	<	dir="${build.j1.dir}"
756	<	fork="true">
757	<
758	<	<!-- <jvmarg value="-server"/> -->
759	<	<classpath refid="j1.classpath"/>
760	<	<formatter type="xml"/>
761	<
762	<	<batchtest todir="${build.j1.dir}">
763	<	<fileset dir="${j1.src.dir}">
764	<	<include name="**/*Test.java"/>
765	<	</fileset>
766	<	</batchtest>
525	>	<target name="jsr166xdist"
526	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
527	>	description="Puts all distributable products in single hierarchy"/>
528
768	–	</junit>
529
770	–	<available property="junit.report.format"
771	–	value="frames"
772	–	classname="org.apache.xalan.lib.Redirect"/>
773	–	<property name="junit.report.format" value="noframes"/>
530
531	<	<junitreport todir="${build.j1.dir}">
532	<	<fileset dir="${build.j1.dir}">
777	<	<include name="TEST-*.xml"/>
778	<	</fileset>
779	<	<report styledir="${stylesheet.dir}"
780	<	format="${junit.report.format}"
781	<	todir="${build.j1.dir}"
782	<	/>
783	<	</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	<
793	<	<target name="configure-cpp">
794	<
795	<	<!-- Define tasks and types -->
541	>	<target name="jsr166xdist-clean"
542	>	description="Removes all build and distribution products">
543
544	<	<path id="cpptasks.path">
798	<	<pathelement location="${lib.dir}/cpptasks.jar"/>
799	<	</path>
800	<	<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
801	<	<typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
544	>	</target>
545
803	–	<!-- Set platform property for JNI includes -->
546
805	–	<condition property="platform" value="linux">
806	–	<os name="Linux"/>
807	–	</condition>
808	–	<condition property="platform" value="win32">
809	–	<os family="windows"/>
810	–	</condition>
811	–	<condition property="platform" value="solaris">
812	–	<os name="SunOS"/>
813	–	</condition>
547
548	<	</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++"
824	<	objdir="${build.dir}"
825	<	outfile="${build.dir}/CppDemo">
826	<	<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
827	<	<libset libs="stdc++"/>
828	<	</cc>
563	>	<target name="jsr166xdist-jar"
564	>	depends="jsr166xclean, jsr166xjar">
565
566	<	<exec executable="${build.dir}/CppDemo">
831	<	<arg line="count in word frequency of word in command line count"/>
832	<	</exec>
566	>	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
567
568		</target>
569
570	+	<!-- jsr166y -->
571
837	–	<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"/>
589	>	<compilerarg value="-XDignore.symbol.file=true"/>
590	>	<compilerarg value="${bootclasspath.args}"/>
591	>
592	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
593	>
594		</javac>
595
596	<	<javah destdir="${build.testcases.dir}"
597	<	classpathref="test.classpath">
598	<	<class name="JniDemo"/>
599	<	</javah>
600	<
601	<	<cc multithreaded="true"
602	<	name="g++"
603	<	objdir="${build.dir}"
604	<	outfile="${build.dir}/JniDemo"
605	<	outtype="shared">
606	<
607	<	<compiler>
608	<	<defineset>
867	<	<define name="__int64" value="long long"/>
868	<	</defineset>
869	<	<includepath location="${java.home}/../include"/>
870	<	<includepath location="${java.home}/../include/${platform}"/>
871	<	<compilerarg value="-mno-cygwin"/>
872	<	</compiler>
873	<
874	<	<linker>
875	<	<linkerarg value="--add-stdcall-alias"/>
876	<	</linker>
877	<
878	<	<includepath location="${build.testcases.dir}"/>
879	<
880	<	<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
881	<
882	<	<libset libs="stdc++"/>
883	<
884	<	</cc>
885	<
886	<	<!-- Necessary if windows, harmless if not -->
887	<	<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
888	<
889	<	<java classname="JniDemo" fork="true">
890	<	<!-- Watch out: path separator hardwired to semicolon here! -->
891	<	<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
892	<	<classpath refid="test.classpath"/>
893	<	<arg line="count in word frequency of word in command line count"/>
894	<	</java>
596	>	</target>
597	>
598	>
599	>
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
613
614	<	<!-- Backward compatibility, work in progress (some files not checked in) -->
614	>	<target name="jsr166ydocs"
615	>	description="Builds javadocs with custom tags to build folder">
616	>
617	>	<delete dir="${build.jsr166yjavadocs.dir}"/>
618	>	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
619	>
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
629
630	<	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
631	<	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
632	<	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
907	<	<property name="pretiger.sourcelevel" value="1.4"/>
630	>	<target name="jsr166ydist"
631	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
632	>	description="Puts all distributable products in single hierarchy"/>
633
909	–	<target name="defang"
910	–	depends="init"
911	–	description="Generates pre-Tiger compatible source">
634
913	–	<delete dir="${pretiger.src.dir}"/>
914	–	<mkdir dir="${pretiger.src.dir}"/>
635
636	<	<exec executable="perl">
637	<	<arg file="etc/defang.pl"/>
638	<	<!-- <arg value="-v"/> -->
639	<	<arg value="-s"/> <arg file="${src.dir}"/>
640	<	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
921	<	</exec>
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
925	–	<target name="compile-pretiger"
926	–	depends="init, configure-compiler, defang"
927	–	description="Compiles pre-Tiger sources to build folder">
644
929	–	<mkdir dir="${build.pretiger.dir}"/>
645
646	<	<javac srcdir="${pretiger.src.dir}"
647	<	destdir="${build.pretiger.dir}"
646	>	<target name="jsr166ydist-clean"
647	>	description="Removes all build and distribution products">
648	>
649	>	</target>
650	>
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	>	<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	>	</target>
665	>
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="${pretiger.sourcelevel}"
689	>	source="${build.sourcelevel}"
690		fork="true">
691
692	+	<include name="**/*.java"/>
693		<compilerarg line="${build.args}"/>
694	<	<exclude name="**/Thread.java"/>
694	>	<compilerarg value="-XDignore.symbol.file=true"/>
695	>	<compilerarg value="${bootclasspath.args}"/>
696	>
697	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
698
699		</javac>
700
701		</target>
702
946	–	<target name="pretiger" depends="compile-pretiger">
703
948	–	<mkdir dir="${build.lib.dir}"/>
704
705	<	<jar destfile="${pretiger.jar}">
706	<	<fileset dir="${build.pretiger.dir}">
707	<	</fileset>
705	>	<target name="extra166yjar"
706	>	depends="extra166ycompile"
707	>	description="Builds library jar from compiled sources">
708	>
709	>	<mkdir dir="${build.extra166ylib.dir}"/>
710	>
711	>	<jar destfile="${extra166yproduct.jar}" index="true">
712	>	<fileset dir="${build.extra166y.dir}"/>
713		</jar>
714
715		</target>
716
957	–	<!-- jsr166x -->
717
718
719	<	<target name="jsr166xcompile"
719	>	<target name="extra166ydocs"
720	>	description="Builds javadocs with custom tags to build folder">
721	>
722	>	<delete dir="${build.extra166yjavadocs.dir}"/>
723	>	<mkdir dir="${build.extra166yjavadocs.dir}"/>
724	>
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="extra166ydist"
736	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
737	>	description="Puts all distributable products in single hierarchy"/>
738	>
739	>
740	>
741	>	<target name="extra166yclean"
742	>	description="Removes all build products">
743	>
744	>	<delete dir="${build.extra166y.dir}"/>
745	>	<delete dir="${build.extra166ylib.dir}"/>
746	>
747	>	</target>
748	>
749	>
750	>
751	>	<target name="extra166ydist-clean"
752	>	description="Removes all build and distribution products">
753	>
754	>	</target>
755	>
756	>	<target name="extra166ydist-docs"
757	>	description="Builds javadocs without custom tags to dist folder">
758	>
759	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
760	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
761	>
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="extra166ydist-jar"
772	>	depends="extra166yclean, extra166yjar">
773	>
774	>	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
775	>
776	>	</target>
777	>
778	>	<!-- jsr166e -->
779	>
780	>
781	>	<target name="jsr166ecompile"
782		depends="init, configure-compiler"
783	<	description="Compiles jsr166x sources">
783	>	description="Compiles jsr166e sources">
784
785	<	<mkdir dir="${build.jsr166x.dir}"/>
785	>	<mkdir dir="${build.jsr166e.dir}"/>
786
787	<	<javac srcdir="${jsr166xsrc.dir}"
788	<	destdir="${build.jsr166x.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"/> -->
801
802		</javac>
803
#	Line 980 | Line 805
805
806
807
808	<	<target name="jsr166xjar"
809	<	depends="jsr166xcompile"
808	>	<target name="jsr166ejar"
809	>	depends="jsr166ecompile"
810		description="Builds library jar from compiled sources">
811
812	<	<mkdir dir="${build.jsr166xlib.dir}"/>
812	>	<mkdir dir="${build.jsr166elib.dir}"/>
813
814	<	<jar destfile="${jsr166xproduct.jar}">
815	<	<fileset dir="${build.jsr166x.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="jsr166xdocs"
822	>	<target name="jsr166edocs"
823		description="Builds javadocs with custom tags to build folder">
824
825	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
826	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
825	>	<delete dir="${build.jsr166ejavadocs.dir}"/>
826	>	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
827
828	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
829	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
830	<	>
831	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
832	<	<include name="jsr166x"/>
833	<	</packageset>
1009	<
1010	<
1011	<	</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="jsr166xdist"
839	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-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="jsr166xclean"
844	>	<target name="jsr166eclean"
845		description="Removes all build products">
846
847	<	<delete dir="${build.jsr166x.dir}"/>
848	<	<delete dir="${build.jsr166xlib.dir}"/>
847	>	<delete dir="${build.jsr166e.dir}"/>
848	>	<delete dir="${build.jsr166elib.dir}"/>
849
850		</target>
851
852
853
854	<	<target name="jsr166xdist-clean"
854	>	<target name="jsr166edist-clean"
855		description="Removes all build and distribution products">
856
857		</target>
858
859	<
1038	<
1039	<	<target name="jsr166xdist-docs"
859	>	<target name="jsr166edist-docs"
860		description="Builds javadocs without custom tags to dist folder">
861
862	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
863	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
862	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
863	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
864
865	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
866	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
867	<	source="${build.sourcelevel}">
868	<
869	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
870	<	<include name="jsr166x"/>
1051	<	</packageset>
1052	<
1053	<	</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="jsr166xdist-jar"
875	<	depends="jsr166xclean, jsr166xjar">
874	>	<target name="jsr166edist-jar"
875	>	depends="jsr166eclean, jsr166ejar">
876
877	<	<copy file="${jsr166xproduct.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