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.70 by dl, Wed Aug 11 10:57:33 2004 UTC vs.
Revision 1.84 by dl, Thu Nov 25 12:48:45 2010 UTC

#	Line 21 | Line 21
21
22
23		<!-- Compilation options -->
24	<	<property name="build.sourcelevel"    value="1.5"/>
24	>	<property name="build.sourcelevel"    value="1.6"/>
25		<property name="build.debug"          value="true"/>
26		<property name="build.debuglevel"     value="source,lines,vars"/>
27		<property name="build.deprecation"    value="false"/>
28
29		<!-- Build locations -->
30	<	<property name="build.dir"            location="build"/>
31	<	<property name="build.classes.dir"    location="${build.dir}/classes"/>
32	<	<property name="build.testcases.dir"  location="${build.dir}/testcases"/>
33	<	<property name="build.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.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"/>
50	–	<property name="j1.src.dir"           location="${basedir}/src/javaone"/>
52		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
53		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54		<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
54	–	<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55	–	<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
55		<property name="lib.dir"              location="${basedir}/lib"/>
56		<property name="dist.dir"             location="${basedir}/dist"/>
57		<property name="topsrc.dir"           location="${basedir}/src"/>
58		<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
59	<
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"/>
69	–	<property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
74
75		<!-- Bootclasspath argument -->
76		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
#	Line 82 | Line 86
86		<pathelement location="${build.loops.dir}"/>
87		</path>
88
85	–	<!-- J1 classpath -->
86	–	<path id="j1.classpath">
87	–	<pathelement location="${build.j1.dir}"/>
88	–	<pathelement location="${junit.jar}"/>
89	–	<pathelement location="${concurrent.jar}"/>
90	–	</path>
91	–
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 108 | Line 108
108		fork="true">
109
110		<include name="**/*.java"/>
111	+	<compilerarg value="-XDignore.symbol.file=true"/>
112	+
113	+	<!--
114		<exclude name="java/lang/**"/>
115		<compilerarg line="${build.args}"/>
116	+	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
117	+	-->
118
119		</javac>
120
#	Line 144 | Line 149
149		<mkdir dir="${build.javadocs.dir}"/>
150
151		<javadoc destdir="${build.javadocs.dir}"
152	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
152	>	link="http://download.oracle.com/javase/6/docs/api/"
153		overview="${src.dir}/intro.html"
154	<	source="${build.sourcelevel}">
155	<
151	<	<tag name="revised" description="Last revised:"/>
152	<	<tag name="spec"    description="Specified by:"/>
154	>	sourcepath="${src.dir}:${jdksrc.dir}"
155	>	>
156
157		<packageset dir="${src.dir}"/>
158
#	Line 159 | Line 162
162
163
164
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"
170	–	docletpath="${lib.dir}/doccheck.jar"
171	–	destdir="${build.doccheck.dir}">
172	–	<packageset dir="${build.dc-filter.dir}"/>
173	–	</javadoc>
174	–
175	–	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
176	–
177	–	</target>
178	–
179	–
180	–
181	–	<target name="checkstyle"
182	–	depends="filter-src"
183	–	description="Reports on style errors in Java source (verbose, mostly chaff)">
184	–
185	–	<taskdef resource="checkstyletask.properties"
186	–	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
187	–
188	–	<mkdir dir="${build.checkstyle.dir}"/>
189	–
190	–	<checkstyle config="etc/checkstyle/sun_checks.xml"
191	–	failOnViolation="false">
192	–	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
193	–	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
194	–	</checkstyle>
195	–
196	–	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
197	–	out="${build.checkstyle.dir}/checkstyle-report.html"
198	–	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
199	–
200	–	</target>
201	–
202	–
203	–
165		<target name="dist"
166		depends="init, dist-clean, dist-jar, dist-docs"
167		description="Puts all distributable products in single hierarchy"/>
168
169
209	–
170		<target name="release"
171		depends="dist"
172		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 254 | Line 214
214		<mkdir dir="${dist.javadocs.dir}"/>
215
216		<javadoc destdir="${dist.javadocs.dir}"
217	<	link="http://java.sun.com/j2se/1.4.2/docs/api"
217	>	link="http://download.oracle.com/javase/6/docs/api/"
218		overview="${src.dir}/intro.html"
259	–	source="${build.sourcelevel}">
260	–
261	–	<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 287 | Line 266
266		</target>
267
268
290	–	<target name="compile-ant-filter"
291	–	depends="init">
292	–
293	–	<mkdir dir="${build.ant.dir}"/>
294	–
295	–	<javac srcdir="${ant.src.dir}"
296	–	destdir="${build.ant.dir}"
297	–	source="1.4"/>
298	–
299	–	</target>
300	–
301	–
302	–	<target name="filter-src"
303	–	depends="compile-ant-filter">
304	–
305	–	<mkdir dir="${build.filter.src.dir}"/>
306	–
307	–	<copy todir="${build.filter.src.dir}">
308	–	<fileset dir="${src.dir}">
309	–	<include name="**/*.html"/>
310	–	</fileset>
311	–	</copy>
312	–
313	–	<copy todir="${build.filter.src.dir}">
314	–	<fileset dir="${src.dir}">
315	–	<exclude name="**/*.html"/>
316	–	<!-- Files excluded from dist-docs -->
317	–	<exclude name="java/util/Random.*"/>
318	–	<exclude name="sun/misc/Unsafe.*"/>
319	–	</fileset>
320	–	<!--
321	–	<filterchain>
322	–	-->
323	–
324	–	<!--
325	–	# This filter gets rid of angle-bracketed type parameters
326	–	# so that javadoc can run on the result. The following
327	–	# heuristic seems to work:
328	–	#
329	–	# For all lines not starting with space(s)-asterisk-space(s),
330	–	#   replace <something> with a space, where there may be more
331	–	#   than one right angle bracket at the end, and "something"
332	–	#   must not contain parens or pipes. (This may need some
333	–	#   tweaking.)
334	–	-->
335	–
336	–	<!--
337	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
338	–	classpath="${build.ant.dir}">
339	–	<param name="notmatching" value="^\s+\*\s.*$"/>
340	–	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
341	–	<param name="replacement" value=" "/>
342	–	</filterreader>
343	–	-->
344	–
345	–	<!--
346	–	</filterchain>
347	–	-->
348	–	</copy>
349	–
350	–	</target>
351	–
352	–
353	–	<target name="filter-doccheck"
354	–	depends="filter-src">
355	–
356	–	<mkdir dir="${build.dc-filter.dir}"/>
357	–
358	–	<copy todir="${build.dc-filter.dir}">
359	–	<fileset dir="${build.filter.src.dir}">
360	–	<include name="**/*.html"/>
361	–	</fileset>
362	–	</copy>
363	–
364	–	<property name="generic.declarations"
365	–	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 {}"
366	–	/>
367	–
368	–	<copy todir="${build.dc-filter.dir}">
369	–	<fileset dir="${build.filter.src.dir}">
370	–	<exclude name="**/*.html"/>
371	–	</fileset>
372	–	<filterchain>
373	–	<!--
374	–	# These two filters try to make the source look like
375	–	# something that doccheck can process. The first removes
376	–	# -source 1.4 assertions and the second adds in a bunch
377	–	# of single letter public nested marker interfaces so that
378	–	# the generic type parameters are recognized.
379	–	-->
380	–
381	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
382	–	classpath="${build.ant.dir}">
383	–	<param name="matching"    value="^\s*assert[\s ].*$"/>
384	–	<param name="pattern"     value="assert"/>
385	–	<param name="replacement" value="//assert"/>
386	–	</filterreader>
387	–
388	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
389	–	classpath="${build.ant.dir}">
390	–	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
391	–	<param name="pattern"     value="$"/>
392	–	<param name="replacement" value=" ${generic.declarations}"/>
393	–	</filterreader>
394	–
395	–	</filterchain>
396	–	</copy>
397	–
398	–	</target>
399	–
400	–
269		<target name="compile-tests"
270		depends="jar">
271
#	Line 413 | Line 281
281
282		<compilerarg value="${bootclasspath.args}"/>
283		<compilerarg line="${build.args}"/>
284	+	<compilerarg value="-XDignore.symbol.file=true"/>
285
286		<classpath refid="test.classpath"/>
287
#	Line 430 | Line 299
299
300		<compilerarg value="${bootclasspath.args}"/>
301		<compilerarg line="${build.args}"/>
302	+	<compilerarg value="-XDignore.symbol.file=true"/>
303
304		<classpath refid="test.classpath"/>
305
#	Line 446 | Line 316
316
317		<compilerarg value="${bootclasspath.args}"/>
318		<compilerarg line="${build.args}"/>
319	+	<compilerarg value="-XDignore.symbol.file=true"/>
320
321		<classpath refid="test.classpath"/>
322
#	Line 518 | Line 389
389		<fileset dir="${build.reports.dir}">
390		<include name="TEST-*.xml"/>
391		</fileset>
392	<	<report styledir="${stylesheet.dir}"
522	<	format="${junit.report.format}"
523	<	todir="${build.reports.dir}"
392	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
393		/>
394		</junitreport>
395
#	Line 570 | Line 439
439		</target>
440
441
573	–
574	–	<!-- Anthill targets -->
575	–
576	–	<target name="anthill-build">
577	–
578	–	<!-- Override this in user.properties -->
579	–	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
580	–
581	–	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
582	–	<arg value="-Xmx256000000"/>
583	–	<!-- classpath of new JVM -->
584	–	<arg value="-classpath"/> <arg path="${java.class.path}"/>
585	–	<!-- location of Ant home directory -->
586	–	<arg value="-Dant.home=${ant.home}"/>
587	–	<!-- the Ant main class -->
588	–	<arg value="org.apache.tools.ant.Main"/>
589	–	<!-- The build file -->
590	–	<arg value="-buildfile"/>  <arg value="build.xml"/>
591	–	<!-- the target to build on the new Ant instance -->
592	–	<arg value="-DJAVA_HOME=${tiger.home}"/>
593	–	<arg value="do-anthill-build"/>
594	–	</exec>
595	–	</target>
596	–
597	–	<target name="do-anthill-build"
598	–	depends="jar, test, docs, dist-docs"/>
599	–
600	–	<target name="anthill-publish">
601	–
602	–	<copy todir="${deployDir}/docs/private">
603	–	<fileset dir="${build.javadocs.dir}"/>
604	–	</copy>
605	–
606	–	<copy todir="${deployDir}/docs/public">
607	–	<fileset dir="${dist.javadocs.dir}"/>
608	–	</copy>
609	–
610	–	<copy tofile="${deployDir}/index.html"
611	–	file="${basedir}/etc/anthill-index.html"/>
612	–
613	–	<copy todir="${deployDir}/notes">
614	–	<fileset dir="${basedir}/etc/notes"/>
615	–	</copy>
616	–
617	–	</target>
618	–
619	–
620	–
442		<!-- Various demos and test programs -->
443
444
624	–	<target name="sample" depends="init, configure-compiler"
625	–	description="Standalone demo program">
626	–
627	–	<mkdir dir="${build.testcases.dir}"/>
628	–
629	–	<javac srcdir="${test.src.dir}"
630	–	destdir="${build.testcases.dir}"
631	–	debug="${build.debug}"
632	–	debuglevel="${build.debuglevel}"
633	–	deprecation="${build.deprecation}"
634	–	source="${build.sourcelevel}"
635	–	fork="true">
636	–
637	–	<include name="jsr166/test/Sample.java"/>
638	–
639	–	</javac>
640	–
641	–	<copy todir="${build.testcases.dir}">
642	–	<fileset dir="${test.src.dir}">
643	–	<include name="**/*.properties"/>
644	–	</fileset>
645	–	</copy>
646	–
647	–
648	–	<java classname="jsr166.test.Sample" fork="true">
649	–	<classpath refid="test.classpath"/>
650	–	<!-- <jvmarg value="-ea"/> -->
651	–	<!-- <jvmarg value="-server"/> -->
652	–	<!-- <arg value="1000"/> -->
653	–	</java>
654	–	</target>
655	–
656	–
445		<target name="loops" depends="init, configure-compiler"
446		description="Benchmark from Doug Lea's AQS paper">
447
#	Line 669 | Line 457
457
458		<compilerarg line="${build.args}"/>
459		<classpath refid="loops.classpath"/>
460	+	<compilerarg value="-XDignore.symbol.file=true"/>
461
462		</javac>
463
#	Line 679 | Line 468
468		</target>
469
470
471	<	<target name="compile-j1" depends="init, configure-compiler">
471	>	<!-- jsr166x -->
472	>
473	>
474	>	<target name="jsr166xcompile"
475	>	depends="init, configure-compiler"
476	>	description="Compiles jsr166x sources">
477
478	<	<mkdir dir="${build.j1.dir}"/>
478	>	<mkdir dir="${build.jsr166x.dir}"/>
479
480	<	<javac srcdir="${j1.src.dir}"
481	<	destdir="${build.j1.dir}"
480	>	<javac srcdir="${jsr166xsrc.dir}"
481	>	destdir="${build.jsr166x.dir}"
482		debug="${build.debug}"
483		debuglevel="${build.debuglevel}"
484		deprecation="${build.deprecation}"
485	<	source="${build.sourcelevel}" >
485	>	source="${build.sourcelevel}"
486	>	fork="true">
487
488		<include name="**/*.java"/>
694	–	<exclude name="**/dijkstra/**"/>
695	–
489		<compilerarg line="${build.args}"/>
490	<	<classpath refid="j1.classpath"/>
490	>	<compilerarg value="-XDignore.symbol.file=true"/>
491
492		</javac>
493
494		</target>
495
496
704	–	<target name="sw" depends="compile-j1"
705	–	description="Runs the SwingWorker demo">
497
498	<	<!--
499	<	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
500	<	<classpath refid="j1.classpath"/>
710	<	</java>
711	<	-->
498	>	<target name="jsr166xjar"
499	>	depends="jsr166xcompile"
500	>	description="Builds library jar from compiled sources">
501
502	<	<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
502	>	<mkdir dir="${build.jsr166xlib.dir}"/>
503
504	<	<exec dir="${build.j1.dir}" executable="appletviewer.exe">
505	<	<arg value="${build.j1.dir}/SwingWorker.html"/>
506	<	</exec>
504	>	<jar destfile="${jsr166xproduct.jar}">
505	>	<fileset dir="${build.jsr166x.dir}"/>
506	>	</jar>
507
508		</target>
509
721	–	<target name="j1" depends="compile-j1"
722	–	description="Runs a standalone JavaOne program">
510
724	–	<java classname="${j1.test}" fork="true">
725	–	<classpath refid="j1.classpath"/>
726	–	<jvmarg value="-client"/>
511
512	<	<!-- TestPseudoRandom args -->
513	<	<arg value="2"/>
730	<	<arg value="25"/>
731	<	<arg value="100000"/>
732	<
733	<	<!-- WebCrawler args -->
734	<	<!--
735	<	<arg value="jsr166.webcrawler.WebCrawler3"/>
736	<	<arg value="http://www.priorartisans.com"/>
737	<	<arg value="25"/>
738	<	-->
512	>	<target name="jsr166xdocs"
513	>	description="Builds javadocs with custom tags to build folder">
514
515	<	</java>
515	>	<delete dir="${build.jsr166xjavadocs.dir}"/>
516	>	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
517
518	<	</target>
518	>	<javadoc destdir="${build.jsr166xjavadocs.dir}"
519	>	link="http://download.oracle.com/javase/6/docs/api/"
520	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
521	>	>
522	>	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
523	>	<include name="jsr166x"/>
524	>	</packageset>
525
526
527	<	<target name="test-j1" depends="compile-j1"
746	<	description="Runs testcases from the JavaOne source directories">
527	>	</javadoc>
528
529	<	<junit printsummary="true"
749	<	showoutput="true"
750	<	errorProperty="junit.failed"
751	<	failureProperty="junit.failed"
752	<	dir="${build.j1.dir}"
753	<	fork="true">
529	>	</target>
530
755	–	<!-- <jvmarg value="-server"/> -->
756	–	<classpath refid="j1.classpath"/>
757	–	<formatter type="xml"/>
531
532	<	<batchtest todir="${build.j1.dir}">
533	<	<fileset dir="${j1.src.dir}">
534	<	<include name="**/*Test.java"/>
762	<	</fileset>
763	<	</batchtest>
532	>	<target name="jsr166xdist"
533	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
534	>	description="Puts all distributable products in single hierarchy"/>
535
765	–	</junit>
536
767	–	<available property="junit.report.format"
768	–	value="frames"
769	–	classname="org.apache.xalan.lib.Redirect"/>
770	–	<property name="junit.report.format" value="noframes"/>
537
538	<	<junitreport todir="${build.j1.dir}">
539	<	<fileset dir="${build.j1.dir}">
774	<	<include name="TEST-*.xml"/>
775	<	</fileset>
776	<	<report styledir="${stylesheet.dir}"
777	<	format="${junit.report.format}"
778	<	todir="${build.j1.dir}"
779	<	/>
780	<	</junitreport>
538	>	<target name="jsr166xclean"
539	>	description="Removes all build products">
540
541	<	<fail message="Test Cases Failed" if="junit.failed"/>
541	>	<delete dir="${build.jsr166x.dir}"/>
542	>	<delete dir="${build.jsr166xlib.dir}"/>
543
544		</target>
545
546
547
548	<	<!-- C++ and JNI definitions and demos -->
548	>	<target name="jsr166xdist-clean"
549	>	description="Removes all build and distribution products">
550
551	<	<target name="configure-cpp">
551	>	</target>
552
792	–	<!-- Define tasks and types -->
553
794	–	<path id="cpptasks.path">
795	–	<pathelement location="${lib.dir}/cpptasks.jar"/>
796	–	</path>
797	–	<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
798	–	<typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
554
555	<	<!-- Set platform property for JNI includes -->
555	>	<target name="jsr166xdist-docs"
556	>	description="Builds javadocs without custom tags to dist folder">
557
558	<	<condition property="platform" value="linux">
559	<	<os name="Linux"/>
804	<	</condition>
805	<	<condition property="platform" value="win32">
806	<	<os family="windows"/>
807	<	</condition>
808	<	<condition property="platform" value="solaris">
809	<	<os name="SunOS"/>
810	<	</condition>
558	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
559	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
560
561	<	</target>
561	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
562	>	link="http://download.oracle.com/javase/6/docs/api/"
563	>	source="${build.sourcelevel}">
564
565	+	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
566	+	<include name="jsr166x"/>
567	+	</packageset>
568
569	<	<target name="cppdemo" depends="configure-cpp">
569	>	</javadoc>
570
571	<	<mkdir dir="${build.dir}"/>
571	>	</target>
572
573	<	<cc multithreaded="true"
574	<	name="g++"
821	<	objdir="${build.dir}"
822	<	outfile="${build.dir}/CppDemo">
823	<	<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
824	<	<libset libs="stdc++"/>
825	<	</cc>
573	>	<target name="jsr166xdist-jar"
574	>	depends="jsr166xclean, jsr166xjar">
575
576	<	<exec executable="${build.dir}/CppDemo">
828	<	<arg line="count in word frequency of word in command line count"/>
829	<	</exec>
576	>	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
577
578		</target>
579
580	+	<!-- jsr166y -->
581
834	–	<target name="jnidemo" depends="init, configure-compiler, configure-cpp">
582
583	<	<mkdir dir="${build.testcases.dir}"/>
583	>	<target name="jsr166ycompile"
584	>	depends="init, configure-compiler"
585	>	description="Compiles jsr166y sources">
586
587	<	<javac srcdir="${test.src.dir}"
588	<	destdir="${build.testcases.dir}"
587	>	<mkdir dir="${build.jsr166y.dir}"/>
588	>
589	>	<javac srcdir="${jsr166ysrc.dir}"
590	>	destdir="${build.jsr166y.dir}"
591		debug="${build.debug}"
592		debuglevel="${build.debuglevel}"
593		deprecation="${build.deprecation}"
594		source="${build.sourcelevel}"
595		fork="true">
596	<	<compilerarg value="${bootclasspath.args}"/>
596	>
597	>	<include name="**/*.java"/>
598		<compilerarg line="${build.args}"/>
599	<	<classpath refid="test.classpath"/>
600	<	<include name="JniDemo.java"/>
849	<	</javac>
599	>	<compilerarg value="-XDignore.symbol.file=true"/>
600	>	<compilerarg value="${bootclasspath.args}"/>
601
602	<	<javah destdir="${build.testcases.dir}"
603	<	classpathref="test.classpath">
604	<	<class name="JniDemo"/>
854	<	</javah>
855	<
856	<	<cc multithreaded="true"
857	<	name="g++"
858	<	objdir="${build.dir}"
859	<	outfile="${build.dir}/JniDemo"
860	<	outtype="shared">
861	<
862	<	<compiler>
863	<	<defineset>
864	<	<define name="__int64" value="long long"/>
865	<	</defineset>
866	<	<includepath location="${java.home}/../include"/>
867	<	<includepath location="${java.home}/../include/${platform}"/>
868	<	<compilerarg value="-mno-cygwin"/>
869	<	</compiler>
870	<
871	<	<linker>
872	<	<linkerarg value="--add-stdcall-alias"/>
873	<	</linker>
874	<
875	<	<includepath location="${build.testcases.dir}"/>
876	<
877	<	<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
878	<
879	<	<libset libs="stdc++"/>
880	<
881	<	</cc>
882	<
883	<	<!-- Necessary if windows, harmless if not -->
884	<	<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
885	<
886	<	<java classname="JniDemo" fork="true">
887	<	<!-- Watch out: path separator hardwired to semicolon here! -->
888	<	<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
889	<	<classpath refid="test.classpath"/>
890	<	<arg line="count in word frequency of word in command line count"/>
891	<	</java>
602	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
603	>
604	>	</javac>
605
606		</target>
607
608
609
610	<	<!-- Backward compatibility, work in progress (some files not checked in) -->
610	>	<target name="jsr166yjar"
611	>	depends="jsr166ycompile"
612	>	description="Builds library jar from compiled sources">
613	>
614	>	<mkdir dir="${build.jsr166ylib.dir}"/>
615	>
616	>	<jar destfile="${jsr166yproduct.jar}" index="true">
617	>	<fileset dir="${build.jsr166y.dir}"/>
618	>	</jar>
619	>
620	>	</target>
621	>
622
623
624	+	<target name="jsr166ydocs"
625	+	description="Builds javadocs with custom tags to build folder">
626
627	<	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
628	<	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
903	<	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
904	<	<property name="pretiger.sourcelevel" value="1.4"/>
627	>	<delete dir="${build.jsr166yjavadocs.dir}"/>
628	>	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
629
630	<	<target name="defang"
631	<	depends="init"
632	<	description="Generates pre-Tiger compatible source">
630	>	<javadoc destdir="${build.jsr166yjavadocs.dir}"
631	>	link="http://download.oracle.com/javase/6/docs/api/"
632	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
633	>	>
634	>	<packageset dir="${topsrc.dir}" defaultexcludes="no">
635	>	<include name="jsr166y"/>
636	>	</packageset>
637
910	–	<delete dir="${pretiger.src.dir}"/>
911	–	<mkdir dir="${pretiger.src.dir}"/>
638
639	<	<exec executable="perl">
914	<	<arg file="etc/defang.pl"/>
915	<	<!-- <arg value="-v"/> -->
916	<	<arg value="-s"/> <arg file="${src.dir}"/>
917	<	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
918	<	</exec>
639	>	</javadoc>
640
641		</target>
642
922	–	<target name="compile-pretiger"
923	–	depends="init, configure-compiler, defang"
924	–	description="Compiles pre-Tiger sources to build folder">
643
644	<	<mkdir dir="${build.pretiger.dir}"/>
644	>	<target name="jsr166ydist"
645	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
646	>	description="Puts all distributable products in single hierarchy"/>
647
928	–	<javac srcdir="${pretiger.src.dir}"
929	–	destdir="${build.pretiger.dir}"
930	–	debug="${build.debug}"
931	–	debuglevel="${build.debuglevel}"
932	–	deprecation="${build.deprecation}"
933	–	source="${pretiger.sourcelevel}"
934	–	fork="true">
648
936	–	<compilerarg line="${build.args}"/>
937	–	<exclude name="**/Thread.java"/>
649
650	<	</javac>
650	>	<target name="jsr166yclean"
651	>	description="Removes all build products">
652	>
653	>	<delete dir="${build.jsr166y.dir}"/>
654	>	<delete dir="${build.jsr166ylib.dir}"/>
655
656		</target>
657
943	–	<target name="pretiger" depends="compile-pretiger">
658
945	–	<mkdir dir="${build.lib.dir}"/>
659
660	<	<jar destfile="${pretiger.jar}">
661	<	<fileset dir="${build.pretiger.dir}">
949	<	</fileset>
950	<	</jar>
660	>	<target name="jsr166ydist-clean"
661	>	description="Removes all build and distribution products">
662
663		</target>
664
665	<	<!-- jsr166x -->
665	>	<target name="jsr166ydist-docs"
666	>	description="Builds javadocs without custom tags to dist folder">
667
668	+	<delete dir="${dist.jsr166yjavadocs.dir}"/>
669	+	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
670
671	<	<target name="jsr166xcompile"
672	<	depends="init, configure-compiler"
673	<	description="Compiles jsr166x sources">
671	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
672	>	link="http://download.oracle.com/javase/6/docs/api/"
673	>	source="${build.sourcelevel}"
674	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
675	>	>
676	>	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
677	>	<include name="jsr166y/*.java"/>
678	>	</fileset>
679	>	</javadoc>
680
681	<	<mkdir dir="${build.jsr166x.dir}"/>
681	>	</target>
682
683	<	<javac srcdir="${jsr166xsrc.dir}"
684	<	destdir="${build.jsr166x.dir}"
683	>	<target name="jsr166ydist-jar"
684	>	depends="jsr166yclean, jsr166yjar">
685	>
686	>	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
687	>
688	>	</target>
689	>
690	>	<!-- extra166y -->
691	>
692	>
693	>	<target name="extra166ycompile"
694	>	depends="init, configure-compiler, jsr166ycompile"
695	>	description="Compiles extra166y sources">
696	>
697	>	<mkdir dir="${build.extra166y.dir}"/>
698	>
699	>	<javac srcdir="${extra166ysrc.dir}"
700	>	destdir="${build.extra166y.dir}"
701		debug="${build.debug}"
702	+	classpath="${jsr166yproduct.jar}"
703		debuglevel="${build.debuglevel}"
704		deprecation="${build.deprecation}"
705		source="${build.sourcelevel}"
#	Line 970 | Line 707
707
708		<include name="**/*.java"/>
709		<compilerarg line="${build.args}"/>
710	+	<compilerarg value="-XDignore.symbol.file=true"/>
711	+	<compilerarg value="${bootclasspath.args}"/>
712	+
713	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
714
715		</javac>
716
#	Line 977 | Line 718
718
719
720
721	<	<target name="jsr166xjar"
722	<	depends="jsr166xcompile"
721	>	<target name="extra166yjar"
722	>	depends="extra166ycompile"
723		description="Builds library jar from compiled sources">
724
725	<	<mkdir dir="${build.jsr166xlib.dir}"/>
725	>	<mkdir dir="${build.extra166ylib.dir}"/>
726
727	<	<jar destfile="${jsr166xproduct.jar}">
728	<	<fileset dir="${build.jsr166x.dir}"/>
727	>	<jar destfile="${extra166yproduct.jar}" index="true">
728	>	<fileset dir="${build.extra166y.dir}"/>
729		</jar>
730
731		</target>
732
733
734
735	<	<target name="jsr166xdocs"
735	>	<target name="extra166ydocs"
736		description="Builds javadocs with custom tags to build folder">
737
738	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
739	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
738	>	<delete dir="${build.extra166yjavadocs.dir}"/>
739	>	<mkdir dir="${build.extra166yjavadocs.dir}"/>
740
741	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
742	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
741	>	<javadoc destdir="${build.extra166yjavadocs.dir}"
742	>	link="http://download.oracle.com/javase/6/docs/api/"
743	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
744		>
745	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
746	<	<include name="jsr166x"/>
745	>	<packageset dir="${topsrc.dir}" defaultexcludes="no">
746	>	<include name="extra166y"/>
747		</packageset>
748
749
#	Line 1010 | Line 752
752		</target>
753
754
755	<	<target name="jsr166xdist"
756	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
755	>	<target name="extra166ydist"
756	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
757		description="Puts all distributable products in single hierarchy"/>
758
759
760
761	<	<target name="jsr166xclean"
761	>	<target name="extra166yclean"
762		description="Removes all build products">
763
764	<	<delete dir="${build.jsr166x.dir}"/>
765	<	<delete dir="${build.jsr166xlib.dir}"/>
764	>	<delete dir="${build.extra166y.dir}"/>
765	>	<delete dir="${build.extra166ylib.dir}"/>
766
767		</target>
768
769
770
771	<	<target name="jsr166xdist-clean"
771	>	<target name="extra166ydist-clean"
772		description="Removes all build and distribution products">
773
774		</target>
775
776	<
1035	<
1036	<	<target name="jsr166xdist-docs"
776	>	<target name="extra166ydist-docs"
777		description="Builds javadocs without custom tags to dist folder">
778
779	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
780	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1041	<
1042	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
1043	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
1044	<	source="${build.sourcelevel}">
1045	<
1046	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
1047	<	<include name="jsr166x"/>
1048	<	</packageset>
779	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
780	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
781
782	+	<javadoc destdir="${dist.extra166yjavadocs.dir}"
783	+	link="http://download.oracle.com/javase/6/docs/api/"
784	+	source="${build.sourcelevel}"
785	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
786	+	>
787	+	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
788	+	<include name="extra166y/*.java"/>
789	+	</fileset>
790		</javadoc>
791
792		</target>
793
794	<	<target name="jsr166xdist-jar"
795	<	depends="jsr166xclean, jsr166xjar">
794	>	<target name="extra166ydist-jar"
795	>	depends="extra166yclean, extra166yjar">
796
797	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
797	>	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
798
799		</target>
800

Diff Legend

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