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.100 by jsr166, Sat Jan 19 17:15:44 2013 UTC

#	Line 8 | Line 8
8
9		User-specific settings are read from user.properties.
10		See user.properties.sample for an explanation of some useful settings.
11	+
12	+	The repository contains all dependencies except for ant and the JDK
13	+	itself.  Because the JDK version matters and because different
14	+	targets require different JDKs, we assume that users have created a
15	+	hierarchy containing:
16	+	$HOME/jdk/jdk6
17	+	$HOME/jdk/jdk7
18	+	$HOME/jdk/jdk8
19	+	where each of the above is a JDK or a symlink to same, and
20	+	$HOME/jdk/src/jdk6
21	+	$HOME/jdk/src/jdk7
22	+	$HOME/jdk/src/jdk8
23	+	where each of the above is a complete JDK source tree
24	+	(e.g. mercurial forest) or a symlink to same.
25		------------------------------------------------------------------------------
26		</description>
27
#	Line 21 | Line 35
35
36
37		<!-- Compilation options -->
38	<	<property name="build.sourcelevel"    value="1.5"/>
38	>	<property name="build.sourcelevel"    value="1.6"/>
39		<property name="build.debug"          value="true"/>
40		<property name="build.debuglevel"     value="source,lines,vars"/>
41		<property name="build.deprecation"    value="false"/>
42
43		<!-- Build locations -->
44	<	<property name="build.dir"            location="build"/>
45	<	<property name="build.classes.dir"    location="${build.dir}/classes"/>
46	<	<property name="build.testcases.dir"  location="${build.dir}/testcases"/>
47	<	<property name="build.j1.dir"         location="${build.dir}/j1"/>
48	<	<property name="build.loops.dir"      location="${build.dir}/loops"/>
49	<	<property name="build.lib.dir"        location="${build.dir}/lib"/>
50	<	<property name="build.ant.dir"        location="${build.dir}/ant"/>
51	<	<property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
52	<	<property name="build.reports.dir"    location="${build.dir}/reports"/>
53	<	<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
54	<	<property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
55	<	<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
56	<	<property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
57	<	<property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
44	>	<property name="build.dir"                   location="build"/>
45	>	<property name="build.classes.dir"           location="${build.dir}/classes"/>
46	>	<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47	>	<property name="build.loops.dir"             location="${build.dir}/loops"/>
48	>	<property name="build.lib.dir"               location="${build.dir}/lib"/>
49	>	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
50	>	<property name="build.reports.dir"           location="${build.dir}/reports"/>
51	>
52	>	<property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53	>	<property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54	>	<property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55	>	<property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56	>	<property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57	>
58	>	<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59		<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60		<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61
62	+	<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63	+	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64	+	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65	+
66	+	<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67	+	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68	+	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69	+
70	+	<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71	+	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72	+	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
73	+
74	+	<!-- JDK binary locations -->
75	+	<property name="jdks.home"  location="${user.home}/jdk"/>
76	+
77	+	<macrodef name="defjdklocations">
78	+	<attribute name="v"/>
79	+	<sequential>
80	+	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
81	+	<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
82	+	<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
83	+	<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84	+	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
85	+	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86	+	<property name="bootclasspath@{v}"
87	+	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
88	+	</sequential>
89	+	</macrodef>
90	+
91	+	<defjdklocations v="6"/>
92	+	<defjdklocations v="7"/>
93	+	<defjdklocations v="8"/>
94	+
95	+	<macrodef name="run-tck-tests">
96	+	<attribute name="jvm"/>
97	+	<attribute name="tck.classes"/>
98	+	<attribute name="product.jar" default="${product.jar}"/>
99	+	<attribute name="jvmflags" default=""/>
100	+	<sequential>
101	+	<java classname="JSR166TestCase"
102	+	jvm="@{jvm}" fork="true">
103	+	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
104	+	<jvmarg line="@{jvmflags}"/>
105	+	<classpath>
106	+	<pathelement location="${junit.jar}"/>
107	+	<pathelement location="@{tck.classes}"/>
108	+	</classpath>
109	+	</java>
110	+	</sequential>
111	+	</macrodef>
112	+
113		<!-- Source locations -->
114		<property name="src.dir"              location="${basedir}/src/main"/>
115		<property name="test.src.dir"         location="${basedir}/src/test"/>
50	–	<property name="j1.src.dir"           location="${basedir}/src/javaone"/>
116		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
117		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
118		<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"/>
119		<property name="lib.dir"              location="${basedir}/lib"/>
120		<property name="dist.dir"             location="${basedir}/dist"/>
121		<property name="topsrc.dir"           location="${basedir}/src"/>
122	<	<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
122	>	<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
123	>	<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
124	>	<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
125	>	<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
126	>	<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127	>	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
128
129		<!-- Distribution locations -->
130	<	<property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
130	>	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
131	>	<property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132		<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133	+	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134	+	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
135	+	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
136
137		<!-- Jar locations -->
138		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139	+	<property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140		<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141	+	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142	+	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
143	+	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
144		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
69	–	<property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
145
146		<!-- Bootclasspath argument -->
147		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
148
149	+	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
150	+	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
151	+	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
152	+	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
153	+
154	+	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
155	+	<!-- The below does not yet exist as of 2012-11 -->
156	+	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
157	+	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
158	+
159		<!-- Test classpath -->
160		<path id="test.classpath">
161		<pathelement location="${build.testcases.dir}"/>
#	Line 82 | Line 167
167		<pathelement location="${build.loops.dir}"/>
168		</path>
169
170	<	<!-- J1 classpath -->
171	<	<path id="j1.classpath">
172	<	<pathelement location="${build.classes.dir}"/>
173	<	<pathelement location="${build.j1.dir}"/>
174	<	<pathelement location="${junit.jar}"/>
90	<
91	<	<!-- Include dl.u.c for BoundedBuffer comparison -->
92	<	<pathelement location="${concurrent.jar}"/>
93	<	</path>
94	<
170	>	<!-- Support @jls tag, used in jdk8+ javadoc -->
171	>	<!-- TODO: How do we get &trade to work? -->
172	>	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
173	>	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
174	>	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
175
176		<!-- Main targets -->
177
178	+	<target name="dists"
179	+	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
180	+	description="Builds all public jars and docs"/>
181
182		<target name="compile"
183	<	depends="init, configure-compiler"
184	<	description="Compiles main sources to build folder">
183	>	depends="configure-compiler"
184	>	description="Compiles src/main sources to build folder">
185
186		<mkdir dir="${build.classes.dir}"/>
187
188		<javac srcdir="${src.dir}"
189	<	destdir="${build.classes.dir}"
190	<	debug="${build.debug}"
191	<	debuglevel="${build.debuglevel}"
192	<	deprecation="${build.deprecation}"
193	<	source="${build.sourcelevel}"
194	<	fork="true">
189	>	destdir="${build.classes.dir}"
190	>	debug="${build.debug}"
191	>	debuglevel="${build.debuglevel}"
192	>	deprecation="${build.deprecation}"
193	>	classpath=""
194	>	includeAntRuntime="false"
195	>	includeJavaRuntime="false"
196	>	executable="${javac8}"
197	>	fork="true">
198
199		<include name="**/*.java"/>
200	+	<compilerarg line="${build.args}"/>
201	+	<compilerarg value="-XDignore.symbol.file=true"/>
202	+	<compilerarg value="-Xlint:all"/>
203	+
204		<!--
205		<exclude name="java/lang/**"/>
206		<compilerarg line="${build.args}"/>
#	Line 144 | Line 234
234
235
236		<target name="docs"
237	<	description="Builds javadocs with custom tags to build folder">
148	<
149	<	<delete dir="${build.javadocs.dir}"/>
150	<	<mkdir dir="${build.javadocs.dir}"/>
151	<
152	<	<javadoc destdir="${build.javadocs.dir}"
153	<	link="http://java.sun.com/j2se/1.5.0/docs/api"
154	<	overview="${src.dir}/intro.html"
155	<	sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
156	<	>
157	<
158	<	<packageset dir="${src.dir}"/>
159	<
160	<	</javadoc>
161	<
162	<	</target>
237	>	description="Builds javadocs for src/main">
238
239	+	<delete dir="${dist.javadocs.dir}"/>
240	+	<mkdir dir="${dist.javadocs.dir}"/>
241
242	+	<!-- the packagenames="none" hack below prevents scanning the -->
243	+	<!-- sourcepath for packages -->
244
245	<	<target name="doccheck"
246	<	depends="filter-doccheck"
247	<	description="Reports on javadoc style errors">
248	<
249	<	<delete dir="${build.doccheck.dir}"/>
250	<	<mkdir dir="${build.doccheck.dir}"/>
251	<
252	<	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
253	<	docletpath="${lib.dir}/doccheck.jar"
254	<	destdir="${build.doccheck.dir}">
255	<	<packageset dir="${build.dc-filter.dir}"/>
245	>	<javadoc destdir="${dist.javadocs.dir}"
246	>	packagenames="none"
247	>	link="${jdkapi8docs.url}"
248	>	overview="${src.dir}/intro.html"
249	>	sourcepath="${src.dir}:${jdk8src.dir}"
250	>	classpath=""
251	>	executable="${javadoc8}">
252	>	<arg value="-XDignore.symbol.file=true"/>
253	>	<arg value="-tag"/>
254	>	<arg value="${javadoc.jls.option}"/>
255	>	<fileset dir="${src.dir}" defaultexcludes="yes">
256	>	<include name="**/*.java"/>
257	>	</fileset>
258		</javadoc>
259
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	–
260		</target>
261
262
263
264		<target name="dist"
265	<	depends="init, dist-clean, dist-jar, dist-docs"
265	>	depends="init, dist-clean, dist-jar, docs"
266		description="Puts all distributable products in single hierarchy"/>
267
268
213	–
269		<target name="release"
270		depends="dist"
271		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 251 | Line 306
306
307
308
254	–	<target name="dist-docs"
255	–	description="Builds javadocs without custom tags to dist folder">
256	–
257	–	<delete dir="${dist.javadocs.dir}"/>
258	–	<mkdir dir="${dist.javadocs.dir}"/>
259	–
260	–	<javadoc destdir="${dist.javadocs.dir}"
261	–	link="http://java.sun.com/j2se/1.5.0/docs/api"
262	–	overview="${src.dir}/intro.html"
263	–
264	–	sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
265	–	>
266	–	<packageset dir="${src.dir}" defaultexcludes="yes">
267	–	<include name="java/util/concurrent"/>
268	–	<include name="java/util/concurrent/atomic"/>
269	–	<include name="java/util/concurrent/locks"/>
270	–	</packageset>
271	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
272	–	<include name="main/java/util/*.java"/>
273	–	<include name="main/java/util/*.html"/>
274	–	<!--      <include name="jsr166x/*.java"/> -->
275	–	</fileset>
276	–	</javadoc>
277	–
278	–	</target>
279	–
280	–
281	–
309		<!-- Internal targets -->
310
311
#	Line 300 | Line 327
327		</target>
328
329
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	–
330		<target name="compile-tests"
331		depends="jar">
332
#	Line 426 | Line 342
342
343		<compilerarg value="${bootclasspath.args}"/>
344		<compilerarg line="${build.args}"/>
345	+	<compilerarg value="-XDignore.symbol.file=true"/>
346
347		<classpath refid="test.classpath"/>
348
#	Line 443 | Line 360
360
361		<compilerarg value="${bootclasspath.args}"/>
362		<compilerarg line="${build.args}"/>
363	+	<compilerarg value="-XDignore.symbol.file=true"/>
364
365		<classpath refid="test.classpath"/>
366
#	Line 459 | Line 377
377
378		<compilerarg value="${bootclasspath.args}"/>
379		<compilerarg line="${build.args}"/>
380	+	<compilerarg value="-XDignore.symbol.file=true"/>
381
382		<classpath refid="test.classpath"/>
383
#	Line 531 | Line 450
450		<fileset dir="${build.reports.dir}">
451		<include name="TEST-*.xml"/>
452		</fileset>
453	<	<report styledir="${stylesheet.dir}"
535	<	format="${junit.report.format}"
536	<	todir="${build.reports.dir}"
453	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
454		/>
455		</junitreport>
456
#	Line 583 | Line 500
500		</target>
501
502
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	–
503		<!-- Various demos and test programs -->
504
505
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	–
506		<target name="loops" depends="init, configure-compiler"
507		description="Benchmark from Doug Lea's AQS paper">
508
#	Line 682 | Line 518
518
519		<compilerarg line="${build.args}"/>
520		<classpath refid="loops.classpath"/>
521	+	<compilerarg value="-XDignore.symbol.file=true"/>
522
523		</javac>
524
#	Line 692 | Line 529
529		</target>
530
531
532	<	<target name="compile-j1" depends="init, configure-compiler, compile">
532	>	<!-- jsr166 4jdk7 -->
533
697	–	<mkdir dir="${build.j1.dir}"/>
534
535	<	<javac srcdir="${j1.src.dir}"
536	<	destdir="${build.j1.dir}"
537	<	debug="${build.debug}"
538	<	debuglevel="${build.debuglevel}"
539	<	deprecation="${build.deprecation}"
540	<	source="${build.sourcelevel}" >
535	>	<target name="4jdk7compile"
536	>	depends="configure-compiler"
537	>	description="Compiles src/jdk7 sources, targeting jdk7">
538	>
539	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
540	>
541	>	<javac srcdir="${4jdk7src.dir}"
542	>	destdir="${build.4jdk7.classes.dir}"
543	>	debug="${build.debug}"
544	>	debuglevel="${build.debuglevel}"
545	>	deprecation="${build.deprecation}"
546	>	source="1.6"
547	>	classpath=""
548	>	bootclasspath="${bootclasspath6}"
549	>	includeAntRuntime="false"
550	>	includeJavaRuntime="false"
551	>	executable="${javac7}"
552	>	fork="true">
553
554		<include name="**/*.java"/>
707	–	<exclude name="**/dijkstra/**"/>
708	–
555		<compilerarg line="${build.args}"/>
556	<	<classpath refid="j1.classpath"/>
556	>	<compilerarg value="-XDignore.symbol.file=true"/>
557	>	<compilerarg value="-Xlint:all"/>
558
559		</javac>
560
561	<	</target>
561	>	<mkdir dir="${build.4jdk7.lib.dir}"/>
562
563	+	<jar destfile="${4jdk7product.jar}" index="true">
564	+	<fileset dir="${build.4jdk7.classes.dir}"/>
565	+	</jar>
566
567	<	<target name="sw" depends="compile-j1"
718	<	description="Runs the SwingWorker demo">
567	>	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
568
569	<	<!--
570	<	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
571	<	<classpath refid="j1.classpath"/>
572	<	</java>
573	<	-->
569	>	<javac srcdir="${tck.src.dir}"
570	>	destdir="${build.4jdk7.tck.classes.dir}"
571	>	debug="${build.debug}"
572	>	debuglevel="${build.debuglevel}"
573	>	deprecation="${build.deprecation}"
574	>	source="1.6"
575	>	classpath="${junit.jar}"
576	>	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
577	>	includeAntRuntime="false"
578	>	includeJavaRuntime="false"
579	>	executable="${javac7}"
580	>	fork="true">
581
582	<	<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
582	>	<include name="**/*.java"/>
583	>	<compilerarg line="${build.args}"/>
584	>	<compilerarg value="-XDignore.symbol.file=true"/>
585	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
586
587	<	<exec dir="${build.j1.dir}" executable="appletviewer.exe">
729	<	<arg value="${build.j1.dir}/SwingWorker.html"/>
730	<	</exec>
587	>	</javac>
588
589		</target>
590
734	–	<target name="j1" depends="compile-j1"
735	–	description="Runs a standalone JavaOne program">
591
592	<	<java classname="${j1.test}" fork="true">
593	<	<classpath refid="j1.classpath"/>
594	<	<jvmarg value="-client"/>
592	>	<target name="4jdk7-test-tck"
593	>	depends="4jdk7compile"
594	>	description="Runs tck tests for jsr166-4jdk7 directly">
595	>	<run-tck-tests
596	>	jvm="${java7}"
597	>	tck.classes="${build.4jdk7.tck.classes.dir}"
598	>	product.jar="${4jdk7product.jar}"/>
599	>	</target>
600
741	–	<!-- TestPseudoRandom args -->
742	–	<arg value="2"/>
743	–	<arg value="25"/>
744	–	<arg value="100000"/>
601
602	<	<!-- WebCrawler args -->
603	<	<!--
604	<	<arg value="jsr166.webcrawler.WebCrawler3"/>
749	<	<arg value="http://www.priorartisans.com"/>
750	<	<arg value="25"/>
751	<	-->
602	>	<target name="4jdk7-test-tck-junit"
603	>	depends="4jdk7compile"
604	>	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
605
606	<	</java>
606	>	<junit printsummary="true"
607	>	showoutput="true"
608	>	errorProperty="junit.failed"
609	>	failureProperty="junit.failed"
610	>	includeantruntime="true"
611	>	jvm="${java7}"
612	>	fork="true">
613
614	<	</target>
614	>	<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
615	>	<jvmarg value="-server"/>
616
617	+	<classpath>
618	+	<pathelement location="${junit.jar}"/>
619	+	<pathelement location="${build.4jdk7.tck.classes.dir}"/>
620	+	</classpath>
621
622	<	<target name="test-j1" depends="compile-j1"
759	<	description="Runs testcases from the JavaOne source directories">
622	>	<formatter type="brief"/>
623
624	<	<junit printsummary="true"
625	<	showoutput="true"
763	<	errorProperty="junit.failed"
764	<	failureProperty="junit.failed"
765	<	dir="${build.j1.dir}"
766	<	fork="true">
624	>	<test name="JSR166TestCase" haltonfailure="no">
625	>	</test>
626
627	<	<!-- <jvmarg value="-server"/> -->
628	<	<classpath refid="j1.classpath"/>
770	<	<formatter type="xml"/>
627	>	</junit>
628	>	</target>
629
772	–	<batchtest todir="${build.j1.dir}">
773	–	<fileset dir="${j1.src.dir}">
774	–	<include name="**/*Test.java"/>
775	–	</fileset>
776	–	</batchtest>
630
631	<	</junit>
631	>	<target name="4jdk7docs"
632	>	description="Builds javadocs with custom tags to build folder">
633
634	<	<available property="junit.report.format"
635	<	value="frames"
782	<	classname="org.apache.xalan.lib.Redirect"/>
783	<	<property name="junit.report.format" value="noframes"/>
634	>	<delete dir="${build.4jdk7.docs.dir}"/>
635	>	<mkdir dir="${build.4jdk7.docs.dir}"/>
636
637	<	<junitreport todir="${build.j1.dir}">
638	<	<fileset dir="${build.j1.dir}">
639	<	<include name="TEST-*.xml"/>
637	>	<javadoc destdir="${build.4jdk7.docs.dir}"
638	>	packagenames="none"
639	>	link="${jdkapi7docs.url}"
640	>	overview="${4jdk7src.dir}/intro.html"
641	>	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
642	>	classpath=""
643	>	executable="${javadoc7}">
644	>	<arg value="-XDignore.symbol.file=true"/>
645	>	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
646	>	<include name="**/*.java"/>
647		</fileset>
648	<	<report styledir="${stylesheet.dir}"
790	<	format="${junit.report.format}"
791	<	todir="${build.j1.dir}"
792	<	/>
793	<	</junitreport>
794	<
795	<	<fail message="Test Cases Failed" if="junit.failed"/>
648	>	</javadoc>
649
650		</target>
651
652
653	+	<target name="4jdk7dist"
654	+	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7dist-docs"
655	+	description="Puts all distributable products in single hierarchy"/>
656
801	–	<!-- C++ and JNI definitions and demos -->
657
803	–	<target name="configure-cpp">
658
659	<	<!-- Define tasks and types -->
659	>	<target name="4jdk7clean"
660	>	description="Removes all build products">
661
662	<	<path id="cpptasks.path">
663	<	<pathelement location="${lib.dir}/cpptasks.jar"/>
664	<	</path>
810	<	<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
811	<	<typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
662	>	<delete dir="${build.4jdk7.dir}"/>
663	>
664	>	</target>
665
813	–	<!-- Set platform property for JNI includes -->
666
667	<	<condition property="platform" value="linux">
668	<	<os name="Linux"/>
669	<	</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>
667	>
668	>	<target name="4jdk7dist-clean"
669	>	description="Removes all build and distribution products">
670
671		</target>
672
673	+	<target name="4jdk7dist-docs"
674	+	description="Builds javadocs without custom tags to dist folder">
675	+
676	+	<delete dir="${dist.4jdk7.docs.dir}"/>
677	+	<mkdir dir="${dist.4jdk7.docs.dir}"/>
678
679	<	<target name="cppdemo" depends="configure-cpp">
679	>	<javadoc destdir="${dist.4jdk7.docs.dir}"
680	>	packagenames="none"
681	>	link="${jdkapi7docs.url}"
682	>	overview="${4jdk7src.dir}/intro.html"
683	>	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
684	>	classpath=""
685	>	executable="${javadoc7}">
686	>	<arg value="-XDignore.symbol.file=true"/>
687	>	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
688	>	<include name="**/*.java"/>
689	>	</fileset>
690	>	</javadoc>
691
692	<	<mkdir dir="${build.dir}"/>
692	>	</target>
693
694	<	<cc multithreaded="true"
695	<	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>
694	>	<target name="4jdk7dist-jar"
695	>	depends="4jdk7clean, 4jdk7compile">
696
697	<	<exec executable="${build.dir}/CppDemo">
841	<	<arg line="count in word frequency of word in command line count"/>
842	<	</exec>
697	>	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
698
699		</target>
700
701	+	<!-- jsr166x -->
702
847	–	<target name="jnidemo" depends="init, configure-compiler, configure-cpp">
703
704	<	<mkdir dir="${build.testcases.dir}"/>
704	>	<target name="jsr166xcompile"
705	>	depends="init, configure-compiler"
706	>	description="Compiles jsr166x sources">
707
708	<	<javac srcdir="${test.src.dir}"
709	<	destdir="${build.testcases.dir}"
708	>	<mkdir dir="${build.jsr166x.dir}"/>
709	>
710	>	<javac srcdir="${jsr166xsrc.dir}"
711	>	destdir="${build.jsr166x.dir}"
712		debug="${build.debug}"
713		debuglevel="${build.debuglevel}"
714		deprecation="${build.deprecation}"
715		source="${build.sourcelevel}"
716		fork="true">
717	<	<compilerarg value="${bootclasspath.args}"/>
717	>
718	>	<include name="**/*.java"/>
719		<compilerarg line="${build.args}"/>
720	<	<classpath refid="test.classpath"/>
721	<	<include name="JniDemo.java"/>
720	>	<compilerarg value="-XDignore.symbol.file=true"/>
721	>
722		</javac>
723
724	<	<javah destdir="${build.testcases.dir}"
725	<	classpathref="test.classpath">
726	<	<class name="JniDemo"/>
727	<	</javah>
728	<
729	<	<cc multithreaded="true"
730	<	name="g++"
731	<	objdir="${build.dir}"
732	<	outfile="${build.dir}/JniDemo"
733	<	outtype="shared">
734	<
735	<	<compiler>
736	<	<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>
724	>	</target>
725	>
726	>
727	>
728	>	<target name="jsr166xjar"
729	>	depends="jsr166xcompile"
730	>	description="Builds library jar from compiled sources">
731	>
732	>	<mkdir dir="${build.jsr166xlib.dir}"/>
733	>
734	>	<jar destfile="${jsr166xproduct.jar}">
735	>	<fileset dir="${build.jsr166x.dir}"/>
736	>	</jar>
737
738		</target>
739
740
741
742	<	<!-- Backward compatibility, work in progress (some files not checked in) -->
742	>	<target name="jsr166xdocs"
743	>	description="Builds javadocs with custom tags to build folder">
744	>
745	>	<delete dir="${build.jsr166xjavadocs.dir}"/>
746	>	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
747	>
748	>	<javadoc destdir="${build.jsr166xjavadocs.dir}"
749	>	packagenames="jsr166x"
750	>	link="${jdkapidocs.url}"
751	>	source="${build.sourcelevel}"
752	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
753	>	additionalparam="-XDignore.symbol.file=true" />
754
755	+	</target>
756
757
758	<	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
759	<	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
760	<	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
917	<	<property name="pretiger.sourcelevel" value="1.4"/>
758	>	<target name="jsr166xdist"
759	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
760	>	description="Puts all distributable products in single hierarchy"/>
761
919	–	<target name="defang"
920	–	depends="init"
921	–	description="Generates pre-Tiger compatible source">
762
923	–	<delete dir="${pretiger.src.dir}"/>
924	–	<mkdir dir="${pretiger.src.dir}"/>
763
764	<	<exec executable="perl">
765	<	<arg file="etc/defang.pl"/>
766	<	<!-- <arg value="-v"/> -->
767	<	<arg value="-s"/> <arg file="${src.dir}"/>
768	<	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
769	<	</exec>
764	>	<target name="jsr166xclean"
765	>	description="Removes all build products">
766	>
767	>	<delete dir="${build.jsr166x.dir}"/>
768	>	<delete dir="${build.jsr166xlib.dir}"/>
769	>
770	>	</target>
771	>
772	>
773	>
774	>	<target name="jsr166xdist-clean"
775	>	description="Removes all build and distribution products">
776
777		</target>
778
935	–	<target name="compile-pretiger"
936	–	depends="init, configure-compiler, defang"
937	–	description="Compiles pre-Tiger sources to build folder">
779
939	–	<mkdir dir="${build.pretiger.dir}"/>
780
781	<	<javac srcdir="${pretiger.src.dir}"
782	<	destdir="${build.pretiger.dir}"
781	>	<target name="jsr166xdist-docs"
782	>	description="Builds javadocs without custom tags to dist folder">
783	>
784	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
785	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
786	>
787	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
788	>	packagenames="jsr166x"
789	>	link="${jdkapidocs.url}"
790	>	source="${build.sourcelevel}"
791	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
792	>	additionalparam="-XDignore.symbol.file=true" />
793	>
794	>	</target>
795	>
796	>	<target name="jsr166xdist-jar"
797	>	depends="jsr166xclean, jsr166xjar">
798	>
799	>	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
800	>
801	>	</target>
802	>
803	>	<!-- jsr166y -->
804	>
805	>
806	>	<target name="jsr166ycompile"
807	>	depends="init, configure-compiler"
808	>	description="Compiles jsr166y sources">
809	>
810	>	<mkdir dir="${build.jsr166y.dir}"/>
811	>
812	>	<javac srcdir="${jsr166ysrc.dir}"
813	>	destdir="${build.jsr166y.dir}"
814		debug="${build.debug}"
815		debuglevel="${build.debuglevel}"
816		deprecation="${build.deprecation}"
817	<	source="${pretiger.sourcelevel}"
817	>	source="${build.sourcelevel}"
818		fork="true">
819
820	+	<include name="**/*.java"/>
821		<compilerarg line="${build.args}"/>
822	<	<exclude name="**/Thread.java"/>
822	>	<compilerarg value="-XDignore.symbol.file=true"/>
823	>	<compilerarg value="${bootclasspath.args}"/>
824	>
825	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
826
827		</javac>
828
829		</target>
830
956	–	<target name="pretiger" depends="compile-pretiger">
831
958	–	<mkdir dir="${build.lib.dir}"/>
832
833	<	<jar destfile="${pretiger.jar}">
834	<	<fileset dir="${build.pretiger.dir}">
835	<	</fileset>
833	>	<target name="jsr166yjar"
834	>	depends="jsr166ycompile"
835	>	description="Builds library jar from compiled sources">
836	>
837	>	<mkdir dir="${build.jsr166ylib.dir}"/>
838	>
839	>	<jar destfile="${jsr166yproduct.jar}" index="true">
840	>	<fileset dir="${build.jsr166y.dir}"/>
841		</jar>
842
843		</target>
844
967	–	<!-- jsr166x -->
845
846
847	<	<target name="jsr166xcompile"
848	<	depends="init, configure-compiler"
972	<	description="Compiles jsr166x sources">
847	>	<target name="jsr166ydocs"
848	>	description="Builds javadocs with custom tags to build folder">
849
850	<	<mkdir dir="${build.jsr166x.dir}"/>
850	>	<delete dir="${build.jsr166yjavadocs.dir}"/>
851	>	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
852
853	<	<javac srcdir="${jsr166xsrc.dir}"
854	<	destdir="${build.jsr166x.dir}"
853	>	<javadoc destdir="${build.jsr166yjavadocs.dir}"
854	>	packagenames="jsr166y"
855	>	link="${jdkapidocs.url}"
856	>	source="${build.sourcelevel}"
857	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
858	>	additionalparam="-XDignore.symbol.file=true" />
859	>
860	>	</target>
861	>
862	>
863	>	<target name="jsr166ydist"
864	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
865	>	description="Puts all distributable products in single hierarchy"/>
866	>
867	>
868	>
869	>	<target name="jsr166yclean"
870	>	description="Removes all build products">
871	>
872	>	<delete dir="${build.jsr166y.dir}"/>
873	>	<delete dir="${build.jsr166ylib.dir}"/>
874	>
875	>	</target>
876	>
877	>
878	>
879	>	<target name="jsr166ydist-clean"
880	>	description="Removes all build and distribution products">
881	>
882	>	</target>
883	>
884	>	<target name="jsr166ydist-docs"
885	>	description="Builds javadocs without custom tags to dist folder">
886	>
887	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
888	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
889	>
890	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
891	>	packagenames="jsr166y"
892	>	link="${jdkapidocs.url}"
893	>	source="${build.sourcelevel}"
894	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
895	>	additionalparam="-XDignore.symbol.file=true" />
896	>
897	>	</target>
898	>
899	>	<target name="jsr166ydist-jar"
900	>	depends="jsr166yclean, jsr166yjar">
901	>
902	>	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
903	>
904	>	</target>
905	>
906	>
907	>	<!-- extra166y -->
908	>
909	>
910	>	<target name="extra166ycompile"
911	>	depends="init, configure-compiler, jsr166ycompile"
912	>	description="Compiles extra166y sources">
913	>
914	>	<mkdir dir="${build.extra166y.dir}"/>
915	>
916	>	<javac srcdir="${extra166ysrc.dir}"
917	>	destdir="${build.extra166y.dir}"
918		debug="${build.debug}"
919	+	classpath="${jsr166yproduct.jar}"
920		debuglevel="${build.debuglevel}"
921		deprecation="${build.deprecation}"
922		source="${build.sourcelevel}"
#	Line 983 | Line 924
924
925		<include name="**/*.java"/>
926		<compilerarg line="${build.args}"/>
927	+	<compilerarg value="-XDignore.symbol.file=true"/>
928	+	<compilerarg value="${bootclasspath.args}"/>
929	+
930	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
931
932		</javac>
933
#	Line 990 | Line 935
935
936
937
938	<	<target name="jsr166xjar"
939	<	depends="jsr166xcompile"
938	>	<target name="extra166yjar"
939	>	depends="extra166ycompile"
940		description="Builds library jar from compiled sources">
941
942	<	<mkdir dir="${build.jsr166xlib.dir}"/>
942	>	<mkdir dir="${build.extra166ylib.dir}"/>
943
944	<	<jar destfile="${jsr166xproduct.jar}">
945	<	<fileset dir="${build.jsr166x.dir}"/>
944	>	<jar destfile="${extra166yproduct.jar}" index="true">
945	>	<fileset dir="${build.extra166y.dir}"/>
946		</jar>
947
948		</target>
949
950
951
952	<	<target name="jsr166xdocs"
952	>	<target name="extra166ydocs"
953		description="Builds javadocs with custom tags to build folder">
954
955	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
956	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
1012	<
1013	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
1014	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
1015	<	sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
955	>	<delete dir="${build.extra166yjavadocs.dir}"/>
956	>	<mkdir dir="${build.extra166yjavadocs.dir}"/>
957
958	<	>
959	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
960	<	<include name="jsr166x"/>
961	<	</packageset>
962	<
963	<
1023	<	</javadoc>
958	>	<javadoc destdir="${build.extra166yjavadocs.dir}"
959	>	packagenames="extra166y"
960	>	link="${jdkapidocs.url}"
961	>	source="${build.sourcelevel}"
962	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
963	>	additionalparam="-XDignore.symbol.file=true" />
964
965		</target>
966
967
968	<	<target name="jsr166xdist"
969	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
968	>	<target name="extra166ydist"
969	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
970		description="Puts all distributable products in single hierarchy"/>
971
972
973
974	<	<target name="jsr166xclean"
974	>	<target name="extra166yclean"
975		description="Removes all build products">
976
977	<	<delete dir="${build.jsr166x.dir}"/>
978	<	<delete dir="${build.jsr166xlib.dir}"/>
977	>	<delete dir="${build.extra166y.dir}"/>
978	>	<delete dir="${build.extra166ylib.dir}"/>
979
980		</target>
981
982
983
984	<	<target name="jsr166xdist-clean"
984	>	<target name="extra166ydist-clean"
985		description="Removes all build and distribution products">
986
987		</target>
988
989	+	<target name="extra166ydist-docs"
990	+	description="Builds javadocs without custom tags to dist folder">
991
992	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
993	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
994
995	<	<target name="jsr166xdist-docs"
996	<	description="Builds javadocs without custom tags to dist folder">
995	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
996	>	packagenames="extra166y"
997	>	link="${jdkapidocs.url}"
998	>	source="${build.sourcelevel}"
999	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1000	>	additionalparam="-XDignore.symbol.file=true" />
1001
1002	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
1055	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
1002	>	</target>
1003
1004	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
1005	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
1006	<	source="${build.sourcelevel}">
1004	>	<target name="extra166ydist-jar"
1005	>	depends="extra166yclean, extra166yjar">
1006	>
1007	>	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1008
1009	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
1062	<	<include name="jsr166x"/>
1063	<	</packageset>
1009	>	</target>
1010
1011	+	<!-- jsr166e -->
1012	+
1013	+	<target name="jsr166ecompile"
1014	+	depends="configure-compiler"
1015	+	description="Compiles jsr166e sources">
1016	+
1017	+	<mkdir dir="${build.jsr166e.dir}"/>
1018	+
1019	+	<javac srcdir="${topsrc.dir}"
1020	+	destdir="${build.jsr166e.dir}"
1021	+	debug="${build.debug}"
1022	+	debuglevel="${build.debuglevel}"
1023	+	deprecation="${build.deprecation}"
1024	+	source="1.7"
1025	+	classpath=""
1026	+	includeAntRuntime="false"
1027	+	includeJavaRuntime="false"
1028	+	executable="${javac7}"
1029	+	fork="true">
1030	+
1031	+	<include name="jsr166e/**/*.java"/>
1032	+	<compilerarg line="${build.args}"/>
1033	+	<compilerarg value="-XDignore.symbol.file=true"/>
1034	+	<compilerarg value="-Xlint:all"/>
1035	+
1036	+	</javac>
1037	+
1038	+	</target>
1039	+
1040	+
1041	+
1042	+	<target name="jsr166ejar"
1043	+	depends="jsr166ecompile"
1044	+	description="Builds library jar from compiled sources">
1045	+
1046	+	<mkdir dir="${build.jsr166elib.dir}"/>
1047	+
1048	+	<jar destfile="${jsr166eproduct.jar}" index="true">
1049	+	<fileset dir="${build.jsr166e.dir}"/>
1050	+	</jar>
1051	+
1052	+	</target>
1053	+
1054	+
1055	+
1056	+	<target name="jsr166edocs"
1057	+	description="Builds javadocs with custom tags to build folder">
1058	+
1059	+	<delete dir="${build.jsr166ejavadocs.dir}"/>
1060	+	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
1061	+
1062	+	<javadoc destdir="${build.jsr166ejavadocs.dir}"
1063	+	packagenames="jsr166e,jsr166e.extra"
1064	+	link="${jdkapi7docs.url}"
1065	+	source="1.7"
1066	+	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1067	+	executable="${javadoc7}"
1068	+	additionalparam="-XDignore.symbol.file=true" >
1069	+	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1070	+	<include name="jsr166e/**/*.java"/>
1071	+	</fileset>
1072		</javadoc>
1073
1074		</target>
1075
1069	–	<target name="jsr166xdist-jar"
1070	–	depends="jsr166xclean, jsr166xjar">
1076
1077	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1077	>	<target name="jsr166edist"
1078	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1079	>	description="Puts all distributable products in single hierarchy"/>
1080	>
1081	>
1082	>
1083	>	<target name="jsr166eclean"
1084	>	description="Removes all build products">
1085	>
1086	>	<delete dir="${build.jsr166e.dir}"/>
1087	>	<delete dir="${build.jsr166elib.dir}"/>
1088	>
1089	>	</target>
1090	>
1091	>
1092	>
1093	>	<target name="jsr166edist-clean"
1094	>	description="Removes all build and distribution products">
1095	>
1096	>	</target>
1097	>
1098	>	<target name="jsr166edist-docs"
1099	>	description="Builds javadocs without custom tags to dist folder">
1100	>
1101	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1102	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1103	>
1104	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1105	>	packagenames="jsr166e,jsr166e.extra"
1106	>	link="${jdkapidocs.url}"
1107	>	source="1.7"
1108	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1109	>	additionalparam="-XDignore.symbol.file=true" />
1110	>
1111	>	</target>
1112	>
1113	>	<target name="jsr166edist-jar"
1114	>	depends="jsr166eclean, jsr166ejar">
1115	>
1116	>	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1117
1118		</target>
1119

Diff Legend

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