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.89 by jsr166, Fri Jun 10 18:07:30 2011 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.extra166y.dir"         location="${build.dir}/extra166y"/>
46	>	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
47	>	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
48
49		<!-- Source locations -->
50		<property name="src.dir"              location="${basedir}/src/main"/>
51		<property name="test.src.dir"         location="${basedir}/src/test"/>
52	<	<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
53	<	<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
52	>	<property name="loops.src.dir"        location="${basedir}/src/loops"/>
53	>	<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
54	>	<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
55		<property name="lib.dir"              location="${basedir}/lib"/>
56		<property name="dist.dir"             location="${basedir}/dist"/>
57	<
57	>	<property name="topsrc.dir"           location="${basedir}/src"/>
58	>	<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
59	>	<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
60	>	<property name="extra166ysrc.dir"     location="${basedir}/src/extra166y"/>
61	>	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
62		<!-- Distribution locations -->
63	<	<property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
63	>	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
64	>	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
65	>	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
66	>	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
67
68		<!-- Jar locations -->
69		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
70	+	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
71	+	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
72	+	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
73		<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"/>
60	–
74
75	<	<!-- Files excluded from dist-docs -->
76	<	<patternset id="docs.exclusion">
64	<	<exclude name="java/util/Random.*"/>
65	<	<exclude name="sun/misc/Unsafe.*"/>
66	<	</patternset>
75	>	<!-- Bootclasspath argument -->
76	>	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
77
78	+	<!-- Test classpath -->
79	+	<path id="test.classpath">
80	+	<pathelement location="${build.testcases.dir}"/>
81	+	<pathelement location="${junit.jar}"/>
82	+	</path>
83	+
84	+	<!-- ALoops classpath -->
85	+	<path id="loops.classpath">
86	+	<pathelement location="${build.loops.dir}"/>
87	+	</path>
88
89
90		<!-- Main targets -->
91
92	+	<target name="dists"
93	+	depends="dist, jsr166xdist, jsr166ydist, extra166ydist"
94	+	description="Builds all public jars and docs"/>
95	+
96		<target name="compile"
97	<	depends="init, configure-compiler, prepare-src"
97	>	depends="init, configure-compiler"
98		description="Compiles main sources to build folder">
99
76	–	<property name="prepare.src.dir" value="${src.dir}"/>
77	–
100		<mkdir dir="${build.classes.dir}"/>
101
102	<	<!--
81	<	<echo>javac ${build.args}</echo>
82	<	-->
83	<
84	<	<javac srcdir="${prepare.src.dir}"
102	>	<javac srcdir="${src.dir}"
103		destdir="${build.classes.dir}"
104		debug="${build.debug}"
105		debuglevel="${build.debuglevel}"
#	Line 89 | Line 107
107		source="${build.sourcelevel}"
108		fork="true">
109
110	<	<compilerarg    line="${build.args}"/>
110	>	<include name="**/*.java"/>
111	>	<compilerarg value="-XDignore.symbol.file=true"/>
112	>
113	>	<!--
114	>	<exclude name="java/lang/**"/>
115	>	<compilerarg line="${build.args}"/>
116	>	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
117	>	-->
118
119		</javac>
120
121		</target>
122
123
99	–	<target name="jar"
100	–	depends="init-jar, native-jar"
101	–	description="Builds library jar from compiled sources"/>
102	–
124
125	<	<target name="test"
126	<	depends="init, configure-tests, report-tests"
127	<	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)">
125	>	<target name="jar"
126	>	depends="compile"
127	>	description="Builds library jar from compiled sources">
128
129	<	<taskdef resource="checkstyletask.properties"
114	<	classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
129	>	<mkdir dir="${build.lib.dir}"/>
130
131	<	<checkstyle>
132	<	<formatter type="plain"/>  <!-- also available: type="xml" -->
133	<	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119	<	</checkstyle>
131	>	<jar destfile="${product.jar}">
132	>	<fileset dir="${build.classes.dir}"/>
133	>	</jar>
134
135		</target>
136
137
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}"/>
130	–
131	–	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
132	–	docletpath="${lib.dir}/doccheck.jar"
133	–	destdir="${build.doccheck.dir}">
134	–	<packageset dir="${build.filter.doccheck.dir}"/>
135	–	</javadoc>
138
139	<	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
139	>	<target name="test"
140	>	depends="init, configure-tests, report-tests"
141	>	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
142
139	–	</target>
143
144
145		<target name="docs"
143	–	depends="filter-src"
146		description="Builds javadocs with custom tags to build folder">
147
148		<delete dir="${build.javadocs.dir}"/>
149		<mkdir dir="${build.javadocs.dir}"/>
150
151	<	<javadoc destdir="${build.javadocs.dir}"
152	<	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}"/>
151	>	<!-- the packagenames="none" hack below prevents scanning the -->
152	>	<!-- sourcepath for packages -->
153
154	+	<javadoc destdir="${build.javadocs.dir}"
155	+	packagenames="none"
156	+	link="http://download.oracle.com/javase/7/docs/api/"
157	+	overview="${src.dir}/intro.html"
158	+	sourcepath="${src.dir}:${jdksrc.dir}"
159	+	additionalparam="-XDignore.symbol.file=true" >
160	+	<fileset dir="${src.dir}" defaultexcludes="yes">
161	+	<include name="**/*.java"/>
162	+	</fileset>
163		</javadoc>
164
165		</target>
166
167
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	–
168
169		<target name="dist"
170		depends="init, dist-clean, dist-jar, dist-docs"
171		description="Puts all distributable products in single hierarchy"/>
172
173	+
174		<target name="release"
175		depends="dist"
176		description="Puts entire CVS tree, plus distribution productions, in a jar">
177
239	–	<!--
240	–	#keep build dir? - dl
241	–	<delete dir="${build.dir}"/>
242	–	-->
178		<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
179
180		<jar basedir="${basedir}" destfile="${release.jar}">
181	+	<!-- <exclude name="build/**"/> -->
182		<exclude name="${release.jar}"/>
183		<exclude name="user.properties"/>
184		<exclude name="etc/notes/**"/>
185	+	<exclude name="src/emulation/**"/>
186		<exclude name="**/SyntaxTest.java"/>
187	+	<exclude name="**/SuperfluousAbstract.java"/>
188		</jar>
189
190		</target>
191
192	+
193	+
194		<target name="clean"
195		description="Removes all build products">
196
#	Line 261 | Line 201
201		</target>
202
203
204	+
205		<target name="dist-clean"
206		description="Removes all build and distribution products">
207
#	Line 269 | Line 210
210		</target>
211
212
213	+
214		<target name="dist-docs"
273	–	depends="filter-src"
215		description="Builds javadocs without custom tags to dist folder">
216
217		<delete dir="${dist.javadocs.dir}"/>
218		<mkdir dir="${dist.javadocs.dir}"/>
219
220	<	<javadoc destdir="${dist.javadocs.dir}"
221	<	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}"/>
220	>	<!-- the packagenames="none" hack below prevents scanning the -->
221	>	<!-- sourcepath for packages -->
222
223	+	<javadoc destdir="${dist.javadocs.dir}"
224	+	packagenames="none"
225	+	link="http://download.oracle.com/javase/7/docs/api/"
226	+	overview="${src.dir}/intro.html"
227	+	sourcepath="${src.dir}:${jdksrc.dir}"
228	+	additionalparam="-XDignore.symbol.file=true" >
229	+	<fileset dir="${src.dir}" defaultexcludes="yes">
230	+	<include name="**/*.java"/>
231	+	</fileset>
232		</javadoc>
233
234		</target>
#	Line 302 | Line 248
248		</target>
249
250
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	–
251		<target name="dist-jar"
252		depends="clean, jar">
253
#	Line 327 | Line 256
256		</target>
257
258
259	<	<target name="compile-ant-filter"
260	<	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	<
259	>	<target name="compile-tests"
260	>	depends="jar">
261
262	<	<target name="filter-doccheck"
389	<	depends="filter-src">
262	>	<mkdir dir="${build.testcases.dir}"/>
263
264	<	<mkdir dir="${build.filter.doccheck.dir}"/>
264	>	<javac srcdir="${tck.src.dir}"
265	>	destdir="${build.testcases.dir}"
266	>	debug="${build.debug}"
267	>	debuglevel="${build.debuglevel}"
268	>	deprecation="${build.deprecation}"
269	>	source="${build.sourcelevel}"
270	>	fork="true">
271
272	<	<copy todir="${build.filter.doccheck.dir}">
273	<	<fileset dir="${build.filter.src.dir}">
274	<	<include name="**/*.html"/>
396	<	</fileset>
397	<	</copy>
272	>	<compilerarg value="${bootclasspath.args}"/>
273	>	<compilerarg line="${build.args}"/>
274	>	<compilerarg value="-XDignore.symbol.file=true"/>
275
276	<	<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	<	/>
276	>	<classpath refid="test.classpath"/>
277
278	<	<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>
278	>	</javac>
279
280	<	</filterchain>
281	<	</copy>
280	>	<javac srcdir="${test.src.dir}"
281	>	destdir="${build.testcases.dir}"
282	>	debug="${build.debug}"
283	>	debuglevel="${build.debuglevel}"
284	>	deprecation="${build.deprecation}"
285	>	source="${build.sourcelevel}"
286	>	fork="true">
287
288	<	</target>
288	>	<include name="jsr166/test/**"/>
289
290	+	<compilerarg value="${bootclasspath.args}"/>
291	+	<compilerarg line="${build.args}"/>
292	+	<compilerarg value="-XDignore.symbol.file=true"/>
293
294	<	<target name="compile-tests"
437	<	depends="jar">
294	>	<classpath refid="test.classpath"/>
295
296	<	<mkdir dir="${build.testcases.dir}"/>
296	>	</javac>
297
298		<!--
299	<	<echo>javac ${build.args}</echo>
443	<	<echo>classpath="${test.classpath}"</echo>
444	<	-->
445	<
446	<	<javac srcdir="${test.src.dir}"
299	>	<javac srcdir="${jtreg.src.dir}"
300		destdir="${build.testcases.dir}"
301		debug="${build.debug}"
302		debuglevel="${build.debuglevel}"
#	Line 451 | Line 304
304		source="${build.sourcelevel}"
305		fork="true">
306
307	+	<compilerarg value="${bootclasspath.args}"/>
308		<compilerarg line="${build.args}"/>
309	+	<compilerarg value="-XDignore.symbol.file=true"/>
310	+
311		<classpath refid="test.classpath"/>
456	–
457	–	<include name="java/**"/>
458	–	<include name="jsr166/**"/>
312
313		</javac>
314	+	-->
315
316		</target>
317
#	Line 477 | Line 331
331		dir="${build.reports.dir}"
332		fork="true">
333
334	<	<jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
334	>	<jvmarg value="${bootclasspath.args}"/>
335	>	<jvmarg value="-server"/>
336	>	<jvmarg value="-showversion"/>
337	>
338	>	<classpath refid="test.classpath"/>
339
340		<formatter type="xml"/>
341
342	<	<batchtest todir="${build.reports.dir}">
342	>	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
343	>	<fileset dir="${tck.src.dir}">
344	>	<include name="**/${testcase}Test.java"/>
345	>	</fileset>
346	>	</batchtest>
347	>
348	>	<batchtest todir="${build.reports.dir}" if="do.test.old">
349		<fileset dir="${test.src.dir}">
350	<	<include name="java/**/${testcase}Test.java"/>
487	<	<include name="jsr166/**/${testcase}Test.java"/>
350	>	<include name="jsr166/test/**/${testcase}Test.java"/>
351		</fileset>
352		</batchtest>
353
354	+	<!--
355	+	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
356	+	<fileset dir="${jtreg.src.dir}">
357	+	<include name="**/${testcase}Test.java"/>
358	+	</fileset>
359	+	</batchtest>
360	+	-->
361	+
362		</junit>
363
364		</target>
#	Line 508 | Line 379
379		<fileset dir="${build.reports.dir}">
380		<include name="TEST-*.xml"/>
381		</fileset>
382	<	<report styledir="${stylesheet.dir}"
512	<	format="${junit.report.format}"
513	<	todir="${build.reports.dir}"
382	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
383		/>
384		</junitreport>
385
#	Line 528 | Line 397
397		</condition>
398
399		<property name="warnunchecked.arg" value=""/>
531	–
532	–	<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
533	–	<istrue value="${build.nothreads}"/>
534	–	</condition>
400
401
402		<!-- Common options in javac invocations -->
#	Line 540 | Line 405
405		</target>
406
407
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	–
408		<target name="configure-tests"
409		depends="configure-compiler">
410
#	Line 561 | Line 412
412		<available property="junit.available"
413		classname="junit.framework.Protectable"/>
414
564	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
565	–	unless="junit.available"/>
566	–
415		<!-- Xalan -->
416		<available property="xalan.available"
417		classname="org.apache.xalan.Version"/>
418
419	+
420	+	<!-- Ant 1.6beta and later don't need or want this check -->
421	+	<!--
422	+	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
423	+	unless="junit.available"/>
424	+
425		<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
426		unless="xalan.available"/>
427	+	-->
428	+
429	+	</target>
430
431
432	<	<!--
576	<	! Bootclasspath munging for testing, so JUnit can test our local
577	<	! modifications to java.*.
578	<	-->
432	>	<!-- Various demos and test programs -->
433
580	–	<path id="test.classpath">
581	–	<pathelement location="${product.jar}"/>
582	–	<pathelement location="${rt.jar}"/>
583	–	<pathelement location="${junit.jar}"/>
584	–	<pathelement location="${build.testcases.dir}"/>
585	–	</path>
434
435	<	<path id="test.bootclasspath">
436	<	<path refid="test.classpath"/>
589	<	</path>
435	>	<target name="loops" depends="init, configure-compiler"
436	>	description="Benchmark from Doug Lea's AQS paper">
437
438	<	<!-- Flatten test classpaths into platform-appropriate strings -->
439	<	<property name="test.classpath"         refid="test.classpath"/>
440	<	<property name="test.bootclasspath"     refid="test.bootclasspath"/>
438	>	<mkdir dir="${build.loops.dir}"/>
439	>
440	>	<javac srcdir="${loops.src.dir}"
441	>	destdir="${build.loops.dir}"
442	>	debug="${build.debug}"
443	>	debuglevel="${build.debuglevel}"
444	>	deprecation="${build.deprecation}"
445	>	source="${build.sourcelevel}"
446	>	fork="true">
447	>
448	>	<compilerarg line="${build.args}"/>
449	>	<classpath refid="loops.classpath"/>
450	>	<compilerarg value="-XDignore.symbol.file=true"/>
451	>
452	>	</javac>
453	>
454	>	<java classname="ALoops" fork="true">
455	>	<classpath refid="loops.classpath"/>
456	>	</java>
457	>
458	>	</target>
459	>
460	>
461	>	<!-- jsr166x -->
462	>
463	>
464	>	<target name="jsr166xcompile"
465	>	depends="init, configure-compiler"
466	>	description="Compiles jsr166x sources">
467	>
468	>	<mkdir dir="${build.jsr166x.dir}"/>
469	>
470	>	<javac srcdir="${jsr166xsrc.dir}"
471	>	destdir="${build.jsr166x.dir}"
472	>	debug="${build.debug}"
473	>	debuglevel="${build.debuglevel}"
474	>	deprecation="${build.deprecation}"
475	>	source="${build.sourcelevel}"
476	>	fork="true">
477	>
478	>	<include name="**/*.java"/>
479	>	<compilerarg line="${build.args}"/>
480	>	<compilerarg value="-XDignore.symbol.file=true"/>
481	>
482	>	</javac>
483
484		</target>
485
486
487
488	<	<!-- Anthill targets -->
488	>	<target name="jsr166xjar"
489	>	depends="jsr166xcompile"
490	>	description="Builds library jar from compiled sources">
491	>
492	>	<mkdir dir="${build.jsr166xlib.dir}"/>
493	>
494	>	<jar destfile="${jsr166xproduct.jar}">
495	>	<fileset dir="${build.jsr166x.dir}"/>
496	>	</jar>
497
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>
498		</target>
621	–
622	–	<target name="do-anthill-build"
623	–	depends="jar, test, docs, dist-docs"/>
499
625	–	<target name="anthill-publish">
500
627	–	<copy todir="${deployDir}/docs/private">
628	–	<fileset dir="${build.javadocs.dir}"/>
629	–	</copy>
501
502	<	<copy todir="${deployDir}/docs/public">
503	<	<fileset dir="${dist.javadocs.dir}"/>
633	<	</copy>
502	>	<target name="jsr166xdocs"
503	>	description="Builds javadocs with custom tags to build folder">
504
505	<	<copy tofile="${deployDir}/index.html"
506	<	file="${basedir}/etc/anthill-index.html"/>
505	>	<delete dir="${build.jsr166xjavadocs.dir}"/>
506	>	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
507
508	<	<copy todir="${deployDir}/notes">
509	<	<fileset dir="${basedir}/etc/notes"/>
510	<	</copy>
508	>	<javadoc destdir="${build.jsr166xjavadocs.dir}"
509	>	packagenames="jsr166x"
510	>	link="http://download.oracle.com/javase/7/docs/api/"
511	>	source="${build.sourcelevel}"
512	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
513	>	additionalparam="-XDignore.symbol.file=true" />
514
515		</target>
516
517
518	<	<target name="ng" depends="test">
519	<	<java classname="SuperfluousAbstract" fork="true">
518	>	<target name="jsr166xdist"
519	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
520	>	description="Puts all distributable products in single hierarchy"/>
521
648	–	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
522
523	<	</java>
523	>
524	>	<target name="jsr166xclean"
525	>	description="Removes all build products">
526	>
527	>	<delete dir="${build.jsr166x.dir}"/>
528	>	<delete dir="${build.jsr166xlib.dir}"/>
529	>
530		</target>
531
532
533	+
534	+	<target name="jsr166xdist-clean"
535	+	description="Removes all build and distribution products">
536	+
537	+	</target>
538	+
539	+
540	+
541	+	<target name="jsr166xdist-docs"
542	+	description="Builds javadocs without custom tags to dist folder">
543	+
544	+	<delete dir="${dist.jsr166xjavadocs.dir}"/>
545	+	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
546	+
547	+	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
548	+	packagenames="jsr166x"
549	+	link="http://download.oracle.com/javase/7/docs/api/"
550	+	source="${build.sourcelevel}"
551	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
552	+	additionalparam="-XDignore.symbol.file=true" />
553	+
554	+	</target>
555	+
556	+	<target name="jsr166xdist-jar"
557	+	depends="jsr166xclean, jsr166xjar">
558	+
559	+	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
560	+
561	+	</target>
562	+
563	+	<!-- jsr166y -->
564	+
565	+
566	+	<target name="jsr166ycompile"
567	+	depends="init, configure-compiler"
568	+	description="Compiles jsr166y sources">
569	+
570	+	<mkdir dir="${build.jsr166y.dir}"/>
571	+
572	+	<javac srcdir="${jsr166ysrc.dir}"
573	+	destdir="${build.jsr166y.dir}"
574	+	debug="${build.debug}"
575	+	debuglevel="${build.debuglevel}"
576	+	deprecation="${build.deprecation}"
577	+	source="${build.sourcelevel}"
578	+	fork="true">
579	+
580	+	<include name="**/*.java"/>
581	+	<compilerarg line="${build.args}"/>
582	+	<compilerarg value="-XDignore.symbol.file=true"/>
583	+	<compilerarg value="${bootclasspath.args}"/>
584	+
585	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
586	+
587	+	</javac>
588	+
589	+	</target>
590	+
591	+
592	+
593	+	<target name="jsr166yjar"
594	+	depends="jsr166ycompile"
595	+	description="Builds library jar from compiled sources">
596	+
597	+	<mkdir dir="${build.jsr166ylib.dir}"/>
598	+
599	+	<jar destfile="${jsr166yproduct.jar}" index="true">
600	+	<fileset dir="${build.jsr166y.dir}"/>
601	+	</jar>
602	+
603	+	</target>
604	+
605	+
606	+
607	+	<target name="jsr166ydocs"
608	+	description="Builds javadocs with custom tags to build folder">
609	+
610	+	<delete dir="${build.jsr166yjavadocs.dir}"/>
611	+	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
612	+
613	+	<javadoc destdir="${build.jsr166yjavadocs.dir}"
614	+	packagenames="jsr166y"
615	+	link="http://download.oracle.com/javase/7/docs/api/"
616	+	source="${build.sourcelevel}"
617	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
618	+	additionalparam="-XDignore.symbol.file=true" />
619	+
620	+	</target>
621	+
622	+
623	+	<target name="jsr166ydist"
624	+	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
625	+	description="Puts all distributable products in single hierarchy"/>
626	+
627	+
628	+
629	+	<target name="jsr166yclean"
630	+	description="Removes all build products">
631	+
632	+	<delete dir="${build.jsr166y.dir}"/>
633	+	<delete dir="${build.jsr166ylib.dir}"/>
634	+
635	+	</target>
636	+
637	+
638	+
639	+	<target name="jsr166ydist-clean"
640	+	description="Removes all build and distribution products">
641	+
642	+	</target>
643	+
644	+	<target name="jsr166ydist-docs"
645	+	description="Builds javadocs without custom tags to dist folder">
646	+
647	+	<delete dir="${dist.jsr166yjavadocs.dir}"/>
648	+	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
649	+
650	+	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
651	+	packagenames="jsr166y"
652	+	link="http://download.oracle.com/javase/7/docs/api/"
653	+	source="${build.sourcelevel}"
654	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
655	+	additionalparam="-XDignore.symbol.file=true" />
656	+
657	+	</target>
658	+
659	+	<target name="jsr166ydist-jar"
660	+	depends="jsr166yclean, jsr166yjar">
661	+
662	+	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
663	+
664	+	</target>
665	+
666	+	<!-- extra166y -->
667	+
668	+
669	+	<target name="extra166ycompile"
670	+	depends="init, configure-compiler, jsr166ycompile"
671	+	description="Compiles extra166y sources">
672	+
673	+	<mkdir dir="${build.extra166y.dir}"/>
674	+
675	+	<javac srcdir="${extra166ysrc.dir}"
676	+	destdir="${build.extra166y.dir}"
677	+	debug="${build.debug}"
678	+	classpath="${jsr166yproduct.jar}"
679	+	debuglevel="${build.debuglevel}"
680	+	deprecation="${build.deprecation}"
681	+	source="${build.sourcelevel}"
682	+	fork="true">
683	+
684	+	<include name="**/*.java"/>
685	+	<compilerarg line="${build.args}"/>
686	+	<compilerarg value="-XDignore.symbol.file=true"/>
687	+	<compilerarg value="${bootclasspath.args}"/>
688	+
689	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
690	+
691	+	</javac>
692	+
693	+	</target>
694	+
695	+
696	+
697	+	<target name="extra166yjar"
698	+	depends="extra166ycompile"
699	+	description="Builds library jar from compiled sources">
700	+
701	+	<mkdir dir="${build.extra166ylib.dir}"/>
702	+
703	+	<jar destfile="${extra166yproduct.jar}" index="true">
704	+	<fileset dir="${build.extra166y.dir}"/>
705	+	</jar>
706	+
707	+	</target>
708	+
709	+
710	+
711	+	<target name="extra166ydocs"
712	+	description="Builds javadocs with custom tags to build folder">
713	+
714	+	<delete dir="${build.extra166yjavadocs.dir}"/>
715	+	<mkdir dir="${build.extra166yjavadocs.dir}"/>
716	+
717	+	<javadoc destdir="${build.extra166yjavadocs.dir}"
718	+	packagenames="extra166y"
719	+	link="http://download.oracle.com/javase/7/docs/api/"
720	+	source="${build.sourcelevel}"
721	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
722	+	additionalparam="-XDignore.symbol.file=true" />
723	+
724	+	</target>
725	+
726	+
727	+	<target name="extra166ydist"
728	+	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
729	+	description="Puts all distributable products in single hierarchy"/>
730	+
731	+
732	+
733	+	<target name="extra166yclean"
734	+	description="Removes all build products">
735	+
736	+	<delete dir="${build.extra166y.dir}"/>
737	+	<delete dir="${build.extra166ylib.dir}"/>
738	+
739	+	</target>
740	+
741	+
742	+
743	+	<target name="extra166ydist-clean"
744	+	description="Removes all build and distribution products">
745	+
746	+	</target>
747	+
748	+	<target name="extra166ydist-docs"
749	+	description="Builds javadocs without custom tags to dist folder">
750	+
751	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
752	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
753	+
754	+	<javadoc destdir="${dist.extra166yjavadocs.dir}"
755	+	packagenames="extra166y"
756	+	link="http://download.oracle.com/javase/7/docs/api/"
757	+	source="${build.sourcelevel}"
758	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
759	+	additionalparam="-XDignore.symbol.file=true" />
760	+
761	+	</target>
762	+
763	+	<target name="extra166ydist-jar"
764	+	depends="extra166yclean, extra166yjar">
765	+
766	+	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
767	+
768	+	</target>
769	+
770		</project>

Diff Legend

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