ViewVC Help

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

root/jsr166/jsr166/build.xml

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

Diff Legend

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