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.72 by dl, Fri May 20 16:29:57 2005 UTC vs.
Revision 1.89 by jsr166, Fri Jun 10 18:07:30 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.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.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	–
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 111 | Line 108
108		fork="true">
109
110		<include name="**/*.java"/>
111	+	<compilerarg value="-XDignore.symbol.file=true"/>
112	+
113		<!--
114		<exclude name="java/lang/**"/>
116	–	-->
115		<compilerarg line="${build.args}"/>
116	+	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
117	+	-->
118
119		</javac>
120
#	Line 148 | Line 148
148		<delete dir="${build.javadocs.dir}"/>
149		<mkdir dir="${build.javadocs.dir}"/>
150
151	<	<javadoc destdir="${build.javadocs.dir}"
152	<	link="http://java.sun.com/j2se/1.5.0/docs/api"
153	<	overview="${src.dir}/intro.html"
154	<	sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
155	<	>
156	<
157	<	<packageset dir="${src.dir}"/>
158	<
159	<	</javadoc>
160	<
161	<	</target>
162	<
151	>	<!-- the packagenames="none" hack below prevents scanning the -->
152	>	<!-- sourcepath for packages -->
153
154	<
155	<	<target name="doccheck"
156	<	depends="filter-doccheck"
157	<	description="Reports on javadoc style errors">
158	<
159	<	<delete dir="${build.doccheck.dir}"/>
160	<	<mkdir dir="${build.doccheck.dir}"/>
161	<
162	<	<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}"/>
154	>	<javadoc destdir="${build.javadocs.dir}"
155	>	packagenames="none"
156	>	link="http://download.oracle.com/javase/7/docs/api/"
157	>	overview="${src.dir}/intro.html"
158	>	sourcepath="${src.dir}:${jdksrc.dir}"
159	>	additionalparam="-XDignore.symbol.file=true" >
160	>	<fileset dir="${src.dir}" defaultexcludes="yes">
161	>	<include name="**/*.java"/>
162	>	</fileset>
163		</javadoc>
164
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	–
165		</target>
166
167
#	Line 209 | Line 171
171		description="Puts all distributable products in single hierarchy"/>
172
173
212	–
174		<target name="release"
175		depends="dist"
176		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 256 | Line 217
217		<delete dir="${dist.javadocs.dir}"/>
218		<mkdir dir="${dist.javadocs.dir}"/>
219
220	<	<javadoc destdir="${dist.javadocs.dir}"
221	<	link="http://java.sun.com/j2se/1.5.0/docs/api"
261	<	overview="${src.dir}/intro.html"
220	>	<!-- the packagenames="none" hack below prevents scanning the -->
221	>	<!-- sourcepath for packages -->
222
223	<	sourcepath="${src.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
224	<	>
225	<	<packageset dir="${src.dir}" defaultexcludes="yes">
226	<	<include name="java/util/concurrent"/>
227	<	<include name="java/util/concurrent/atomic"/>
228	<	<include name="java/util/concurrent/locks"/>
229	<	</packageset>
230	<	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
271	<	<include name="main/java/util/*.java"/>
272	<	<!--      <include name="jsr166x/*.java"/> -->
223	>	<javadoc destdir="${dist.javadocs.dir}"
224	>	packagenames="none"
225	>	link="http://download.oracle.com/javase/7/docs/api/"
226	>	overview="${src.dir}/intro.html"
227	>	sourcepath="${src.dir}:${jdksrc.dir}"
228	>	additionalparam="-XDignore.symbol.file=true" >
229	>	<fileset dir="${src.dir}" defaultexcludes="yes">
230	>	<include name="**/*.java"/>
231		</fileset>
232		</javadoc>
233
#	Line 298 | Line 256
256		</target>
257
258
301	–	<target name="compile-ant-filter"
302	–	depends="init">
303	–
304	–	<mkdir dir="${build.ant.dir}"/>
305	–
306	–	<javac srcdir="${ant.src.dir}"
307	–	destdir="${build.ant.dir}"
308	–	source="1.4"/>
309	–
310	–	</target>
311	–
312	–
313	–	<target name="filter-src"
314	–	depends="compile-ant-filter">
315	–
316	–	<mkdir dir="${build.filter.src.dir}"/>
317	–
318	–	<copy todir="${build.filter.src.dir}">
319	–	<fileset dir="${src.dir}">
320	–	<include name="**/*.html"/>
321	–	</fileset>
322	–	</copy>
323	–
324	–	<copy todir="${build.filter.src.dir}">
325	–	<fileset dir="${src.dir}">
326	–	<exclude name="**/*.html"/>
327	–	<!-- Files excluded from dist-docs -->
328	–	<exclude name="java/util/Random.*"/>
329	–	<exclude name="sun/misc/Unsafe.*"/>
330	–	</fileset>
331	–	<!--
332	–	<filterchain>
333	–	-->
334	–
335	–	<!--
336	–	# This filter gets rid of angle-bracketed type parameters
337	–	# so that javadoc can run on the result. The following
338	–	# heuristic seems to work:
339	–	#
340	–	# For all lines not starting with space(s)-asterisk-space(s),
341	–	#   replace <something> with a space, where there may be more
342	–	#   than one right angle bracket at the end, and "something"
343	–	#   must not contain parens or pipes. (This may need some
344	–	#   tweaking.)
345	–	-->
346	–
347	–	<!--
348	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
349	–	classpath="${build.ant.dir}">
350	–	<param name="notmatching" value="^\s+\*\s.*$"/>
351	–	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
352	–	<param name="replacement" value=" "/>
353	–	</filterreader>
354	–	-->
355	–
356	–	<!--
357	–	</filterchain>
358	–	-->
359	–	</copy>
360	–
361	–	</target>
362	–
363	–
364	–	<target name="filter-doccheck"
365	–	depends="filter-src">
366	–
367	–	<mkdir dir="${build.dc-filter.dir}"/>
368	–
369	–	<copy todir="${build.dc-filter.dir}">
370	–	<fileset dir="${build.filter.src.dir}">
371	–	<include name="**/*.html"/>
372	–	</fileset>
373	–	</copy>
374	–
375	–	<property name="generic.declarations"
376	–	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 {}"
377	–	/>
378	–
379	–	<copy todir="${build.dc-filter.dir}">
380	–	<fileset dir="${build.filter.src.dir}">
381	–	<exclude name="**/*.html"/>
382	–	</fileset>
383	–	<filterchain>
384	–	<!--
385	–	# These two filters try to make the source look like
386	–	# something that doccheck can process. The first removes
387	–	# -source 1.4 assertions and the second adds in a bunch
388	–	# of single letter public nested marker interfaces so that
389	–	# the generic type parameters are recognized.
390	–	-->
391	–
392	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
393	–	classpath="${build.ant.dir}">
394	–	<param name="matching"    value="^\s*assert[\s ].*$"/>
395	–	<param name="pattern"     value="assert"/>
396	–	<param name="replacement" value="//assert"/>
397	–	</filterreader>
398	–
399	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
400	–	classpath="${build.ant.dir}">
401	–	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
402	–	<param name="pattern"     value="$"/>
403	–	<param name="replacement" value=" ${generic.declarations}"/>
404	–	</filterreader>
405	–
406	–	</filterchain>
407	–	</copy>
408	–
409	–	</target>
410	–
411	–
259		<target name="compile-tests"
260		depends="jar">
261
#	Line 424 | Line 271
271
272		<compilerarg value="${bootclasspath.args}"/>
273		<compilerarg line="${build.args}"/>
274	+	<compilerarg value="-XDignore.symbol.file=true"/>
275
276		<classpath refid="test.classpath"/>
277
#	Line 441 | Line 289
289
290		<compilerarg value="${bootclasspath.args}"/>
291		<compilerarg line="${build.args}"/>
292	+	<compilerarg value="-XDignore.symbol.file=true"/>
293
294		<classpath refid="test.classpath"/>
295
#	Line 457 | Line 306
306
307		<compilerarg value="${bootclasspath.args}"/>
308		<compilerarg line="${build.args}"/>
309	+	<compilerarg value="-XDignore.symbol.file=true"/>
310
311		<classpath refid="test.classpath"/>
312
#	Line 529 | Line 379
379		<fileset dir="${build.reports.dir}">
380		<include name="TEST-*.xml"/>
381		</fileset>
382	<	<report styledir="${stylesheet.dir}"
533	<	format="${junit.report.format}"
534	<	todir="${build.reports.dir}"
382	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
383		/>
384		</junitreport>
385
#	Line 581 | Line 429
429		</target>
430
431
584	–
585	–	<!-- Anthill targets -->
586	–
587	–	<target name="anthill-build">
588	–
589	–	<!-- Override this in user.properties -->
590	–	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
591	–
592	–	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
593	–	<arg value="-Xmx256000000"/>
594	–	<!-- classpath of new JVM -->
595	–	<arg value="-classpath"/> <arg path="${java.class.path}"/>
596	–	<!-- location of Ant home directory -->
597	–	<arg value="-Dant.home=${ant.home}"/>
598	–	<!-- the Ant main class -->
599	–	<arg value="org.apache.tools.ant.Main"/>
600	–	<!-- The build file -->
601	–	<arg value="-buildfile"/>  <arg value="build.xml"/>
602	–	<!-- the target to build on the new Ant instance -->
603	–	<arg value="-DJAVA_HOME=${tiger.home}"/>
604	–	<arg value="do-anthill-build"/>
605	–	</exec>
606	–	</target>
607	–
608	–	<target name="do-anthill-build"
609	–	depends="jar, test, docs, dist-docs"/>
610	–
611	–	<target name="anthill-publish">
612	–
613	–	<copy todir="${deployDir}/docs/private">
614	–	<fileset dir="${build.javadocs.dir}"/>
615	–	</copy>
616	–
617	–	<copy todir="${deployDir}/docs/public">
618	–	<fileset dir="${dist.javadocs.dir}"/>
619	–	</copy>
620	–
621	–	<copy tofile="${deployDir}/index.html"
622	–	file="${basedir}/etc/anthill-index.html"/>
623	–
624	–	<copy todir="${deployDir}/notes">
625	–	<fileset dir="${basedir}/etc/notes"/>
626	–	</copy>
627	–
628	–	</target>
629	–
630	–
631	–
432		<!-- Various demos and test programs -->
433
434
635	–	<target name="sample" depends="init, configure-compiler"
636	–	description="Standalone demo program">
637	–
638	–	<mkdir dir="${build.testcases.dir}"/>
639	–
640	–	<javac srcdir="${test.src.dir}"
641	–	destdir="${build.testcases.dir}"
642	–	debug="${build.debug}"
643	–	debuglevel="${build.debuglevel}"
644	–	deprecation="${build.deprecation}"
645	–	source="${build.sourcelevel}"
646	–	fork="true">
647	–
648	–	<include name="jsr166/test/Sample.java"/>
649	–
650	–	</javac>
651	–
652	–	<copy todir="${build.testcases.dir}">
653	–	<fileset dir="${test.src.dir}">
654	–	<include name="**/*.properties"/>
655	–	</fileset>
656	–	</copy>
657	–
658	–
659	–	<java classname="jsr166.test.Sample" fork="true">
660	–	<classpath refid="test.classpath"/>
661	–	<!-- <jvmarg value="-ea"/> -->
662	–	<!-- <jvmarg value="-server"/> -->
663	–	<!-- <arg value="1000"/> -->
664	–	</java>
665	–	</target>
666	–
667	–
435		<target name="loops" depends="init, configure-compiler"
436		description="Benchmark from Doug Lea's AQS paper">
437
#	Line 680 | Line 447
447
448		<compilerarg line="${build.args}"/>
449		<classpath refid="loops.classpath"/>
450	+	<compilerarg value="-XDignore.symbol.file=true"/>
451
452		</javac>
453
#	Line 690 | Line 458
458		</target>
459
460
461	<	<target name="compile-j1" depends="init, configure-compiler, compile">
461	>	<!-- jsr166x -->
462	>
463	>
464	>	<target name="jsr166xcompile"
465	>	depends="init, configure-compiler"
466	>	description="Compiles jsr166x sources">
467
468	<	<mkdir dir="${build.j1.dir}"/>
468	>	<mkdir dir="${build.jsr166x.dir}"/>
469
470	<	<javac srcdir="${j1.src.dir}"
471	<	destdir="${build.j1.dir}"
470	>	<javac srcdir="${jsr166xsrc.dir}"
471	>	destdir="${build.jsr166x.dir}"
472		debug="${build.debug}"
473		debuglevel="${build.debuglevel}"
474		deprecation="${build.deprecation}"
475	<	source="${build.sourcelevel}" >
475	>	source="${build.sourcelevel}"
476	>	fork="true">
477
478		<include name="**/*.java"/>
705	–	<exclude name="**/dijkstra/**"/>
706	–
479		<compilerarg line="${build.args}"/>
480	<	<classpath refid="j1.classpath"/>
480	>	<compilerarg value="-XDignore.symbol.file=true"/>
481
482		</javac>
483
484		</target>
485
486
715	–	<target name="sw" depends="compile-j1"
716	–	description="Runs the SwingWorker demo">
487
488	<	<!--
489	<	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
490	<	<classpath refid="j1.classpath"/>
721	<	</java>
722	<	-->
488	>	<target name="jsr166xjar"
489	>	depends="jsr166xcompile"
490	>	description="Builds library jar from compiled sources">
491
492	<	<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
492	>	<mkdir dir="${build.jsr166xlib.dir}"/>
493
494	<	<exec dir="${build.j1.dir}" executable="appletviewer.exe">
495	<	<arg value="${build.j1.dir}/SwingWorker.html"/>
496	<	</exec>
494	>	<jar destfile="${jsr166xproduct.jar}">
495	>	<fileset dir="${build.jsr166x.dir}"/>
496	>	</jar>
497
498		</target>
499
732	–	<target name="j1" depends="compile-j1"
733	–	description="Runs a standalone JavaOne program">
500
735	–	<java classname="${j1.test}" fork="true">
736	–	<classpath refid="j1.classpath"/>
737	–	<jvmarg value="-client"/>
501
502	<	<!-- TestPseudoRandom args -->
503	<	<arg value="2"/>
741	<	<arg value="25"/>
742	<	<arg value="100000"/>
502	>	<target name="jsr166xdocs"
503	>	description="Builds javadocs with custom tags to build folder">
504
505	<	<!-- WebCrawler args -->
506	<	<!--
746	<	<arg value="jsr166.webcrawler.WebCrawler3"/>
747	<	<arg value="http://www.priorartisans.com"/>
748	<	<arg value="25"/>
749	<	-->
505	>	<delete dir="${build.jsr166xjavadocs.dir}"/>
506	>	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
507
508	<	</java>
508	>	<javadoc destdir="${build.jsr166xjavadocs.dir}"
509	>	packagenames="jsr166x"
510	>	link="http://download.oracle.com/javase/7/docs/api/"
511	>	source="${build.sourcelevel}"
512	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
513	>	additionalparam="-XDignore.symbol.file=true" />
514
515		</target>
516
517
518	<	<target name="test-j1" depends="compile-j1"
519	<	description="Runs testcases from the JavaOne source directories">
520	<
759	<	<junit printsummary="true"
760	<	showoutput="true"
761	<	errorProperty="junit.failed"
762	<	failureProperty="junit.failed"
763	<	dir="${build.j1.dir}"
764	<	fork="true">
765	<
766	<	<!-- <jvmarg value="-server"/> -->
767	<	<classpath refid="j1.classpath"/>
768	<	<formatter type="xml"/>
769	<
770	<	<batchtest todir="${build.j1.dir}">
771	<	<fileset dir="${j1.src.dir}">
772	<	<include name="**/*Test.java"/>
773	<	</fileset>
774	<	</batchtest>
518	>	<target name="jsr166xdist"
519	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
520	>	description="Puts all distributable products in single hierarchy"/>
521
776	–	</junit>
522
778	–	<available property="junit.report.format"
779	–	value="frames"
780	–	classname="org.apache.xalan.lib.Redirect"/>
781	–	<property name="junit.report.format" value="noframes"/>
523
524	<	<junitreport todir="${build.j1.dir}">
525	<	<fileset dir="${build.j1.dir}">
785	<	<include name="TEST-*.xml"/>
786	<	</fileset>
787	<	<report styledir="${stylesheet.dir}"
788	<	format="${junit.report.format}"
789	<	todir="${build.j1.dir}"
790	<	/>
791	<	</junitreport>
524	>	<target name="jsr166xclean"
525	>	description="Removes all build products">
526
527	<	<fail message="Test Cases Failed" if="junit.failed"/>
527	>	<delete dir="${build.jsr166x.dir}"/>
528	>	<delete dir="${build.jsr166xlib.dir}"/>
529
530		</target>
531
532
533
534	<	<!-- C++ and JNI definitions and demos -->
535	<
801	<	<target name="configure-cpp">
802	<
803	<	<!-- Define tasks and types -->
534	>	<target name="jsr166xdist-clean"
535	>	description="Removes all build and distribution products">
536
537	<	<path id="cpptasks.path">
806	<	<pathelement location="${lib.dir}/cpptasks.jar"/>
807	<	</path>
808	<	<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
809	<	<typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
537	>	</target>
538
811	–	<!-- Set platform property for JNI includes -->
539
813	–	<condition property="platform" value="linux">
814	–	<os name="Linux"/>
815	–	</condition>
816	–	<condition property="platform" value="win32">
817	–	<os family="windows"/>
818	–	</condition>
819	–	<condition property="platform" value="solaris">
820	–	<os name="SunOS"/>
821	–	</condition>
540
541	<	</target>
541	>	<target name="jsr166xdist-docs"
542	>	description="Builds javadocs without custom tags to dist folder">
543
544	+	<delete dir="${dist.jsr166xjavadocs.dir}"/>
545	+	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
546
547	<	<target name="cppdemo" depends="configure-cpp">
547	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
548	>	packagenames="jsr166x"
549	>	link="http://download.oracle.com/javase/7/docs/api/"
550	>	source="${build.sourcelevel}"
551	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
552	>	additionalparam="-XDignore.symbol.file=true" />
553
554	<	<mkdir dir="${build.dir}"/>
554	>	</target>
555
556	<	<cc multithreaded="true"
557	<	name="g++"
832	<	objdir="${build.dir}"
833	<	outfile="${build.dir}/CppDemo">
834	<	<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
835	<	<libset libs="stdc++"/>
836	<	</cc>
556	>	<target name="jsr166xdist-jar"
557	>	depends="jsr166xclean, jsr166xjar">
558
559	<	<exec executable="${build.dir}/CppDemo">
839	<	<arg line="count in word frequency of word in command line count"/>
840	<	</exec>
559	>	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
560
561		</target>
562
563	+	<!-- jsr166y -->
564
845	–	<target name="jnidemo" depends="init, configure-compiler, configure-cpp">
565
566	<	<mkdir dir="${build.testcases.dir}"/>
566	>	<target name="jsr166ycompile"
567	>	depends="init, configure-compiler"
568	>	description="Compiles jsr166y sources">
569
570	<	<javac srcdir="${test.src.dir}"
571	<	destdir="${build.testcases.dir}"
570	>	<mkdir dir="${build.jsr166y.dir}"/>
571	>
572	>	<javac srcdir="${jsr166ysrc.dir}"
573	>	destdir="${build.jsr166y.dir}"
574		debug="${build.debug}"
575		debuglevel="${build.debuglevel}"
576		deprecation="${build.deprecation}"
577		source="${build.sourcelevel}"
578		fork="true">
579	<	<compilerarg value="${bootclasspath.args}"/>
579	>
580	>	<include name="**/*.java"/>
581		<compilerarg line="${build.args}"/>
582	<	<classpath refid="test.classpath"/>
583	<	<include name="JniDemo.java"/>
860	<	</javac>
582	>	<compilerarg value="-XDignore.symbol.file=true"/>
583	>	<compilerarg value="${bootclasspath.args}"/>
584
585	<	<javah destdir="${build.testcases.dir}"
586	<	classpathref="test.classpath">
587	<	<class name="JniDemo"/>
865	<	</javah>
866	<
867	<	<cc multithreaded="true"
868	<	name="g++"
869	<	objdir="${build.dir}"
870	<	outfile="${build.dir}/JniDemo"
871	<	outtype="shared">
872	<
873	<	<compiler>
874	<	<defineset>
875	<	<define name="__int64" value="long long"/>
876	<	</defineset>
877	<	<includepath location="${java.home}/../include"/>
878	<	<includepath location="${java.home}/../include/${platform}"/>
879	<	<compilerarg value="-mno-cygwin"/>
880	<	</compiler>
881	<
882	<	<linker>
883	<	<linkerarg value="--add-stdcall-alias"/>
884	<	</linker>
885	<
886	<	<includepath location="${build.testcases.dir}"/>
887	<
888	<	<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
889	<
890	<	<libset libs="stdc++"/>
891	<
892	<	</cc>
893	<
894	<	<!-- Necessary if windows, harmless if not -->
895	<	<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
896	<
897	<	<java classname="JniDemo" fork="true">
898	<	<!-- Watch out: path separator hardwired to semicolon here! -->
899	<	<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
900	<	<classpath refid="test.classpath"/>
901	<	<arg line="count in word frequency of word in command line count"/>
902	<	</java>
585	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
586	>
587	>	</javac>
588
589		</target>
590
591
592
593	<	<!-- Backward compatibility, work in progress (some files not checked in) -->
593	>	<target name="jsr166yjar"
594	>	depends="jsr166ycompile"
595	>	description="Builds library jar from compiled sources">
596
597	+	<mkdir dir="${build.jsr166ylib.dir}"/>
598
599	+	<jar destfile="${jsr166yproduct.jar}" index="true">
600	+	<fileset dir="${build.jsr166y.dir}"/>
601	+	</jar>
602	+
603	+	</target>
604
912	–	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
913	–	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
914	–	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
915	–	<property name="pretiger.sourcelevel" value="1.4"/>
605
917	–	<target name="defang"
918	–	depends="init"
919	–	description="Generates pre-Tiger compatible source">
606
607	<	<delete dir="${pretiger.src.dir}"/>
608	<	<mkdir dir="${pretiger.src.dir}"/>
607	>	<target name="jsr166ydocs"
608	>	description="Builds javadocs with custom tags to build folder">
609
610	<	<exec executable="perl">
611	<	<arg file="etc/defang.pl"/>
612	<	<!-- <arg value="-v"/> -->
613	<	<arg value="-s"/> <arg file="${src.dir}"/>
614	<	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
615	<	</exec>
610	>	<delete dir="${build.jsr166yjavadocs.dir}"/>
611	>	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
612	>
613	>	<javadoc destdir="${build.jsr166yjavadocs.dir}"
614	>	packagenames="jsr166y"
615	>	link="http://download.oracle.com/javase/7/docs/api/"
616	>	source="${build.sourcelevel}"
617	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
618	>	additionalparam="-XDignore.symbol.file=true" />
619
620		</target>
621
933	–	<target name="compile-pretiger"
934	–	depends="init, configure-compiler, defang"
935	–	description="Compiles pre-Tiger sources to build folder">
622
623	<	<mkdir dir="${build.pretiger.dir}"/>
623	>	<target name="jsr166ydist"
624	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
625	>	description="Puts all distributable products in single hierarchy"/>
626
939	–	<javac srcdir="${pretiger.src.dir}"
940	–	destdir="${build.pretiger.dir}"
941	–	debug="${build.debug}"
942	–	debuglevel="${build.debuglevel}"
943	–	deprecation="${build.deprecation}"
944	–	source="${pretiger.sourcelevel}"
945	–	fork="true">
627
947	–	<compilerarg line="${build.args}"/>
948	–	<exclude name="**/Thread.java"/>
628
629	<	</javac>
629	>	<target name="jsr166yclean"
630	>	description="Removes all build products">
631	>
632	>	<delete dir="${build.jsr166y.dir}"/>
633	>	<delete dir="${build.jsr166ylib.dir}"/>
634
635		</target>
636
954	–	<target name="pretiger" depends="compile-pretiger">
637
956	–	<mkdir dir="${build.lib.dir}"/>
638
639	<	<jar destfile="${pretiger.jar}">
640	<	<fileset dir="${build.pretiger.dir}">
960	<	</fileset>
961	<	</jar>
639	>	<target name="jsr166ydist-clean"
640	>	description="Removes all build and distribution products">
641
642		</target>
643
644	<	<!-- jsr166x -->
644	>	<target name="jsr166ydist-docs"
645	>	description="Builds javadocs without custom tags to dist folder">
646
647	+	<delete dir="${dist.jsr166yjavadocs.dir}"/>
648	+	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
649
650	<	<target name="jsr166xcompile"
651	<	depends="init, configure-compiler"
652	<	description="Compiles jsr166x sources">
650	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
651	>	packagenames="jsr166y"
652	>	link="http://download.oracle.com/javase/7/docs/api/"
653	>	source="${build.sourcelevel}"
654	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
655	>	additionalparam="-XDignore.symbol.file=true" />
656
657	<	<mkdir dir="${build.jsr166x.dir}"/>
657	>	</target>
658
659	<	<javac srcdir="${jsr166xsrc.dir}"
660	<	destdir="${build.jsr166x.dir}"
659	>	<target name="jsr166ydist-jar"
660	>	depends="jsr166yclean, jsr166yjar">
661	>
662	>	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
663	>
664	>	</target>
665	>
666	>	<!-- extra166y -->
667	>
668	>
669	>	<target name="extra166ycompile"
670	>	depends="init, configure-compiler, jsr166ycompile"
671	>	description="Compiles extra166y sources">
672	>
673	>	<mkdir dir="${build.extra166y.dir}"/>
674	>
675	>	<javac srcdir="${extra166ysrc.dir}"
676	>	destdir="${build.extra166y.dir}"
677		debug="${build.debug}"
678	+	classpath="${jsr166yproduct.jar}"
679		debuglevel="${build.debuglevel}"
680		deprecation="${build.deprecation}"
681		source="${build.sourcelevel}"
#	Line 981 | Line 683
683
684		<include name="**/*.java"/>
685		<compilerarg line="${build.args}"/>
686	+	<compilerarg value="-XDignore.symbol.file=true"/>
687	+	<compilerarg value="${bootclasspath.args}"/>
688	+
689	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
690
691		</javac>
692
#	Line 988 | Line 694
694
695
696
697	<	<target name="jsr166xjar"
698	<	depends="jsr166xcompile"
697	>	<target name="extra166yjar"
698	>	depends="extra166ycompile"
699		description="Builds library jar from compiled sources">
700
701	<	<mkdir dir="${build.jsr166xlib.dir}"/>
701	>	<mkdir dir="${build.extra166ylib.dir}"/>
702
703	<	<jar destfile="${jsr166xproduct.jar}">
704	<	<fileset dir="${build.jsr166x.dir}"/>
703	>	<jar destfile="${extra166yproduct.jar}" index="true">
704	>	<fileset dir="${build.extra166y.dir}"/>
705		</jar>
706
707		</target>
708
709
710
711	<	<target name="jsr166xdocs"
711	>	<target name="extra166ydocs"
712		description="Builds javadocs with custom tags to build folder">
713
714	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
715	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
714	>	<delete dir="${build.extra166yjavadocs.dir}"/>
715	>	<mkdir dir="${build.extra166yjavadocs.dir}"/>
716
717	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
718	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
719	<	sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
720	<
721	<	>
722	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
1017	<	<include name="jsr166x"/>
1018	<	</packageset>
1019	<
1020	<
1021	<	</javadoc>
717	>	<javadoc destdir="${build.extra166yjavadocs.dir}"
718	>	packagenames="extra166y"
719	>	link="http://download.oracle.com/javase/7/docs/api/"
720	>	source="${build.sourcelevel}"
721	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
722	>	additionalparam="-XDignore.symbol.file=true" />
723
724		</target>
725
726
727	<	<target name="jsr166xdist"
728	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
727	>	<target name="extra166ydist"
728	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
729		description="Puts all distributable products in single hierarchy"/>
730
731
732
733	<	<target name="jsr166xclean"
733	>	<target name="extra166yclean"
734		description="Removes all build products">
735
736	<	<delete dir="${build.jsr166x.dir}"/>
737	<	<delete dir="${build.jsr166xlib.dir}"/>
736	>	<delete dir="${build.extra166y.dir}"/>
737	>	<delete dir="${build.extra166ylib.dir}"/>
738
739		</target>
740
741
742
743	<	<target name="jsr166xdist-clean"
743	>	<target name="extra166ydist-clean"
744		description="Removes all build and distribution products">
745
746		</target>
747
748	<
1048	<
1049	<	<target name="jsr166xdist-docs"
748	>	<target name="extra166ydist-docs"
749		description="Builds javadocs without custom tags to dist folder">
750
751	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
752	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
751	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
752	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
753
754	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
755	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
756	<	source="${build.sourcelevel}">
757	<
758	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
759	<	<include name="jsr166x"/>
1061	<	</packageset>
1062	<
1063	<	</javadoc>
754	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
755	>	packagenames="extra166y"
756	>	link="http://download.oracle.com/javase/7/docs/api/"
757	>	source="${build.sourcelevel}"
758	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
759	>	additionalparam="-XDignore.symbol.file=true" />
760
761		</target>
762
763	<	<target name="jsr166xdist-jar"
764	<	depends="jsr166xclean, jsr166xjar">
763	>	<target name="extra166ydist-jar"
764	>	depends="extra166yclean, extra166yjar">
765
766	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
766	>	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
767
768		</target>
769

Diff Legend

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