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

Diff Legend

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