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.43 by tim, Thu Jun 26 11:54:26 2003 UTC vs.
Revision 1.76 by dl, Tue Jan 6 16:31:52 2009 UTC

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

Diff Legend

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