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

Diff Legend

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