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.73 by dl, Tue Nov 8 00:13:41 2005 UTC vs.
Revision 1.75 by jsr166, Tue Sep 18 12:46:40 2007 UTC

#	Line 30 | Line 30
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"/>
33		<property name="build.loops.dir"      location="${build.dir}/loops"/>
34		<property name="build.lib.dir"        location="${build.dir}/lib"/>
36	–	<property name="build.ant.dir"        location="${build.dir}/ant"/>
35		<property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
36		<property name="build.reports.dir"    location="${build.dir}/reports"/>
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"/>
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		<!-- Source locations -->
46		<property name="src.dir"              location="${basedir}/src/main"/>
47		<property name="test.src.dir"         location="${basedir}/src/test"/>
50	–	<property name="j1.src.dir"           location="${basedir}/src/javaone"/>
48		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
49		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
50		<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"/>
51		<property name="lib.dir"              location="${basedir}/lib"/>
52		<property name="dist.dir"             location="${basedir}/dist"/>
53		<property name="topsrc.dir"           location="${basedir}/src"/>
54		<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
55	+	<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
56
57		<!-- Distribution locations -->
58		<property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
59		<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
60	+	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
61
62		<!-- Jar locations -->
63		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
64		<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
65	+	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
66		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
69	–	<property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
67
68		<!-- Bootclasspath argument -->
69		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
#	Line 82 | Line 79
79		<pathelement location="${build.loops.dir}"/>
80		</path>
81
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	–
82
83		<!-- Main targets -->
84
#	Line 111 | Line 98
98		fork="true">
99
100		<include name="**/*.java"/>
101	+	<compilerarg value="-XDignore.symbol.file"/>
102	+
103		<!--
104		<exclude name="java/lang/**"/>
105		<compilerarg line="${build.args}"/>
#	Line 150 | Line 139
139		<mkdir dir="${build.javadocs.dir}"/>
140
141		<javadoc destdir="${build.javadocs.dir}"
142	<	link="http://java.sun.com/j2se/1.5.0/docs/api"
142	>	link="http://java.sun.com/javase/6/docs/api/"
143		overview="${src.dir}/intro.html"
144		sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
145		>
#	Line 163 | Line 152
152
153
154
166	–	<target name="doccheck"
167	–	depends="filter-doccheck"
168	–	description="Reports on javadoc style errors">
169	–
170	–	<delete dir="${build.doccheck.dir}"/>
171	–	<mkdir dir="${build.doccheck.dir}"/>
172	–
173	–	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
174	–	docletpath="${lib.dir}/doccheck.jar"
175	–	destdir="${build.doccheck.dir}">
176	–	<packageset dir="${build.dc-filter.dir}"/>
177	–	</javadoc>
178	–
179	–	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
180	–
181	–	</target>
182	–
183	–
184	–
185	–	<target name="checkstyle"
186	–	depends="filter-src"
187	–	description="Reports on style errors in Java source (verbose, mostly chaff)">
188	–
189	–	<taskdef resource="checkstyletask.properties"
190	–	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
191	–
192	–	<mkdir dir="${build.checkstyle.dir}"/>
193	–
194	–	<checkstyle config="etc/checkstyle/sun_checks.xml"
195	–	failOnViolation="false">
196	–	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
197	–	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
198	–	</checkstyle>
199	–
200	–	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
201	–	out="${build.checkstyle.dir}/checkstyle-report.html"
202	–	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
203	–
204	–	</target>
205	–
206	–
207	–
155		<target name="dist"
156		depends="init, dist-clean, dist-jar, dist-docs"
157		description="Puts all distributable products in single hierarchy"/>
#	Line 258 | Line 205
205		<mkdir dir="${dist.javadocs.dir}"/>
206
207		<javadoc destdir="${dist.javadocs.dir}"
208	<	link="http://java.sun.com/j2se/1.5.0/docs/api"
208	>	link="http://java.sun.com/javase/6/docs/api/"
209		overview="${src.dir}/intro.html"
210
211		sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
212		>
213	+	<!--
214		<packageset dir="${src.dir}" defaultexcludes="yes">
215		<include name="java/util/concurrent"/>
216		<include name="java/util/concurrent/atomic"/>
217		<include name="java/util/concurrent/locks"/>
218		</packageset>
219	+	-->
220		<fileset dir="${topsrc.dir}" defaultexcludes="yes">
221	+	<include name="main/java/util/concurrent/*.java"/>
222	+	<include name="main/java/util/concurrent/atomic/*.java"/>
223	+	<include name="main/java/util/concurrent/locks/*.java"/>
224		<include name="main/java/util/*.java"/>
225	+	<!--
226	+	<include name="main/java/util/concurrent/*.html"/>
227	+	<include name="main/java/util/concurrent/atomic/*.html"/>
228	+	<include name="main/java/util/concurrent/locks/*.html"/>
229		<include name="main/java/util/*.html"/>
230	+	-->
231		<!--      <include name="jsr166x/*.java"/> -->
232		</fileset>
233		</javadoc>
#	Line 300 | Line 257
257		</target>
258
259
303	–	<target name="compile-ant-filter"
304	–	depends="init">
305	–
306	–	<mkdir dir="${build.ant.dir}"/>
307	–
308	–	<javac srcdir="${ant.src.dir}"
309	–	destdir="${build.ant.dir}"
310	–	source="1.4"/>
311	–
312	–	</target>
313	–
314	–
315	–	<target name="filter-src"
316	–	depends="compile-ant-filter">
317	–
318	–	<mkdir dir="${build.filter.src.dir}"/>
319	–
320	–	<copy todir="${build.filter.src.dir}">
321	–	<fileset dir="${src.dir}">
322	–	<include name="**/*.html"/>
323	–	</fileset>
324	–	</copy>
325	–
326	–	<copy todir="${build.filter.src.dir}">
327	–	<fileset dir="${src.dir}">
328	–	<exclude name="**/*.html"/>
329	–	<!-- Files excluded from dist-docs -->
330	–	<exclude name="java/util/Random.*"/>
331	–	<exclude name="sun/misc/Unsafe.*"/>
332	–	</fileset>
333	–	<!--
334	–	<filterchain>
335	–	-->
336	–
337	–	<!--
338	–	# This filter gets rid of angle-bracketed type parameters
339	–	# so that javadoc can run on the result. The following
340	–	# heuristic seems to work:
341	–	#
342	–	# For all lines not starting with space(s)-asterisk-space(s),
343	–	#   replace <something> with a space, where there may be more
344	–	#   than one right angle bracket at the end, and "something"
345	–	#   must not contain parens or pipes. (This may need some
346	–	#   tweaking.)
347	–	-->
348	–
349	–	<!--
350	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
351	–	classpath="${build.ant.dir}">
352	–	<param name="notmatching" value="^\s+\*\s.*$"/>
353	–	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
354	–	<param name="replacement" value=" "/>
355	–	</filterreader>
356	–	-->
357	–
358	–	<!--
359	–	</filterchain>
360	–	-->
361	–	</copy>
362	–
363	–	</target>
364	–
365	–
366	–	<target name="filter-doccheck"
367	–	depends="filter-src">
368	–
369	–	<mkdir dir="${build.dc-filter.dir}"/>
370	–
371	–	<copy todir="${build.dc-filter.dir}">
372	–	<fileset dir="${build.filter.src.dir}">
373	–	<include name="**/*.html"/>
374	–	</fileset>
375	–	</copy>
376	–
377	–	<property name="generic.declarations"
378	–	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 {}"
379	–	/>
380	–
381	–	<copy todir="${build.dc-filter.dir}">
382	–	<fileset dir="${build.filter.src.dir}">
383	–	<exclude name="**/*.html"/>
384	–	</fileset>
385	–	<filterchain>
386	–	<!--
387	–	# These two filters try to make the source look like
388	–	# something that doccheck can process. The first removes
389	–	# -source 1.4 assertions and the second adds in a bunch
390	–	# of single letter public nested marker interfaces so that
391	–	# the generic type parameters are recognized.
392	–	-->
393	–
394	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
395	–	classpath="${build.ant.dir}">
396	–	<param name="matching"    value="^\s*assert[\s ].*$"/>
397	–	<param name="pattern"     value="assert"/>
398	–	<param name="replacement" value="//assert"/>
399	–	</filterreader>
400	–
401	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
402	–	classpath="${build.ant.dir}">
403	–	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
404	–	<param name="pattern"     value="$"/>
405	–	<param name="replacement" value=" ${generic.declarations}"/>
406	–	</filterreader>
407	–
408	–	</filterchain>
409	–	</copy>
410	–
411	–	</target>
412	–
413	–
260		<target name="compile-tests"
261		depends="jar">
262
#	Line 531 | Line 377
377		<fileset dir="${build.reports.dir}">
378		<include name="TEST-*.xml"/>
379		</fileset>
380	<	<report styledir="${stylesheet.dir}"
535	<	format="${junit.report.format}"
536	<	todir="${build.reports.dir}"
380	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
381		/>
382		</junitreport>
383
#	Line 583 | Line 427
427		</target>
428
429
586	–
587	–	<!-- Anthill targets -->
588	–
589	–	<target name="anthill-build">
590	–
591	–	<!-- Override this in user.properties -->
592	–	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
593	–
594	–	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
595	–	<arg value="-Xmx256000000"/>
596	–	<!-- classpath of new JVM -->
597	–	<arg value="-classpath"/> <arg path="${java.class.path}"/>
598	–	<!-- location of Ant home directory -->
599	–	<arg value="-Dant.home=${ant.home}"/>
600	–	<!-- the Ant main class -->
601	–	<arg value="org.apache.tools.ant.Main"/>
602	–	<!-- The build file -->
603	–	<arg value="-buildfile"/>  <arg value="build.xml"/>
604	–	<!-- the target to build on the new Ant instance -->
605	–	<arg value="-DJAVA_HOME=${tiger.home}"/>
606	–	<arg value="do-anthill-build"/>
607	–	</exec>
608	–	</target>
609	–
610	–	<target name="do-anthill-build"
611	–	depends="jar, test, docs, dist-docs"/>
612	–
613	–	<target name="anthill-publish">
614	–
615	–	<copy todir="${deployDir}/docs/private">
616	–	<fileset dir="${build.javadocs.dir}"/>
617	–	</copy>
618	–
619	–	<copy todir="${deployDir}/docs/public">
620	–	<fileset dir="${dist.javadocs.dir}"/>
621	–	</copy>
622	–
623	–	<copy tofile="${deployDir}/index.html"
624	–	file="${basedir}/etc/anthill-index.html"/>
625	–
626	–	<copy todir="${deployDir}/notes">
627	–	<fileset dir="${basedir}/etc/notes"/>
628	–	</copy>
629	–
630	–	</target>
631	–
632	–
633	–
430		<!-- Various demos and test programs -->
431
432
637	–	<target name="sample" depends="init, configure-compiler"
638	–	description="Standalone demo program">
639	–
640	–	<mkdir dir="${build.testcases.dir}"/>
641	–
642	–	<javac srcdir="${test.src.dir}"
643	–	destdir="${build.testcases.dir}"
644	–	debug="${build.debug}"
645	–	debuglevel="${build.debuglevel}"
646	–	deprecation="${build.deprecation}"
647	–	source="${build.sourcelevel}"
648	–	fork="true">
649	–
650	–	<include name="jsr166/test/Sample.java"/>
651	–
652	–	</javac>
653	–
654	–	<copy todir="${build.testcases.dir}">
655	–	<fileset dir="${test.src.dir}">
656	–	<include name="**/*.properties"/>
657	–	</fileset>
658	–	</copy>
659	–
660	–
661	–	<java classname="jsr166.test.Sample" fork="true">
662	–	<classpath refid="test.classpath"/>
663	–	<!-- <jvmarg value="-ea"/> -->
664	–	<!-- <jvmarg value="-server"/> -->
665	–	<!-- <arg value="1000"/> -->
666	–	</java>
667	–	</target>
668	–
669	–
433		<target name="loops" depends="init, configure-compiler"
434		description="Benchmark from Doug Lea's AQS paper">
435
#	Line 692 | Line 455
455		</target>
456
457
458	<	<target name="compile-j1" depends="init, configure-compiler, compile">
458	>	<!-- jsr166x -->
459	>
460
461	<	<mkdir dir="${build.j1.dir}"/>
461	>	<target name="jsr166xcompile"
462	>	depends="init, configure-compiler"
463	>	description="Compiles jsr166x sources">
464
465	<	<javac srcdir="${j1.src.dir}"
466	<	destdir="${build.j1.dir}"
465	>	<mkdir dir="${build.jsr166x.dir}"/>
466	>
467	>	<javac srcdir="${jsr166xsrc.dir}"
468	>	destdir="${build.jsr166x.dir}"
469		debug="${build.debug}"
470		debuglevel="${build.debuglevel}"
471		deprecation="${build.deprecation}"
472	<	source="${build.sourcelevel}" >
472	>	source="${build.sourcelevel}"
473	>	fork="true">
474
475		<include name="**/*.java"/>
707	–	<exclude name="**/dijkstra/**"/>
708	–
476		<compilerarg line="${build.args}"/>
710	–	<classpath refid="j1.classpath"/>
477
478		</javac>
479
480		</target>
481
482
717	–	<target name="sw" depends="compile-j1"
718	–	description="Runs the SwingWorker demo">
483
484	<	<!--
485	<	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
486	<	<classpath refid="j1.classpath"/>
723	<	</java>
724	<	-->
725	<
726	<	<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
727	<
728	<	<exec dir="${build.j1.dir}" executable="appletviewer.exe">
729	<	<arg value="${build.j1.dir}/SwingWorker.html"/>
730	<	</exec>
731	<
732	<	</target>
733	<
734	<	<target name="j1" depends="compile-j1"
735	<	description="Runs a standalone JavaOne program">
736	<
737	<	<java classname="${j1.test}" fork="true">
738	<	<classpath refid="j1.classpath"/>
739	<	<jvmarg value="-client"/>
740	<
741	<	<!-- TestPseudoRandom args -->
742	<	<arg value="2"/>
743	<	<arg value="25"/>
744	<	<arg value="100000"/>
484	>	<target name="jsr166xjar"
485	>	depends="jsr166xcompile"
486	>	description="Builds library jar from compiled sources">
487
488	<	<!-- WebCrawler args -->
747	<	<!--
748	<	<arg value="jsr166.webcrawler.WebCrawler3"/>
749	<	<arg value="http://www.priorartisans.com"/>
750	<	<arg value="25"/>
751	<	-->
488	>	<mkdir dir="${build.jsr166xlib.dir}"/>
489
490	<	</java>
490	>	<jar destfile="${jsr166xproduct.jar}">
491	>	<fileset dir="${build.jsr166x.dir}"/>
492	>	</jar>
493
494		</target>
495
496
758	–	<target name="test-j1" depends="compile-j1"
759	–	description="Runs testcases from the JavaOne source directories">
497
498	<	<junit printsummary="true"
499	<	showoutput="true"
763	<	errorProperty="junit.failed"
764	<	failureProperty="junit.failed"
765	<	dir="${build.j1.dir}"
766	<	fork="true">
498	>	<target name="jsr166xdocs"
499	>	description="Builds javadocs with custom tags to build folder">
500
501	<	<!-- <jvmarg value="-server"/> -->
502	<	<classpath refid="j1.classpath"/>
770	<	<formatter type="xml"/>
501	>	<delete dir="${build.jsr166xjavadocs.dir}"/>
502	>	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
503
504	<	<batchtest todir="${build.j1.dir}">
505	<	<fileset dir="${j1.src.dir}">
774	<	<include name="**/*Test.java"/>
775	<	</fileset>
776	<	</batchtest>
504	>	<javadoc destdir="${build.jsr166xjavadocs.dir}"
505	>	link="http://java.sun.com/javase/6/docs/api/"
506
507	<	</junit>
507	>	sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
508
509	<	<available property="junit.report.format"
510	<	value="frames"
511	<	classname="org.apache.xalan.lib.Redirect"/>
512	<	<property name="junit.report.format" value="noframes"/>
509	>	>
510	>	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
511	>	<include name="jsr166x"/>
512	>	</packageset>
513
785	–	<junitreport todir="${build.j1.dir}">
786	–	<fileset dir="${build.j1.dir}">
787	–	<include name="TEST-*.xml"/>
788	–	</fileset>
789	–	<report styledir="${stylesheet.dir}"
790	–	format="${junit.report.format}"
791	–	todir="${build.j1.dir}"
792	–	/>
793	–	</junitreport>
514
515	<	<fail message="Test Cases Failed" if="junit.failed"/>
515	>	</javadoc>
516
517		</target>
518
519
520	+	<target name="jsr166xdist"
521	+	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
522	+	description="Puts all distributable products in single hierarchy"/>
523
801	–	<!-- C++ and JNI definitions and demos -->
802	–
803	–	<target name="configure-cpp">
804	–
805	–	<!-- Define tasks and types -->
806	–
807	–	<path id="cpptasks.path">
808	–	<pathelement location="${lib.dir}/cpptasks.jar"/>
809	–	</path>
810	–	<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
811	–	<typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
812	–
813	–	<!-- Set platform property for JNI includes -->
814	–
815	–	<condition property="platform" value="linux">
816	–	<os name="Linux"/>
817	–	</condition>
818	–	<condition property="platform" value="win32">
819	–	<os family="windows"/>
820	–	</condition>
821	–	<condition property="platform" value="solaris">
822	–	<os name="SunOS"/>
823	–	</condition>
824	–
825	–	</target>
826	–
827	–
828	–	<target name="cppdemo" depends="configure-cpp">
524
830	–	<mkdir dir="${build.dir}"/>
525
526	<	<cc multithreaded="true"
527	<	name="g++"
834	<	objdir="${build.dir}"
835	<	outfile="${build.dir}/CppDemo">
836	<	<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
837	<	<libset libs="stdc++"/>
838	<	</cc>
526	>	<target name="jsr166xclean"
527	>	description="Removes all build products">
528
529	<	<exec executable="${build.dir}/CppDemo">
530	<	<arg line="count in word frequency of word in command line count"/>
842	<	</exec>
529	>	<delete dir="${build.jsr166x.dir}"/>
530	>	<delete dir="${build.jsr166xlib.dir}"/>
531
532		</target>
533
534
847	–	<target name="jnidemo" depends="init, configure-compiler, configure-cpp">
848	–
849	–	<mkdir dir="${build.testcases.dir}"/>
850	–
851	–	<javac srcdir="${test.src.dir}"
852	–	destdir="${build.testcases.dir}"
853	–	debug="${build.debug}"
854	–	debuglevel="${build.debuglevel}"
855	–	deprecation="${build.deprecation}"
856	–	source="${build.sourcelevel}"
857	–	fork="true">
858	–	<compilerarg value="${bootclasspath.args}"/>
859	–	<compilerarg line="${build.args}"/>
860	–	<classpath refid="test.classpath"/>
861	–	<include name="JniDemo.java"/>
862	–	</javac>
535
536	<	<javah destdir="${build.testcases.dir}"
537	<	classpathref="test.classpath">
866	<	<class name="JniDemo"/>
867	<	</javah>
868	<
869	<	<cc multithreaded="true"
870	<	name="g++"
871	<	objdir="${build.dir}"
872	<	outfile="${build.dir}/JniDemo"
873	<	outtype="shared">
874	<
875	<	<compiler>
876	<	<defineset>
877	<	<define name="__int64" value="long long"/>
878	<	</defineset>
879	<	<includepath location="${java.home}/../include"/>
880	<	<includepath location="${java.home}/../include/${platform}"/>
881	<	<compilerarg value="-mno-cygwin"/>
882	<	</compiler>
883	<
884	<	<linker>
885	<	<linkerarg value="--add-stdcall-alias"/>
886	<	</linker>
887	<
888	<	<includepath location="${build.testcases.dir}"/>
889	<
890	<	<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
891	<
892	<	<libset libs="stdc++"/>
893	<
894	<	</cc>
895	<
896	<	<!-- Necessary if windows, harmless if not -->
897	<	<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
898	<
899	<	<java classname="JniDemo" fork="true">
900	<	<!-- Watch out: path separator hardwired to semicolon here! -->
901	<	<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
902	<	<classpath refid="test.classpath"/>
903	<	<arg line="count in word frequency of word in command line count"/>
904	<	</java>
536	>	<target name="jsr166xdist-clean"
537	>	description="Removes all build and distribution products">
538
539		</target>
540
541
542
543	<	<!-- Backward compatibility, work in progress (some files not checked in) -->
544	<
912	<
913	<
914	<	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
915	<	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
916	<	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
917	<	<property name="pretiger.sourcelevel" value="1.4"/>
918	<
919	<	<target name="defang"
920	<	depends="init"
921	<	description="Generates pre-Tiger compatible source">
922	<
923	<	<delete dir="${pretiger.src.dir}"/>
924	<	<mkdir dir="${pretiger.src.dir}"/>
925	<
926	<	<exec executable="perl">
927	<	<arg file="etc/defang.pl"/>
928	<	<!-- <arg value="-v"/> -->
929	<	<arg value="-s"/> <arg file="${src.dir}"/>
930	<	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
931	<	</exec>
932	<
933	<	</target>
934	<
935	<	<target name="compile-pretiger"
936	<	depends="init, configure-compiler, defang"
937	<	description="Compiles pre-Tiger sources to build folder">
543	>	<target name="jsr166xdist-docs"
544	>	description="Builds javadocs without custom tags to dist folder">
545
546	<	<mkdir dir="${build.pretiger.dir}"/>
546	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
547	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
548
549	<	<javac srcdir="${pretiger.src.dir}"
550	<	destdir="${build.pretiger.dir}"
551	<	debug="${build.debug}"
944	<	debuglevel="${build.debuglevel}"
945	<	deprecation="${build.deprecation}"
946	<	source="${pretiger.sourcelevel}"
947	<	fork="true">
549	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
550	>	link="http://java.sun.com/javase/6/docs/api/"
551	>	source="${build.sourcelevel}">
552
553	<	<compilerarg line="${build.args}"/>
554	<	<exclude name="**/Thread.java"/>
553	>	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
554	>	<include name="jsr166x"/>
555	>	</packageset>
556
557	<	</javac>
557	>	</javadoc>
558
559		</target>
560
561	<	<target name="pretiger" depends="compile-pretiger">
562	<
958	<	<mkdir dir="${build.lib.dir}"/>
561	>	<target name="jsr166xdist-jar"
562	>	depends="jsr166xclean, jsr166xjar">
563
564	<	<jar destfile="${pretiger.jar}">
961	<	<fileset dir="${build.pretiger.dir}">
962	<	</fileset>
963	<	</jar>
564	>	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
565
566		</target>
567
568	<	<!-- jsr166x -->
568	>	<!-- jsr166y -->
569
570
571	<	<target name="jsr166xcompile"
571	>	<target name="jsr166ycompile"
572		depends="init, configure-compiler"
573	<	description="Compiles jsr166x sources">
573	>	description="Compiles jsr166y sources">
574
575	<	<mkdir dir="${build.jsr166x.dir}"/>
575	>	<mkdir dir="${build.jsr166y.dir}"/>
576
577	<	<javac srcdir="${jsr166xsrc.dir}"
578	<	destdir="${build.jsr166x.dir}"
577	>	<javac srcdir="${jsr166ysrc.dir}"
578	>	destdir="${build.jsr166y.dir}"
579		debug="${build.debug}"
580		debuglevel="${build.debuglevel}"
581		deprecation="${build.deprecation}"
#	Line 983 | Line 584
584
585		<include name="**/*.java"/>
586		<compilerarg line="${build.args}"/>
587	+	<compilerarg value="${bootclasspath.args}"/>
588	+
589	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
590
591		</javac>
592
#	Line 990 | Line 594
594
595
596
597	<	<target name="jsr166xjar"
598	<	depends="jsr166xcompile"
597	>	<target name="jsr166yjar"
598	>	depends="jsr166ycompile"
599		description="Builds library jar from compiled sources">
600
601	<	<mkdir dir="${build.jsr166xlib.dir}"/>
601	>	<mkdir dir="${build.jsr166ylib.dir}"/>
602
603	<	<jar destfile="${jsr166xproduct.jar}">
604	<	<fileset dir="${build.jsr166x.dir}"/>
603	>	<jar destfile="${jsr166yproduct.jar}">
604	>	<fileset dir="${build.jsr166y.dir}"/>
605		</jar>
606
607		</target>
608
609
610
611	<	<target name="jsr166xdocs"
611	>	<target name="jsr166ydocs"
612		description="Builds javadocs with custom tags to build folder">
613
614	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
615	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
614	>	<delete dir="${build.jsr166yjavadocs.dir}"/>
615	>	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
616
617	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
618	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
619	<	sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
617	>	<javadoc destdir="${build.jsr166yjavadocs.dir}"
618	>	link="http://java.sun.com/javase/6/docs/api/"
619	>	sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
620
621		>
622	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
623	<	<include name="jsr166x"/>
622	>	<packageset dir="${topsrc.dir}" defaultexcludes="no">
623	>	<include name="jsr166y"/>
624		</packageset>
625
626
#	Line 1025 | Line 629
629		</target>
630
631
632	<	<target name="jsr166xdist"
633	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
632	>	<target name="jsr166ydist"
633	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
634		description="Puts all distributable products in single hierarchy"/>
635
636
637
638	<	<target name="jsr166xclean"
638	>	<target name="jsr166yclean"
639		description="Removes all build products">
640
641	<	<delete dir="${build.jsr166x.dir}"/>
642	<	<delete dir="${build.jsr166xlib.dir}"/>
641	>	<delete dir="${build.jsr166y.dir}"/>
642	>	<delete dir="${build.jsr166ylib.dir}"/>
643
644		</target>
645
646
647
648	<	<target name="jsr166xdist-clean"
648	>	<target name="jsr166ydist-clean"
649		description="Removes all build and distribution products">
650
651		</target>
652
653	<
1050	<
1051	<	<target name="jsr166xdist-docs"
653	>	<target name="jsr166ydist-docs"
654		description="Builds javadocs without custom tags to dist folder">
655
656	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
657	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
656	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
657	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
658
659	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
660	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
659	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
660	>	link="http://java.sun.com/javase/6/docs/api/"
661		source="${build.sourcelevel}">
662	<
663	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
664	<	<include name="jsr166x"/>
665	<	</packageset>
1064	<
662	>	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
663	>	<include name="jsr166y/*.java"/>
664	>	<include name="jsr166y/forkjoin/*.java"/>
665	>	</fileset>
666		</javadoc>
667
668		</target>
669
670	<	<target name="jsr166xdist-jar"
671	<	depends="jsr166xclean, jsr166xjar">
670	>	<target name="jsr166ydist-jar"
671	>	depends="jsr166yclean, jsr166yjar">
672
673	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
673	>	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
674
675		</target>
676

Diff Legend

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