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.74 by dl, Thu Sep 13 11:19:25 2007 UTC vs.
Revision 1.105 by jsr166, Sat Jan 19 21:54:53 2013 UTC

#	Line 8 | Line 8
8
9		User-specific settings are read from user.properties.
10		See user.properties.sample for an explanation of some useful settings.
11	+
12	+	The repository contains all dependencies except for ant and the JDK
13	+	itself.  Because the JDK version matters and because different
14	+	targets require different JDKs, we assume that users have created a
15	+	hierarchy containing:
16	+	$HOME/jdk/jdk6
17	+	$HOME/jdk/jdk7
18	+	$HOME/jdk/jdk8
19	+	where each of the above is a JDK or a symlink to same, and
20	+	$HOME/jdk/src/jdk6
21	+	$HOME/jdk/src/jdk7
22	+	$HOME/jdk/src/jdk8
23	+	where each of the above is a complete JDK source tree
24	+	(e.g. mercurial forest) or a symlink to same.
25		------------------------------------------------------------------------------
26		</description>
27
#	Line 21 | Line 35
35
36
37		<!-- Compilation options -->
38	<	<property name="build.sourcelevel"    value="1.5"/>
38	>	<property name="build.sourcelevel"    value="1.6"/>
39		<property name="build.debug"          value="true"/>
40		<property name="build.debuglevel"     value="source,lines,vars"/>
41		<property name="build.deprecation"    value="false"/>
42
43		<!-- Build locations -->
44	<	<property name="build.dir"            location="build"/>
45	<	<property name="build.classes.dir"    location="${build.dir}/classes"/>
46	<	<property name="build.testcases.dir"  location="${build.dir}/testcases"/>
47	<	<property name="build.j1.dir"         location="${build.dir}/j1"/>
48	<	<property name="build.loops.dir"      location="${build.dir}/loops"/>
49	<	<property name="build.lib.dir"        location="${build.dir}/lib"/>
50	<	<property name="build.ant.dir"        location="${build.dir}/ant"/>
51	<	<property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
52	<	<property name="build.reports.dir"    location="${build.dir}/reports"/>
53	<	<property name="build.checkstyle.dir" location="${build.dir}/checkstyle"/>
54	<	<property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
55	<	<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
56	<	<property name="build.dc-filter.dir"  location="${build.dir}/filterdocchk"/>
57	<	<property name="build.jsr166x.dir"    location="${build.dir}/jsr166x"/>
44	>	<property name="build.dir"                   location="build"/>
45	>	<property name="build.classes.dir"           location="${build.dir}/classes"/>
46	>	<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
47	>	<property name="build.loops.dir"             location="${build.dir}/loops"/>
48	>	<property name="build.lib.dir"               location="${build.dir}/lib"/>
49	>	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
50	>	<property name="build.reports.dir"           location="${build.dir}/reports"/>
51	>
52	>	<property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
53	>	<property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
54	>	<property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
55	>	<property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
56	>	<property name="build.4jdk7.docs.dir"         location="${build.4jdk7.dir}/docs"/>
57	>
58	>	<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
59		<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
60		<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
61
62	<	<property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>
62	>	<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
63		<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
64		<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
65
66	+	<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
67	+	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
68	+	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
69	+
70	+	<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
71	+	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
72	+	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
73	+
74	+	<!-- JDK binary locations -->
75	+	<property name="jdks.home"  location="${user.home}/jdk"/>
76	+
77	+	<macrodef name="defjdklocations">
78	+	<attribute name="v"/>
79	+	<sequential>
80	+	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
81	+	<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
82	+	<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
83	+	<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
84	+	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
85	+	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
86	+	<property name="bootclasspath@{v}"
87	+	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
88	+	</sequential>
89	+	</macrodef>
90	+
91	+	<defjdklocations v="6"/>
92	+	<defjdklocations v="7"/>
93	+	<defjdklocations v="8"/>
94	+
95	+	<macrodef name="run-tck-tests">
96	+	<attribute name="jvm"/>
97	+	<attribute name="tck.classes"/>
98	+	<attribute name="product.jar" default="${product.jar}"/>
99	+	<attribute name="jvmflags" default=""/>
100	+	<sequential>
101	+	<java classname="JSR166TestCase"
102	+	jvm="@{jvm}" fork="true">
103	+	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
104	+	<jvmarg line="@{jvmflags}"/>
105	+	<classpath>
106	+	<pathelement location="${junit.jar}"/>
107	+	<pathelement location="@{tck.classes}"/>
108	+	</classpath>
109	+	</java>
110	+	</sequential>
111	+	</macrodef>
112	+
113		<!-- Source locations -->
114		<property name="src.dir"              location="${basedir}/src/main"/>
115		<property name="test.src.dir"         location="${basedir}/src/test"/>
54	–	<property name="j1.src.dir"           location="${basedir}/src/javaone"/>
116		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
117		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
118		<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
58	–	<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
59	–	<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
119		<property name="lib.dir"              location="${basedir}/lib"/>
120		<property name="dist.dir"             location="${basedir}/dist"/>
121		<property name="topsrc.dir"           location="${basedir}/src"/>
122	<	<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
123	<	<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
122	>	<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
123	>	<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
124	>	<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
125	>	<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
126	>	<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
127	>	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
128
129		<!-- Distribution locations -->
130	<	<property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
130	>	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
131	>	<property name="dist.4jdk7.docs.dir"         location="${dist.dir}/jsr166-4jdk7docs"/>
132		<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
133		<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
134	+	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
135	+	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
136
137		<!-- Jar locations -->
138		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
139	+	<property name="4jdk7product.jar"     location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
140		<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
141		<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
142	+	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
143	+	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
144		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
76	–	<property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
145
146		<!-- Bootclasspath argument -->
147		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
148
149	+	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
150	+	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
151	+	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
152	+	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
153	+
154	+	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
155	+	<!-- The below does not yet exist as of 2012-11 -->
156	+	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
157	+	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
158	+
159		<!-- Test classpath -->
160		<path id="test.classpath">
161		<pathelement location="${build.testcases.dir}"/>
#	Line 89 | Line 167
167		<pathelement location="${build.loops.dir}"/>
168		</path>
169
170	<	<!-- J1 classpath -->
171	<	<path id="j1.classpath">
172	<	<pathelement location="${build.classes.dir}"/>
173	<	<pathelement location="${build.j1.dir}"/>
174	<	<pathelement location="${junit.jar}"/>
175	<
98	<	<!-- Include dl.u.c for BoundedBuffer comparison -->
99	<	<pathelement location="${concurrent.jar}"/>
100	<	</path>
101	<
170	>	<!-- Support @jls tag, used in jdk8+ javadoc -->
171	>	<!-- TODO: How do we get &trade to work? -->
172	>	<!-- TODO: Why isn't @jls a "standard" tag? -->
173	>	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
174	>	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
175	>	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
176
177		<!-- Main targets -->
178
179	+	<target name="dists"
180	+	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
181	+	description="Builds all public jars and docs"/>
182
183		<target name="compile"
184	<	depends="init, configure-compiler"
185	<	description="Compiles main sources to build folder">
184	>	depends="configure-compiler"
185	>	description="Compiles src/main sources to build dir">
186
187		<mkdir dir="${build.classes.dir}"/>
188
189		<javac srcdir="${src.dir}"
190	<	destdir="${build.classes.dir}"
191	<	debug="${build.debug}"
192	<	debuglevel="${build.debuglevel}"
193	<	deprecation="${build.deprecation}"
194	<	source="${build.sourcelevel}"
195	<	fork="true">
190	>	destdir="${build.classes.dir}"
191	>	debug="${build.debug}"
192	>	debuglevel="${build.debuglevel}"
193	>	deprecation="${build.deprecation}"
194	>	classpath=""
195	>	includeAntRuntime="false"
196	>	includeJavaRuntime="false"
197	>	executable="${javac8}"
198	>	fork="true">
199
200		<include name="**/*.java"/>
201	<	<compilerarg value="-XDignore.symbol.file"/>
201	>	<compilerarg line="${build.args}"/>
202	>	<compilerarg value="-XDignore.symbol.file=true"/>
203	>	<compilerarg value="-Xlint:all"/>
204
205		<!--
206		<exclude name="java/lang/**"/>
#	Line 147 | Line 229
229
230
231		<target name="test"
232	<	depends="init, configure-tests, report-tests"
232	>	depends="configure-tests, report-tests"
233		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
234
235
236
237		<target name="docs"
238	<	description="Builds javadocs with custom tags to build folder">
157	<
158	<	<delete dir="${build.javadocs.dir}"/>
159	<	<mkdir dir="${build.javadocs.dir}"/>
160	<
161	<	<javadoc destdir="${build.javadocs.dir}"
162	<	link="http://java.sun.com/javase/6/docs/api/"
163	<	overview="${src.dir}/intro.html"
164	<	sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
165	<	>
166	<
167	<	<packageset dir="${src.dir}"/>
168	<
169	<	</javadoc>
170	<
171	<	</target>
238	>	description="Builds javadocs for src/main to dist dir">
239
240	+	<delete dir="${dist.javadocs.dir}"/>
241	+	<mkdir dir="${dist.javadocs.dir}"/>
242
243	+	<!-- the packagenames="none" hack below prevents scanning the -->
244	+	<!-- sourcepath for packages -->
245
246	<	<target name="doccheck"
247	<	depends="filter-doccheck"
248	<	description="Reports on javadoc style errors">
249	<
250	<	<delete dir="${build.doccheck.dir}"/>
251	<	<mkdir dir="${build.doccheck.dir}"/>
252	<
253	<	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
254	<	docletpath="${lib.dir}/doccheck.jar"
255	<	destdir="${build.doccheck.dir}">
256	<	<packageset dir="${build.dc-filter.dir}"/>
246	>	<javadoc destdir="${dist.javadocs.dir}"
247	>	packagenames="none"
248	>	link="${jdkapi8docs.url}"
249	>	overview="${src.dir}/intro.html"
250	>	sourcepath="${src.dir}:${jdk8src.dir}"
251	>	classpath=""
252	>	executable="${javadoc8}">
253	>	<arg value="-XDignore.symbol.file=true"/>
254	>	<arg value="-tag"/>
255	>	<arg value="${javadoc.jls.option}"/>
256	>	<fileset dir="${src.dir}" defaultexcludes="yes">
257	>	<include name="**/*.java"/>
258	>	</fileset>
259		</javadoc>
260
188	–	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
189	–
190	–	</target>
191	–
192	–
193	–
194	–	<target name="checkstyle"
195	–	depends="filter-src"
196	–	description="Reports on style errors in Java source (verbose, mostly chaff)">
197	–
198	–	<taskdef resource="checkstyletask.properties"
199	–	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
200	–
201	–	<mkdir dir="${build.checkstyle.dir}"/>
202	–
203	–	<checkstyle config="etc/checkstyle/sun_checks.xml"
204	–	failOnViolation="false">
205	–	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
206	–	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
207	–	</checkstyle>
208	–
209	–	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
210	–	out="${build.checkstyle.dir}/checkstyle-report.html"
211	–	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
212	–
261		</target>
262
263
264
265		<target name="dist"
266	<	depends="init, dist-clean, dist-jar, dist-docs"
266	>	depends="dist-clean, dist-jar, docs"
267		description="Puts all distributable products in single hierarchy"/>
268
269
222	–
270		<target name="release"
271		depends="dist"
272		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 260 | Line 307
307
308
309
263	–	<target name="dist-docs"
264	–	description="Builds javadocs without custom tags to dist folder">
265	–
266	–	<delete dir="${dist.javadocs.dir}"/>
267	–	<mkdir dir="${dist.javadocs.dir}"/>
268	–
269	–	<javadoc destdir="${dist.javadocs.dir}"
270	–	link="http://java.sun.com/javase/6/docs/api/"
271	–	overview="${src.dir}/intro.html"
272	–
273	–	sourcepath="${src.dir}:/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"
274	–	>
275	–	<!--
276	–	<packageset dir="${src.dir}" defaultexcludes="yes">
277	–	<include name="java/util/concurrent"/>
278	–	<include name="java/util/concurrent/atomic"/>
279	–	<include name="java/util/concurrent/locks"/>
280	–	</packageset>
281	–	-->
282	–	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
283	–	<include name="main/java/util/concurrent/*.java"/>
284	–	<include name="main/java/util/concurrent/atomic/*.java"/>
285	–	<include name="main/java/util/concurrent/locks/*.java"/>
286	–	<include name="main/java/util/*.java"/>
287	–	<!--
288	–	<include name="main/java/util/concurrent/*.html"/>
289	–	<include name="main/java/util/concurrent/atomic/*.html"/>
290	–	<include name="main/java/util/concurrent/locks/*.html"/>
291	–	<include name="main/java/util/*.html"/>
292	–	-->
293	–	<!--      <include name="jsr166x/*.java"/> -->
294	–	</fileset>
295	–	</javadoc>
296	–
297	–	</target>
298	–
299	–
300	–
310		<!-- Internal targets -->
311
312
304	–	<target name="init">
305	–
306	–	<!-- Version is kept in a separate file -->
307	–	<loadfile property="version" srcFile="version.properties"/>
308	–	<echo>Building JSR-166 version ${version}</echo>
309	–	<echo>java.home is ${java.home}</echo>
310	–
311	–	</target>
312	–
313	–
313		<target name="dist-jar"
314		depends="clean, jar">
315
#	Line 319 | Line 318
318		</target>
319
320
322	–	<target name="compile-ant-filter"
323	–	depends="init">
324	–
325	–	<mkdir dir="${build.ant.dir}"/>
326	–
327	–	<javac srcdir="${ant.src.dir}"
328	–	destdir="${build.ant.dir}"
329	–	source="1.4"/>
330	–
331	–	</target>
332	–
333	–
334	–	<target name="filter-src"
335	–	depends="compile-ant-filter">
336	–
337	–	<mkdir dir="${build.filter.src.dir}"/>
338	–
339	–	<copy todir="${build.filter.src.dir}">
340	–	<fileset dir="${src.dir}">
341	–	<include name="**/*.html"/>
342	–	</fileset>
343	–	</copy>
344	–
345	–	<copy todir="${build.filter.src.dir}">
346	–	<fileset dir="${src.dir}">
347	–	<exclude name="**/*.html"/>
348	–	<!-- Files excluded from dist-docs -->
349	–	<exclude name="java/util/Random.*"/>
350	–	<exclude name="sun/misc/Unsafe.*"/>
351	–	</fileset>
352	–	<!--
353	–	<filterchain>
354	–	-->
355	–
356	–	<!--
357	–	# This filter gets rid of angle-bracketed type parameters
358	–	# so that javadoc can run on the result. The following
359	–	# heuristic seems to work:
360	–	#
361	–	# For all lines not starting with space(s)-asterisk-space(s),
362	–	#   replace <something> with a space, where there may be more
363	–	#   than one right angle bracket at the end, and "something"
364	–	#   must not contain parens or pipes. (This may need some
365	–	#   tweaking.)
366	–	-->
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	–	</filterchain>
379	–	-->
380	–	</copy>
381	–
382	–	</target>
383	–
384	–
385	–	<target name="filter-doccheck"
386	–	depends="filter-src">
387	–
388	–	<mkdir dir="${build.dc-filter.dir}"/>
389	–
390	–	<copy todir="${build.dc-filter.dir}">
391	–	<fileset dir="${build.filter.src.dir}">
392	–	<include name="**/*.html"/>
393	–	</fileset>
394	–	</copy>
395	–
396	–	<property name="generic.declarations"
397	–	value="/** Fake type parameter. */ public interface E {} /** Fake type parameter. */ public interface T {} /** Fake type parameter. */ public interface K {} /** Fake type parameter. */ public interface V {}"
398	–	/>
399	–
400	–	<copy todir="${build.dc-filter.dir}">
401	–	<fileset dir="${build.filter.src.dir}">
402	–	<exclude name="**/*.html"/>
403	–	</fileset>
404	–	<filterchain>
405	–	<!--
406	–	# These two filters try to make the source look like
407	–	# something that doccheck can process. The first removes
408	–	# -source 1.4 assertions and the second adds in a bunch
409	–	# of single letter public nested marker interfaces so that
410	–	# the generic type parameters are recognized.
411	–	-->
412	–
413	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
414	–	classpath="${build.ant.dir}">
415	–	<param name="matching"    value="^\s*assert[\s ].*$"/>
416	–	<param name="pattern"     value="assert"/>
417	–	<param name="replacement" value="//assert"/>
418	–	</filterreader>
419	–
420	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
421	–	classpath="${build.ant.dir}">
422	–	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
423	–	<param name="pattern"     value="$"/>
424	–	<param name="replacement" value=" ${generic.declarations}"/>
425	–	</filterreader>
426	–
427	–	</filterchain>
428	–	</copy>
429	–
430	–	</target>
431	–
432	–
321		<target name="compile-tests"
322		depends="jar">
323
#	Line 445 | Line 333
333
334		<compilerarg value="${bootclasspath.args}"/>
335		<compilerarg line="${build.args}"/>
336	+	<compilerarg value="-XDignore.symbol.file=true"/>
337
338		<classpath refid="test.classpath"/>
339
#	Line 462 | Line 351
351
352		<compilerarg value="${bootclasspath.args}"/>
353		<compilerarg line="${build.args}"/>
354	+	<compilerarg value="-XDignore.symbol.file=true"/>
355
356		<classpath refid="test.classpath"/>
357
#	Line 478 | Line 368
368
369		<compilerarg value="${bootclasspath.args}"/>
370		<compilerarg line="${build.args}"/>
371	+	<compilerarg value="-XDignore.symbol.file=true"/>
372
373		<classpath refid="test.classpath"/>
374
#	Line 550 | Line 441
441		<fileset dir="${build.reports.dir}">
442		<include name="TEST-*.xml"/>
443		</fileset>
444	<	<report styledir="${stylesheet.dir}"
554	<	format="${junit.report.format}"
555	<	todir="${build.reports.dir}"
444	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
445		/>
446		</junitreport>
447
#	Line 602 | Line 491
491		</target>
492
493
605	–
606	–	<!-- Anthill targets -->
607	–
608	–	<target name="anthill-build">
609	–
610	–	<!-- Override this in user.properties -->
611	–	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
612	–
613	–	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
614	–	<arg value="-Xmx256000000"/>
615	–	<!-- classpath of new JVM -->
616	–	<arg value="-classpath"/> <arg path="${java.class.path}"/>
617	–	<!-- location of Ant home directory -->
618	–	<arg value="-Dant.home=${ant.home}"/>
619	–	<!-- the Ant main class -->
620	–	<arg value="org.apache.tools.ant.Main"/>
621	–	<!-- The build file -->
622	–	<arg value="-buildfile"/>  <arg value="build.xml"/>
623	–	<!-- the target to build on the new Ant instance -->
624	–	<arg value="-DJAVA_HOME=${tiger.home}"/>
625	–	<arg value="do-anthill-build"/>
626	–	</exec>
627	–	</target>
628	–
629	–	<target name="do-anthill-build"
630	–	depends="jar, test, docs, dist-docs"/>
631	–
632	–	<target name="anthill-publish">
633	–
634	–	<copy todir="${deployDir}/docs/private">
635	–	<fileset dir="${build.javadocs.dir}"/>
636	–	</copy>
637	–
638	–	<copy todir="${deployDir}/docs/public">
639	–	<fileset dir="${dist.javadocs.dir}"/>
640	–	</copy>
641	–
642	–	<copy tofile="${deployDir}/index.html"
643	–	file="${basedir}/etc/anthill-index.html"/>
644	–
645	–	<copy todir="${deployDir}/notes">
646	–	<fileset dir="${basedir}/etc/notes"/>
647	–	</copy>
648	–
649	–	</target>
650	–
651	–
652	–
494		<!-- Various demos and test programs -->
495
496
497	<	<target name="sample" depends="init, configure-compiler"
657	<	description="Standalone demo program">
658	<
659	<	<mkdir dir="${build.testcases.dir}"/>
660	<
661	<	<javac srcdir="${test.src.dir}"
662	<	destdir="${build.testcases.dir}"
663	<	debug="${build.debug}"
664	<	debuglevel="${build.debuglevel}"
665	<	deprecation="${build.deprecation}"
666	<	source="${build.sourcelevel}"
667	<	fork="true">
668	<
669	<	<include name="jsr166/test/Sample.java"/>
670	<
671	<	</javac>
672	<
673	<	<copy todir="${build.testcases.dir}">
674	<	<fileset dir="${test.src.dir}">
675	<	<include name="**/*.properties"/>
676	<	</fileset>
677	<	</copy>
678	<
679	<
680	<	<java classname="jsr166.test.Sample" fork="true">
681	<	<classpath refid="test.classpath"/>
682	<	<!-- <jvmarg value="-ea"/> -->
683	<	<!-- <jvmarg value="-server"/> -->
684	<	<!-- <arg value="1000"/> -->
685	<	</java>
686	<	</target>
687	<
688	<
689	<	<target name="loops" depends="init, configure-compiler"
497	>	<target name="loops" depends="configure-compiler"
498		description="Benchmark from Doug Lea's AQS paper">
499
500		<mkdir dir="${build.loops.dir}"/>
#	Line 701 | Line 509
509
510		<compilerarg line="${build.args}"/>
511		<classpath refid="loops.classpath"/>
512	+	<compilerarg value="-XDignore.symbol.file=true"/>
513
514		</javac>
515
#	Line 711 | Line 520
520		</target>
521
522
523	<	<target name="compile-j1" depends="init, configure-compiler, compile">
523	>	<!-- jsr166 4jdk7 -->
524
716	–	<mkdir dir="${build.j1.dir}"/>
525
526	<	<javac srcdir="${j1.src.dir}"
527	<	destdir="${build.j1.dir}"
528	<	debug="${build.debug}"
529	<	debuglevel="${build.debuglevel}"
530	<	deprecation="${build.deprecation}"
531	<	source="${build.sourcelevel}" >
526	>	<target name="4jdk7compile"
527	>	depends="configure-compiler"
528	>	description="Compiles src/jdk7 sources, targeting jdk7">
529	>
530	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
531	>
532	>	<javac srcdir="${4jdk7src.dir}"
533	>	destdir="${build.4jdk7.classes.dir}"
534	>	debug="${build.debug}"
535	>	debuglevel="${build.debuglevel}"
536	>	deprecation="${build.deprecation}"
537	>	source="1.6"
538	>	classpath=""
539	>	bootclasspath="${bootclasspath6}"
540	>	includeAntRuntime="false"
541	>	includeJavaRuntime="false"
542	>	executable="${javac7}"
543	>	fork="true">
544
545		<include name="**/*.java"/>
726	–	<exclude name="**/dijkstra/**"/>
727	–
546		<compilerarg line="${build.args}"/>
547	<	<classpath refid="j1.classpath"/>
547	>	<compilerarg value="-XDignore.symbol.file=true"/>
548	>	<compilerarg value="-Xlint:all"/>
549
550		</javac>
551
552	<	</target>
552	>	<mkdir dir="${build.4jdk7.lib.dir}"/>
553
554	+	<jar destfile="${4jdk7product.jar}" index="true">
555	+	<fileset dir="${build.4jdk7.classes.dir}"/>
556	+	</jar>
557
558	<	<target name="sw" depends="compile-j1"
737	<	description="Runs the SwingWorker demo">
558	>	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
559
560	<	<!--
561	<	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
562	<	<classpath refid="j1.classpath"/>
563	<	</java>
564	<	-->
560	>	<javac srcdir="${tck.src.dir}"
561	>	destdir="${build.4jdk7.tck.classes.dir}"
562	>	debug="${build.debug}"
563	>	debuglevel="${build.debuglevel}"
564	>	deprecation="${build.deprecation}"
565	>	source="1.6"
566	>	classpath="${junit.jar}"
567	>	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
568	>	includeAntRuntime="false"
569	>	includeJavaRuntime="false"
570	>	executable="${javac7}"
571	>	fork="true">
572
573	<	<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
573	>	<include name="**/*.java"/>
574	>	<compilerarg line="${build.args}"/>
575	>	<compilerarg value="-XDignore.symbol.file=true"/>
576	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
577
578	<	<exec dir="${build.j1.dir}" executable="appletviewer.exe">
748	<	<arg value="${build.j1.dir}/SwingWorker.html"/>
749	<	</exec>
578	>	</javac>
579
580		</target>
581
753	–	<target name="j1" depends="compile-j1"
754	–	description="Runs a standalone JavaOne program">
755	–
756	–	<java classname="${j1.test}" fork="true">
757	–	<classpath refid="j1.classpath"/>
758	–	<jvmarg value="-client"/>
759	–
760	–	<!-- TestPseudoRandom args -->
761	–	<arg value="2"/>
762	–	<arg value="25"/>
763	–	<arg value="100000"/>
764	–
765	–	<!-- WebCrawler args -->
766	–	<!--
767	–	<arg value="jsr166.webcrawler.WebCrawler3"/>
768	–	<arg value="http://www.priorartisans.com"/>
769	–	<arg value="25"/>
770	–	-->
771	–
772	–	</java>
582
583	+	<target name="4jdk7-test-tck"
584	+	depends="4jdk7compile"
585	+	description="Runs tck tests for jsr166-4jdk7 directly">
586	+	<run-tck-tests
587	+	jvm="${java7}"
588	+	tck.classes="${build.4jdk7.tck.classes.dir}"
589	+	product.jar="${4jdk7product.jar}"/>
590		</target>
591
592
593	<	<target name="test-j1" depends="compile-j1"
594	<	description="Runs testcases from the JavaOne source directories">
593	>	<target name="4jdk7-test-tck-junit"
594	>	depends="4jdk7compile"
595	>	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
596
597		<junit printsummary="true"
598	<	showoutput="true"
599	<	errorProperty="junit.failed"
600	<	failureProperty="junit.failed"
601	<	dir="${build.j1.dir}"
602	<	fork="true">
603	<
787	<	<!-- <jvmarg value="-server"/> -->
788	<	<classpath refid="j1.classpath"/>
789	<	<formatter type="xml"/>
790	<
791	<	<batchtest todir="${build.j1.dir}">
792	<	<fileset dir="${j1.src.dir}">
793	<	<include name="**/*Test.java"/>
794	<	</fileset>
795	<	</batchtest>
796	<
797	<	</junit>
598	>	showoutput="true"
599	>	errorProperty="junit.failed"
600	>	failureProperty="junit.failed"
601	>	includeantruntime="true"
602	>	jvm="${java7}"
603	>	fork="true">
604
605	<	<available property="junit.report.format"
606	<	value="frames"
801	<	classname="org.apache.xalan.lib.Redirect"/>
802	<	<property name="junit.report.format" value="noframes"/>
803	<
804	<	<junitreport todir="${build.j1.dir}">
805	<	<fileset dir="${build.j1.dir}">
806	<	<include name="TEST-*.xml"/>
807	<	</fileset>
808	<	<report styledir="${stylesheet.dir}"
809	<	format="${junit.report.format}"
810	<	todir="${build.j1.dir}"
811	<	/>
812	<	</junitreport>
813	<
814	<	<fail message="Test Cases Failed" if="junit.failed"/>
815	<
816	<	</target>
817	<
818	<
819	<
820	<	<!-- C++ and JNI definitions and demos -->
821	<
822	<	<target name="configure-cpp">
823	<
824	<	<!-- Define tasks and types -->
825	<
826	<	<path id="cpptasks.path">
827	<	<pathelement location="${lib.dir}/cpptasks.jar"/>
828	<	</path>
829	<	<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
830	<	<typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
831	<
832	<	<!-- Set platform property for JNI includes -->
833	<
834	<	<condition property="platform" value="linux">
835	<	<os name="Linux"/>
836	<	</condition>
837	<	<condition property="platform" value="win32">
838	<	<os family="windows"/>
839	<	</condition>
840	<	<condition property="platform" value="solaris">
841	<	<os name="SunOS"/>
842	<	</condition>
843	<
844	<	</target>
845	<
846	<
847	<	<target name="cppdemo" depends="configure-cpp">
605	>	<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
606	>	<jvmarg value="-server"/>
607
608	<	<mkdir dir="${build.dir}"/>
608	>	<classpath>
609	>	<pathelement location="${junit.jar}"/>
610	>	<pathelement location="${build.4jdk7.tck.classes.dir}"/>
611	>	</classpath>
612
613	<	<cc multithreaded="true"
852	<	name="g++"
853	<	objdir="${build.dir}"
854	<	outfile="${build.dir}/CppDemo">
855	<	<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
856	<	<libset libs="stdc++"/>
857	<	</cc>
613	>	<formatter type="brief"/>
614
615	<	<exec executable="${build.dir}/CppDemo">
616	<	<arg line="count in word frequency of word in command line count"/>
861	<	</exec>
615	>	<test name="JSR166TestCase" haltonfailure="no">
616	>	</test>
617
618	+	</junit>
619		</target>
620
621
622	<	<target name="jnidemo" depends="init, configure-compiler, configure-cpp">
623	<
868	<	<mkdir dir="${build.testcases.dir}"/>
622	>	<target name="4jdk7docs"
623	>	description="Builds javadocs for src/jdk7 to dist dir">
624
625	<	<javac srcdir="${test.src.dir}"
626	<	destdir="${build.testcases.dir}"
872	<	debug="${build.debug}"
873	<	debuglevel="${build.debuglevel}"
874	<	deprecation="${build.deprecation}"
875	<	source="${build.sourcelevel}"
876	<	fork="true">
877	<	<compilerarg value="${bootclasspath.args}"/>
878	<	<compilerarg line="${build.args}"/>
879	<	<classpath refid="test.classpath"/>
880	<	<include name="JniDemo.java"/>
881	<	</javac>
625	>	<delete dir="${dist.4jdk7.docs.dir}"/>
626	>	<mkdir dir="${dist.4jdk7.docs.dir}"/>
627
628	<	<javah destdir="${build.testcases.dir}"
629	<	classpathref="test.classpath">
630	<	<class name="JniDemo"/>
631	<	</javah>
632	<
633	<	<cc multithreaded="true"
634	<	name="g++"
635	<	objdir="${build.dir}"
636	<	outfile="${build.dir}/JniDemo"
637	<	outtype="shared">
638	<
639	<	<compiler>
895	<	<defineset>
896	<	<define name="__int64" value="long long"/>
897	<	</defineset>
898	<	<includepath location="${java.home}/../include"/>
899	<	<includepath location="${java.home}/../include/${platform}"/>
900	<	<compilerarg value="-mno-cygwin"/>
901	<	</compiler>
902	<
903	<	<linker>
904	<	<linkerarg value="--add-stdcall-alias"/>
905	<	</linker>
906	<
907	<	<includepath location="${build.testcases.dir}"/>
908	<
909	<	<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
910	<
911	<	<libset libs="stdc++"/>
912	<
913	<	</cc>
914	<
915	<	<!-- Necessary if windows, harmless if not -->
916	<	<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
917	<
918	<	<java classname="JniDemo" fork="true">
919	<	<!-- Watch out: path separator hardwired to semicolon here! -->
920	<	<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
921	<	<classpath refid="test.classpath"/>
922	<	<arg line="count in word frequency of word in command line count"/>
923	<	</java>
628	>	<javadoc destdir="${dist.4jdk7.docs.dir}"
629	>	packagenames="none"
630	>	link="${jdkapi7docs.url}"
631	>	overview="${4jdk7src.dir}/intro.html"
632	>	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
633	>	classpath=""
634	>	executable="${javadoc7}">
635	>	<arg value="-XDignore.symbol.file=true"/>
636	>	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
637	>	<include name="**/*.java"/>
638	>	</fileset>
639	>	</javadoc>
640
641		</target>
642
643
644	+	<target name="4jdk7dist"
645	+	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
646	+	description="Puts all distributable products in single hierarchy"/>
647
929	–	<!-- Backward compatibility, work in progress (some files not checked in) -->
930	–
931	–
932	–
933	–	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
934	–	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
935	–	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
936	–	<property name="pretiger.sourcelevel" value="1.4"/>
648
938	–	<target name="defang"
939	–	depends="init"
940	–	description="Generates pre-Tiger compatible source">
649
650	<	<delete dir="${pretiger.src.dir}"/>
651	<	<mkdir dir="${pretiger.src.dir}"/>
650	>	<target name="4jdk7clean"
651	>	description="Removes all build products">
652
653	<	<exec executable="perl">
946	<	<arg file="etc/defang.pl"/>
947	<	<!-- <arg value="-v"/> -->
948	<	<arg value="-s"/> <arg file="${src.dir}"/>
949	<	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
950	<	</exec>
653	>	<delete dir="${build.4jdk7.dir}"/>
654
655		</target>
656
954	–	<target name="compile-pretiger"
955	–	depends="init, configure-compiler, defang"
956	–	description="Compiles pre-Tiger sources to build folder">
957	–
958	–	<mkdir dir="${build.pretiger.dir}"/>
657
960	–	<javac srcdir="${pretiger.src.dir}"
961	–	destdir="${build.pretiger.dir}"
962	–	debug="${build.debug}"
963	–	debuglevel="${build.debuglevel}"
964	–	deprecation="${build.deprecation}"
965	–	source="${pretiger.sourcelevel}"
966	–	fork="true">
658
659	<	<compilerarg line="${build.args}"/>
660	<	<exclude name="**/Thread.java"/>
970	<
971	<	</javac>
659	>	<target name="4jdk7dist-clean"
660	>	description="Removes all build and distribution products">
661
662		</target>
663
664	<	<target name="pretiger" depends="compile-pretiger">
664	>	<target name="4jdk7dist-jar"
665	>	depends="4jdk7clean, 4jdk7compile">
666
667	<	<mkdir dir="${build.lib.dir}"/>
978	<
979	<	<jar destfile="${pretiger.jar}">
980	<	<fileset dir="${build.pretiger.dir}">
981	<	</fileset>
982	<	</jar>
667	>	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
668
669		</target>
670
#	Line 987 | Line 672
672
673
674		<target name="jsr166xcompile"
675	<	depends="init, configure-compiler"
676	<	description="Compiles jsr166x sources">
675	>	depends="configure-compiler"
676	>	description="Compiles jsr166x sources to build dir">
677
678		<mkdir dir="${build.jsr166x.dir}"/>
679
680	<	<javac srcdir="${jsr166xsrc.dir}"
681	<	destdir="${build.jsr166x.dir}"
682	<	debug="${build.debug}"
683	<	debuglevel="${build.debuglevel}"
684	<	deprecation="${build.deprecation}"
685	<	source="${build.sourcelevel}"
686	<	fork="true">
680	>	<javac srcdir="${topsrc.dir}"
681	>	destdir="${build.jsr166x.dir}"
682	>	debug="${build.debug}"
683	>	debuglevel="${build.debuglevel}"
684	>	deprecation="${build.deprecation}"
685	>	classpath=""
686	>	source="1.5"
687	>	bootclasspath="${bootclasspath6}"
688	>	includeAntRuntime="false"
689	>	includeJavaRuntime="false"
690	>	executable="${javac7}"
691	>	fork="true">
692
693	<	<include name="**/*.java"/>
693	>	<include name="jsr166x/**/*.java"/>
694		<compilerarg line="${build.args}"/>
695	+	<compilerarg value="-XDignore.symbol.file=true"/>
696	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
697
698		</javac>
699
#	Line 1024 | Line 716
716
717
718		<target name="jsr166xdocs"
719	<	description="Builds javadocs with custom tags to build folder">
719	>	description="Builds javadocs to dist dir">
720
721		<delete dir="${build.jsr166xjavadocs.dir}"/>
722		<mkdir dir="${build.jsr166xjavadocs.dir}"/>
723
724		<javadoc destdir="${build.jsr166xjavadocs.dir}"
725	<	link="http://java.sun.com/javase/6/docs/api/"
726	<
727	<	sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
728	<
729	<	>
1038	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
1039	<	<include name="jsr166x"/>
1040	<	</packageset>
1041	<
1042	<
1043	<	</javadoc>
725	>	packagenames="jsr166x"
726	>	link="${jdkapidocs.url}"
727	>	source="${build.sourcelevel}"
728	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
729	>	additionalparam="-XDignore.symbol.file=true" />
730
731		</target>
732
#	Line 1069 | Line 755
755
756
757		<target name="jsr166xdist-docs"
758	<	description="Builds javadocs without custom tags to dist folder">
758	>	description="Builds javadocs to dist dir">
759
760		<delete dir="${dist.jsr166xjavadocs.dir}"/>
761		<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
762
763		<javadoc destdir="${dist.jsr166xjavadocs.dir}"
764	<	link="http://java.sun.com/javase/6/docs/api/"
765	<	source="${build.sourcelevel}">
766	<
767	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
768	<	<include name="jsr166x"/>
1083	<	</packageset>
1084	<
1085	<	</javadoc>
764	>	packagenames="jsr166x"
765	>	link="${jdkapidocs.url}"
766	>	source="${build.sourcelevel}"
767	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
768	>	additionalparam="-XDignore.symbol.file=true" />
769
770		</target>
771
#	Line 1097 | Line 780
780
781
782		<target name="jsr166ycompile"
783	<	depends="init, configure-compiler"
783	>	depends="configure-compiler"
784		description="Compiles jsr166y sources">
785
786		<mkdir dir="${build.jsr166y.dir}"/>
787
788	<	<javac srcdir="${jsr166ysrc.dir}"
789	<	destdir="${build.jsr166y.dir}"
790	<	debug="${build.debug}"
791	<	debuglevel="${build.debuglevel}"
792	<	deprecation="${build.deprecation}"
793	<	source="${build.sourcelevel}"
794	<	fork="true">
788	>	<javac srcdir="${topsrc.dir}"
789	>	destdir="${build.jsr166y.dir}"
790	>	debug="${build.debug}"
791	>	debuglevel="${build.debuglevel}"
792	>	deprecation="${build.deprecation}"
793	>	source="1.6"
794	>	classpath=""
795	>	bootclasspath="${bootclasspath6}"
796	>	includeAntRuntime="false"
797	>	includeJavaRuntime="false"
798	>	executable="${javac7}"
799	>	fork="true">
800
801	<	<include name="**/*.java"/>
801	>	<include name="jsr166y/**/*.java"/>
802		<compilerarg line="${build.args}"/>
803	<	<compilerarg value="${bootclasspath.args}"/>
804	<
1117	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
1118	<
803	>	<compilerarg value="-XDignore.symbol.file=true"/>
804	>	<compilerarg value="-Xlint:all"/>
805		</javac>
1120	–
806		</target>
807
808
1124	–
809		<target name="jsr166yjar"
810		depends="jsr166ycompile"
811		description="Builds library jar from compiled sources">
812
813		<mkdir dir="${build.jsr166ylib.dir}"/>
814
815	<	<jar destfile="${jsr166yproduct.jar}">
815	>	<jar destfile="${jsr166yproduct.jar}" index="true">
816		<fileset dir="${build.jsr166y.dir}"/>
817		</jar>
818
#	Line 1137 | Line 821
821
822
823		<target name="jsr166ydocs"
824	<	description="Builds javadocs with custom tags to build folder">
824	>	description="Builds javadocs to dist dir">
825
826		<delete dir="${build.jsr166yjavadocs.dir}"/>
827		<mkdir dir="${build.jsr166yjavadocs.dir}"/>
828
829		<javadoc destdir="${build.jsr166yjavadocs.dir}"
830	<	link="http://java.sun.com/javase/6/docs/api/"
831	<	sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
832	<
833	<	>
834	<	<packageset dir="${topsrc.dir}" defaultexcludes="no">
1151	<	<include name="jsr166y"/>
1152	<	</packageset>
1153	<
1154	<
1155	<	</javadoc>
830	>	packagenames="jsr166y"
831	>	link="${jdkapidocs.url}"
832	>	source="${build.sourcelevel}"
833	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
834	>	additionalparam="-XDignore.symbol.file=true" />
835
836		</target>
837
#	Line 1179 | Line 858
858		</target>
859
860		<target name="jsr166ydist-docs"
861	<	description="Builds javadocs without custom tags to dist folder">
861	>	description="Builds javadocs to dist dir">
862
863		<delete dir="${dist.jsr166yjavadocs.dir}"/>
864		<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
865
866		<javadoc destdir="${dist.jsr166yjavadocs.dir}"
867	<	link="http://java.sun.com/javase/6/docs/api/"
868	<	source="${build.sourcelevel}">
869	<	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
870	<	<include name="jsr166y/*.java"/>
871	<	<include name="jsr166y/forkjoin/*.java"/>
1193	<	</fileset>
1194	<	</javadoc>
867	>	packagenames="jsr166y"
868	>	link="${jdkapidocs.url}"
869	>	source="${build.sourcelevel}"
870	>	sourcepath="${topsrc.dir}:${jdksrc.dir}"
871	>	additionalparam="-XDignore.symbol.file=true" />
872
873		</target>
874
#	Line 1202 | Line 879
879
880		</target>
881
882	+
883	+	<!-- extra166y -->
884	+
885	+
886	+	<target name="extra166ycompile"
887	+	depends="configure-compiler, jsr166yjar"
888	+	description="Compiles extra166y sources">
889	+
890	+	<mkdir dir="${build.extra166y.dir}"/>
891	+
892	+	<javac srcdir="${topsrc.dir}"
893	+	destdir="${build.extra166y.dir}"
894	+	debug="${build.debug}"
895	+	debuglevel="${build.debuglevel}"
896	+	deprecation="${build.deprecation}"
897	+	classpath=""
898	+	source="1.6"
899	+	bootclasspath="${jsr166yproduct.jar}:${bootclasspath6}"
900	+	includeAntRuntime="false"
901	+	includeJavaRuntime="false"
902	+	executable="${javac7}"
903	+	fork="true">
904	+
905	+	<include name="extra166y/**/*.java"/>
906	+	<compilerarg line="${build.args}"/>
907	+	<compilerarg value="-XDignore.symbol.file=true"/>
908	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
909	+
910	+	</javac>
911	+
912	+	</target>
913	+
914	+
915	+
916	+	<target name="extra166yjar"
917	+	depends="extra166ycompile"
918	+	description="Builds library jar from compiled sources">
919	+
920	+	<mkdir dir="${build.extra166ylib.dir}"/>
921	+
922	+	<jar destfile="${extra166yproduct.jar}" index="true">
923	+	<fileset dir="${build.extra166y.dir}"/>
924	+	</jar>
925	+
926	+	</target>
927	+
928	+
929	+
930	+	<target name="extra166ydocs"
931	+	description="Builds javadocs with custom tags to build dir">
932	+
933	+	<delete dir="${build.extra166yjavadocs.dir}"/>
934	+	<mkdir dir="${build.extra166yjavadocs.dir}"/>
935	+
936	+	<javadoc destdir="${build.extra166yjavadocs.dir}"
937	+	packagenames="extra166y"
938	+	link="${jdkapidocs.url}"
939	+	source="${build.sourcelevel}"
940	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
941	+	additionalparam="-XDignore.symbol.file=true" />
942	+
943	+	</target>
944	+
945	+
946	+	<target name="extra166ydist"
947	+	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
948	+	description="Puts all distributable products in single hierarchy"/>
949	+
950	+
951	+
952	+	<target name="extra166yclean"
953	+	description="Removes all build products">
954	+
955	+	<delete dir="${build.extra166y.dir}"/>
956	+	<delete dir="${build.extra166ylib.dir}"/>
957	+
958	+	</target>
959	+
960	+
961	+
962	+	<target name="extra166ydist-clean"
963	+	description="Removes all build and distribution products">
964	+
965	+	</target>
966	+
967	+	<target name="extra166ydist-docs"
968	+	description="Builds javadocs to dist dir">
969	+
970	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
971	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
972	+
973	+	<javadoc destdir="${dist.extra166yjavadocs.dir}"
974	+	packagenames="extra166y"
975	+	link="${jdkapidocs.url}"
976	+	source="${build.sourcelevel}"
977	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
978	+	additionalparam="-XDignore.symbol.file=true" />
979	+
980	+	</target>
981	+
982	+	<target name="extra166ydist-jar"
983	+	depends="extra166yclean, extra166yjar">
984	+
985	+	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
986	+
987	+	</target>
988	+
989	+	<!-- jsr166e -->
990	+
991	+	<target name="jsr166ecompile"
992	+	depends="configure-compiler"
993	+	description="Compiles jsr166e sources">
994	+
995	+	<mkdir dir="${build.jsr166e.dir}"/>
996	+
997	+	<javac srcdir="${topsrc.dir}"
998	+	destdir="${build.jsr166e.dir}"
999	+	debug="${build.debug}"
1000	+	debuglevel="${build.debuglevel}"
1001	+	deprecation="${build.deprecation}"
1002	+	source="1.7"
1003	+	classpath=""
1004	+	includeAntRuntime="false"
1005	+	includeJavaRuntime="false"
1006	+	executable="${javac7}"
1007	+	fork="true">
1008	+
1009	+	<include name="jsr166e/**/*.java"/>
1010	+	<compilerarg line="${build.args}"/>
1011	+	<compilerarg value="-XDignore.symbol.file=true"/>
1012	+	<compilerarg value="-Xlint:all"/>
1013	+
1014	+	</javac>
1015	+
1016	+	</target>
1017	+
1018	+
1019	+
1020	+	<target name="jsr166ejar"
1021	+	depends="jsr166ecompile"
1022	+	description="Builds library jar from compiled sources">
1023	+
1024	+	<mkdir dir="${build.jsr166elib.dir}"/>
1025	+
1026	+	<jar destfile="${jsr166eproduct.jar}" index="true">
1027	+	<fileset dir="${build.jsr166e.dir}"/>
1028	+	</jar>
1029	+
1030	+	</target>
1031	+
1032	+
1033	+
1034	+	<target name="jsr166edocs"
1035	+	description="Builds javadocs with custom tags to build dir">
1036	+
1037	+	<delete dir="${build.jsr166ejavadocs.dir}"/>
1038	+	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
1039	+
1040	+	<javadoc destdir="${build.jsr166ejavadocs.dir}"
1041	+	packagenames="jsr166e,jsr166e.extra"
1042	+	link="${jdkapi7docs.url}"
1043	+	source="1.7"
1044	+	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1045	+	executable="${javadoc7}"
1046	+	additionalparam="-XDignore.symbol.file=true" >
1047	+	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1048	+	<include name="jsr166e/**/*.java"/>
1049	+	</fileset>
1050	+	</javadoc>
1051	+
1052	+	</target>
1053	+
1054	+
1055	+	<target name="jsr166edist"
1056	+	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1057	+	description="Puts all distributable products in single hierarchy"/>
1058	+
1059	+
1060	+
1061	+	<target name="jsr166eclean"
1062	+	description="Removes all build products">
1063	+
1064	+	<delete dir="${build.jsr166e.dir}"/>
1065	+	<delete dir="${build.jsr166elib.dir}"/>
1066	+
1067	+	</target>
1068	+
1069	+
1070	+
1071	+	<target name="jsr166edist-clean"
1072	+	description="Removes all build and distribution products">
1073	+
1074	+	</target>
1075	+
1076	+	<target name="jsr166edist-docs"
1077	+	description="Builds javadocs to dist dir">
1078	+
1079	+	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1080	+	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1081	+
1082	+	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1083	+	packagenames="jsr166e,jsr166e.extra"
1084	+	link="${jdkapidocs.url}"
1085	+	source="1.7"
1086	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1087	+	additionalparam="-XDignore.symbol.file=true" />
1088	+
1089	+	</target>
1090	+
1091	+	<target name="jsr166edist-jar"
1092	+	depends="jsr166eclean, jsr166ejar">
1093	+
1094	+	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1095	+
1096	+	</target>
1097	+
1098		</project>

Diff Legend

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