ViewVC Help

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

root/jsr166/jsr166/build.xml

Comparing jsr166/build.xml (file contents):
Revision 1.70 by dl, Wed Aug 11 10:57:33 2004 UTC vs.
Revision 1.97 by jsr166, Tue Jan 15 01:15:02 2013 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	>
38	>	<property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>
39	>	<property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>
40	>	<property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>
41	>	<property name="build.jdk7.tck.classes.dir"  location="${build.jdk7.dir}/tck/classes"/>
42	>	<property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
43	>
44	>	<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
45		<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
46		<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
47
48	+	<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
49	+	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
50	+	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
51	+
52	+	<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
53	+	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
54	+	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
55	+
56	+	<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
57	+	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
58	+	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
59	+
60	+	<!-- JDK binary locations -->
61	+	<property name="jdks.home"  location="${user.home}/jdk"/>
62	+
63	+	<macrodef name="defjdklocations">
64	+	<attribute name="v"/>
65	+	<sequential>
66	+	<property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>
67	+	<property name="java@{v}"      location="${jdk@{v}.home}/bin/java"/>
68	+	<property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>
69	+	<property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>
70	+	<property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>
71	+	<property name="bootclasspath@{v}"
72	+	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
73	+	</sequential>
74	+	</macrodef>
75	+
76	+	<defjdklocations v="6"/>
77	+	<defjdklocations v="7"/>
78	+	<defjdklocations v="8"/>
79	+
80	+	<macrodef name="run-tck-tests">
81	+	<attribute name="jvm"/>
82	+	<attribute name="tck.classes"/>
83	+	<attribute name="product.jar" default="${product.jar}"/>
84	+	<attribute name="jvmflags" default=""/>
85	+	<sequential>
86	+	<java classname="JSR166TestCase"
87	+	jvm="@{jvm}" fork="true">
88	+	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
89	+	<jvmarg line="@{jvmflags}"/>
90	+	<classpath>
91	+	<pathelement location="${junit.jar}"/>
92	+	<pathelement location="@{tck.classes}"/>
93	+	</classpath>
94	+	</java>
95	+	</sequential>
96	+	</macrodef>
97	+
98		<!-- Source locations -->
99		<property name="src.dir"              location="${basedir}/src/main"/>
100		<property name="test.src.dir"         location="${basedir}/src/test"/>
50	–	<property name="j1.src.dir"           location="${basedir}/src/javaone"/>
101		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
102		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
103		<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"/>
104		<property name="lib.dir"              location="${basedir}/lib"/>
105		<property name="dist.dir"             location="${basedir}/dist"/>
106		<property name="topsrc.dir"           location="${basedir}/src"/>
107	<	<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
107	>	<property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
108	>	<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
109	>	<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
110	>	<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
111	>	<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
112	>	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
113
114		<!-- Distribution locations -->
115	<	<property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
115	>	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
116	>	<property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
117		<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
118	+	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
119	+	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
120	+	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
121
122		<!-- Jar locations -->
123		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
124	+	<property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
125		<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
126	+	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
127	+	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
128	+	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
129		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
69	–	<property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
130
131		<!-- Bootclasspath argument -->
132		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
133
134	+	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
135	+	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
136	+	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
137	+	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
138	+
139	+	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
140	+	<!-- The below does not yet exist as of 2012-11 -->
141	+	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
142	+	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
143	+
144		<!-- Test classpath -->
145		<path id="test.classpath">
146		<pathelement location="${build.testcases.dir}"/>
#	Line 82 | Line 152
152		<pathelement location="${build.loops.dir}"/>
153		</path>
154
85	–	<!-- J1 classpath -->
86	–	<path id="j1.classpath">
87	–	<pathelement location="${build.j1.dir}"/>
88	–	<pathelement location="${junit.jar}"/>
89	–	<pathelement location="${concurrent.jar}"/>
90	–	</path>
91	–
155
156		<!-- Main targets -->
157
158	+	<target name="dists"
159	+	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
160	+	description="Builds all public jars and docs"/>
161
162		<target name="compile"
163		depends="init, configure-compiler"
#	Line 108 | Line 174
174		fork="true">
175
176		<include name="**/*.java"/>
177	+	<compilerarg value="-XDignore.symbol.file=true"/>
178	+
179	+	<!--
180		<exclude name="java/lang/**"/>
181		<compilerarg line="${build.args}"/>
182	+	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
183	+	-->
184
185		</javac>
186
#	Line 143 | Line 214
214		<delete dir="${build.javadocs.dir}"/>
215		<mkdir dir="${build.javadocs.dir}"/>
216
217	<	<javadoc destdir="${build.javadocs.dir}"
218	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
148	<	overview="${src.dir}/intro.html"
149	<	source="${build.sourcelevel}">
150	<
151	<	<tag name="revised" description="Last revised:"/>
152	<	<tag name="spec"    description="Specified by:"/>
153	<
154	<	<packageset dir="${src.dir}"/>
155	<
156	<	</javadoc>
157	<
158	<	</target>
217	>	<!-- the packagenames="none" hack below prevents scanning the -->
218	>	<!-- sourcepath for packages -->
219
220	<
221	<
222	<	<target name="doccheck"
223	<	depends="filter-doccheck"
224	<	description="Reports on javadoc style errors">
225	<
226	<	<delete dir="${build.doccheck.dir}"/>
227	<	<mkdir dir="${build.doccheck.dir}"/>
228	<
169	<	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
170	<	docletpath="${lib.dir}/doccheck.jar"
171	<	destdir="${build.doccheck.dir}">
172	<	<packageset dir="${build.dc-filter.dir}"/>
220	>	<javadoc destdir="${build.javadocs.dir}"
221	>	packagenames="none"
222	>	link="${jdkapidocs.url}"
223	>	overview="${src.dir}/intro.html"
224	>	sourcepath="${src.dir}:${jdksrc.dir}"
225	>	additionalparam="-XDignore.symbol.file=true" >
226	>	<fileset dir="${src.dir}" defaultexcludes="yes">
227	>	<include name="**/*.java"/>
228	>	</fileset>
229		</javadoc>
230
175	–	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
176	–
177	–	</target>
178	–
179	–
180	–
181	–	<target name="checkstyle"
182	–	depends="filter-src"
183	–	description="Reports on style errors in Java source (verbose, mostly chaff)">
184	–
185	–	<taskdef resource="checkstyletask.properties"
186	–	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
187	–
188	–	<mkdir dir="${build.checkstyle.dir}"/>
189	–
190	–	<checkstyle config="etc/checkstyle/sun_checks.xml"
191	–	failOnViolation="false">
192	–	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
193	–	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
194	–	</checkstyle>
195	–
196	–	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
197	–	out="${build.checkstyle.dir}/checkstyle-report.html"
198	–	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
199	–
231		</target>
232
233
#	Line 206 | Line 237
237		description="Puts all distributable products in single hierarchy"/>
238
239
209	–
240		<target name="release"
241		depends="dist"
242		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 253 | Line 283
283		<delete dir="${dist.javadocs.dir}"/>
284		<mkdir dir="${dist.javadocs.dir}"/>
285
286	<	<javadoc destdir="${dist.javadocs.dir}"
287	<	link="http://java.sun.com/j2se/1.4.2/docs/api"
258	<	overview="${src.dir}/intro.html"
259	<	source="${build.sourcelevel}">
260	<
261	<	<packageset dir="${src.dir}"/>
286	>	<!-- the packagenames="none" hack below prevents scanning the -->
287	>	<!-- sourcepath for packages -->
288
289	+	<javadoc destdir="${dist.javadocs.dir}"
290	+	packagenames="none"
291	+	link="${jdkapidocs.url}"
292	+	overview="${src.dir}/intro.html"
293	+	sourcepath="${src.dir}:${jdksrc.dir}"
294	+	additionalparam="-XDignore.symbol.file=true" >
295	+	<fileset dir="${src.dir}" defaultexcludes="yes">
296	+	<include name="**/*.java"/>
297	+	</fileset>
298		</javadoc>
299
300		</target>
#	Line 287 | Line 322
322		</target>
323
324
290	–	<target name="compile-ant-filter"
291	–	depends="init">
292	–
293	–	<mkdir dir="${build.ant.dir}"/>
294	–
295	–	<javac srcdir="${ant.src.dir}"
296	–	destdir="${build.ant.dir}"
297	–	source="1.4"/>
298	–
299	–	</target>
300	–
301	–
302	–	<target name="filter-src"
303	–	depends="compile-ant-filter">
304	–
305	–	<mkdir dir="${build.filter.src.dir}"/>
306	–
307	–	<copy todir="${build.filter.src.dir}">
308	–	<fileset dir="${src.dir}">
309	–	<include name="**/*.html"/>
310	–	</fileset>
311	–	</copy>
312	–
313	–	<copy todir="${build.filter.src.dir}">
314	–	<fileset dir="${src.dir}">
315	–	<exclude name="**/*.html"/>
316	–	<!-- Files excluded from dist-docs -->
317	–	<exclude name="java/util/Random.*"/>
318	–	<exclude name="sun/misc/Unsafe.*"/>
319	–	</fileset>
320	–	<!--
321	–	<filterchain>
322	–	-->
323	–
324	–	<!--
325	–	# This filter gets rid of angle-bracketed type parameters
326	–	# so that javadoc can run on the result. The following
327	–	# heuristic seems to work:
328	–	#
329	–	# For all lines not starting with space(s)-asterisk-space(s),
330	–	#   replace <something> with a space, where there may be more
331	–	#   than one right angle bracket at the end, and "something"
332	–	#   must not contain parens or pipes. (This may need some
333	–	#   tweaking.)
334	–	-->
335	–
336	–	<!--
337	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
338	–	classpath="${build.ant.dir}">
339	–	<param name="notmatching" value="^\s+\*\s.*$"/>
340	–	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
341	–	<param name="replacement" value=" "/>
342	–	</filterreader>
343	–	-->
344	–
345	–	<!--
346	–	</filterchain>
347	–	-->
348	–	</copy>
349	–
350	–	</target>
351	–
352	–
353	–	<target name="filter-doccheck"
354	–	depends="filter-src">
355	–
356	–	<mkdir dir="${build.dc-filter.dir}"/>
357	–
358	–	<copy todir="${build.dc-filter.dir}">
359	–	<fileset dir="${build.filter.src.dir}">
360	–	<include name="**/*.html"/>
361	–	</fileset>
362	–	</copy>
363	–
364	–	<property name="generic.declarations"
365	–	value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
366	–	/>
367	–
368	–	<copy todir="${build.dc-filter.dir}">
369	–	<fileset dir="${build.filter.src.dir}">
370	–	<exclude name="**/*.html"/>
371	–	</fileset>
372	–	<filterchain>
373	–	<!--
374	–	# These two filters try to make the source look like
375	–	# something that doccheck can process. The first removes
376	–	# -source 1.4 assertions and the second adds in a bunch
377	–	# of single letter public nested marker interfaces so that
378	–	# the generic type parameters are recognized.
379	–	-->
380	–
381	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
382	–	classpath="${build.ant.dir}">
383	–	<param name="matching"    value="^\s*assert[\s ].*$"/>
384	–	<param name="pattern"     value="assert"/>
385	–	<param name="replacement" value="//assert"/>
386	–	</filterreader>
387	–
388	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
389	–	classpath="${build.ant.dir}">
390	–	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
391	–	<param name="pattern"     value="$"/>
392	–	<param name="replacement" value=" ${generic.declarations}"/>
393	–	</filterreader>
394	–
395	–	</filterchain>
396	–	</copy>
397	–
398	–	</target>
399	–
400	–
325		<target name="compile-tests"
326		depends="jar">
327
#	Line 413 | Line 337
337
338		<compilerarg value="${bootclasspath.args}"/>
339		<compilerarg line="${build.args}"/>
340	+	<compilerarg value="-XDignore.symbol.file=true"/>
341
342		<classpath refid="test.classpath"/>
343
#	Line 430 | Line 355
355
356		<compilerarg value="${bootclasspath.args}"/>
357		<compilerarg line="${build.args}"/>
358	+	<compilerarg value="-XDignore.symbol.file=true"/>
359
360		<classpath refid="test.classpath"/>
361
#	Line 446 | Line 372
372
373		<compilerarg value="${bootclasspath.args}"/>
374		<compilerarg line="${build.args}"/>
375	+	<compilerarg value="-XDignore.symbol.file=true"/>
376
377		<classpath refid="test.classpath"/>
378
#	Line 518 | Line 445
445		<fileset dir="${build.reports.dir}">
446		<include name="TEST-*.xml"/>
447		</fileset>
448	<	<report styledir="${stylesheet.dir}"
522	<	format="${junit.report.format}"
523	<	todir="${build.reports.dir}"
448	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
449		/>
450		</junitreport>
451
#	Line 570 | Line 495
495		</target>
496
497
573	–
574	–	<!-- Anthill targets -->
575	–
576	–	<target name="anthill-build">
577	–
578	–	<!-- Override this in user.properties -->
579	–	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
580	–
581	–	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
582	–	<arg value="-Xmx256000000"/>
583	–	<!-- classpath of new JVM -->
584	–	<arg value="-classpath"/> <arg path="${java.class.path}"/>
585	–	<!-- location of Ant home directory -->
586	–	<arg value="-Dant.home=${ant.home}"/>
587	–	<!-- the Ant main class -->
588	–	<arg value="org.apache.tools.ant.Main"/>
589	–	<!-- The build file -->
590	–	<arg value="-buildfile"/>  <arg value="build.xml"/>
591	–	<!-- the target to build on the new Ant instance -->
592	–	<arg value="-DJAVA_HOME=${tiger.home}"/>
593	–	<arg value="do-anthill-build"/>
594	–	</exec>
595	–	</target>
596	–
597	–	<target name="do-anthill-build"
598	–	depends="jar, test, docs, dist-docs"/>
599	–
600	–	<target name="anthill-publish">
601	–
602	–	<copy todir="${deployDir}/docs/private">
603	–	<fileset dir="${build.javadocs.dir}"/>
604	–	</copy>
605	–
606	–	<copy todir="${deployDir}/docs/public">
607	–	<fileset dir="${dist.javadocs.dir}"/>
608	–	</copy>
609	–
610	–	<copy tofile="${deployDir}/index.html"
611	–	file="${basedir}/etc/anthill-index.html"/>
612	–
613	–	<copy todir="${deployDir}/notes">
614	–	<fileset dir="${basedir}/etc/notes"/>
615	–	</copy>
616	–
617	–	</target>
618	–
619	–
620	–
498		<!-- Various demos and test programs -->
499
500
624	–	<target name="sample" depends="init, configure-compiler"
625	–	description="Standalone demo program">
626	–
627	–	<mkdir dir="${build.testcases.dir}"/>
628	–
629	–	<javac srcdir="${test.src.dir}"
630	–	destdir="${build.testcases.dir}"
631	–	debug="${build.debug}"
632	–	debuglevel="${build.debuglevel}"
633	–	deprecation="${build.deprecation}"
634	–	source="${build.sourcelevel}"
635	–	fork="true">
636	–
637	–	<include name="jsr166/test/Sample.java"/>
638	–
639	–	</javac>
640	–
641	–	<copy todir="${build.testcases.dir}">
642	–	<fileset dir="${test.src.dir}">
643	–	<include name="**/*.properties"/>
644	–	</fileset>
645	–	</copy>
646	–
647	–
648	–	<java classname="jsr166.test.Sample" fork="true">
649	–	<classpath refid="test.classpath"/>
650	–	<!-- <jvmarg value="-ea"/> -->
651	–	<!-- <jvmarg value="-server"/> -->
652	–	<!-- <arg value="1000"/> -->
653	–	</java>
654	–	</target>
655	–
656	–
501		<target name="loops" depends="init, configure-compiler"
502		description="Benchmark from Doug Lea's AQS paper">
503
#	Line 669 | Line 513
513
514		<compilerarg line="${build.args}"/>
515		<classpath refid="loops.classpath"/>
516	+	<compilerarg value="-XDignore.symbol.file=true"/>
517
518		</javac>
519
#	Line 679 | Line 524
524		</target>
525
526
527	<	<target name="compile-j1" depends="init, configure-compiler">
527	>	<!-- jdk7 -->
528
684	–	<mkdir dir="${build.j1.dir}"/>
529
530	<	<javac srcdir="${j1.src.dir}"
531	<	destdir="${build.j1.dir}"
532	<	debug="${build.debug}"
533	<	debuglevel="${build.debuglevel}"
534	<	deprecation="${build.deprecation}"
535	<	source="${build.sourcelevel}" >
530	>	<target name="jdk7compile"
531	>	depends="configure-compiler"
532	>	description="Compiles src/jdk7 sources">
533	>
534	>	<mkdir dir="${build.jdk7.classes.dir}"/>
535	>
536	>	<javac srcdir="${jdk7src.dir}"
537	>	destdir="${build.jdk7.classes.dir}"
538	>	debug="${build.debug}"
539	>	debuglevel="${build.debuglevel}"
540	>	deprecation="${build.deprecation}"
541	>	source="1.6"
542	>	classpath=""
543	>	bootclasspath="${bootclasspath6}"
544	>	includeAntRuntime="false"
545	>	includeJavaRuntime="false"
546	>	executable="${javac7}"
547	>	fork="true">
548
549		<include name="**/*.java"/>
694	–	<exclude name="**/dijkstra/**"/>
695	–
550		<compilerarg line="${build.args}"/>
551	<	<classpath refid="j1.classpath"/>
551	>	<compilerarg value="-XDignore.symbol.file=true"/>
552	>	<compilerarg value="-Xlint:all"/>
553
554		</javac>
555
556	<	</target>
556	>	<mkdir dir="${build.jdk7.lib.dir}"/>
557
558	+	<jar destfile="${jdk7product.jar}" index="true">
559	+	<fileset dir="${build.jdk7.classes.dir}"/>
560	+	</jar>
561
562	<	<target name="sw" depends="compile-j1"
705	<	description="Runs the SwingWorker demo">
562	>	<mkdir dir="${build.jdk7.tck.classes.dir}"/>
563
564	<	<!--
565	<	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
566	<	<classpath refid="j1.classpath"/>
567	<	</java>
568	<	-->
564	>	<javac srcdir="${tck.src.dir}"
565	>	destdir="${build.jdk7.tck.classes.dir}"
566	>	debug="${build.debug}"
567	>	debuglevel="${build.debuglevel}"
568	>	deprecation="${build.deprecation}"
569	>	source="1.6"
570	>	classpath="${junit.jar}"
571	>	bootclasspath="${jdk7product.jar}:${bootclasspath6}"
572	>	includeAntRuntime="false"
573	>	includeJavaRuntime="false"
574	>	executable="${javac7}"
575	>	fork="true">
576
577	<	<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
577	>	<include name="**/*.java"/>
578	>	<compilerarg line="${build.args}"/>
579	>	<compilerarg value="-XDignore.symbol.file=true"/>
580	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
581
582	<	<exec dir="${build.j1.dir}" executable="appletviewer.exe">
716	<	<arg value="${build.j1.dir}/SwingWorker.html"/>
717	<	</exec>
582	>	</javac>
583
584		</target>
585
721	–	<target name="j1" depends="compile-j1"
722	–	description="Runs a standalone JavaOne program">
586
587	<	<java classname="${j1.test}" fork="true">
588	<	<classpath refid="j1.classpath"/>
589	<	<jvmarg value="-client"/>
587	>	<target name="run-jdk7-tck-tests"
588	>	depends="jdk7compile"
589	>	description="Runs tck tests for jsr166-jdk7 directly">
590	>	<run-tck-tests
591	>	jvm="${java7}"
592	>	tck.classes="${build.jdk7.tck.classes.dir}"
593	>	product.jar="${jdk7product.jar}"/>
594	>	</target>
595
728	–	<!-- TestPseudoRandom args -->
729	–	<arg value="2"/>
730	–	<arg value="25"/>
731	–	<arg value="100000"/>
596
597	<	<!-- WebCrawler args -->
598	<	<!--
735	<	<arg value="jsr166.webcrawler.WebCrawler3"/>
736	<	<arg value="http://www.priorartisans.com"/>
737	<	<arg value="25"/>
738	<	-->
597	>	<target name="run-jdk7-tck-tests-via-junit-task"
598	>	depends="jdk7compile">
599
600	<	</java>
600	>	<junit printsummary="true"
601	>	showoutput="true"
602	>	errorProperty="junit.failed"
603	>	failureProperty="junit.failed"
604	>	includeantruntime="true"
605	>	jvm="${java7}"
606	>	fork="true">
607
608	<	</target>
608	>	<jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/>
609	>	<jvmarg value="-server"/>
610
611	+	<classpath>
612	+	<pathelement location="${junit.jar}"/>
613	+	<pathelement location="${build.jdk7.tck.classes.dir}"/>
614	+	</classpath>
615
616	<	<target name="test-j1" depends="compile-j1"
746	<	description="Runs testcases from the JavaOne source directories">
616	>	<formatter type="brief"/>
617
618	<	<junit printsummary="true"
619	<	showoutput="true"
750	<	errorProperty="junit.failed"
751	<	failureProperty="junit.failed"
752	<	dir="${build.j1.dir}"
753	<	fork="true">
618	>	<test name="JSR166TestCase" haltonfailure="no">
619	>	</test>
620
621	<	<!-- <jvmarg value="-server"/> -->
622	<	<classpath refid="j1.classpath"/>
757	<	<formatter type="xml"/>
621	>	</junit>
622	>	</target>
623
759	–	<batchtest todir="${build.j1.dir}">
760	–	<fileset dir="${j1.src.dir}">
761	–	<include name="**/*Test.java"/>
762	–	</fileset>
763	–	</batchtest>
624
625	<	</junit>
625	>	<target name="jdk7docs"
626	>	description="Builds javadocs with custom tags to build folder">
627
628	<	<available property="junit.report.format"
629	<	value="frames"
769	<	classname="org.apache.xalan.lib.Redirect"/>
770	<	<property name="junit.report.format" value="noframes"/>
628	>	<delete dir="${build.jdk7.docs.dir}"/>
629	>	<mkdir dir="${build.jdk7.docs.dir}"/>
630
631	<	<junitreport todir="${build.j1.dir}">
632	<	<fileset dir="${build.j1.dir}">
633	<	<include name="TEST-*.xml"/>
631	>	<javadoc destdir="${build.jdk7.docs.dir}"
632	>	packagenames="none"
633	>	link="${jdkapi7docs.url}"
634	>	overview="${jdk7src.dir}/intro.html"
635	>	sourcepath="${jdk7src.dir}"
636	>	bootclasspath="${bootclasspath6}"
637	>	classpath=""
638	>	source="1.6"
639	>	executable="${javadoc7}"
640	>	additionalparam="-XDignore.symbol.file=true" >
641	>	<fileset dir="${jdk7src.dir}" defaultexcludes="yes">
642	>	<include name="**/*.java"/>
643		</fileset>
644	<	<report styledir="${stylesheet.dir}"
777	<	format="${junit.report.format}"
778	<	todir="${build.j1.dir}"
779	<	/>
780	<	</junitreport>
781	<
782	<	<fail message="Test Cases Failed" if="junit.failed"/>
644	>	</javadoc>
645
646		</target>
647
648
649	+	<target name="jdk7dist"
650	+	depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
651	+	description="Puts all distributable products in single hierarchy"/>
652	+
653
788	–	<!-- C++ and JNI definitions and demos -->
654
655	<	<target name="configure-cpp">
655	>	<target name="jdk7clean"
656	>	description="Removes all build products">
657
658	<	<!-- Define tasks and types -->
658	>	<delete dir="${build.jdk7.dir}"/>
659
660	<	<path id="cpptasks.path">
795	<	<pathelement location="${lib.dir}/cpptasks.jar"/>
796	<	</path>
797	<	<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
798	<	<typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
660	>	</target>
661
800	–	<!-- Set platform property for JNI includes -->
662
663	<	<condition property="platform" value="linux">
664	<	<os name="Linux"/>
665	<	</condition>
805	<	<condition property="platform" value="win32">
806	<	<os family="windows"/>
807	<	</condition>
808	<	<condition property="platform" value="solaris">
809	<	<os name="SunOS"/>
810	<	</condition>
663	>
664	>	<target name="jdk7dist-clean"
665	>	description="Removes all build and distribution products">
666
667		</target>
668
669	+	<target name="jdk7dist-docs"
670	+	description="Builds javadocs without custom tags to dist folder">
671
672	<	<target name="cppdemo" depends="configure-cpp">
672	>	<delete dir="${dist.jdk7.docs.dir}"/>
673	>	<mkdir dir="${dist.jdk7.docs.dir}"/>
674	>
675	>	<javadoc destdir="${dist.jdk7.docs.dir}"
676	>	packagenames="none"
677	>	link="${jdkapi7docs.url}"
678	>	overview="${jdk7src.dir}/intro.html"
679	>	sourcepath="${jdk7src.dir}"
680	>	classpath=""
681	>	executable="${javadoc7}"
682	>	bootclasspath="${bootclasspath6}"
683	>	source="1.6">
684	>	<arg value="-XDignore.symbol.file=true"/>
685	>	<fileset dir="${jdk7src.dir}" defaultexcludes="yes">
686	>	<include name="**/*.java"/>
687	>	</fileset>
688	>	</javadoc>
689
690	<	<mkdir dir="${build.dir}"/>
690	>	</target>
691
692	<	<cc multithreaded="true"
693	<	name="g++"
821	<	objdir="${build.dir}"
822	<	outfile="${build.dir}/CppDemo">
823	<	<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
824	<	<libset libs="stdc++"/>
825	<	</cc>
692	>	<target name="jdk7dist-jar"
693	>	depends="jdk7clean, jdk7compile">
694
695	<	<exec executable="${build.dir}/CppDemo">
828	<	<arg line="count in word frequency of word in command line count"/>
829	<	</exec>
695	>	<copy file="${jdk7product.jar}" todir="${dist.dir}"/>
696
697		</target>
698
699	+	<!-- jsr166x -->
700
834	–	<target name="jnidemo" depends="init, configure-compiler, configure-cpp">
701
702	<	<mkdir dir="${build.testcases.dir}"/>
702	>	<target name="jsr166xcompile"
703	>	depends="init, configure-compiler"
704	>	description="Compiles jsr166x sources">
705
706	<	<javac srcdir="${test.src.dir}"
707	<	destdir="${build.testcases.dir}"
706	>	<mkdir dir="${build.jsr166x.dir}"/>
707	>
708	>	<javac srcdir="${jsr166xsrc.dir}"
709	>	destdir="${build.jsr166x.dir}"
710		debug="${build.debug}"
711		debuglevel="${build.debuglevel}"
712		deprecation="${build.deprecation}"
713		source="${build.sourcelevel}"
714		fork="true">
715	<	<compilerarg value="${bootclasspath.args}"/>
715	>
716	>	<include name="**/*.java"/>
717		<compilerarg line="${build.args}"/>
718	<	<classpath refid="test.classpath"/>
719	<	<include name="JniDemo.java"/>
718	>	<compilerarg value="-XDignore.symbol.file=true"/>
719	>
720		</javac>
721
722	<	<javah destdir="${build.testcases.dir}"
723	<	classpathref="test.classpath">
724	<	<class name="JniDemo"/>
725	<	</javah>
726	<
727	<	<cc multithreaded="true"
728	<	name="g++"
729	<	objdir="${build.dir}"
730	<	outfile="${build.dir}/JniDemo"
731	<	outtype="shared">
732	<
733	<	<compiler>
734	<	<defineset>
864	<	<define name="__int64" value="long long"/>
865	<	</defineset>
866	<	<includepath location="${java.home}/../include"/>
867	<	<includepath location="${java.home}/../include/${platform}"/>
868	<	<compilerarg value="-mno-cygwin"/>
869	<	</compiler>
870	<
871	<	<linker>
872	<	<linkerarg value="--add-stdcall-alias"/>
873	<	</linker>
874	<
875	<	<includepath location="${build.testcases.dir}"/>
876	<
877	<	<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
878	<
879	<	<libset libs="stdc++"/>
880	<
881	<	</cc>
882	<
883	<	<!-- Necessary if windows, harmless if not -->
884	<	<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
885	<
886	<	<java classname="JniDemo" fork="true">
887	<	<!-- Watch out: path separator hardwired to semicolon here! -->
888	<	<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
889	<	<classpath refid="test.classpath"/>
890	<	<arg line="count in word frequency of word in command line count"/>
891	<	</java>
722	>	</target>
723	>
724	>
725	>
726	>	<target name="jsr166xjar"
727	>	depends="jsr166xcompile"
728	>	description="Builds library jar from compiled sources">
729	>
730	>	<mkdir dir="${build.jsr166xlib.dir}"/>
731	>
732	>	<jar destfile="${jsr166xproduct.jar}">
733	>	<fileset dir="${build.jsr166x.dir}"/>
734	>	</jar>
735
736		</target>
737
738
739
740	<	<!-- Backward compatibility, work in progress (some files not checked in) -->
740	>	<target name="jsr166xdocs"
741	>	description="Builds javadocs with custom tags to build folder">
742	>
743	>	<delete dir="${build.jsr166xjavadocs.dir}"/>
744	>	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
745	>
746	>	<javadoc destdir="${build.jsr166xjavadocs.dir}"
747	>	packagenames="jsr166x"
748	>	link="${jdkapidocs.url}"
749	>	source="${build.sourcelevel}"
750	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
751	>	additionalparam="-XDignore.symbol.file=true" />
752	>
753	>	</target>
754	>
755	>
756	>	<target name="jsr166xdist"
757	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
758	>	description="Puts all distributable products in single hierarchy"/>
759	>
760	>
761	>
762	>	<target name="jsr166xclean"
763	>	description="Removes all build products">
764	>
765	>	<delete dir="${build.jsr166x.dir}"/>
766	>	<delete dir="${build.jsr166xlib.dir}"/>
767
768	+	</target>
769	+
770	+
771	+
772	+	<target name="jsr166xdist-clean"
773	+	description="Removes all build and distribution products">
774	+
775	+	</target>
776	+
777	+
778	+
779	+	<target name="jsr166xdist-docs"
780	+	description="Builds javadocs without custom tags to dist folder">
781
782	+	<delete dir="${dist.jsr166xjavadocs.dir}"/>
783	+	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
784
785	<	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
786	<	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
787	<	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
788	<	<property name="pretiger.sourcelevel" value="1.4"/>
785	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
786	>	packagenames="jsr166x"
787	>	link="${jdkapidocs.url}"
788	>	source="${build.sourcelevel}"
789	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
790	>	additionalparam="-XDignore.symbol.file=true" />
791
792	<	<target name="defang"
907	<	depends="init"
908	<	description="Generates pre-Tiger compatible source">
792	>	</target>
793
794	<	<delete dir="${pretiger.src.dir}"/>
795	<	<mkdir dir="${pretiger.src.dir}"/>
794	>	<target name="jsr166xdist-jar"
795	>	depends="jsr166xclean, jsr166xjar">
796
797	<	<exec executable="perl">
914	<	<arg file="etc/defang.pl"/>
915	<	<!-- <arg value="-v"/> -->
916	<	<arg value="-s"/> <arg file="${src.dir}"/>
917	<	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
918	<	</exec>
797	>	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
798
799		</target>
800
801	<	<target name="compile-pretiger"
802	<	depends="init, configure-compiler, defang"
803	<	description="Compiles pre-Tiger sources to build folder">
801	>	<!-- jsr166y -->
802	>
803	>
804	>	<target name="jsr166ycompile"
805	>	depends="init, configure-compiler"
806	>	description="Compiles jsr166y sources">
807
808	<	<mkdir dir="${build.pretiger.dir}"/>
808	>	<mkdir dir="${build.jsr166y.dir}"/>
809
810	<	<javac srcdir="${pretiger.src.dir}"
811	<	destdir="${build.pretiger.dir}"
810	>	<javac srcdir="${jsr166ysrc.dir}"
811	>	destdir="${build.jsr166y.dir}"
812		debug="${build.debug}"
813		debuglevel="${build.debuglevel}"
814		deprecation="${build.deprecation}"
815	<	source="${pretiger.sourcelevel}"
815	>	source="${build.sourcelevel}"
816		fork="true">
817
818	+	<include name="**/*.java"/>
819		<compilerarg line="${build.args}"/>
820	<	<exclude name="**/Thread.java"/>
820	>	<compilerarg value="-XDignore.symbol.file=true"/>
821	>	<compilerarg value="${bootclasspath.args}"/>
822	>
823	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
824
825		</javac>
826
827		</target>
828
943	–	<target name="pretiger" depends="compile-pretiger">
829
945	–	<mkdir dir="${build.lib.dir}"/>
830
831	<	<jar destfile="${pretiger.jar}">
832	<	<fileset dir="${build.pretiger.dir}">
833	<	</fileset>
831	>	<target name="jsr166yjar"
832	>	depends="jsr166ycompile"
833	>	description="Builds library jar from compiled sources">
834	>
835	>	<mkdir dir="${build.jsr166ylib.dir}"/>
836	>
837	>	<jar destfile="${jsr166yproduct.jar}" index="true">
838	>	<fileset dir="${build.jsr166y.dir}"/>
839		</jar>
840
841		</target>
842
954	–	<!-- jsr166x -->
843
844
845	<	<target name="jsr166xcompile"
846	<	depends="init, configure-compiler"
959	<	description="Compiles jsr166x sources">
845	>	<target name="jsr166ydocs"
846	>	description="Builds javadocs with custom tags to build folder">
847
848	<	<mkdir dir="${build.jsr166x.dir}"/>
848	>	<delete dir="${build.jsr166yjavadocs.dir}"/>
849	>	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
850
851	<	<javac srcdir="${jsr166xsrc.dir}"
852	<	destdir="${build.jsr166x.dir}"
851	>	<javadoc destdir="${build.jsr166yjavadocs.dir}"
852	>	packagenames="jsr166y"
853	>	link="${jdkapidocs.url}"
854	>	source="${build.sourcelevel}"
855	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
856	>	additionalparam="-XDignore.symbol.file=true" />
857	>
858	>	</target>
859	>
860	>
861	>	<target name="jsr166ydist"
862	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
863	>	description="Puts all distributable products in single hierarchy"/>
864	>
865	>
866	>
867	>	<target name="jsr166yclean"
868	>	description="Removes all build products">
869	>
870	>	<delete dir="${build.jsr166y.dir}"/>
871	>	<delete dir="${build.jsr166ylib.dir}"/>
872	>
873	>	</target>
874	>
875	>
876	>
877	>	<target name="jsr166ydist-clean"
878	>	description="Removes all build and distribution products">
879	>
880	>	</target>
881	>
882	>	<target name="jsr166ydist-docs"
883	>	description="Builds javadocs without custom tags to dist folder">
884	>
885	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
886	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
887	>
888	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
889	>	packagenames="jsr166y"
890	>	link="${jdkapidocs.url}"
891	>	source="${build.sourcelevel}"
892	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
893	>	additionalparam="-XDignore.symbol.file=true" />
894	>
895	>	</target>
896	>
897	>	<target name="jsr166ydist-jar"
898	>	depends="jsr166yclean, jsr166yjar">
899	>
900	>	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
901	>
902	>	</target>
903	>
904	>
905	>	<!-- extra166y -->
906	>
907	>
908	>	<target name="extra166ycompile"
909	>	depends="init, configure-compiler, jsr166ycompile"
910	>	description="Compiles extra166y sources">
911	>
912	>	<mkdir dir="${build.extra166y.dir}"/>
913	>
914	>	<javac srcdir="${extra166ysrc.dir}"
915	>	destdir="${build.extra166y.dir}"
916		debug="${build.debug}"
917	+	classpath="${jsr166yproduct.jar}"
918		debuglevel="${build.debuglevel}"
919		deprecation="${build.deprecation}"
920		source="${build.sourcelevel}"
#	Line 970 | Line 922
922
923		<include name="**/*.java"/>
924		<compilerarg line="${build.args}"/>
925	+	<compilerarg value="-XDignore.symbol.file=true"/>
926	+	<compilerarg value="${bootclasspath.args}"/>
927	+
928	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
929
930		</javac>
931
#	Line 977 | Line 933
933
934
935
936	<	<target name="jsr166xjar"
937	<	depends="jsr166xcompile"
936	>	<target name="extra166yjar"
937	>	depends="extra166ycompile"
938		description="Builds library jar from compiled sources">
939
940	<	<mkdir dir="${build.jsr166xlib.dir}"/>
940	>	<mkdir dir="${build.extra166ylib.dir}"/>
941
942	<	<jar destfile="${jsr166xproduct.jar}">
943	<	<fileset dir="${build.jsr166x.dir}"/>
942	>	<jar destfile="${extra166yproduct.jar}" index="true">
943	>	<fileset dir="${build.extra166y.dir}"/>
944		</jar>
945
946		</target>
947
948
949
950	<	<target name="jsr166xdocs"
950	>	<target name="extra166ydocs"
951		description="Builds javadocs with custom tags to build folder">
952
953	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
954	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
999	<
1000	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
1001	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
1002	<	>
1003	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
1004	<	<include name="jsr166x"/>
1005	<	</packageset>
953	>	<delete dir="${build.extra166yjavadocs.dir}"/>
954	>	<mkdir dir="${build.extra166yjavadocs.dir}"/>
955
956	<
957	<	</javadoc>
956	>	<javadoc destdir="${build.extra166yjavadocs.dir}"
957	>	packagenames="extra166y"
958	>	link="${jdkapidocs.url}"
959	>	source="${build.sourcelevel}"
960	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
961	>	additionalparam="-XDignore.symbol.file=true" />
962
963		</target>
964
965
966	<	<target name="jsr166xdist"
967	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
966	>	<target name="extra166ydist"
967	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
968		description="Puts all distributable products in single hierarchy"/>
969
970
971
972	<	<target name="jsr166xclean"
972	>	<target name="extra166yclean"
973		description="Removes all build products">
974
975	<	<delete dir="${build.jsr166x.dir}"/>
976	<	<delete dir="${build.jsr166xlib.dir}"/>
975	>	<delete dir="${build.extra166y.dir}"/>
976	>	<delete dir="${build.extra166ylib.dir}"/>
977
978		</target>
979
980
981
982	<	<target name="jsr166xdist-clean"
982	>	<target name="extra166ydist-clean"
983		description="Removes all build and distribution products">
984
985		</target>
986
987	+	<target name="extra166ydist-docs"
988	+	description="Builds javadocs without custom tags to dist folder">
989
990	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
991	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
992
993	<	<target name="jsr166xdist-docs"
994	<	description="Builds javadocs without custom tags to dist folder">
993	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
994	>	packagenames="extra166y"
995	>	link="${jdkapidocs.url}"
996	>	source="${build.sourcelevel}"
997	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
998	>	additionalparam="-XDignore.symbol.file=true" />
999
1000	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
1040	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1000	>	</target>
1001
1002	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
1003	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
1004	<	source="${build.sourcelevel}">
1002	>	<target name="extra166ydist-jar"
1003	>	depends="extra166yclean, extra166yjar">
1004	>
1005	>	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1006	>
1007	>	</target>
1008	>
1009	>	<!-- jsr166e -->
1010
1011	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
1012	<	<include name="jsr166x"/>
1013	<	</packageset>
1011	>	<target name="jsr166ecompile"
1012	>	depends="configure-compiler"
1013	>	description="Compiles jsr166e sources">
1014
1015	+	<mkdir dir="${build.jsr166e.dir}"/>
1016	+
1017	+	<javac srcdir="${topsrc.dir}"
1018	+	destdir="${build.jsr166e.dir}"
1019	+	debug="${build.debug}"
1020	+	debuglevel="${build.debuglevel}"
1021	+	deprecation="${build.deprecation}"
1022	+	source="1.7"
1023	+	classpath=""
1024	+	includeAntRuntime="false"
1025	+	includeJavaRuntime="false"
1026	+	executable="${javac7}"
1027	+	fork="true">
1028	+
1029	+	<include name="jsr166e/**/*.java"/>
1030	+	<compilerarg line="${build.args}"/>
1031	+	<compilerarg value="-XDignore.symbol.file=true"/>
1032	+	<compilerarg value="-Xlint:all"/>
1033	+
1034	+	</javac>
1035	+
1036	+	</target>
1037	+
1038	+
1039	+
1040	+	<target name="jsr166ejar"
1041	+	depends="jsr166ecompile"
1042	+	description="Builds library jar from compiled sources">
1043	+
1044	+	<mkdir dir="${build.jsr166elib.dir}"/>
1045	+
1046	+	<jar destfile="${jsr166eproduct.jar}" index="true">
1047	+	<fileset dir="${build.jsr166e.dir}"/>
1048	+	</jar>
1049	+
1050	+	</target>
1051	+
1052	+
1053	+
1054	+	<target name="jsr166edocs"
1055	+	description="Builds javadocs with custom tags to build folder">
1056	+
1057	+	<delete dir="${build.jsr166ejavadocs.dir}"/>
1058	+	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
1059	+
1060	+	<javadoc destdir="${build.jsr166ejavadocs.dir}"
1061	+	packagenames="jsr166e,jsr166e.extra"
1062	+	link="${jdkapi7docs.url}"
1063	+	source="1.7"
1064	+	sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"
1065	+	executable="${javadoc7}"
1066	+	additionalparam="-XDignore.symbol.file=true" >
1067	+	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1068	+	<include name="jsr166e/**/*.java"/>
1069	+	</fileset>
1070		</javadoc>
1071
1072		</target>
1073
1054	–	<target name="jsr166xdist-jar"
1055	–	depends="jsr166xclean, jsr166xjar">
1074
1075	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1075	>	<target name="jsr166edist"
1076	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1077	>	description="Puts all distributable products in single hierarchy"/>
1078	>
1079	>
1080	>
1081	>	<target name="jsr166eclean"
1082	>	description="Removes all build products">
1083	>
1084	>	<delete dir="${build.jsr166e.dir}"/>
1085	>	<delete dir="${build.jsr166elib.dir}"/>
1086	>
1087	>	</target>
1088	>
1089	>
1090	>
1091	>	<target name="jsr166edist-clean"
1092	>	description="Removes all build and distribution products">
1093	>
1094	>	</target>
1095	>
1096	>	<target name="jsr166edist-docs"
1097	>	description="Builds javadocs without custom tags to dist folder">
1098	>
1099	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1100	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1101	>
1102	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1103	>	packagenames="jsr166e,jsr166e.extra"
1104	>	link="${jdkapidocs.url}"
1105	>	source="1.7"
1106	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1107	>	additionalparam="-XDignore.symbol.file=true" />
1108	>
1109	>	</target>
1110	>
1111	>	<target name="jsr166edist-jar"
1112	>	depends="jsr166eclean, jsr166ejar">
1113	>
1114	>	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1115
1116		</target>
1117

Diff Legend

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