ViewVC Help

View File | Revision Log | Show Annotations | Download File | Root Listing

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.74 by dl, Thu Sep 13 11:19:25 2007 UTC vs.
Revision 1.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"/>
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"/>
54	–	<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"/>
58	–	<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
59	–	<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		<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
60	<
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"/>
76	–	<property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
74
75		<!-- Bootclasspath argument -->
76		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
#	Line 89 | Line 86
86		<pathelement location="${build.loops.dir}"/>
87		</path>
88
92	–	<!-- J1 classpath -->
93	–	<path id="j1.classpath">
94	–	<pathelement location="${build.classes.dir}"/>
95	–	<pathelement location="${build.j1.dir}"/>
96	–	<pathelement location="${junit.jar}"/>
97	–
98	–	<!-- Include dl.u.c for BoundedBuffer comparison -->
99	–	<pathelement location="${concurrent.jar}"/>
100	–	</path>
101	–
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 118 | Line 108
108		fork="true">
109
110		<include name="**/*.java"/>
111	<	<compilerarg value="-XDignore.symbol.file"/>
111	>	<compilerarg value="-XDignore.symbol.file=true"/>
112
113		<!--
114		<exclude name="java/lang/**"/>
#	Line 159 | Line 149
149		<mkdir dir="${build.javadocs.dir}"/>
150
151		<javadoc destdir="${build.javadocs.dir}"
152	<	link="http://java.sun.com/javase/6/docs/api/"
152	>	link="http://download.oracle.com/javase/6/docs/api/"
153		overview="${src.dir}/intro.html"
154	<	sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
155	<	>
154	>	sourcepath="${src.dir}:${jdksrc.dir}"
155	>	>
156
157		<packageset dir="${src.dir}"/>
158
#	Line 172 | Line 162
162
163
164
175	–	<target name="doccheck"
176	–	depends="filter-doccheck"
177	–	description="Reports on javadoc style errors">
178	–
179	–	<delete dir="${build.doccheck.dir}"/>
180	–	<mkdir dir="${build.doccheck.dir}"/>
181	–
182	–	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
183	–	docletpath="${lib.dir}/doccheck.jar"
184	–	destdir="${build.doccheck.dir}">
185	–	<packageset dir="${build.dc-filter.dir}"/>
186	–	</javadoc>
187	–
188	–	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
189	–
190	–	</target>
191	–
192	–
193	–
194	–	<target name="checkstyle"
195	–	depends="filter-src"
196	–	description="Reports on style errors in Java source (verbose, mostly chaff)">
197	–
198	–	<taskdef resource="checkstyletask.properties"
199	–	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
200	–
201	–	<mkdir dir="${build.checkstyle.dir}"/>
202	–
203	–	<checkstyle config="etc/checkstyle/sun_checks.xml"
204	–	failOnViolation="false">
205	–	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
206	–	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
207	–	</checkstyle>
208	–
209	–	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
210	–	out="${build.checkstyle.dir}/checkstyle-report.html"
211	–	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
212	–
213	–	</target>
214	–
215	–
216	–
165		<target name="dist"
166		depends="init, dist-clean, dist-jar, dist-docs"
167		description="Puts all distributable products in single hierarchy"/>
168
169
222	–
170		<target name="release"
171		depends="dist"
172		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 267 | Line 214
214		<mkdir dir="${dist.javadocs.dir}"/>
215
216		<javadoc destdir="${dist.javadocs.dir}"
217	<	link="http://java.sun.com/javase/6/docs/api/"
217	>	link="http://download.oracle.com/javase/6/docs/api/"
218		overview="${src.dir}/intro.html"
219
220	<	sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
220	>	sourcepath="${src.dir}:${jdksrc.dir}"
221		>
222		<!--
223		<packageset dir="${src.dir}" defaultexcludes="yes">
#	Line 319 | Line 266
266		</target>
267
268
322	–	<target name="compile-ant-filter"
323	–	depends="init">
324	–
325	–	<mkdir dir="${build.ant.dir}"/>
326	–
327	–	<javac srcdir="${ant.src.dir}"
328	–	destdir="${build.ant.dir}"
329	–	source="1.4"/>
330	–
331	–	</target>
332	–
333	–
334	–	<target name="filter-src"
335	–	depends="compile-ant-filter">
336	–
337	–	<mkdir dir="${build.filter.src.dir}"/>
338	–
339	–	<copy todir="${build.filter.src.dir}">
340	–	<fileset dir="${src.dir}">
341	–	<include name="**/*.html"/>
342	–	</fileset>
343	–	</copy>
344	–
345	–	<copy todir="${build.filter.src.dir}">
346	–	<fileset dir="${src.dir}">
347	–	<exclude name="**/*.html"/>
348	–	<!-- Files excluded from dist-docs -->
349	–	<exclude name="java/util/Random.*"/>
350	–	<exclude name="sun/misc/Unsafe.*"/>
351	–	</fileset>
352	–	<!--
353	–	<filterchain>
354	–	-->
355	–
356	–	<!--
357	–	# This filter gets rid of angle-bracketed type parameters
358	–	# so that javadoc can run on the result. The following
359	–	# heuristic seems to work:
360	–	#
361	–	# For all lines not starting with space(s)-asterisk-space(s),
362	–	#   replace <something> with a space, where there may be more
363	–	#   than one right angle bracket at the end, and "something"
364	–	#   must not contain parens or pipes. (This may need some
365	–	#   tweaking.)
366	–	-->
367	–
368	–	<!--
369	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
370	–	classpath="${build.ant.dir}">
371	–	<param name="notmatching" value="^\s+\*\s.*$"/>
372	–	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
373	–	<param name="replacement" value=" "/>
374	–	</filterreader>
375	–	-->
376	–
377	–	<!--
378	–	</filterchain>
379	–	-->
380	–	</copy>
381	–
382	–	</target>
383	–
384	–
385	–	<target name="filter-doccheck"
386	–	depends="filter-src">
387	–
388	–	<mkdir dir="${build.dc-filter.dir}"/>
389	–
390	–	<copy todir="${build.dc-filter.dir}">
391	–	<fileset dir="${build.filter.src.dir}">
392	–	<include name="**/*.html"/>
393	–	</fileset>
394	–	</copy>
395	–
396	–	<property name="generic.declarations"
397	–	value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
398	–	/>
399	–
400	–	<copy todir="${build.dc-filter.dir}">
401	–	<fileset dir="${build.filter.src.dir}">
402	–	<exclude name="**/*.html"/>
403	–	</fileset>
404	–	<filterchain>
405	–	<!--
406	–	# These two filters try to make the source look like
407	–	# something that doccheck can process. The first removes
408	–	# -source 1.4 assertions and the second adds in a bunch
409	–	# of single letter public nested marker interfaces so that
410	–	# the generic type parameters are recognized.
411	–	-->
412	–
413	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
414	–	classpath="${build.ant.dir}">
415	–	<param name="matching"    value="^\s*assert[\s ].*$"/>
416	–	<param name="pattern"     value="assert"/>
417	–	<param name="replacement" value="//assert"/>
418	–	</filterreader>
419	–
420	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
421	–	classpath="${build.ant.dir}">
422	–	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
423	–	<param name="pattern"     value="$"/>
424	–	<param name="replacement" value=" ${generic.declarations}"/>
425	–	</filterreader>
426	–
427	–	</filterchain>
428	–	</copy>
429	–
430	–	</target>
431	–
432	–
269		<target name="compile-tests"
270		depends="jar">
271
#	Line 445 | 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 462 | 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 478 | 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 550 | Line 389
389		<fileset dir="${build.reports.dir}">
390		<include name="TEST-*.xml"/>
391		</fileset>
392	<	<report styledir="${stylesheet.dir}"
554	<	format="${junit.report.format}"
555	<	todir="${build.reports.dir}"
392	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
393		/>
394		</junitreport>
395
#	Line 602 | Line 439
439		</target>
440
441
605	–
606	–	<!-- Anthill targets -->
607	–
608	–	<target name="anthill-build">
609	–
610	–	<!-- Override this in user.properties -->
611	–	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
612	–
613	–	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
614	–	<arg value="-Xmx256000000"/>
615	–	<!-- classpath of new JVM -->
616	–	<arg value="-classpath"/> <arg path="${java.class.path}"/>
617	–	<!-- location of Ant home directory -->
618	–	<arg value="-Dant.home=${ant.home}"/>
619	–	<!-- the Ant main class -->
620	–	<arg value="org.apache.tools.ant.Main"/>
621	–	<!-- The build file -->
622	–	<arg value="-buildfile"/>  <arg value="build.xml"/>
623	–	<!-- the target to build on the new Ant instance -->
624	–	<arg value="-DJAVA_HOME=${tiger.home}"/>
625	–	<arg value="do-anthill-build"/>
626	–	</exec>
627	–	</target>
628	–
629	–	<target name="do-anthill-build"
630	–	depends="jar, test, docs, dist-docs"/>
631	–
632	–	<target name="anthill-publish">
633	–
634	–	<copy todir="${deployDir}/docs/private">
635	–	<fileset dir="${build.javadocs.dir}"/>
636	–	</copy>
637	–
638	–	<copy todir="${deployDir}/docs/public">
639	–	<fileset dir="${dist.javadocs.dir}"/>
640	–	</copy>
641	–
642	–	<copy tofile="${deployDir}/index.html"
643	–	file="${basedir}/etc/anthill-index.html"/>
644	–
645	–	<copy todir="${deployDir}/notes">
646	–	<fileset dir="${basedir}/etc/notes"/>
647	–	</copy>
648	–
649	–	</target>
650	–
651	–
652	–
442		<!-- Various demos and test programs -->
443
444
656	–	<target name="sample" depends="init, configure-compiler"
657	–	description="Standalone demo program">
658	–
659	–	<mkdir dir="${build.testcases.dir}"/>
660	–
661	–	<javac srcdir="${test.src.dir}"
662	–	destdir="${build.testcases.dir}"
663	–	debug="${build.debug}"
664	–	debuglevel="${build.debuglevel}"
665	–	deprecation="${build.deprecation}"
666	–	source="${build.sourcelevel}"
667	–	fork="true">
668	–
669	–	<include name="jsr166/test/Sample.java"/>
670	–
671	–	</javac>
672	–
673	–	<copy todir="${build.testcases.dir}">
674	–	<fileset dir="${test.src.dir}">
675	–	<include name="**/*.properties"/>
676	–	</fileset>
677	–	</copy>
678	–
679	–
680	–	<java classname="jsr166.test.Sample" fork="true">
681	–	<classpath refid="test.classpath"/>
682	–	<!-- <jvmarg value="-ea"/> -->
683	–	<!-- <jvmarg value="-server"/> -->
684	–	<!-- <arg value="1000"/> -->
685	–	</java>
686	–	</target>
687	–
688	–
445		<target name="loops" depends="init, configure-compiler"
446		description="Benchmark from Doug Lea's AQS paper">
447
#	Line 701 | 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 711 | Line 468
468		</target>
469
470
714	–	<target name="compile-j1" depends="init, configure-compiler, compile">
715	–
716	–	<mkdir dir="${build.j1.dir}"/>
717	–
718	–	<javac srcdir="${j1.src.dir}"
719	–	destdir="${build.j1.dir}"
720	–	debug="${build.debug}"
721	–	debuglevel="${build.debuglevel}"
722	–	deprecation="${build.deprecation}"
723	–	source="${build.sourcelevel}" >
724	–
725	–	<include name="**/*.java"/>
726	–	<exclude name="**/dijkstra/**"/>
727	–
728	–	<compilerarg line="${build.args}"/>
729	–	<classpath refid="j1.classpath"/>
730	–
731	–	</javac>
732	–
733	–	</target>
734	–
735	–
736	–	<target name="sw" depends="compile-j1"
737	–	description="Runs the SwingWorker demo">
738	–
739	–	<!--
740	–	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
741	–	<classpath refid="j1.classpath"/>
742	–	</java>
743	–	-->
744	–
745	–	<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
746	–
747	–	<exec dir="${build.j1.dir}" executable="appletviewer.exe">
748	–	<arg value="${build.j1.dir}/SwingWorker.html"/>
749	–	</exec>
750	–
751	–	</target>
752	–
753	–	<target name="j1" depends="compile-j1"
754	–	description="Runs a standalone JavaOne program">
755	–
756	–	<java classname="${j1.test}" fork="true">
757	–	<classpath refid="j1.classpath"/>
758	–	<jvmarg value="-client"/>
759	–
760	–	<!-- TestPseudoRandom args -->
761	–	<arg value="2"/>
762	–	<arg value="25"/>
763	–	<arg value="100000"/>
764	–
765	–	<!-- WebCrawler args -->
766	–	<!--
767	–	<arg value="jsr166.webcrawler.WebCrawler3"/>
768	–	<arg value="http://www.priorartisans.com"/>
769	–	<arg value="25"/>
770	–	-->
771	–
772	–	</java>
773	–
774	–	</target>
775	–
776	–
777	–	<target name="test-j1" depends="compile-j1"
778	–	description="Runs testcases from the JavaOne source directories">
779	–
780	–	<junit printsummary="true"
781	–	showoutput="true"
782	–	errorProperty="junit.failed"
783	–	failureProperty="junit.failed"
784	–	dir="${build.j1.dir}"
785	–	fork="true">
786	–
787	–	<!-- <jvmarg value="-server"/> -->
788	–	<classpath refid="j1.classpath"/>
789	–	<formatter type="xml"/>
790	–
791	–	<batchtest todir="${build.j1.dir}">
792	–	<fileset dir="${j1.src.dir}">
793	–	<include name="**/*Test.java"/>
794	–	</fileset>
795	–	</batchtest>
796	–
797	–	</junit>
798	–
799	–	<available property="junit.report.format"
800	–	value="frames"
801	–	classname="org.apache.xalan.lib.Redirect"/>
802	–	<property name="junit.report.format" value="noframes"/>
803	–
804	–	<junitreport todir="${build.j1.dir}">
805	–	<fileset dir="${build.j1.dir}">
806	–	<include name="TEST-*.xml"/>
807	–	</fileset>
808	–	<report styledir="${stylesheet.dir}"
809	–	format="${junit.report.format}"
810	–	todir="${build.j1.dir}"
811	–	/>
812	–	</junitreport>
813	–
814	–	<fail message="Test Cases Failed" if="junit.failed"/>
815	–
816	–	</target>
817	–
818	–
819	–
820	–	<!-- C++ and JNI definitions and demos -->
821	–
822	–	<target name="configure-cpp">
823	–
824	–	<!-- Define tasks and types -->
825	–
826	–	<path id="cpptasks.path">
827	–	<pathelement location="${lib.dir}/cpptasks.jar"/>
828	–	</path>
829	–	<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
830	–	<typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
831	–
832	–	<!-- Set platform property for JNI includes -->
833	–
834	–	<condition property="platform" value="linux">
835	–	<os name="Linux"/>
836	–	</condition>
837	–	<condition property="platform" value="win32">
838	–	<os family="windows"/>
839	–	</condition>
840	–	<condition property="platform" value="solaris">
841	–	<os name="SunOS"/>
842	–	</condition>
843	–
844	–	</target>
845	–
846	–
847	–	<target name="cppdemo" depends="configure-cpp">
848	–
849	–	<mkdir dir="${build.dir}"/>
850	–
851	–	<cc multithreaded="true"
852	–	name="g++"
853	–	objdir="${build.dir}"
854	–	outfile="${build.dir}/CppDemo">
855	–	<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
856	–	<libset libs="stdc++"/>
857	–	</cc>
858	–
859	–	<exec executable="${build.dir}/CppDemo">
860	–	<arg line="count in word frequency of word in command line count"/>
861	–	</exec>
862	–
863	–	</target>
864	–
865	–
866	–	<target name="jnidemo" depends="init, configure-compiler, configure-cpp">
867	–
868	–	<mkdir dir="${build.testcases.dir}"/>
869	–
870	–	<javac srcdir="${test.src.dir}"
871	–	destdir="${build.testcases.dir}"
872	–	debug="${build.debug}"
873	–	debuglevel="${build.debuglevel}"
874	–	deprecation="${build.deprecation}"
875	–	source="${build.sourcelevel}"
876	–	fork="true">
877	–	<compilerarg value="${bootclasspath.args}"/>
878	–	<compilerarg line="${build.args}"/>
879	–	<classpath refid="test.classpath"/>
880	–	<include name="JniDemo.java"/>
881	–	</javac>
882	–
883	–	<javah destdir="${build.testcases.dir}"
884	–	classpathref="test.classpath">
885	–	<class name="JniDemo"/>
886	–	</javah>
887	–
888	–	<cc multithreaded="true"
889	–	name="g++"
890	–	objdir="${build.dir}"
891	–	outfile="${build.dir}/JniDemo"
892	–	outtype="shared">
893	–
894	–	<compiler>
895	–	<defineset>
896	–	<define name="__int64" value="long long"/>
897	–	</defineset>
898	–	<includepath location="${java.home}/../include"/>
899	–	<includepath location="${java.home}/../include/${platform}"/>
900	–	<compilerarg value="-mno-cygwin"/>
901	–	</compiler>
902	–
903	–	<linker>
904	–	<linkerarg value="--add-stdcall-alias"/>
905	–	</linker>
906	–
907	–	<includepath location="${build.testcases.dir}"/>
908	–
909	–	<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
910	–
911	–	<libset libs="stdc++"/>
912	–
913	–	</cc>
914	–
915	–	<!-- Necessary if windows, harmless if not -->
916	–	<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
917	–
918	–	<java classname="JniDemo" fork="true">
919	–	<!-- Watch out: path separator hardwired to semicolon here! -->
920	–	<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
921	–	<classpath refid="test.classpath"/>
922	–	<arg line="count in word frequency of word in command line count"/>
923	–	</java>
924	–
925	–	</target>
926	–
927	–
928	–
929	–	<!-- Backward compatibility, work in progress (some files not checked in) -->
930	–
931	–
932	–
933	–	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
934	–	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
935	–	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
936	–	<property name="pretiger.sourcelevel" value="1.4"/>
937	–
938	–	<target name="defang"
939	–	depends="init"
940	–	description="Generates pre-Tiger compatible source">
941	–
942	–	<delete dir="${pretiger.src.dir}"/>
943	–	<mkdir dir="${pretiger.src.dir}"/>
944	–
945	–	<exec executable="perl">
946	–	<arg file="etc/defang.pl"/>
947	–	<!-- <arg value="-v"/> -->
948	–	<arg value="-s"/> <arg file="${src.dir}"/>
949	–	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
950	–	</exec>
951	–
952	–	</target>
953	–
954	–	<target name="compile-pretiger"
955	–	depends="init, configure-compiler, defang"
956	–	description="Compiles pre-Tiger sources to build folder">
957	–
958	–	<mkdir dir="${build.pretiger.dir}"/>
959	–
960	–	<javac srcdir="${pretiger.src.dir}"
961	–	destdir="${build.pretiger.dir}"
962	–	debug="${build.debug}"
963	–	debuglevel="${build.debuglevel}"
964	–	deprecation="${build.deprecation}"
965	–	source="${pretiger.sourcelevel}"
966	–	fork="true">
967	–
968	–	<compilerarg line="${build.args}"/>
969	–	<exclude name="**/Thread.java"/>
970	–
971	–	</javac>
972	–
973	–	</target>
974	–
975	–	<target name="pretiger" depends="compile-pretiger">
976	–
977	–	<mkdir dir="${build.lib.dir}"/>
978	–
979	–	<jar destfile="${pretiger.jar}">
980	–	<fileset dir="${build.pretiger.dir}">
981	–	</fileset>
982	–	</jar>
983	–
984	–	</target>
985	–
471		<!-- jsr166x -->
472
473
#	Line 1002 | Line 487
487
488		<include name="**/*.java"/>
489		<compilerarg line="${build.args}"/>
490	+	<compilerarg value="-XDignore.symbol.file=true"/>
491
492		</javac>
493
#	Line 1030 | Line 516
516		<mkdir dir="${build.jsr166xjavadocs.dir}"/>
517
518		<javadoc destdir="${build.jsr166xjavadocs.dir}"
519	<	link="http://java.sun.com/javase/6/docs/api/"
520	<
1035	<	sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1036	<
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"/>
#	Line 1075 | Line 559
559		<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
560
561		<javadoc destdir="${dist.jsr166xjavadocs.dir}"
562	<	link="http://java.sun.com/javase/6/docs/api/"
562	>	link="http://download.oracle.com/javase/6/docs/api/"
563		source="${build.sourcelevel}">
564
565		<packageset dir="${topsrc.dir}" defaultexcludes="yes">
#	Line 1112 | Line 596
596
597		<include name="**/*.java"/>
598		<compilerarg line="${build.args}"/>
599	+	<compilerarg value="-XDignore.symbol.file=true"/>
600		<compilerarg value="${bootclasspath.args}"/>
601
602		<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
#	Line 1128 | Line 613
613
614		<mkdir dir="${build.jsr166ylib.dir}"/>
615
616	<	<jar destfile="${jsr166yproduct.jar}">
616	>	<jar destfile="${jsr166yproduct.jar}" index="true">
617		<fileset dir="${build.jsr166y.dir}"/>
618		</jar>
619
#	Line 1143 | Line 628
628		<mkdir dir="${build.jsr166yjavadocs.dir}"/>
629
630		<javadoc destdir="${build.jsr166yjavadocs.dir}"
631	<	link="http://java.sun.com/javase/6/docs/api/"
632	<	sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1148	<
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"/>
#	Line 1185 | Line 669
669		<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
670
671		<javadoc destdir="${dist.jsr166yjavadocs.dir}"
672	<	link="http://java.sun.com/javase/6/docs/api/"
673	<	source="${build.sourcelevel}">
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"/>
1192	–	<include name="jsr166y/forkjoin/*.java"/>
678		</fileset>
679		</javadoc>
680
#	Line 1202 | Line 687
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}"
706	+	fork="true">
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	+
717	+	</target>
718	+
719	+
720	+
721	+	<target name="extra166yjar"
722	+	depends="extra166ycompile"
723	+	description="Builds library jar from compiled sources">
724	+
725	+	<mkdir dir="${build.extra166ylib.dir}"/>
726	+
727	+	<jar destfile="${extra166yproduct.jar}" index="true">
728	+	<fileset dir="${build.extra166y.dir}"/>
729	+	</jar>
730	+
731	+	</target>
732	+
733	+
734	+
735	+	<target name="extra166ydocs"
736	+	description="Builds javadocs with custom tags to build folder">
737	+
738	+	<delete dir="${build.extra166yjavadocs.dir}"/>
739	+	<mkdir dir="${build.extra166yjavadocs.dir}"/>
740	+
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="no">
746	+	<include name="extra166y"/>
747	+	</packageset>
748	+
749	+
750	+	</javadoc>
751	+
752	+	</target>
753	+
754	+
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="extra166yclean"
762	+	description="Removes all build products">
763	+
764	+	<delete dir="${build.extra166y.dir}"/>
765	+	<delete dir="${build.extra166ylib.dir}"/>
766	+
767	+	</target>
768	+
769	+
770	+
771	+	<target name="extra166ydist-clean"
772	+	description="Removes all build and distribution products">
773	+
774	+	</target>
775	+
776	+	<target name="extra166ydist-docs"
777	+	description="Builds javadocs without custom tags to dist folder">
778	+
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="extra166ydist-jar"
795	+	depends="extra166yclean, extra166yjar">
796	+
797	+	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
798	+
799	+	</target>
800	+
801		</project>

Diff Legend

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