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.57 by tim, Mon Sep 15 14:07:36 2003 UTC vs.
Revision 1.91 by jsr166, Sun Nov 18 06:21:11 2012 UTC

#	Line 21 | Line 21
21
22
23		<!-- Compilation options -->
24	<	<property name="build.sourcelevel"    value="1.5"/>
25	<	<property name="build.docsourcelevel" value="1.4"/>
24	>	<property name="build.sourcelevel"    value="1.6"/>
25		<property name="build.debug"          value="true"/>
26		<property name="build.debuglevel"     value="source,lines,vars"/>
27		<property name="build.deprecation"    value="false"/>
28
29		<!-- Build locations -->
30	<	<property name="build.dir"            location="build"/>
31	<	<property name="build.classes.dir"    location="${build.dir}/classes"/>
32	<	<property name="build.testcases.dir"  location="${build.dir}/testcases"/>
33	<	<property name="build.lib.dir"        location="${build.dir}/lib"/>
34	<	<property name="build.ant.dir"        location="${build.dir}/ant"/>
35	<	<property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
36	<	<property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
37	<	<property name="build.stripped.dir"   location="${build.dir}/stripped"/>
38	<	<property name="build.reports.dir"    location="${build.dir}/reports"/>
39	<	<property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
40	<	<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
41	<	<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
30	>	<property name="build.dir"                   location="build"/>
31	>	<property name="build.classes.dir"           location="${build.dir}/classes"/>
32	>	<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
33	>	<property name="build.loops.dir"             location="${build.dir}/loops"/>
34	>	<property name="build.lib.dir"               location="${build.dir}/lib"/>
35	>	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
36	>	<property name="build.reports.dir"           location="${build.dir}/reports"/>
37	>	<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
38	>	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
39	>	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
40	>
41	>	<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
42	>	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
43	>	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
44	>
45	>	<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
46	>	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
47	>	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
48	>
49	>	<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
50	>	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
51	>	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
52
53		<!-- Source locations -->
54		<property name="src.dir"              location="${basedir}/src/main"/>
55		<property name="test.src.dir"         location="${basedir}/src/test"/>
56	<	<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
57	<	<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
56	>	<property name="loops.src.dir"        location="${basedir}/src/loops"/>
57	>	<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
58	>	<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
59		<property name="lib.dir"              location="${basedir}/lib"/>
60		<property name="dist.dir"             location="${basedir}/dist"/>
61	+	<property name="topsrc.dir"           location="${basedir}/src"/>
62	+	<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
63	+	<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
64	+	<property name="jsr166esrc.dir"       location="${basedir}/src/jsr166e"/>
65	+	<property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
66	+	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
67
68		<!-- Distribution locations -->
69	<	<property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
69	>	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
70	>	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
71	>	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
72	>	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
73	>	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
74
75		<!-- Jar locations -->
76		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
77	+	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
78	+	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
79	+	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
80	+	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
81		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
58	–	<property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
59	–	<property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
82
83	+	<!-- Bootclasspath argument -->
84	+	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
85
86	<	<!-- Files excluded from dist-docs -->
87	<	<patternset id="docs.exclusion">
88	<	<exclude name="java/util/Random.*"/>
89	<	<exclude name="sun/misc/Unsafe.*"/>
90	<	</patternset>
91	<
86	>	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
87	>	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
88	>	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
89	>	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
90	>
91	>	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
92	>	<!-- The below does not yet exist as of 2012-11 -->
93	>	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
94	>	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
95	>
96	>	<!-- Test classpath -->
97	>	<path id="test.classpath">
98	>	<pathelement location="${build.testcases.dir}"/>
99	>	<pathelement location="${junit.jar}"/>
100	>	</path>
101	>
102	>	<!-- ALoops classpath -->
103	>	<path id="loops.classpath">
104	>	<pathelement location="${build.loops.dir}"/>
105	>	</path>
106
107
108		<!-- Main targets -->
109
110	+	<target name="dists"
111	+	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
112	+	description="Builds all public jars and docs"/>
113	+
114		<target name="compile"
115	<	depends="init, configure-compiler, prepare-src"
115	>	depends="init, configure-compiler"
116		description="Compiles main sources to build folder">
117
76	–	<property name="prepare.src.dir" value="${src.dir}"/>
77	–
118		<mkdir dir="${build.classes.dir}"/>
119
120	<	<!--
81	<	<echo>javac ${build.args}</echo>
82	<	-->
83	<
84	<	<javac srcdir="${prepare.src.dir}"
120	>	<javac srcdir="${src.dir}"
121		destdir="${build.classes.dir}"
122		debug="${build.debug}"
123		debuglevel="${build.debuglevel}"
#	Line 89 | Line 125
125		source="${build.sourcelevel}"
126		fork="true">
127
128	<	<compilerarg    line="${build.args}"/>
128	>	<include name="**/*.java"/>
129	>	<compilerarg value="-XDignore.symbol.file=true"/>
130	>
131	>	<!--
132	>	<exclude name="java/lang/**"/>
133	>	<compilerarg line="${build.args}"/>
134	>	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
135	>	-->
136
137		</javac>
138
139		</target>
140
141
99	–	<target name="jar"
100	–	depends="init-jar, native-jar"
101	–	description="Builds library jar from compiled sources"/>
102	–
142
143	<	<target name="test"
144	<	depends="init, configure-tests, report-tests"
145	<	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
107	<
108	<
109	<	<target name="checkstyle"
110	<	depends="filter-src"
111	<	description="Reports on style errors in Java source (verbose, mostly chaff)">
143	>	<target name="jar"
144	>	depends="compile"
145	>	description="Builds library jar from compiled sources">
146
147	<	<taskdef resource="checkstyletask.properties"
114	<	classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
147	>	<mkdir dir="${build.lib.dir}"/>
148
149	<	<checkstyle>
150	<	<formatter type="plain"/>  <!-- also available: type="xml" -->
151	<	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119	<	</checkstyle>
149	>	<jar destfile="${product.jar}">
150	>	<fileset dir="${build.classes.dir}"/>
151	>	</jar>
152
153		</target>
154
155
124	–	<target name="doccheck"
125	–	depends="filter-doccheck"
126	–	description="Reports on javadoc style errors">
127	–
128	–	<delete dir="${build.doccheck.dir}"/>
129	–	<mkdir dir="${build.doccheck.dir}"/>
156
157	<	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
158	<	docletpath="${lib.dir}/doccheck.jar"
159	<	destdir="${build.doccheck.dir}">
134	<	<packageset dir="${build.filter.doccheck.dir}"/>
135	<	</javadoc>
157	>	<target name="test"
158	>	depends="init, configure-tests, report-tests"
159	>	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
160
137	–	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
138	–
139	–	</target>
161
162
163		<target name="docs"
143	–	depends="filter-src"
164		description="Builds javadocs with custom tags to build folder">
165
166		<delete dir="${build.javadocs.dir}"/>
167		<mkdir dir="${build.javadocs.dir}"/>
168
169	<	<javadoc destdir="${build.javadocs.dir}"
170	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
151	<	overview="${src.dir}/intro.html"
152	<	source="${build.docsourcelevel}">
153	<
154	<	<tag name="revised" description="Last revised:"/>
155	<	<tag name="spec"    description="Specified by:"/>
156	<	<tag name="editor"  description="Last edited by:"/>
157	<	<tag name="fixme"   description="FIX ME:"/>
158	<
159	<	<packageset dir="${build.filter.src.dir}"/>
169	>	<!-- the packagenames="none" hack below prevents scanning the -->
170	>	<!-- sourcepath for packages -->
171
172	+	<javadoc destdir="${build.javadocs.dir}"
173	+	packagenames="none"
174	+	link="${jdkapidocs.url}"
175	+	overview="${src.dir}/intro.html"
176	+	sourcepath="${src.dir}:${jdksrc.dir}"
177	+	additionalparam="-XDignore.symbol.file=true" >
178	+	<fileset dir="${src.dir}" defaultexcludes="yes">
179	+	<include name="**/*.java"/>
180	+	</fileset>
181		</javadoc>
182
183		</target>
184
185
166	–	<target name="sinjdocs"
167	–	depends="configure-tests"
168	–	description="Builds javadocs with custom tags to build folder">
169	–
170	–	<delete dir="${build.sinjdocs.dir}"/>
171	–	<mkdir dir="${build.sinjdocs.dir}"/>
172	–
173	–	<java classname="net.cscott.sinjdoc.Main" fork="true">
174	–
175	–	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
176	–
177	–	<classpath>
178	–	<pathelement location="${sinjdoc.jar}"/>
179	–	<pathelement location="${lib.dir}/jutil.jar"/>
180	–	<pathelement location="${lib.dir}/cup.jar"/>
181	–	<path refid="test.classpath"/>
182	–	</classpath>
183	–
184	–	<!-- <arg value="-help"/> -->
185	–	<!-- <arg value="-verbose"/> -->
186	–	<!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
187	–
188	–	<arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
189	–	<arg value="-sourcepath"/> <arg value="${src.dir}"/>
190	–	<arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
191	–	<arg value="-source"/>     <arg value="${build.sourcelevel}"/>
192	–
193	–	<arg value="java.lang"/>
194	–	<arg value="java.util"/>
195	–	<arg value="java.util.concurrent"/>
196	–	<arg value="java.util.concurrent.atomic"/>
197	–	<arg value="java.util.concurrent.locks"/>
198	–
199	–
200	–	</java>
201	–
202	–	</target>
203	–
204	–
205	–	<target name="strip"
206	–	depends="init, configure-compiler"
207	–	description="Strip generics from java source (not working yet)">
208	–
209	–	<mkdir dir="${build.stripped.dir}"/>
210	–
211	–	<!--
212	–	# javac -s doesn't reliably generate compilable code. It generates
213	–	# bridge methods (marked as "synthetic") that can have identical
214	–	# signatures to existing methods except for the return value.
215	–	-->
216	–	<javac srcdir="${src.dir}"
217	–	destdir="${build.stripped.dir}"
218	–	debug="${build.debug}"
219	–	debuglevel="${build.debuglevel}"
220	–	deprecation="${build.deprecation}"
221	–	source="${build.sourcelevel}"
222	–	fork="true">
223	–
224	–	<compilerarg    line="${build.args} -s"/>
225	–
226	–	</javac>
227	–
228	–	</target>
229	–
186
187		<target name="dist"
188		depends="init, dist-clean, dist-jar, dist-docs"
189		description="Puts all distributable products in single hierarchy"/>
190
191	+
192		<target name="release"
193		depends="dist"
194		description="Puts entire CVS tree, plus distribution productions, in a jar">
195
239	–	<!--
240	–	#keep build dir? - dl
241	–	<delete dir="${build.dir}"/>
242	–	-->
196		<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
197
198		<jar basedir="${basedir}" destfile="${release.jar}">
199	+	<!-- <exclude name="build/**"/> -->
200		<exclude name="${release.jar}"/>
201		<exclude name="user.properties"/>
202		<exclude name="etc/notes/**"/>
203	+	<exclude name="src/emulation/**"/>
204		<exclude name="**/SyntaxTest.java"/>
205	+	<exclude name="**/SuperfluousAbstract.java"/>
206		</jar>
207
208		</target>
209
210	+
211	+
212		<target name="clean"
213		description="Removes all build products">
214
#	Line 261 | Line 219
219		</target>
220
221
222	+
223		<target name="dist-clean"
224		description="Removes all build and distribution products">
225
#	Line 269 | Line 228
228		</target>
229
230
231	+
232		<target name="dist-docs"
273	–	depends="filter-src"
233		description="Builds javadocs without custom tags to dist folder">
234
235		<delete dir="${dist.javadocs.dir}"/>
236		<mkdir dir="${dist.javadocs.dir}"/>
237
238	<	<javadoc destdir="${dist.javadocs.dir}"
239	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
281	<	overview="${src.dir}/intro.html"
282	<	source="${build.docsourcelevel}">
283	<
284	<	<packageset dir="${build.filter.src.dir}"/>
238	>	<!-- the packagenames="none" hack below prevents scanning the -->
239	>	<!-- sourcepath for packages -->
240
241	+	<javadoc destdir="${dist.javadocs.dir}"
242	+	packagenames="none"
243	+	link="${jdkapidocs.url}"
244	+	overview="${src.dir}/intro.html"
245	+	sourcepath="${src.dir}:${jdksrc.dir}"
246	+	additionalparam="-XDignore.symbol.file=true" >
247	+	<fileset dir="${src.dir}" defaultexcludes="yes">
248	+	<include name="**/*.java"/>
249	+	</fileset>
250		</javadoc>
251
252		</target>
#	Line 302 | Line 266
266		</target>
267
268
305	–	<target name="init-jar">
306	–
307	–	<mkdir dir="${build.lib.dir}"/>
308	–
309	–	</target>
310	–
311	–
312	–	<target name="native-jar"
313	–	depends="compile">
314	–
315	–	<jar destfile="${product.jar}">
316	–	<fileset dir="${build.classes.dir}"/>
317	–	</jar>
318	–
319	–	</target>
320	–
321	–
269		<target name="dist-jar"
270		depends="clean, jar">
271
#	Line 327 | Line 274
274		</target>
275
276
277	<	<target name="compile-ant-filter"
278	<	depends="init">
332	<
333	<	<mkdir dir="${build.ant.dir}"/>
334	<
335	<	<javac srcdir="${ant.src.dir}"
336	<	destdir="${build.ant.dir}"
337	<	source="1.4"
338	<	/>
339	<
340	<	</target>
341	<
342	<
343	<	<target name="filter-src"
344	<	depends="compile-ant-filter">
345	<
346	<	<mkdir dir="${build.filter.src.dir}"/>
347	<
348	<	<copy todir="${build.filter.src.dir}">
349	<	<fileset dir="${src.dir}">
350	<	<include name="**/*.html"/>
351	<	</fileset>
352	<	</copy>
353	<
354	<	<copy todir="${build.filter.src.dir}">
355	<	<fileset dir="${src.dir}">
356	<	<exclude name="**/*.html"/>
357	<	<patternset refid="docs.exclusion"/>
358	<	</fileset>
359	<	<filterchain>
360	<
361	<	<!--
362	<	# This filter gets rid of angle-bracketed type parameters
363	<	# so that javadoc can run on the result. The following
364	<	# heuristic seems to work:
365	<	#
366	<	# For all lines not starting with space(s)-asterisk-space(s),
367	<	#   replace <something> with a space, where there may be more
368	<	#   than one right angle bracket at the end, and "something"
369	<	#   must not contain parens or pipes. (This may need some
370	<	#   tweaking.)
371	<	-->
372	<
373	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
374	<	classpath="${build.ant.dir}">
375	<	<param name="notmatching" value="^\s+\*\s.*$"/>
376	<	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
377	<	<param name="replacement" value=" "/>
378	<	</filterreader>
379	<
380	<	</filterchain>
381	<	</copy>
382	<
383	<	</target>
384	<
385	<
386	<
277	>	<target name="compile-tests"
278	>	depends="jar">
279
280	<	<target name="filter-doccheck"
389	<	depends="filter-src">
280	>	<mkdir dir="${build.testcases.dir}"/>
281
282	<	<mkdir dir="${build.filter.doccheck.dir}"/>
282	>	<javac srcdir="${tck.src.dir}"
283	>	destdir="${build.testcases.dir}"
284	>	debug="${build.debug}"
285	>	debuglevel="${build.debuglevel}"
286	>	deprecation="${build.deprecation}"
287	>	source="${build.sourcelevel}"
288	>	fork="true">
289
290	<	<copy todir="${build.filter.doccheck.dir}">
291	<	<fileset dir="${build.filter.src.dir}">
292	<	<include name="**/*.html"/>
396	<	</fileset>
397	<	</copy>
290	>	<compilerarg value="${bootclasspath.args}"/>
291	>	<compilerarg line="${build.args}"/>
292	>	<compilerarg value="-XDignore.symbol.file=true"/>
293
294	<	<property name="generic.declarations"
400	<	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 {}"
401	<	/>
294	>	<classpath refid="test.classpath"/>
295
296	<	<copy todir="${build.filter.doccheck.dir}">
404	<	<fileset dir="${build.filter.src.dir}">
405	<	<exclude name="**/*.html"/>
406	<	</fileset>
407	<	<filterchain>
408	<	<!--
409	<	# These two filters try to make the source look like
410	<	# something that doccheck can process. The first removes
411	<	# -source 1.4 assertions and the second adds in a bunch
412	<	# of single letter public nested marker interfaces so that
413	<	# the generic type parameters are recognized.
414	<	-->
415	<
416	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
417	<	classpath="${build.ant.dir}">
418	<	<param name="matching"    value="^\s*assert[\s ].*$"/>
419	<	<param name="pattern"     value="assert"/>
420	<	<param name="replacement" value="//assert"/>
421	<	</filterreader>
422	<
423	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
424	<	classpath="${build.ant.dir}">
425	<	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
426	<	<param name="pattern"     value="$"/>
427	<	<param name="replacement" value=" ${generic.declarations}"/>
428	<	</filterreader>
296	>	</javac>
297
298	<	</filterchain>
299	<	</copy>
298	>	<javac srcdir="${test.src.dir}"
299	>	destdir="${build.testcases.dir}"
300	>	debug="${build.debug}"
301	>	debuglevel="${build.debuglevel}"
302	>	deprecation="${build.deprecation}"
303	>	source="${build.sourcelevel}"
304	>	fork="true">
305
306	<	</target>
306	>	<include name="jsr166/test/**"/>
307
308	+	<compilerarg value="${bootclasspath.args}"/>
309	+	<compilerarg line="${build.args}"/>
310	+	<compilerarg value="-XDignore.symbol.file=true"/>
311
312	<	<target name="compile-tests"
437	<	depends="jar">
312	>	<classpath refid="test.classpath"/>
313
314	<	<mkdir dir="${build.testcases.dir}"/>
314	>	</javac>
315
316		<!--
317	<	<echo>javac ${build.args}</echo>
443	<	<echo>classpath="${test.classpath}"</echo>
444	<	-->
445	<
446	<	<javac srcdir="${test.src.dir}"
317	>	<javac srcdir="${jtreg.src.dir}"
318		destdir="${build.testcases.dir}"
319		debug="${build.debug}"
320		debuglevel="${build.debuglevel}"
#	Line 451 | Line 322
322		source="${build.sourcelevel}"
323		fork="true">
324
325	+	<compilerarg value="${bootclasspath.args}"/>
326		<compilerarg line="${build.args}"/>
327	+	<compilerarg value="-XDignore.symbol.file=true"/>
328	+
329		<classpath refid="test.classpath"/>
456	–
457	–	<include name="java/**"/>
458	–	<include name="jsr166/**"/>
330
331		</javac>
332	+	-->
333
334		</target>
335
#	Line 477 | Line 349
349		dir="${build.reports.dir}"
350		fork="true">
351
352	<	<jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
352	>	<jvmarg value="${bootclasspath.args}"/>
353	>	<jvmarg value="-server"/>
354	>	<jvmarg value="-showversion"/>
355	>
356	>	<classpath refid="test.classpath"/>
357
358		<formatter type="xml"/>
359
360	<	<batchtest todir="${build.reports.dir}">
360	>	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
361	>	<fileset dir="${tck.src.dir}">
362	>	<include name="**/${testcase}Test.java"/>
363	>	</fileset>
364	>	</batchtest>
365	>
366	>	<batchtest todir="${build.reports.dir}" if="do.test.old">
367		<fileset dir="${test.src.dir}">
368	<	<include name="java/**/${testcase}Test.java"/>
369	<	<include name="jsr166/**/${testcase}Test.java"/>
368	>	<include name="jsr166/test/**/${testcase}Test.java"/>
369	>	</fileset>
370	>	</batchtest>
371	>
372	>	<!--
373	>	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
374	>	<fileset dir="${jtreg.src.dir}">
375	>	<include name="**/${testcase}Test.java"/>
376		</fileset>
377		</batchtest>
378	+	-->
379
380		</junit>
381
#	Line 508 | Line 397
397		<fileset dir="${build.reports.dir}">
398		<include name="TEST-*.xml"/>
399		</fileset>
400	<	<report styledir="${stylesheet.dir}"
512	<	format="${junit.report.format}"
513	<	todir="${build.reports.dir}"
400	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
401		/>
402		</junitreport>
403
#	Line 528 | Line 415
415		</condition>
416
417		<property name="warnunchecked.arg" value=""/>
531	–
532	–	<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
533	–	<istrue value="${build.nothreads}"/>
534	–	</condition>
418
419
420		<!-- Common options in javac invocations -->
#	Line 540 | Line 423
423		</target>
424
425
543	–	<target name="prepare-src"
544	–	depends="configure-compiler"
545	–	if="prepare.src.dir">
546	–
547	–	<mkdir dir="${prepare.src.dir}"/>
548	–	<copy todir="${prepare.src.dir}">
549	–	<fileset dir="${src.dir}">
550	–	<exclude name="java/lang/**"/>
551	–	</fileset>
552	–	</copy>
553	–
554	–	</target>
555	–
556	–
426		<target name="configure-tests"
427		depends="configure-compiler">
428
#	Line 561 | Line 430
430		<available property="junit.available"
431		classname="junit.framework.Protectable"/>
432
564	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
565	–	unless="junit.available"/>
566	–
433		<!-- Xalan -->
434		<available property="xalan.available"
435		classname="org.apache.xalan.Version"/>
436
437	+
438	+	<!-- Ant 1.6beta and later don't need or want this check -->
439	+	<!--
440	+	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
441	+	unless="junit.available"/>
442	+
443		<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
444		unless="xalan.available"/>
445	+	-->
446
447	+	</target>
448
575	–	<!--
576	–	! Bootclasspath munging for testing, so JUnit can test our local
577	–	! modifications to java.*.
578	–	-->
449
450	<	<path id="test.classpath">
451	<	<pathelement location="${product.jar}"/>
452	<	<pathelement location="${rt.jar}"/>
453	<	<pathelement location="${junit.jar}"/>
454	<	<pathelement location="${build.testcases.dir}"/>
455	<	</path>
450	>	<!-- Various demos and test programs -->
451	>
452	>
453	>	<target name="loops" depends="init, configure-compiler"
454	>	description="Benchmark from Doug Lea's AQS paper">
455	>
456	>	<mkdir dir="${build.loops.dir}"/>
457	>
458	>	<javac srcdir="${loops.src.dir}"
459	>	destdir="${build.loops.dir}"
460	>	debug="${build.debug}"
461	>	debuglevel="${build.debuglevel}"
462	>	deprecation="${build.deprecation}"
463	>	source="${build.sourcelevel}"
464	>	fork="true">
465	>
466	>	<compilerarg line="${build.args}"/>
467	>	<classpath refid="loops.classpath"/>
468	>	<compilerarg value="-XDignore.symbol.file=true"/>
469
470	<	<path id="test.bootclasspath">
588	<	<path refid="test.classpath"/>
589	<	</path>
470	>	</javac>
471
472	<	<!-- Flatten test classpaths into platform-appropriate strings -->
473	<	<property name="test.classpath"         refid="test.classpath"/>
474	<	<property name="test.bootclasspath"     refid="test.bootclasspath"/>
472	>	<java classname="ALoops" fork="true">
473	>	<classpath refid="loops.classpath"/>
474	>	</java>
475
476		</target>
477
478
479	+	<!-- jsr166x -->
480	+
481	+
482	+	<target name="jsr166xcompile"
483	+	depends="init, configure-compiler"
484	+	description="Compiles jsr166x sources">
485
486	<	<!-- Anthill targets -->
486	>	<mkdir dir="${build.jsr166x.dir}"/>
487	>
488	>	<javac srcdir="${jsr166xsrc.dir}"
489	>	destdir="${build.jsr166x.dir}"
490	>	debug="${build.debug}"
491	>	debuglevel="${build.debuglevel}"
492	>	deprecation="${build.deprecation}"
493	>	source="${build.sourcelevel}"
494	>	fork="true">
495	>
496	>	<include name="**/*.java"/>
497	>	<compilerarg line="${build.args}"/>
498	>	<compilerarg value="-XDignore.symbol.file=true"/>
499	>
500	>	</javac>
501
601	–	<target name="anthill-build">
602	–
603	–	<!-- Override this in user.properties -->
604	–	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
605	–
606	–	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
607	–	<arg value="-Xmx256000000"/>
608	–	<!-- classpath of new JVM -->
609	–	<arg value="-classpath"/> <arg path="${java.class.path}"/>
610	–	<!-- location of Ant home directory -->
611	–	<arg value="-Dant.home=${ant.home}"/>
612	–	<!-- the Ant main class -->
613	–	<arg value="org.apache.tools.ant.Main"/>
614	–	<!-- The build file -->
615	–	<arg value="-buildfile"/>  <arg value="build.xml"/>
616	–	<!-- the target to build on the new Ant instance -->
617	–	<arg value="-DJAVA_HOME=${tiger.home}"/>
618	–	<arg value="do-anthill-build"/>
619	–	</exec>
502		</target>
621	–
622	–	<target name="do-anthill-build"
623	–	depends="jar, test, docs, dist-docs"/>
503
625	–	<target name="anthill-publish">
504
627	–	<copy todir="${deployDir}/docs/private">
628	–	<fileset dir="${build.javadocs.dir}"/>
629	–	</copy>
505
506	<	<copy todir="${deployDir}/docs/public">
507	<	<fileset dir="${dist.javadocs.dir}"/>
508	<	</copy>
506	>	<target name="jsr166xjar"
507	>	depends="jsr166xcompile"
508	>	description="Builds library jar from compiled sources">
509
510	<	<copy tofile="${deployDir}/index.html"
636	<	file="${basedir}/etc/anthill-index.html"/>
510	>	<mkdir dir="${build.jsr166xlib.dir}"/>
511
512	<	<copy todir="${deployDir}/notes">
513	<	<fileset dir="${basedir}/etc/notes"/>
514	<	</copy>
512	>	<jar destfile="${jsr166xproduct.jar}">
513	>	<fileset dir="${build.jsr166x.dir}"/>
514	>	</jar>
515
516		</target>
517
518
645	–	<target name="ng" depends="test">
646	–	<java classname="SuperfluousAbstract" fork="true">
519
520	<	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
520	>	<target name="jsr166xdocs"
521	>	description="Builds javadocs with custom tags to build folder">
522	>
523	>	<delete dir="${build.jsr166xjavadocs.dir}"/>
524	>	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
525	>
526	>	<javadoc destdir="${build.jsr166xjavadocs.dir}"
527	>	packagenames="jsr166x"
528	>	link="${jdkapidocs.url}"
529	>	source="${build.sourcelevel}"
530	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
531	>	additionalparam="-XDignore.symbol.file=true" />
532	>
533	>	</target>
534	>
535	>
536	>	<target name="jsr166xdist"
537	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
538	>	description="Puts all distributable products in single hierarchy"/>
539	>
540	>
541	>
542	>	<target name="jsr166xclean"
543	>	description="Removes all build products">
544	>
545	>	<delete dir="${build.jsr166x.dir}"/>
546	>	<delete dir="${build.jsr166xlib.dir}"/>
547	>
548	>	</target>
549	>
550	>
551	>
552	>	<target name="jsr166xdist-clean"
553	>	description="Removes all build and distribution products">
554	>
555	>	</target>
556	>
557	>
558	>
559	>	<target name="jsr166xdist-docs"
560	>	description="Builds javadocs without custom tags to dist folder">
561	>
562	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
563	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
564	>
565	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
566	>	packagenames="jsr166x"
567	>	link="${jdkapidocs.url}"
568	>	source="${build.sourcelevel}"
569	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
570	>	additionalparam="-XDignore.symbol.file=true" />
571	>
572	>	</target>
573	>
574	>	<target name="jsr166xdist-jar"
575	>	depends="jsr166xclean, jsr166xjar">
576	>
577	>	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
578	>
579	>	</target>
580	>
581	>	<!-- jsr166y -->
582	>
583	>
584	>	<target name="jsr166ycompile"
585	>	depends="init, configure-compiler"
586	>	description="Compiles jsr166y sources">
587	>
588	>	<mkdir dir="${build.jsr166y.dir}"/>
589	>
590	>	<javac srcdir="${jsr166ysrc.dir}"
591	>	destdir="${build.jsr166y.dir}"
592	>	debug="${build.debug}"
593	>	debuglevel="${build.debuglevel}"
594	>	deprecation="${build.deprecation}"
595	>	source="${build.sourcelevel}"
596	>	fork="true">
597	>
598	>	<include name="**/*.java"/>
599	>	<compilerarg line="${build.args}"/>
600	>	<compilerarg value="-XDignore.symbol.file=true"/>
601	>	<compilerarg value="${bootclasspath.args}"/>
602	>
603	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
604	>
605	>	</javac>
606	>
607	>	</target>
608	>
609	>
610	>
611	>	<target name="jsr166yjar"
612	>	depends="jsr166ycompile"
613	>	description="Builds library jar from compiled sources">
614	>
615	>	<mkdir dir="${build.jsr166ylib.dir}"/>
616	>
617	>	<jar destfile="${jsr166yproduct.jar}" index="true">
618	>	<fileset dir="${build.jsr166y.dir}"/>
619	>	</jar>
620
650	–	</java>
621		</target>
622
623
624	+
625	+	<target name="jsr166ydocs"
626	+	description="Builds javadocs with custom tags to build folder">
627	+
628	+	<delete dir="${build.jsr166yjavadocs.dir}"/>
629	+	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
630	+
631	+	<javadoc destdir="${build.jsr166yjavadocs.dir}"
632	+	packagenames="jsr166y"
633	+	link="${jdkapidocs.url}"
634	+	source="${build.sourcelevel}"
635	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
636	+	additionalparam="-XDignore.symbol.file=true" />
637	+
638	+	</target>
639	+
640	+
641	+	<target name="jsr166ydist"
642	+	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
643	+	description="Puts all distributable products in single hierarchy"/>
644	+
645	+
646	+
647	+	<target name="jsr166yclean"
648	+	description="Removes all build products">
649	+
650	+	<delete dir="${build.jsr166y.dir}"/>
651	+	<delete dir="${build.jsr166ylib.dir}"/>
652	+
653	+	</target>
654	+
655	+
656	+
657	+	<target name="jsr166ydist-clean"
658	+	description="Removes all build and distribution products">
659	+
660	+	</target>
661	+
662	+	<target name="jsr166ydist-docs"
663	+	description="Builds javadocs without custom tags to dist folder">
664	+
665	+	<delete dir="${dist.jsr166yjavadocs.dir}"/>
666	+	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
667	+
668	+	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
669	+	packagenames="jsr166y"
670	+	link="${jdkapidocs.url}"
671	+	source="${build.sourcelevel}"
672	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
673	+	additionalparam="-XDignore.symbol.file=true" />
674	+
675	+	</target>
676	+
677	+	<target name="jsr166ydist-jar"
678	+	depends="jsr166yclean, jsr166yjar">
679	+
680	+	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
681	+
682	+	</target>
683	+
684	+
685	+	<!-- extra166y -->
686	+
687	+
688	+	<target name="extra166ycompile"
689	+	depends="init, configure-compiler, jsr166ycompile"
690	+	description="Compiles extra166y sources">
691	+
692	+	<mkdir dir="${build.extra166y.dir}"/>
693	+
694	+	<javac srcdir="${extra166ysrc.dir}"
695	+	destdir="${build.extra166y.dir}"
696	+	debug="${build.debug}"
697	+	classpath="${jsr166yproduct.jar}"
698	+	debuglevel="${build.debuglevel}"
699	+	deprecation="${build.deprecation}"
700	+	source="${build.sourcelevel}"
701	+	fork="true">
702	+
703	+	<include name="**/*.java"/>
704	+	<compilerarg line="${build.args}"/>
705	+	<compilerarg value="-XDignore.symbol.file=true"/>
706	+	<compilerarg value="${bootclasspath.args}"/>
707	+
708	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
709	+
710	+	</javac>
711	+
712	+	</target>
713	+
714	+
715	+
716	+	<target name="extra166yjar"
717	+	depends="extra166ycompile"
718	+	description="Builds library jar from compiled sources">
719	+
720	+	<mkdir dir="${build.extra166ylib.dir}"/>
721	+
722	+	<jar destfile="${extra166yproduct.jar}" index="true">
723	+	<fileset dir="${build.extra166y.dir}"/>
724	+	</jar>
725	+
726	+	</target>
727	+
728	+
729	+
730	+	<target name="extra166ydocs"
731	+	description="Builds javadocs with custom tags to build folder">
732	+
733	+	<delete dir="${build.extra166yjavadocs.dir}"/>
734	+	<mkdir dir="${build.extra166yjavadocs.dir}"/>
735	+
736	+	<javadoc destdir="${build.extra166yjavadocs.dir}"
737	+	packagenames="extra166y"
738	+	link="${jdkapidocs.url}"
739	+	source="${build.sourcelevel}"
740	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
741	+	additionalparam="-XDignore.symbol.file=true" />
742	+
743	+	</target>
744	+
745	+
746	+	<target name="extra166ydist"
747	+	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
748	+	description="Puts all distributable products in single hierarchy"/>
749	+
750	+
751	+
752	+	<target name="extra166yclean"
753	+	description="Removes all build products">
754	+
755	+	<delete dir="${build.extra166y.dir}"/>
756	+	<delete dir="${build.extra166ylib.dir}"/>
757	+
758	+	</target>
759	+
760	+
761	+
762	+	<target name="extra166ydist-clean"
763	+	description="Removes all build and distribution products">
764	+
765	+	</target>
766	+
767	+	<target name="extra166ydist-docs"
768	+	description="Builds javadocs without custom tags to dist folder">
769	+
770	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
771	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
772	+
773	+	<javadoc destdir="${dist.extra166yjavadocs.dir}"
774	+	packagenames="extra166y"
775	+	link="${jdkapidocs.url}"
776	+	source="${build.sourcelevel}"
777	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
778	+	additionalparam="-XDignore.symbol.file=true" />
779	+
780	+	</target>
781	+
782	+	<target name="extra166ydist-jar"
783	+	depends="extra166yclean, extra166yjar">
784	+
785	+	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
786	+
787	+	</target>
788	+
789	+	<!-- jsr166e -->
790	+
791	+
792	+	<target name="jsr166ecompile"
793	+	depends="init, configure-compiler"
794	+	description="Compiles jsr166e sources">
795	+
796	+	<mkdir dir="${build.jsr166e.dir}"/>
797	+
798	+	<javac srcdir="${jsr166esrc.dir}"
799	+	destdir="${build.jsr166e.dir}"
800	+	debug="${build.debug}"
801	+	debuglevel="${build.debuglevel}"
802	+	deprecation="${build.deprecation}"
803	+	source="1.7"
804	+	fork="true">
805	+
806	+	<include name="**/*.java"/>
807	+	<compilerarg line="${build.args}"/>
808	+	<compilerarg value="-XDignore.symbol.file=true"/>
809	+	<compilerarg value="${bootclasspath.args}"/>
810	+
811	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
812	+
813	+	</javac>
814	+
815	+	</target>
816	+
817	+
818	+
819	+	<target name="jsr166ejar"
820	+	depends="jsr166ecompile"
821	+	description="Builds library jar from compiled sources">
822	+
823	+	<mkdir dir="${build.jsr166elib.dir}"/>
824	+
825	+	<jar destfile="${jsr166eproduct.jar}" index="true">
826	+	<fileset dir="${build.jsr166e.dir}"/>
827	+	</jar>
828	+
829	+	</target>
830	+
831	+
832	+
833	+	<target name="jsr166edocs"
834	+	description="Builds javadocs with custom tags to build folder">
835	+
836	+	<delete dir="${build.jsr166ejavadocs.dir}"/>
837	+	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
838	+
839	+	<javadoc destdir="${build.jsr166ejavadocs.dir}"
840	+	packagenames="jsr166e,jsr166e.extra"
841	+	link="${jdkapidocs.url}"
842	+	source="1.7"
843	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
844	+	additionalparam="-XDignore.symbol.file=true" />
845	+
846	+	</target>
847	+
848	+
849	+	<target name="jsr166edist"
850	+	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
851	+	description="Puts all distributable products in single hierarchy"/>
852	+
853	+
854	+
855	+	<target name="jsr166eclean"
856	+	description="Removes all build products">
857	+
858	+	<delete dir="${build.jsr166e.dir}"/>
859	+	<delete dir="${build.jsr166elib.dir}"/>
860	+
861	+	</target>
862	+
863	+
864	+
865	+	<target name="jsr166edist-clean"
866	+	description="Removes all build and distribution products">
867	+
868	+	</target>
869	+
870	+	<target name="jsr166edist-docs"
871	+	description="Builds javadocs without custom tags to dist folder">
872	+
873	+	<delete dir="${dist.jsr166ejavadocs.dir}"/>
874	+	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
875	+
876	+	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
877	+	packagenames="jsr166e,jsr166e.extra"
878	+	link="${jdkapidocs.url}"
879	+	source="1.7"
880	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
881	+	additionalparam="-XDignore.symbol.file=true" />
882	+
883	+	</target>
884	+
885	+	<target name="jsr166edist-jar"
886	+	depends="jsr166eclean, jsr166ejar">
887	+
888	+	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
889	+
890	+	</target>
891	+
892		</project>

Diff Legend

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