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.41 by tim, Fri Jun 6 20:48:55 2003 UTC vs.
Revision 1.88 by jsr166, Sun May 29 16:00:20 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.emulation.dir"  location="${build.dir}/emulation"/>
33	<	<property name="build.testcases.dir"  location="${build.dir}/testcases"/>
34	<	<property name="build.lib.dir"        location="${build.dir}/lib"/>
35	<	<property name="build.ant.dir"        location="${build.dir}/ant"/>
36	<	<property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
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"/>
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"/>
45	–	<property name="emulation.src.dir"    location="${basedir}/src/emulation"/>
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	–
60	–
74
75	<	<!-- Files excluded from dist-docs and emulation jar -->
76	<	<patternset id="unsafe.exclusion">
64	<	<exclude name="java/util/Random.*"/>
65	<	<exclude name="sun/misc/Unsafe.*"/>
66	<	</patternset>
67	<
68	<	<!-- Files excludes from emulation jar -->
69	<	<patternset id="atomic.exclusion">
70	<	<exclude name="java/util/concurrent/atomic/AtomicBoolean*"/>
71	<	<exclude name="java/util/concurrent/atomic/AtomicInteger*"/>
72	<	<exclude name="java/util/concurrent/atomic/AtomicLong*"/>
73	<	<exclude name="java/util/concurrent/atomic/AtomicReference*"/>
74	<	</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
84	–	<property name="prepare.src.dir" value="${src.dir}"/>
85	–
100		<mkdir dir="${build.classes.dir}"/>
101
102	<	<!--
89	<	<echo>javac ${gjc.args}</echo>
90	<	<echo>bootclasspath=${compile.bootclasspath}</echo>
91	<	-->
92	<
93	<	<javac srcdir="${prepare.src.dir}"
102	>	<javac srcdir="${src.dir}"
103		destdir="${build.classes.dir}"
104		debug="${build.debug}"
105		debuglevel="${build.debuglevel}"
#	Line 98 | Line 107
107		source="${build.sourcelevel}"
108		fork="true">
109
110	<	<compilerarg    line="${gjc.args}"/>
111	<	<bootclasspath refid="compile.bootclasspath"/>
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
109	–	<target name="jar"
110	–	depends="configure-emulation, init-jar, native-jar, emulation-jar"
111	–	description="Builds library jar from compiled sources"/>
112	–
113	–
114	–	<target name="test"
115	–	depends="init, configure-tests, report-tests"
116	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
124
125	+	<target name="jar"
126	+	depends="compile"
127	+	description="Builds library jar from compiled sources">
128
129	<	<target name="checkstyle"
120	<	depends="filter-src"
121	<	description="Reports on style errors in Java source (verbose, mostly chaff)">
122	<
123	<	<taskdef resource="checkstyletask.properties"
124	<	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"/>
129	<	</checkstyle>
131	>	<jar destfile="${product.jar}">
132	>	<fileset dir="${build.classes.dir}"/>
133	>	</jar>
134
135		</target>
136
137
134	–	<target name="doccheck"
135	–	depends="filter-src"
136	–	description="Reports on javadoc style errors (not working yet)">
138
139	<	<delete dir="${build.doccheck.dir}"/>
140	<	<mkdir dir="${build.doccheck.dir}"/>
141	<
141	<	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
142	<	docletpath="${lib.dir}/doccheck.jar"
143	<	destdir="${build.doccheck.dir}">
144	<	<packageset dir="${build.filter.src.dir}"/>
145	<	</javadoc>
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
147	–	</target>
143
144
145		<target name="docs"
151	–	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"
159	<	overview="${src.dir}/intro.html"
160	<	source="${build.docsourcelevel}">
161	<
162	<	<tag name="revised" description="Last revised:"/>
163	<	<tag name="spec"    description="Specified by:"/>
164	<	<tag name="editor"  description="Last edited by:"/>
165	<	<tag name="fixme"   description="FIX ME:"/>
166	<
167	<	<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	+	<fileset dir="${src.dir}" defaultexcludes="yes">
160	+	<include name="**/*.java"/>
161	+	</fileset>
162		</javadoc>
163
164		</target>
165
166
174	–	<target name="strip"
175	–	depends="init, configure-compiler"
176	–	description="Strip generics from java source (not working yet)">
177	–
178	–	<mkdir dir="${build.stripped.dir}"/>
167
168	<	<!--
169	<	# javac -s doesn't reliably generate compilable code. It generates
170	<	# bridge methods (marked as "synthetic") that can have identical
183	<	# signatures to existing methods except for the return value.
184	<	-->
185	<	<javac srcdir="${src.dir}"
186	<	destdir="${build.stripped.dir}"
187	<	debug="${build.debug}"
188	<	debuglevel="${build.debuglevel}"
189	<	deprecation="${build.deprecation}"
190	<	source="${build.sourcelevel}"
191	<	fork="true">
168	>	<target name="dist"
169	>	depends="init, dist-clean, dist-jar, dist-docs"
170	>	description="Puts all distributable products in single hierarchy"/>
171
193	–	<compilerarg    line="${gjc.args} -s"/>
194	–	<bootclasspath refid="compile.bootclasspath"/>
172
173	<	</javac>
173	>	<target name="release"
174	>	depends="dist"
175	>	description="Puts entire CVS tree, plus distribution productions, in a jar">
176	>
177	>	<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
178	>
179	>	<jar basedir="${basedir}" destfile="${release.jar}">
180	>	<!-- <exclude name="build/**"/> -->
181	>	<exclude name="${release.jar}"/>
182	>	<exclude name="user.properties"/>
183	>	<exclude name="etc/notes/**"/>
184	>	<exclude name="src/emulation/**"/>
185	>	<exclude name="**/SyntaxTest.java"/>
186	>	<exclude name="**/SuperfluousAbstract.java"/>
187	>	</jar>
188
189		</target>
190
191
201	–	<target name="dist"
202	–	depends="init, dist-clean, dist-jar, dist-docs"
203	–	description="Puts all distributable products in single hierarchy"/>
204	–
192
193		<target name="clean"
194		description="Removes all build products">
#	Line 213 | Line 200
200		</target>
201
202
203	+
204		<target name="dist-clean"
205		description="Removes all build and distribution products">
206
#	Line 221 | Line 209
209		</target>
210
211
212	+
213		<target name="dist-docs"
225	–	depends="filter-src"
214		description="Builds javadocs without custom tags to dist folder">
215
216		<delete dir="${dist.javadocs.dir}"/>
217		<mkdir dir="${dist.javadocs.dir}"/>
218
219	<	<javadoc destdir="${dist.javadocs.dir}"
220	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
233	<	overview="${src.dir}/intro.html"
234	<	source="${build.docsourcelevel}">
235	<
236	<	<packageset dir="${build.filter.src.dir}"/>
219	>	<!-- the packagenames="none" hack below prevents scanning the -->
220	>	<!-- sourcepath for packages -->
221
222	+	<javadoc destdir="${dist.javadocs.dir}"
223	+	packagenames="none"
224	+	link="http://download.oracle.com/javase/7/docs/api/"
225	+	overview="${src.dir}/intro.html"
226	+	sourcepath="${src.dir}:${jdksrc.dir}" >
227	+	<fileset dir="${src.dir}" defaultexcludes="yes">
228	+	<include name="**/*.java"/>
229	+	</fileset>
230		</javadoc>
231
232		</target>
#	Line 249 | Line 241
241		<!-- Version is kept in a separate file -->
242		<loadfile property="version" srcFile="version.properties"/>
243		<echo>Building JSR-166 version ${version}</echo>
244	+	<echo>java.home is ${java.home}</echo>
245
246		</target>
247
248
249	<	<target name="init-jar">
250	<
258	<	<mkdir dir="${build.lib.dir}"/>
259	<
260	<	</target>
261	<
262	<
263	<	<target name="native-jar"
264	<	depends="compile"
265	<	unless="build.emulation.true">
249	>	<target name="dist-jar"
250	>	depends="clean, jar">
251
252	<	<jar destfile="${product.jar}">
268	<	<fileset dir="${build.classes.dir}"/>
269	<	</jar>
252	>	<copy file="${product.jar}" todir="${dist.dir}"/>
253
254		</target>
255
256
257	<	<target name="compile-emulation"
258	<	depends="init, configure-compiler"
276	<	if="build.emulation.true">
257	>	<target name="compile-tests"
258	>	depends="jar">
259
260	<	<mkdir dir="${build.emulation.dir}"/>
260	>	<mkdir dir="${build.testcases.dir}"/>
261
262	<	<javac srcdir="${emulation.src.dir}"
263	<	destdir="${build.emulation.dir}"
262	>	<javac srcdir="${tck.src.dir}"
263	>	destdir="${build.testcases.dir}"
264		debug="${build.debug}"
265		debuglevel="${build.debuglevel}"
266		deprecation="${build.deprecation}"
267		source="${build.sourcelevel}"
268		fork="true">
269
270	<	<compilerarg    line="${gjc.args}"/>
271	<	<bootclasspath refid="compile.bootclasspath"/>
272	<
291	<	</javac>
292	<
293	<	</target>
294	<
295	<
296	<	<target name="emulation-jar"
297	<	depends="compile-emulation"
298	<	if="build.emulation.true">
299	<
300	<
301	<	<jar destfile="${product.jar}" duplicate="add">
302	<	<fileset dir="${build.classes.dir}">
303	<	<patternset refid="atomic.exclusion"/>
304	<	<patternset refid="unsafe.exclusion"/>
305	<	</fileset>
306	<	<fileset dir="${build.emulation.dir}"/>
307	<	</jar>
270	>	<compilerarg value="${bootclasspath.args}"/>
271	>	<compilerarg line="${build.args}"/>
272	>	<compilerarg value="-XDignore.symbol.file=true"/>
273
274	<	</target>
310	<
311	<
312	<	<target name="dist-jar"
313	<	depends="clean, jar">
274	>	<classpath refid="test.classpath"/>
275
276	<	<copy file="${product.jar}" todir="${dist.dir}"/>
316	<
317	<	</target>
318	<
319	<
320	<	<target name="compile-ant-filter"
321	<	depends="init">
322	<
323	<	<mkdir dir="${build.ant.dir}"/>
324	<
325	<	<javac srcdir="${ant.src.dir}"
326	<	destdir="${build.ant.dir}"
327	<	source="1.4"
328	<	/>
329	<
330	<	</target>
331	<
332	<
333	<	<target name="filter-src"
334	<	depends="compile-ant-filter">
335	<
336	<	<mkdir dir="${build.filter.src.dir}"/>
337	<
338	<	<copy todir="${build.filter.src.dir}">
339	<	<fileset dir="${src.dir}">
340	<	<include name="**/*.html"/>
341	<	</fileset>
342	<	</copy>
343	<
344	<	<!-- Not needed now, used for doccheck filtering:
345	<	<property name="generic.declarations"
346	<	value="public interface E {} public interface T {} public interface K {} public interface V {}"
347	<	/>
348	<	-->
349	<
350	<	<copy todir="${build.filter.src.dir}">
351	<	<fileset dir="${src.dir}">
352	<	<exclude name="**/*.html"/>
353	<	<patternset refid="unsafe.exclusion"/>
354	<	</fileset>
355	<	<filterchain>
356	<
357	<	<!--
358	<	# This filter gets rid of angle-bracketed type parameters
359	<	# so that javadoc can run on the result. The following
360	<	# heuristic seems to work:
361	<	#
362	<	# For all lines not starting with space(s)-asterisk-space(s),
363	<	#   replace <something> with a space, where there may be more
364	<	#   than one right angle bracket at the end, and "something"
365	<	#   must not contain parens or pipes. (This may need some
366	<	#   tweaking.)
367	<	-->
368	<
369	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
370	<	classpath="${build.ant.dir}">
371	<	<param name="notmatching" value="^\s+\*\s.*$"/>
372	<	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
373	<	<param name="replacement" value=" "/>
374	<	</filterreader>
375	<
376	<
377	<	<!--
378	<	# This filter uncomments lines beginning with "//@" so that
379	<	# javadoc can see imports that are needed to resolve links
380	<	# but that shouldn't be in the compiled code.
381	<	-->
382	<
383	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
384	<	classpath="${build.ant.dir}">
385	<	<param name="matching"    value="^//@.*$"/>
386	<	<param name="pattern"     value="^//@"/>
387	<	<param name="replacement" value=""/>
388	<	</filterreader>
389	<
390	<
391	<	<!--
392	<	# The next two filters try to make the source look like
393	<	# something that doccheck can process. The first removes
394	<	# -source 1.4 assertions and the second adds in a bunch
395	<	# of single letter public nested marker interfaces so that
396	<	# the generic type parameters are recognized.
397	<	#
398	<	# Currently commented out because doccheck doesn't work. :-(
399	<	-->
400	<
401	<	<!--
402	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
403	<	classpath="${build.ant.dir}">
404	<	<param name="matching"    value="^\s*assert[\s ].*$"/>
405	<	<param name="pattern"     value="assert"/>
406	<	<param name="replacement" value="//assert"/>
407	<	</filterreader>
408	<
409	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
410	<	classpath="${build.ant.dir}">
411	<	<param name="matching"    value="^(.*(class|interface|implements) .*|)\{.*$"/>
412	<	<param name="pattern"     value="$"/>
413	<	<param name="replacement" value=" ${generic.declarations}"/>
414	<	</filterreader>
415	<	-->
276	>	</javac>
277
278	<	</filterchain>
279	<	</copy>
278	>	<javac srcdir="${test.src.dir}"
279	>	destdir="${build.testcases.dir}"
280	>	debug="${build.debug}"
281	>	debuglevel="${build.debuglevel}"
282	>	deprecation="${build.deprecation}"
283	>	source="${build.sourcelevel}"
284	>	fork="true">
285
286	<	</target>
286	>	<include name="jsr166/test/**"/>
287
288	+	<compilerarg value="${bootclasspath.args}"/>
289	+	<compilerarg line="${build.args}"/>
290	+	<compilerarg value="-XDignore.symbol.file=true"/>
291
292	<	<target name="compile-tests"
424	<	depends="jar">
292	>	<classpath refid="test.classpath"/>
293
294	<	<mkdir dir="${build.testcases.dir}"/>
294	>	</javac>
295
296		<!--
297	<	<echo>javac ${gjc.args}</echo>
430	<	<echo>bootclasspath=${test.compile.bootclasspath}</echo>
431	<	<echo>classpath="${test.classpath}"</echo>
432	<	-->
433	<
434	<	<javac srcdir="${test.src.dir}"
297	>	<javac srcdir="${jtreg.src.dir}"
298		destdir="${build.testcases.dir}"
299		debug="${build.debug}"
300		debuglevel="${build.debuglevel}"
#	Line 439 | Line 302
302		source="${build.sourcelevel}"
303		fork="true">
304
305	<	<compilerarg    line="${gjc.args}"/>
306	<	<bootclasspath refid="test.compile.bootclasspath"/>
307	<	<classpath     refid="test.classpath"/>
305	>	<compilerarg value="${bootclasspath.args}"/>
306	>	<compilerarg line="${build.args}"/>
307	>	<compilerarg value="-XDignore.symbol.file=true"/>
308	>
309	>	<classpath refid="test.classpath"/>
310
311		</javac>
312	+	-->
313
314		</target>
315
#	Line 463 | Line 329
329		dir="${build.reports.dir}"
330		fork="true">
331
332	<	<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/>
332	>	<jvmarg value="${bootclasspath.args}"/>
333	>	<jvmarg value="-server"/>
334	>	<jvmarg value="-showversion"/>
335	>
336	>	<classpath refid="test.classpath"/>
337
338		<formatter type="xml"/>
339
340	<	<batchtest todir="${build.reports.dir}">
340	>	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
341	>	<fileset dir="${tck.src.dir}">
342	>	<include name="**/${testcase}Test.java"/>
343	>	</fileset>
344	>	</batchtest>
345	>
346	>	<batchtest todir="${build.reports.dir}" if="do.test.old">
347		<fileset dir="${test.src.dir}">
348	+	<include name="jsr166/test/**/${testcase}Test.java"/>
349	+	</fileset>
350	+	</batchtest>
351	+
352	+	<!--
353	+	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
354	+	<fileset dir="${jtreg.src.dir}">
355		<include name="**/${testcase}Test.java"/>
356		</fileset>
357		</batchtest>
358	+	-->
359
360		</junit>
361
#	Line 481 | Line 365
365		<target name="report-tests"
366		depends="run-tests">
367
368	<	<!-- Sets junit.report.format to frames if Xalan is present,
368	>	<!-- Sets junit.report.format to frames if redirection is present,
369		otherwise sets it to noframes. -->
370		<available property="junit.report.format"
371		value="frames"
#	Line 493 | Line 377
377		<fileset dir="${build.reports.dir}">
378		<include name="TEST-*.xml"/>
379		</fileset>
380	<	<report styledir="${stylesheet.dir}"
497	<	format="${junit.report.format}"
498	<	todir="${build.reports.dir}"
380	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
381		/>
382		</junitreport>
383
#	Line 506 | Line 388
388
389		<target name="configure-compiler">
390
391	<	<property name="gjc.version"
510	<	value="2.0"/>
391	>	<property name="unchecked.option" value="-Xlint:unchecked"/>
392
393	<	<condition property="novariance.arg" value="-novariance">
394	<	<and>
514	<	<equals arg1="${gjc.version}" arg2="2.0"/>
515	<	<or>
516	<	<not><isset property="gjc.novariance"/></not>
517	<	<istrue value="${gjc.novariance}"/>
518	<	</or>
519	<	</and>
393	>	<condition property="warnunchecked.arg" value="${unchecked.option}">
394	>	<istrue value="${build.warnunchecked}"/>
395		</condition>
396
397	<	<property name="novariance.arg"
523	<	value=""/>
397	>	<property name="warnunchecked.arg" value=""/>
398
525	–	<property name="gjc.dir"
526	–	value="${lib.dir}/gjc"/>
399
400	<	<property name="javac.jar"
401	<	location="${gjc.dir}/${gjc.version}/javac.jar"/>
400	>	<!-- Common options in javac invocations -->
401	>	<property name="build.args" value="${warnunchecked.arg}"/>
402
403	<	<property name="collect.jar"
532	<	location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/>
403	>	</target>
404
405
406	<	<condition property="warnunchecked.arg" value="-warnunchecked">
407	<	<istrue value="${gjc.warnunchecked}"/>
537	<	</condition>
406	>	<target name="configure-tests"
407	>	depends="configure-compiler">
408
409	<	<property name="warnunchecked.arg" value=""/>
409	>	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
410	>	<available property="junit.available"
411	>	classname="junit.framework.Protectable"/>
412
413	<	<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
414	<	<istrue value="${build.nothreads}"/>
415	<	</condition>
413	>	<!-- Xalan -->
414	>	<available property="xalan.available"
415	>	classname="org.apache.xalan.Version"/>
416
417
418	+	<!-- Ant 1.6beta and later don't need or want this check -->
419		<!--
420	<	! Bootclasspath munging for source compilation.
421	<	-->
420	>	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
421	>	unless="junit.available"/>
422
423	<	<path id="pre.bootclasspath">
424	<	<pathelement location="${javac.jar}"/>
425	<	</path>
553	<
554	<	<path id="compile.bootclasspath">
555	<	<pathelement location="${build.classes.dir}"/>
556	<	<pathelement location="${collect.jar}"/>
557	<	<pathelement location="${rt.jar}"/>
558	<	</path>
559	<
560	<	<!-- Flatten paths into platform-appropriate strings -->
561	<	<property name="pre.bootclasspath"     refid="pre.bootclasspath"/>
562	<	<property name="compile.bootclasspath" refid="compile.bootclasspath"/>
423	>	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
424	>	unless="xalan.available"/>
425	>	-->
426
427	+	</target>
428
429	<	<!-- Common options in javac invocations -->
430	<	<property name="gjc.args"
431	<	value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}"
432	<	/>
429	>
430	>	<!-- Various demos and test programs -->
431	>
432	>
433	>	<target name="loops" depends="init, configure-compiler"
434	>	description="Benchmark from Doug Lea's AQS paper">
435	>
436	>	<mkdir dir="${build.loops.dir}"/>
437	>
438	>	<javac srcdir="${loops.src.dir}"
439	>	destdir="${build.loops.dir}"
440	>	debug="${build.debug}"
441	>	debuglevel="${build.debuglevel}"
442	>	deprecation="${build.deprecation}"
443	>	source="${build.sourcelevel}"
444	>	fork="true">
445	>
446	>	<compilerarg line="${build.args}"/>
447	>	<classpath refid="loops.classpath"/>
448	>	<compilerarg value="-XDignore.symbol.file=true"/>
449	>
450	>	</javac>
451	>
452	>	<java classname="ALoops" fork="true">
453	>	<classpath refid="loops.classpath"/>
454	>	</java>
455
456		</target>
457
458
459	<	<target name="prepare-src"
460	<	depends="configure-compiler"
461	<	if="prepare.src.dir">
462	<
463	<	<mkdir dir="${prepare.src.dir}"/>
464	<	<copy todir="${prepare.src.dir}">
465	<	<fileset dir="${src.dir}">
466	<	<exclude name="java/lang/**"/>
467	<	</fileset>
468	<	</copy>
459	>	<!-- jsr166x -->
460	>
461	>
462	>	<target name="jsr166xcompile"
463	>	depends="init, configure-compiler"
464	>	description="Compiles jsr166x sources">
465	>
466	>	<mkdir dir="${build.jsr166x.dir}"/>
467	>
468	>	<javac srcdir="${jsr166xsrc.dir}"
469	>	destdir="${build.jsr166x.dir}"
470	>	debug="${build.debug}"
471	>	debuglevel="${build.debuglevel}"
472	>	deprecation="${build.deprecation}"
473	>	source="${build.sourcelevel}"
474	>	fork="true">
475	>
476	>	<include name="**/*.java"/>
477	>	<compilerarg line="${build.args}"/>
478	>	<compilerarg value="-XDignore.symbol.file=true"/>
479	>
480	>	</javac>
481
482		</target>
483
484
587	–	<target name="configure-emulation">
485
486	<	<condition property="build.emulation.true">
487	<	<or>
488	<	<and>
489	<	<os family="windows"/>
490	<	<not>
491	<	<isset property="build.emulation"/>
492	<	</not>
493	<	</and>
494	<	<istrue value="${build.emulation}"/>
598	<	</or>
599	<	</condition>
486	>	<target name="jsr166xjar"
487	>	depends="jsr166xcompile"
488	>	description="Builds library jar from compiled sources">
489	>
490	>	<mkdir dir="${build.jsr166xlib.dir}"/>
491	>
492	>	<jar destfile="${jsr166xproduct.jar}">
493	>	<fileset dir="${build.jsr166x.dir}"/>
494	>	</jar>
495
496		</target>
497
498
604	–	<target name="configure-tests"
605	–	depends="configure-compiler">
499
500	<	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
501	<	<available property="junit.available"
609	<	classname="junit.framework.Protectable"/>
500	>	<target name="jsr166xdocs"
501	>	description="Builds javadocs with custom tags to build folder">
502
503	<	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
504	<	unless="junit.available"/>
503	>	<delete dir="${build.jsr166xjavadocs.dir}"/>
504	>	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
505
506	+	<javadoc destdir="${build.jsr166xjavadocs.dir}"
507	+	packagenames="jsr166x"
508	+	link="http://download.oracle.com/javase/7/docs/api/"
509	+	source="${build.sourcelevel}"
510	+	sourcepath="${topsrc.dir}:${jdksrc.dir}" />
511
512	<	<!--
513	<	! Bootclasspath munging for testing, so JUnit can test our local
514	<	! modifications to java.*.
515	<	-->
512	>	</target>
513	>
514	>
515	>	<target name="jsr166xdist"
516	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
517	>	description="Puts all distributable products in single hierarchy"/>
518	>
519	>
520	>
521	>	<target name="jsr166xclean"
522	>	description="Removes all build products">
523	>
524	>	<delete dir="${build.jsr166x.dir}"/>
525	>	<delete dir="${build.jsr166xlib.dir}"/>
526	>
527	>	</target>
528	>
529	>
530	>
531	>	<target name="jsr166xdist-clean"
532	>	description="Removes all build and distribution products">
533	>
534	>	</target>
535	>
536	>
537	>
538	>	<target name="jsr166xdist-docs"
539	>	description="Builds javadocs without custom tags to dist folder">
540	>
541	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
542	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
543	>
544	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
545	>	packagenames="jsr166x"
546	>	link="http://download.oracle.com/javase/7/docs/api/"
547	>	source="${build.sourcelevel}"
548	>	sourcepath="${topsrc.dir}:${jdksrc.dir}" />
549	>
550	>	</target>
551	>
552	>	<target name="jsr166xdist-jar"
553	>	depends="jsr166xclean, jsr166xjar">
554	>
555	>	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
556	>
557	>	</target>
558	>
559	>	<!-- jsr166y -->
560	>
561	>
562	>	<target name="jsr166ycompile"
563	>	depends="init, configure-compiler"
564	>	description="Compiles jsr166y sources">
565	>
566	>	<mkdir dir="${build.jsr166y.dir}"/>
567	>
568	>	<javac srcdir="${jsr166ysrc.dir}"
569	>	destdir="${build.jsr166y.dir}"
570	>	debug="${build.debug}"
571	>	debuglevel="${build.debuglevel}"
572	>	deprecation="${build.deprecation}"
573	>	source="${build.sourcelevel}"
574	>	fork="true">
575	>
576	>	<include name="**/*.java"/>
577	>	<compilerarg line="${build.args}"/>
578	>	<compilerarg value="-XDignore.symbol.file=true"/>
579	>	<compilerarg value="${bootclasspath.args}"/>
580	>
581	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
582	>
583	>	</javac>
584	>
585	>	</target>
586
620	–	<path id="test.classpath">
621	–	<pathelement location="${product.jar}"/>
622	–	<pathelement location="${build.testcases.dir}"/>
623	–	<pathelement location="${junit.jar}"/>
624	–	</path>
587
626	–	<path id="test.compile.bootclasspath">
627	–	<pathelement location="${javac.jar}"/>
628	–	<pathelement location="${collect.jar}"/>
629	–	<pathelement location="${rt.jar}"/>
630	–	</path>
588
589	<	<path id="test.run.bootclasspath">
590	<	<pathelement location="${javac.jar}"/>
591	<	<path refid="test.classpath"/>
635	<	</path>
589	>	<target name="jsr166yjar"
590	>	depends="jsr166ycompile"
591	>	description="Builds library jar from compiled sources">
592
593	<	<!-- Flatten test classpaths into platform-appropriate strings -->
594	<	<property name="test.classpath"             refid="test.classpath"/>
595	<	<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/>
596	<	<property name="test.run.bootclasspath"     refid="test.run.bootclasspath"/>
593	>	<mkdir dir="${build.jsr166ylib.dir}"/>
594	>
595	>	<jar destfile="${jsr166yproduct.jar}" index="true">
596	>	<fileset dir="${build.jsr166y.dir}"/>
597	>	</jar>
598	>
599	>	</target>
600	>
601	>
602	>
603	>	<target name="jsr166ydocs"
604	>	description="Builds javadocs with custom tags to build folder">
605	>
606	>	<delete dir="${build.jsr166yjavadocs.dir}"/>
607	>	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
608	>
609	>	<javadoc destdir="${build.jsr166yjavadocs.dir}"
610	>	packagenames="jsr166y"
611	>	link="http://download.oracle.com/javase/7/docs/api/"
612	>	source="${build.sourcelevel}"
613	>	sourcepath="${topsrc.dir}:${jdksrc.dir}" />
614	>
615	>	</target>
616	>
617	>
618	>	<target name="jsr166ydist"
619	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
620	>	description="Puts all distributable products in single hierarchy"/>
621	>
622	>
623	>
624	>	<target name="jsr166yclean"
625	>	description="Removes all build products">
626	>
627	>	<delete dir="${build.jsr166y.dir}"/>
628	>	<delete dir="${build.jsr166ylib.dir}"/>
629	>
630	>	</target>
631	>
632	>
633	>
634	>	<target name="jsr166ydist-clean"
635	>	description="Removes all build and distribution products">
636	>
637	>	</target>
638	>
639	>	<target name="jsr166ydist-docs"
640	>	description="Builds javadocs without custom tags to dist folder">
641	>
642	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
643	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
644	>
645	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
646	>	packagenames="jsr166y"
647	>	link="http://download.oracle.com/javase/7/docs/api/"
648	>	source="${build.sourcelevel}"
649	>	sourcepath="${topsrc.dir}:${jdksrc.dir}" />
650	>
651	>	</target>
652	>
653	>	<target name="jsr166ydist-jar"
654	>	depends="jsr166yclean, jsr166yjar">
655	>
656	>	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
657	>
658	>	</target>
659	>
660	>	<!-- extra166y -->
661	>
662	>
663	>	<target name="extra166ycompile"
664	>	depends="init, configure-compiler, jsr166ycompile"
665	>	description="Compiles extra166y sources">
666	>
667	>	<mkdir dir="${build.extra166y.dir}"/>
668	>
669	>	<javac srcdir="${extra166ysrc.dir}"
670	>	destdir="${build.extra166y.dir}"
671	>	debug="${build.debug}"
672	>	classpath="${jsr166yproduct.jar}"
673	>	debuglevel="${build.debuglevel}"
674	>	deprecation="${build.deprecation}"
675	>	source="${build.sourcelevel}"
676	>	fork="true">
677	>
678	>	<include name="**/*.java"/>
679	>	<compilerarg line="${build.args}"/>
680	>	<compilerarg value="-XDignore.symbol.file=true"/>
681	>	<compilerarg value="${bootclasspath.args}"/>
682	>
683	>	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
684	>
685	>	</javac>
686
687		</target>
688
689
690
691	<	<!-- Anthill targets -->
691	>	<target name="extra166yjar"
692	>	depends="extra166ycompile"
693	>	description="Builds library jar from compiled sources">
694
695	<	<target name="anthill-build"
649	<	depends="jar, test, docs, dist-docs"/>
695	>	<mkdir dir="${build.extra166ylib.dir}"/>
696
697	<	<target name="anthill-publish">
697	>	<jar destfile="${extra166yproduct.jar}" index="true">
698	>	<fileset dir="${build.extra166y.dir}"/>
699	>	</jar>
700	>
701	>	</target>
702
653	–	<copy todir="${deployDir}/docs/private">
654	–	<fileset dir="${build.javadocs.dir}"/>
655	–	</copy>
703
657	–	<copy todir="${deployDir}/docs/public">
658	–	<fileset dir="${dist.javadocs.dir}"/>
659	–	</copy>
704
705	<	<copy tofile="${deployDir}/index.html"
706	<	file="${basedir}/etc/anthill-index.html"/>
705	>	<target name="extra166ydocs"
706	>	description="Builds javadocs with custom tags to build folder">
707	>
708	>	<delete dir="${build.extra166yjavadocs.dir}"/>
709	>	<mkdir dir="${build.extra166yjavadocs.dir}"/>
710
711	<	<copy todir="${deployDir}/notes">
712	<	<fileset dir="${basedir}/etc/notes"/>
713	<	</copy>
711	>	<javadoc destdir="${build.extra166yjavadocs.dir}"
712	>	packagenames="extra166y"
713	>	link="http://download.oracle.com/javase/7/docs/api/"
714	>	source="${build.sourcelevel}"
715	>	sourcepath="${topsrc.dir}:${jdksrc.dir}" />
716
717		</target>
718
719
720	+	<target name="extra166ydist"
721	+	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
722	+	description="Puts all distributable products in single hierarchy"/>
723	+
724	+
725	+
726	+	<target name="extra166yclean"
727	+	description="Removes all build products">
728	+
729	+	<delete dir="${build.extra166y.dir}"/>
730	+	<delete dir="${build.extra166ylib.dir}"/>
731	+
732	+	</target>
733	+
734	+
735	+
736	+	<target name="extra166ydist-clean"
737	+	description="Removes all build and distribution products">
738	+
739	+	</target>
740	+
741	+	<target name="extra166ydist-docs"
742	+	description="Builds javadocs without custom tags to dist folder">
743	+
744	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
745	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
746	+
747	+	<javadoc destdir="${dist.extra166yjavadocs.dir}"
748	+	packagenames="extra166y"
749	+	link="http://download.oracle.com/javase/7/docs/api/"
750	+	source="${build.sourcelevel}"
751	+	sourcepath="${topsrc.dir}:${jdksrc.dir}" />
752	+
753	+	</target>
754	+
755	+	<target name="extra166ydist-jar"
756	+	depends="extra166yclean, extra166yjar">
757	+
758	+	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
759	+
760	+	</target>
761	+
762		</project>

Diff Legend

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