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.107 by jsr166, Sat Jan 19 23:40:04 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"/>
131	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
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="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
140	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
141	<	<property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
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="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141	>	<property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142	>	<property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
143	>	<property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.jar"/>
144	>	<property name="junit.jar"        location="${lib.dir}/junit.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	+
158	+	<!-- Default jdk api doc location (latest stable release seems best) -->
159	+	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
160	+
161		<!-- Test classpath -->
162		<path id="test.classpath">
163		<pathelement location="${build.testcases.dir}"/>
#	Line 82 | Line 169
169		<pathelement location="${build.loops.dir}"/>
170		</path>
171
172	<	<!-- J1 classpath -->
173	<	<path id="j1.classpath">
174	<	<pathelement location="${build.j1.dir}"/>
175	<	<pathelement location="${junit.jar}"/>
176	<	<pathelement location="${concurrent.jar}"/>
177	<	</path>
91	<
172	>	<!-- Support @jls tag, used in jdk8+ javadoc -->
173	>	<!-- TODO: How do we get &trade to work? -->
174	>	<!-- TODO: Why isn't @jls a "standard" tag? -->
175	>	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
176	>	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
177	>	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
178
179		<!-- Main targets -->
180
181	+	<target name="dists"
182	+	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
183	+	description="Builds all public jars and docs"/>
184
185		<target name="compile"
186	<	depends="init, configure-compiler"
187	<	description="Compiles main sources to build folder">
186	>	depends="configure-compiler"
187	>	description="Compiles src/main sources to build dir">
188
189		<mkdir dir="${build.classes.dir}"/>
190
191		<javac srcdir="${src.dir}"
192	<	destdir="${build.classes.dir}"
193	<	debug="${build.debug}"
194	<	debuglevel="${build.debuglevel}"
195	<	deprecation="${build.deprecation}"
196	<	source="${build.sourcelevel}"
197	<	fork="true">
192	>	destdir="${build.classes.dir}"
193	>	debug="${build.debug}"
194	>	debuglevel="${build.debuglevel}"
195	>	deprecation="${build.deprecation}"
196	>	classpath=""
197	>	includeAntRuntime="false"
198	>	includeJavaRuntime="false"
199	>	executable="${javac8}"
200	>	fork="true">
201
202		<include name="**/*.java"/>
203	+	<compilerarg line="${build.args}"/>
204	+	<compilerarg value="-XDignore.symbol.file=true"/>
205	+	<compilerarg value="-Xlint:all"/>
206	+
207	+	<!--
208		<exclude name="java/lang/**"/>
209		<compilerarg line="${build.args}"/>
210	+	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
211	+	-->
212
213		</javac>
214
#	Line 132 | Line 231
231
232
233		<target name="test"
234	<	depends="init, configure-tests, report-tests"
234	>	depends="configure-tests, report-tests"
235		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
236
237
238
239		<target name="docs"
240	<	description="Builds javadocs with custom tags to build folder">
142	<
143	<	<delete dir="${build.javadocs.dir}"/>
144	<	<mkdir dir="${build.javadocs.dir}"/>
145	<
146	<	<javadoc destdir="${build.javadocs.dir}"
147	<	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>
240	>	description="Builds javadocs for src/main to dist dir">
241
242	+	<delete dir="${dist.javadocs.dir}"/>
243	+	<mkdir dir="${dist.javadocs.dir}"/>
244
245	+	<!-- the packagenames="none" hack below prevents scanning the -->
246	+	<!-- sourcepath for packages -->
247
248	<	<target name="doccheck"
249	<	depends="filter-doccheck"
250	<	description="Reports on javadoc style errors">
251	<
252	<	<delete dir="${build.doccheck.dir}"/>
253	<	<mkdir dir="${build.doccheck.dir}"/>
254	<
255	<	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
256	<	docletpath="${lib.dir}/doccheck.jar"
257	<	destdir="${build.doccheck.dir}">
258	<	<packageset dir="${build.dc-filter.dir}"/>
248	>	<javadoc destdir="${dist.javadocs.dir}"
249	>	packagenames="none"
250	>	link="${jdkapi8docs.url}"
251	>	overview="${src.dir}/intro.html"
252	>	sourcepath="${src.dir}:${jdk8src.dir}"
253	>	classpath=""
254	>	executable="${javadoc8}">
255	>	<arg value="-XDignore.symbol.file=true"/>
256	>	<arg value="-tag"/>
257	>	<arg value="${javadoc.jls.option}"/>
258	>	<fileset dir="${src.dir}" defaultexcludes="yes">
259	>	<include name="**/*.java"/>
260	>	</fileset>
261		</javadoc>
262
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	–
263		</target>
264
265
266
267		<target name="dist"
268	<	depends="init, dist-clean, dist-jar, dist-docs"
268	>	depends="dist-clean, dist-jar, docs"
269		description="Puts all distributable products in single hierarchy"/>
270
271
209	–
272		<target name="release"
273		depends="dist"
274		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 247 | Line 309
309
310
311
250	–	<target name="dist-docs"
251	–	description="Builds javadocs without custom tags to dist folder">
252	–
253	–	<delete dir="${dist.javadocs.dir}"/>
254	–	<mkdir dir="${dist.javadocs.dir}"/>
255	–
256	–	<javadoc destdir="${dist.javadocs.dir}"
257	–	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}"/>
262	–
263	–	</javadoc>
264	–
265	–	</target>
266	–
267	–
268	–
312		<!-- Internal targets -->
313
314
272	–	<target name="init">
273	–
274	–	<!-- Version is kept in a separate file -->
275	–	<loadfile property="version" srcFile="version.properties"/>
276	–	<echo>Building JSR-166 version ${version}</echo>
277	–	<echo>java.home is ${java.home}</echo>
278	–
279	–	</target>
280	–
281	–
315		<target name="dist-jar"
316		depends="clean, jar">
317
#	Line 287 | Line 320
320		</target>
321
322
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	–
323		<target name="compile-tests"
324		depends="jar">
325
#	Line 413 | Line 335
335
336		<compilerarg value="${bootclasspath.args}"/>
337		<compilerarg line="${build.args}"/>
338	+	<compilerarg value="-XDignore.symbol.file=true"/>
339
340		<classpath refid="test.classpath"/>
341
#	Line 430 | Line 353
353
354		<compilerarg value="${bootclasspath.args}"/>
355		<compilerarg line="${build.args}"/>
356	+	<compilerarg value="-XDignore.symbol.file=true"/>
357
358		<classpath refid="test.classpath"/>
359
#	Line 446 | Line 370
370
371		<compilerarg value="${bootclasspath.args}"/>
372		<compilerarg line="${build.args}"/>
373	+	<compilerarg value="-XDignore.symbol.file=true"/>
374
375		<classpath refid="test.classpath"/>
376
#	Line 518 | Line 443
443		<fileset dir="${build.reports.dir}">
444		<include name="TEST-*.xml"/>
445		</fileset>
446	<	<report styledir="${stylesheet.dir}"
522	<	format="${junit.report.format}"
523	<	todir="${build.reports.dir}"
446	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
447		/>
448		</junitreport>
449
#	Line 570 | Line 493
493		</target>
494
495
496	+	<!-- Various demos and test programs -->
497	+
498	+
499	+	<target name="loops" depends="configure-compiler"
500	+	description="Benchmark from Doug Lea's AQS paper">
501
502	<	<!-- Anthill targets -->
502	>	<mkdir dir="${build.loops.dir}"/>
503
504	<	<target name="anthill-build">
504	>	<javac srcdir="${loops.src.dir}"
505	>	destdir="${build.loops.dir}"
506	>	debug="${build.debug}"
507	>	debuglevel="${build.debuglevel}"
508	>	deprecation="${build.deprecation}"
509	>	source="${build.sourcelevel}"
510	>	fork="true">
511	>
512	>	<compilerarg line="${build.args}"/>
513	>	<classpath refid="loops.classpath"/>
514	>	<compilerarg value="-XDignore.symbol.file=true"/>
515
516	<	<!-- Override this in user.properties -->
579	<	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
516	>	</javac>
517
518	<	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
519	<	<arg value="-Xmx256000000"/>
520	<	<!-- 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>
518	>	<java classname="ALoops" fork="true">
519	>	<classpath refid="loops.classpath"/>
520	>	</java>
521
522		</target>
523
524
525	+	<!-- jsr166 4jdk7 -->
526
621	–	<!-- Various demos and test programs -->
527
528	+	<target name="4jdk7compile"
529	+	depends="configure-compiler"
530	+	description="Compiles src/jdk7 sources, targeting jdk7">
531	+
532	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
533	+
534	+	<javac srcdir="${4jdk7src.dir}"
535	+	destdir="${build.4jdk7.classes.dir}"
536	+	debug="${build.debug}"
537	+	debuglevel="${build.debuglevel}"
538	+	deprecation="${build.deprecation}"
539	+	source="6"
540	+	classpath=""
541	+	bootclasspath="${bootclasspath6}"
542	+	includeAntRuntime="false"
543	+	includeJavaRuntime="false"
544	+	executable="${javac7}"
545	+	fork="true">
546
547	<	<target name="sample" depends="init, configure-compiler"
548	<	description="Standalone demo program">
547	>	<include name="**/*.java"/>
548	>	<compilerarg line="${build.args}"/>
549	>	<compilerarg value="-XDignore.symbol.file=true"/>
550	>	<compilerarg value="-Xlint:all"/>
551
552	<	<mkdir dir="${build.testcases.dir}"/>
552	>	</javac>
553
554	<	<javac srcdir="${test.src.dir}"
555	<	destdir="${build.testcases.dir}"
556	<	debug="${build.debug}"
557	<	debuglevel="${build.debuglevel}"
558	<	deprecation="${build.deprecation}"
559	<	source="${build.sourcelevel}"
560	<	fork="true">
554	>	<mkdir dir="${build.4jdk7.lib.dir}"/>
555	>
556	>	<jar destfile="${4jdk7product.jar}" index="true">
557	>	<fileset dir="${build.4jdk7.classes.dir}"/>
558	>	</jar>
559	>
560	>	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
561	>
562	>	<javac srcdir="${tck.src.dir}"
563	>	destdir="${build.4jdk7.tck.classes.dir}"
564	>	debug="${build.debug}"
565	>	debuglevel="${build.debuglevel}"
566	>	deprecation="${build.deprecation}"
567	>	source="6"
568	>	classpath="${junit.jar}"
569	>	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
570	>	includeAntRuntime="false"
571	>	includeJavaRuntime="false"
572	>	executable="${javac7}"
573	>	fork="true">
574
575	<	<include name="jsr166/test/Sample.java"/>
575	>	<include name="**/*.java"/>
576	>	<compilerarg line="${build.args}"/>
577	>	<compilerarg value="-XDignore.symbol.file=true"/>
578	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
579
580		</javac>
581
582	<	<copy todir="${build.testcases.dir}">
642	<	<fileset dir="${test.src.dir}">
643	<	<include name="**/*.properties"/>
644	<	</fileset>
645	<	</copy>
582	>	</target>
583
584
585	<	<java classname="jsr166.test.Sample" fork="true">
586	<	<classpath refid="test.classpath"/>
587	<	<!-- <jvmarg value="-ea"/> -->
588	<	<!-- <jvmarg value="-server"/> -->
589	<	<!-- <arg value="1000"/> -->
590	<	</java>
585	>	<target name="4jdk7-test-tck"
586	>	depends="4jdk7compile"
587	>	description="Runs tck tests for jsr166-4jdk7 directly">
588	>	<run-tck-tests
589	>	jvm="${java7}"
590	>	tck.classes="${build.4jdk7.tck.classes.dir}"
591	>	product.jar="${4jdk7product.jar}"/>
592		</target>
593
594
595	<	<target name="loops" depends="init, configure-compiler"
596	<	description="Benchmark from Doug Lea's AQS paper">
595	>	<target name="4jdk7-test-tck-junit"
596	>	depends="4jdk7compile"
597	>	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
598
599	<	<mkdir dir="${build.loops.dir}"/>
599	>	<junit printsummary="true"
600	>	showoutput="true"
601	>	errorProperty="junit.failed"
602	>	failureProperty="junit.failed"
603	>	includeantruntime="true"
604	>	jvm="${java7}"
605	>	fork="true">
606
607	<	<javac srcdir="${loops.src.dir}"
608	<	destdir="${build.loops.dir}"
664	<	debug="${build.debug}"
665	<	debuglevel="${build.debuglevel}"
666	<	deprecation="${build.deprecation}"
667	<	source="${build.sourcelevel}"
668	<	fork="true">
607	>	<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
608	>	<jvmarg value="-server"/>
609
610	<	<compilerarg line="${build.args}"/>
611	<	<classpath refid="loops.classpath"/>
610	>	<classpath>
611	>	<pathelement location="${junit.jar}"/>
612	>	<pathelement location="${build.4jdk7.tck.classes.dir}"/>
613	>	</classpath>
614
615	<	</javac>
615	>	<formatter type="brief"/>
616
617	<	<java classname="ALoops" fork="true">
618	<	<classpath refid="loops.classpath"/>
677	<	</java>
617	>	<test name="JSR166TestCase" haltonfailure="no">
618	>	</test>
619
620	+	</junit>
621		</target>
622
623
624	<	<target name="compile-j1" depends="init, configure-compiler">
624	>	<target name="4jdk7docs"
625	>	description="Builds javadocs for src/jdk7 to dist dir">
626
627	<	<mkdir dir="${build.j1.dir}"/>
627	>	<delete dir="${dist.4jdk7.docs.dir}"/>
628	>	<mkdir dir="${dist.4jdk7.docs.dir}"/>
629
630	<	<javac srcdir="${j1.src.dir}"
631	<	destdir="${build.j1.dir}"
632	<	debug="${build.debug}"
633	<	debuglevel="${build.debuglevel}"
634	<	deprecation="${build.deprecation}"
635	<	source="${build.sourcelevel}" >
630	>	<javadoc destdir="${dist.4jdk7.docs.dir}"
631	>	packagenames="none"
632	>	link="${jdkapi7docs.url}"
633	>	overview="${4jdk7src.dir}/intro.html"
634	>	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
635	>	classpath=""
636	>	executable="${javadoc7}">
637	>	<arg value="-XDignore.symbol.file=true"/>
638	>	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
639	>	<include name="**/*.java"/>
640	>	</fileset>
641	>	</javadoc>
642
643	<	<include name="**/*.java"/>
694	<	<exclude name="**/dijkstra/**"/>
643	>	</target>
644
696	–	<compilerarg line="${build.args}"/>
697	–	<classpath refid="j1.classpath"/>
645
646	<	</javac>
646	>	<target name="4jdk7dist"
647	>	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
648	>	description="Puts all distributable products in single hierarchy"/>
649	>
650	>
651	>
652	>	<target name="4jdk7clean"
653	>	description="Removes all build products">
654	>
655	>	<delete dir="${build.4jdk7.dir}"/>
656
657		</target>
658
659
704	–	<target name="sw" depends="compile-j1"
705	–	description="Runs the SwingWorker demo">
660
661	<	<!--
662	<	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
709	<	<classpath refid="j1.classpath"/>
710	<	</java>
711	<	-->
661	>	<target name="4jdk7dist-clean"
662	>	description="Removes all build and distribution products">
663
664	<	<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
664	>	</target>
665
666	<	<exec dir="${build.j1.dir}" executable="appletviewer.exe">
667	<	<arg value="${build.j1.dir}/SwingWorker.html"/>
668	<	</exec>
666	>	<target name="4jdk7dist-jar"
667	>	depends="4jdk7clean, 4jdk7compile">
668	>
669	>	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
670
671		</target>
672
673	<	<target name="j1" depends="compile-j1"
722	<	description="Runs a standalone JavaOne program">
673	>	<!-- jsr166x -->
674
724	–	<java classname="${j1.test}" fork="true">
725	–	<classpath refid="j1.classpath"/>
726	–	<jvmarg value="-client"/>
675
676	<	<!-- TestPseudoRandom args -->
677	<	<arg value="2"/>
678	<	<arg value="25"/>
731	<	<arg value="100000"/>
676	>	<target name="jsr166xcompile"
677	>	depends="configure-compiler"
678	>	description="Compiles jsr166x sources to build dir">
679
680	<	<!-- WebCrawler args -->
734	<	<!--
735	<	<arg value="jsr166.webcrawler.WebCrawler3"/>
736	<	<arg value="http://www.priorartisans.com"/>
737	<	<arg value="25"/>
738	<	-->
680	>	<mkdir dir="${build.jsr166x.dir}"/>
681
682	<	</java>
682	>	<javac srcdir="${topsrc.dir}"
683	>	destdir="${build.jsr166x.dir}"
684	>	debug="${build.debug}"
685	>	debuglevel="${build.debuglevel}"
686	>	deprecation="${build.deprecation}"
687	>	classpath=""
688	>	source="5"
689	>	bootclasspath="${bootclasspath6}"
690	>	includeAntRuntime="false"
691	>	includeJavaRuntime="false"
692	>	executable="${javac7}"
693	>	fork="true">
694	>
695	>	<include name="jsr166x/**/*.java"/>
696	>	<compilerarg line="${build.args}"/>
697	>	<compilerarg value="-XDignore.symbol.file=true"/>
698	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
699	>
700	>	</javac>
701
702		</target>
703
704
745	–	<target name="test-j1" depends="compile-j1"
746	–	description="Runs testcases from the JavaOne source directories">
705
706	<	<junit printsummary="true"
707	<	showoutput="true"
708	<	errorProperty="junit.failed"
751	<	failureProperty="junit.failed"
752	<	dir="${build.j1.dir}"
753	<	fork="true">
706	>	<target name="jsr166xjar"
707	>	depends="jsr166xcompile"
708	>	description="Builds library jar from compiled sources">
709
710	<	<!-- <jvmarg value="-server"/> -->
756	<	<classpath refid="j1.classpath"/>
757	<	<formatter type="xml"/>
710	>	<mkdir dir="${build.jsr166xlib.dir}"/>
711
712	<	<batchtest todir="${build.j1.dir}">
713	<	<fileset dir="${j1.src.dir}">
714	<	<include name="**/*Test.java"/>
762	<	</fileset>
763	<	</batchtest>
712	>	<jar destfile="${jsr166x.jar}">
713	>	<fileset dir="${build.jsr166x.dir}"/>
714	>	</jar>
715
716	<	</junit>
716	>	</target>
717
767	–	<available property="junit.report.format"
768	–	value="frames"
769	–	classname="org.apache.xalan.lib.Redirect"/>
770	–	<property name="junit.report.format" value="noframes"/>
718
772	–	<junitreport todir="${build.j1.dir}">
773	–	<fileset dir="${build.j1.dir}">
774	–	<include name="TEST-*.xml"/>
775	–	</fileset>
776	–	<report styledir="${stylesheet.dir}"
777	–	format="${junit.report.format}"
778	–	todir="${build.j1.dir}"
779	–	/>
780	–	</junitreport>
719
720	<	<fail message="Test Cases Failed" if="junit.failed"/>
720	>	<target name="jsr166xdocs"
721	>	description="Builds javadocs to dist dir">
722	>
723	>	<delete dir="${build.jsr166xjavadocs.dir}"/>
724	>	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
725	>
726	>	<javadoc destdir="${build.jsr166xjavadocs.dir}"
727	>	packagenames="jsr166x.*"
728	>	link="${jdkapidocs.url}"
729	>	source="5"
730	>	bootclasspath="${bootclasspath6}"
731	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
732	>	executable="${javadoc7}"
733	>	additionalparam="-XDignore.symbol.file=true" />
734
735		</target>
736
737
738	+	<target name="jsr166xdist"
739	+	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
740	+	description="Puts all distributable products in single hierarchy"/>
741	+
742	+
743
744	<	<!-- C++ and JNI definitions and demos -->
744	>	<target name="jsr166xclean"
745	>	description="Removes all build products">
746
747	<	<target name="configure-cpp">
747	>	<delete dir="${build.jsr166x.dir}"/>
748	>	<delete dir="${build.jsr166xlib.dir}"/>
749
750	<	<!-- Define tasks and types -->
750	>	</target>
751
794	–	<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"/>
752
800	–	<!-- Set platform property for JNI includes -->
753
754	<	<condition property="platform" value="linux">
755	<	<os name="Linux"/>
804	<	</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>
754	>	<target name="jsr166xdist-clean"
755	>	description="Removes all build and distribution products">
756
757		</target>
758
759
815	–	<target name="cppdemo" depends="configure-cpp">
760
761	<	<mkdir dir="${build.dir}"/>
761	>	<target name="jsr166xdist-docs"
762	>	description="Builds javadocs to dist dir">
763
764	<	<cc multithreaded="true"
765	<	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>
764	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
765	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
766
767	<	<exec executable="${build.dir}/CppDemo">
768	<	<arg line="count in word frequency of word in command line count"/>
769	<	</exec>
767	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
768	>	packagenames="jsr166x.*"
769	>	link="${jdkapidocs.url}"
770	>	source="${build.sourcelevel}"
771	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
772	>	executable="${javadoc7}"
773	>	additionalparam="-XDignore.symbol.file=true" />
774
775		</target>
776
777	+	<target name="jsr166xdist-jar"
778	+	depends="jsr166xclean, jsr166xjar">
779
780	<	<target name="jnidemo" depends="init, configure-compiler, configure-cpp">
780	>	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
781
782	<	<mkdir dir="${build.testcases.dir}"/>
782	>	</target>
783
784	<	<javac srcdir="${test.src.dir}"
785	<	destdir="${build.testcases.dir}"
786	<	debug="${build.debug}"
787	<	debuglevel="${build.debuglevel}"
788	<	deprecation="${build.deprecation}"
789	<	source="${build.sourcelevel}"
790	<	fork="true">
791	<	<compilerarg value="${bootclasspath.args}"/>
784	>	<!-- jsr166y -->
785	>
786	>
787	>	<target name="jsr166ycompile"
788	>	depends="configure-compiler"
789	>	description="Compiles jsr166y sources">
790	>
791	>	<mkdir dir="${build.jsr166y.dir}"/>
792	>
793	>	<javac srcdir="${topsrc.dir}"
794	>	destdir="${build.jsr166y.dir}"
795	>	debug="${build.debug}"
796	>	debuglevel="${build.debuglevel}"
797	>	deprecation="${build.deprecation}"
798	>	source="6"
799	>	classpath=""
800	>	bootclasspath="${bootclasspath6}"
801	>	includeAntRuntime="false"
802	>	includeJavaRuntime="false"
803	>	executable="${javac7}"
804	>	fork="true">
805	>
806	>	<include name="jsr166y/**/*.java"/>
807		<compilerarg line="${build.args}"/>
808	<	<classpath refid="test.classpath"/>
809	<	<include name="JniDemo.java"/>
808	>	<compilerarg value="-XDignore.symbol.file=true"/>
809	>	<compilerarg value="-Xlint:all"/>
810		</javac>
811	+	</target>
812
813	<	<javah destdir="${build.testcases.dir}"
814	<	classpathref="test.classpath">
815	<	<class name="JniDemo"/>
816	<	</javah>
817	<
818	<	<cc multithreaded="true"
819	<	name="g++"
820	<	objdir="${build.dir}"
821	<	outfile="${build.dir}/JniDemo"
822	<	outtype="shared">
861	<
862	<	<compiler>
863	<	<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>
813	>
814	>	<target name="jsr166yjar"
815	>	depends="jsr166ycompile"
816	>	description="Builds library jar from compiled sources">
817	>
818	>	<mkdir dir="${build.jsr166ylib.dir}"/>
819	>
820	>	<jar destfile="${jsr166y.jar}" index="true">
821	>	<fileset dir="${build.jsr166y.dir}"/>
822	>	</jar>
823
824		</target>
825
826
827
828	<	<!-- Backward compatibility, work in progress (some files not checked in) -->
828	>	<target name="jsr166ydocs"
829	>	description="Builds javadocs to dist dir">
830
831	+	<delete dir="${build.jsr166yjavadocs.dir}"/>
832	+	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
833
834	+	<javadoc destdir="${build.jsr166yjavadocs.dir}"
835	+	packagenames="jsr166y.*"
836	+	link="${jdkapidocs.url}"
837	+	source="6"
838	+	bootclasspath="${bootclasspath6}"
839	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
840	+	executable="${javadoc7}"
841	+	additionalparam="-XDignore.symbol.file=true" />
842
843	<	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
902	<	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
903	<	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
904	<	<property name="pretiger.sourcelevel" value="1.4"/>
843	>	</target>
844
906	–	<target name="defang"
907	–	depends="init"
908	–	description="Generates pre-Tiger compatible source">
845
846	<	<delete dir="${pretiger.src.dir}"/>
847	<	<mkdir dir="${pretiger.src.dir}"/>
846	>	<target name="jsr166ydist"
847	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
848	>	description="Puts all distributable products in single hierarchy"/>
849
913	–	<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>
850
920	–	</target>
851
852	<	<target name="compile-pretiger"
853	<	depends="init, configure-compiler, defang"
924	<	description="Compiles pre-Tiger sources to build folder">
852	>	<target name="jsr166yclean"
853	>	description="Removes all build products">
854
855	<	<mkdir dir="${build.pretiger.dir}"/>
855	>	<delete dir="${build.jsr166y.dir}"/>
856	>	<delete dir="${build.jsr166ylib.dir}"/>
857
858	<	<javac srcdir="${pretiger.src.dir}"
929	<	destdir="${build.pretiger.dir}"
930	<	debug="${build.debug}"
931	<	debuglevel="${build.debuglevel}"
932	<	deprecation="${build.deprecation}"
933	<	source="${pretiger.sourcelevel}"
934	<	fork="true">
858	>	</target>
859
936	–	<compilerarg line="${build.args}"/>
937	–	<exclude name="**/Thread.java"/>
860
861	<	</javac>
861	>
862	>	<target name="jsr166ydist-clean"
863	>	description="Removes all build and distribution products">
864
865		</target>
866
867	<	<target name="pretiger" depends="compile-pretiger">
867	>	<target name="jsr166ydist-docs"
868	>	description="Builds javadocs to dist dir">
869
870	<	<mkdir dir="${build.lib.dir}"/>
870	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
871	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
872
873	<	<jar destfile="${pretiger.jar}">
874	<	<fileset dir="${build.pretiger.dir}">
875	<	</fileset>
876	<	</jar>
873	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
874	>	packagenames="jsr166y.*"
875	>	link="${jdkapidocs.url}"
876	>	source="${build.sourcelevel}"
877	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
878	>	executable="${javadoc7}"
879	>	additionalparam="-XDignore.symbol.file=true" />
880
881		</target>
882
883	<	<!-- jsr166x -->
883	>	<target name="jsr166ydist-jar"
884	>	depends="jsr166yclean, jsr166yjar">
885
886	+	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
887
888	<	<target name="jsr166xcompile"
958	<	depends="init, configure-compiler"
959	<	description="Compiles jsr166x sources">
888	>	</target>
889
961	–	<mkdir dir="${build.jsr166x.dir}"/>
890
891	<	<javac srcdir="${jsr166xsrc.dir}"
964	<	destdir="${build.jsr166x.dir}"
965	<	debug="${build.debug}"
966	<	debuglevel="${build.debuglevel}"
967	<	deprecation="${build.deprecation}"
968	<	source="${build.sourcelevel}"
969	<	fork="true">
891	>	<!-- extra166y -->
892
893	<	<include name="**/*.java"/>
893	>
894	>	<target name="extra166ycompile"
895	>	depends="configure-compiler, jsr166yjar"
896	>	description="Compiles extra166y sources">
897	>
898	>	<mkdir dir="${build.extra166y.dir}"/>
899	>
900	>	<javac srcdir="${topsrc.dir}"
901	>	destdir="${build.extra166y.dir}"
902	>	debug="${build.debug}"
903	>	debuglevel="${build.debuglevel}"
904	>	deprecation="${build.deprecation}"
905	>	classpath=""
906	>	source="6"
907	>	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
908	>	includeAntRuntime="false"
909	>	includeJavaRuntime="false"
910	>	executable="${javac7}"
911	>	fork="true">
912	>
913	>	<include name="extra166y/**/*.java"/>
914		<compilerarg line="${build.args}"/>
915	+	<compilerarg value="-XDignore.symbol.file=true"/>
916	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
917
918		</javac>
919
#	Line 977 | Line 921
921
922
923
924	<	<target name="jsr166xjar"
925	<	depends="jsr166xcompile"
924	>	<target name="extra166yjar"
925	>	depends="extra166ycompile"
926		description="Builds library jar from compiled sources">
927
928	<	<mkdir dir="${build.jsr166xlib.dir}"/>
928	>	<mkdir dir="${build.extra166ylib.dir}"/>
929
930	<	<jar destfile="${jsr166xproduct.jar}">
931	<	<fileset dir="${build.jsr166x.dir}"/>
930	>	<jar destfile="${extra166y.jar}" index="true">
931	>	<fileset dir="${build.extra166y.dir}"/>
932		</jar>
933
934		</target>
935
936
937
938	<	<target name="jsr166xdocs"
939	<	description="Builds javadocs with custom tags to build folder">
996	<
997	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
998	<	<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>
938	>	<target name="extra166ydocs"
939	>	description="Builds javadocs to build dir">
940
941	+	<delete dir="${build.extra166yjavadocs.dir}"/>
942	+	<mkdir dir="${build.extra166yjavadocs.dir}"/>
943
944	<	</javadoc>
944	>	<javadoc destdir="${build.extra166yjavadocs.dir}"
945	>	packagenames="extra166y.*"
946	>	link="${jdkapidocs.url}"
947	>	source="6"
948	>	bootclasspath="${bootclasspath6}"
949	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
950	>	executable="${javadoc7}"
951	>	additionalparam="-XDignore.symbol.file=true" />
952
953		</target>
954
955
956	<	<target name="jsr166xdist"
957	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
956	>	<target name="extra166ydist"
957	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
958		description="Puts all distributable products in single hierarchy"/>
959
960
961
962	<	<target name="jsr166xclean"
962	>	<target name="extra166yclean"
963		description="Removes all build products">
964
965	<	<delete dir="${build.jsr166x.dir}"/>
966	<	<delete dir="${build.jsr166xlib.dir}"/>
965	>	<delete dir="${build.extra166y.dir}"/>
966	>	<delete dir="${build.extra166ylib.dir}"/>
967
968		</target>
969
970
971
972	<	<target name="jsr166xdist-clean"
972	>	<target name="extra166ydist-clean"
973		description="Removes all build and distribution products">
974
975		</target>
976
977	+	<target name="extra166ydist-docs"
978	+	description="Builds javadocs to dist dir">
979
980	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
981	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
982
983	<	<target name="jsr166xdist-docs"
984	<	description="Builds javadocs without custom tags to dist folder">
983	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
984	>	packagenames="extra166y.*"
985	>	link="${jdkapidocs.url}"
986	>	source="${build.sourcelevel}"
987	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
988	>	executable="${javadoc7}"
989	>	additionalparam="-XDignore.symbol.file=true" />
990
991	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
1040	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
991	>	</target>
992
993	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
994	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
995	<	source="${build.sourcelevel}">
993	>	<target name="extra166ydist-jar"
994	>	depends="extra166yclean, extra166yjar">
995	>
996	>	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
997	>
998	>	</target>
999	>
1000	>	<!-- jsr166e -->
1001	>
1002	>	<target name="jsr166ecompile"
1003	>	depends="configure-compiler"
1004	>	description="Compiles jsr166e sources">
1005
1006	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
1047	<	<include name="jsr166x"/>
1048	<	</packageset>
1006	>	<mkdir dir="${build.jsr166e.dir}"/>
1007
1008	+	<javac srcdir="${topsrc.dir}"
1009	+	destdir="${build.jsr166e.dir}"
1010	+	debug="${build.debug}"
1011	+	debuglevel="${build.debuglevel}"
1012	+	deprecation="${build.deprecation}"
1013	+	source="7"
1014	+	classpath=""
1015	+	includeAntRuntime="false"
1016	+	includeJavaRuntime="false"
1017	+	executable="${javac7}"
1018	+	fork="true">
1019	+
1020	+	<include name="jsr166e/**/*.java"/>
1021	+	<compilerarg line="${build.args}"/>
1022	+	<compilerarg value="-XDignore.symbol.file=true"/>
1023	+	<compilerarg value="-Xlint:all"/>
1024	+
1025	+	</javac>
1026	+
1027	+	</target>
1028	+
1029	+
1030	+
1031	+	<target name="jsr166ejar"
1032	+	depends="jsr166ecompile"
1033	+	description="Builds library jar from compiled sources">
1034	+
1035	+	<mkdir dir="${build.jsr166elib.dir}"/>
1036	+
1037	+	<jar destfile="${jsr166e.jar}" index="true">
1038	+	<fileset dir="${build.jsr166e.dir}"/>
1039	+	</jar>
1040	+
1041	+	</target>
1042	+
1043	+
1044	+
1045	+	<target name="jsr166edocs"
1046	+	description="Builds javadocs to build dir">
1047	+
1048	+	<delete dir="${build.jsr166ejavadocs.dir}"/>
1049	+	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
1050	+
1051	+	<javadoc destdir="${build.jsr166ejavadocs.dir}"
1052	+	packagenames="jsr166e.*"
1053	+	link="${jdkapidocs.url}"
1054	+	source="7"
1055	+	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1056	+	executable="${javadoc7}"
1057	+	additionalparam="-XDignore.symbol.file=true" >
1058		</javadoc>
1059
1060		</target>
1061
1054	–	<target name="jsr166xdist-jar"
1055	–	depends="jsr166xclean, jsr166xjar">
1062
1063	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
1063	>	<target name="jsr166edist"
1064	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1065	>	description="Puts all distributable products in single hierarchy"/>
1066	>
1067	>
1068	>
1069	>	<target name="jsr166eclean"
1070	>	description="Removes all build products">
1071	>
1072	>	<delete dir="${build.jsr166e.dir}"/>
1073	>	<delete dir="${build.jsr166elib.dir}"/>
1074	>
1075	>	</target>
1076	>
1077	>
1078	>
1079	>	<target name="jsr166edist-clean"
1080	>	description="Removes all build and distribution products">
1081	>
1082	>	</target>
1083	>
1084	>	<target name="jsr166edist-docs"
1085	>	description="Builds javadocs to dist dir">
1086	>
1087	>	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1088	>	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1089	>
1090	>	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1091	>	packagenames="jsr166e.*"
1092	>	link="${jdkapidocs.url}"
1093	>	source="7"
1094	>	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1095	>	executable="${javadoc7}"
1096	>	additionalparam="-XDignore.symbol.file=true" />
1097	>
1098	>	</target>
1099	>
1100	>	<target name="jsr166edist-jar"
1101	>	depends="jsr166eclean, jsr166ejar">
1102	>
1103	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1104
1105		</target>
1106

Diff Legend

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