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.110 by jsr166, Sun Jan 20 01:09:12 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"/>
58	<	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
59	<	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
60	<
61	<	<property name="build.jsr166y.dir"    location="${build.dir}/jsr166y"/>
62	<	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
63	<	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
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.reports.dir"           location="${build.dir}/reports"/>
49	>
50	>	<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
51	>	<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
52	>	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck/classes"/>
53	>	<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
54	>
55	>	<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
56	>	<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
57	>	<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
58	>	<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
59	>
60	>	<!-- JDK binary locations -->
61	>	<property name="jdks.home"  location="${user.home}/jdk"/>
62	>
63	>	<macrodef name="defjdklocations">
64	>	<attribute name="v"/>
65	>	<sequential>
66	>	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
67	>	<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
68	>	<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
69	>	<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
70	>	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
71	>	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
72	>	<property name="bootclasspath@{v}"
73	>	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
74	>	</sequential>
75	>	</macrodef>
76	>
77	>	<defjdklocations v="6"/>
78	>	<defjdklocations v="7"/>
79	>	<defjdklocations v="8"/>
80	>
81	>	<macrodef name="run-tck-tests">
82	>	<attribute name="jvm"/>
83	>	<attribute name="tck.classes"/>
84	>	<attribute name="product.jar" default="${product.jar}"/>
85	>	<attribute name="jvmflags" default=""/>
86	>	<sequential>
87	>	<java classname="JSR166TestCase"
88	>	jvm="@{jvm}" fork="true">
89	>	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
90	>	<jvmarg line="@{jvmflags}"/>
91	>	<classpath>
92	>	<pathelement location="${junit.jar}"/>
93	>	<pathelement location="@{tck.classes}"/>
94	>	</classpath>
95	>	</java>
96	>	</sequential>
97	>	</macrodef>
98
99		<!-- Source locations -->
100		<property name="src.dir"              location="${basedir}/src/main"/>
101		<property name="test.src.dir"         location="${basedir}/src/test"/>
54	–	<property name="j1.src.dir"           location="${basedir}/src/javaone"/>
102		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
103		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
104		<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"/>
105		<property name="lib.dir"              location="${basedir}/lib"/>
106		<property name="dist.dir"             location="${basedir}/dist"/>
107		<property name="topsrc.dir"           location="${basedir}/src"/>
108	<	<property name="jsr166xsrc.dir"       location="${basedir}/src/jsr166x"/>
109	<	<property name="jsr166ysrc.dir"       location="${basedir}/src/jsr166y"/>
108	>	<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
109	>	<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
110	>	<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
111	>	<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
112	>	<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
113
114		<!-- Distribution locations -->
115	<	<property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
116	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
117	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
115	>	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
116	>	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
117	>	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
118	>	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
119	>	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
120	>	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
121
122		<!-- Jar locations -->
123	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
124	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
125	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
126	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
127	<	<property name="concurrent.jar"       location="${lib.dir}/concurrent.jar"/>
123	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
124	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
125	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
126	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
127	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
128	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
129	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
130
131		<!-- Bootclasspath argument -->
132		<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
133
134	+	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
135	+	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
136	+	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
137	+	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
138	+
139	+	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
140	+	<!-- The below does not yet exist as of 2012-11 -->
141	+	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
142	+
143	+	<!-- Default jdk api doc location (latest stable release seems best) -->
144	+	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
145	+
146		<!-- Test classpath -->
147		<path id="test.classpath">
148		<pathelement location="${build.testcases.dir}"/>
#	Line 89 | Line 154
154		<pathelement location="${build.loops.dir}"/>
155		</path>
156
157	<	<!-- J1 classpath -->
158	<	<path id="j1.classpath">
159	<	<pathelement location="${build.classes.dir}"/>
160	<	<pathelement location="${build.j1.dir}"/>
161	<	<pathelement location="${junit.jar}"/>
162	<
98	<	<!-- Include dl.u.c for BoundedBuffer comparison -->
99	<	<pathelement location="${concurrent.jar}"/>
100	<	</path>
101	<
157	>	<!-- Support @jls tag, used in jdk8+ javadoc -->
158	>	<!-- TODO: How do we get &trade to work? -->
159	>	<!-- TODO: Why isn't @jls a "standard" tag? -->
160	>	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
161	>	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
162	>	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
163
164		<!-- Main targets -->
165
166	+	<target name="dists"
167	+	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
168	+	description="Builds all public jars and docs"/>
169
170		<target name="compile"
171	<	depends="init, configure-compiler"
172	<	description="Compiles main sources to build folder">
171	>	depends="configure-compiler"
172	>	description="Compiles src/main sources to build dir">
173
174		<mkdir dir="${build.classes.dir}"/>
175
176		<javac srcdir="${src.dir}"
177	<	destdir="${build.classes.dir}"
178	<	debug="${build.debug}"
179	<	debuglevel="${build.debuglevel}"
180	<	deprecation="${build.deprecation}"
181	<	source="${build.sourcelevel}"
182	<	fork="true">
177	>	destdir="${build.classes.dir}"
178	>	debug="${build.debug}"
179	>	debuglevel="${build.debuglevel}"
180	>	deprecation="${build.deprecation}"
181	>	classpath=""
182	>	includeAntRuntime="false"
183	>	includeJavaRuntime="false"
184	>	executable="${javac8}"
185	>	fork="true">
186
187		<include name="**/*.java"/>
188	<	<compilerarg value="-XDignore.symbol.file"/>
188	>	<compilerarg line="${build.args}"/>
189	>	<compilerarg value="-XDignore.symbol.file=true"/>
190	>	<compilerarg value="-Xlint:all"/>
191
192		<!--
193		<exclude name="java/lang/**"/>
#	Line 136 | Line 205
205		depends="compile"
206		description="Builds library jar from compiled sources">
207
139	–	<mkdir dir="${build.lib.dir}"/>
140	–
208		<jar destfile="${product.jar}">
209		<fileset dir="${build.classes.dir}"/>
210		</jar>
#	Line 147 | Line 214
214
215
216		<target name="test"
217	<	depends="init, configure-tests, report-tests"
217	>	depends="configure-tests, report-tests"
218		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
219
220
221
222		<target name="docs"
223	<	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>
223	>	description="Builds javadocs for src/main to dist dir">
224
225	+	<delete dir="${dist.javadocs.dir}"/>
226	+	<mkdir dir="${dist.javadocs.dir}"/>
227
228	+	<!-- the packagenames="none" hack below prevents scanning the -->
229	+	<!-- sourcepath for packages -->
230
231	<	<target name="doccheck"
232	<	depends="filter-doccheck"
233	<	description="Reports on javadoc style errors">
234	<
235	<	<delete dir="${build.doccheck.dir}"/>
236	<	<mkdir dir="${build.doccheck.dir}"/>
237	<
238	<	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
239	<	docletpath="${lib.dir}/doccheck.jar"
240	<	destdir="${build.doccheck.dir}">
241	<	<packageset dir="${build.dc-filter.dir}"/>
231	>	<javadoc destdir="${dist.javadocs.dir}"
232	>	packagenames="none"
233	>	link="${jdkapi8docs.url}"
234	>	overview="${src.dir}/intro.html"
235	>	sourcepath="${src.dir}:${jdk8src.dir}"
236	>	classpath=""
237	>	executable="${javadoc8}">
238	>	<arg value="-XDignore.symbol.file=true"/>
239	>	<arg value="-tag"/>
240	>	<arg value="${javadoc.jls.option}"/>
241	>	<fileset dir="${src.dir}" defaultexcludes="yes">
242	>	<include name="**/*.java"/>
243	>	</fileset>
244		</javadoc>
245
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	–
246		</target>
247
248
249
250		<target name="dist"
251	<	depends="init, dist-clean, dist-jar, dist-docs"
251	>	depends="dist-clean, dist-jar, docs"
252		description="Puts all distributable products in single hierarchy"/>
253
254
222	–
255		<target name="release"
256		depends="dist"
257		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 244 | Line 276
276		description="Removes all build products">
277
278		<delete dir="${build.dir}"/>
247	–	<delete dir="${build.classes.dir}"/>
248	–	<delete dir="${build.lib.dir}"/>
279
280		</target>
281
#	Line 260 | Line 290
290
291
292
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	–
293		<!-- Internal targets -->
294
295
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	–
296		<target name="dist-jar"
297		depends="clean, jar">
298
#	Line 319 | Line 301
301		</target>
302
303
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	–
304		<target name="compile-tests"
305		depends="jar">
306
#	Line 445 | Line 316
316
317		<compilerarg value="${bootclasspath.args}"/>
318		<compilerarg line="${build.args}"/>
319	+	<compilerarg value="-XDignore.symbol.file=true"/>
320
321		<classpath refid="test.classpath"/>
322
#	Line 462 | Line 334
334
335		<compilerarg value="${bootclasspath.args}"/>
336		<compilerarg line="${build.args}"/>
337	+	<compilerarg value="-XDignore.symbol.file=true"/>
338
339		<classpath refid="test.classpath"/>
340
#	Line 478 | 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 550 | Line 424
424		<fileset dir="${build.reports.dir}">
425		<include name="TEST-*.xml"/>
426		</fileset>
427	<	<report styledir="${stylesheet.dir}"
554	<	format="${junit.report.format}"
555	<	todir="${build.reports.dir}"
427	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
428		/>
429		</junitreport>
430
#	Line 602 | Line 474
474		</target>
475
476
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	–
477		<!-- Various demos and test programs -->
478
479
480	<	<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"
480	>	<target name="loops" depends="configure-compiler"
481		description="Benchmark from Doug Lea's AQS paper">
482
483		<mkdir dir="${build.loops.dir}"/>
#	Line 701 | Line 492
492
493		<compilerarg line="${build.args}"/>
494		<classpath refid="loops.classpath"/>
495	+	<compilerarg value="-XDignore.symbol.file=true"/>
496
497		</javac>
498
#	Line 711 | Line 503
503		</target>
504
505
506	<	<target name="compile-j1" depends="init, configure-compiler, compile">
506	>	<!-- jsr166 4jdk7 -->
507
716	–	<mkdir dir="${build.j1.dir}"/>
508
509	<	<javac srcdir="${j1.src.dir}"
510	<	destdir="${build.j1.dir}"
511	<	debug="${build.debug}"
512	<	debuglevel="${build.debuglevel}"
513	<	deprecation="${build.deprecation}"
514	<	source="${build.sourcelevel}" >
509	>	<target name="4jdk7compile"
510	>	depends="configure-compiler"
511	>	description="Compiles src/jdk7 sources, targeting jdk7">
512	>
513	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
514	>
515	>	<javac srcdir="${4jdk7src.dir}"
516	>	destdir="${build.4jdk7.classes.dir}"
517	>	debug="${build.debug}"
518	>	debuglevel="${build.debuglevel}"
519	>	deprecation="${build.deprecation}"
520	>	source="6"
521	>	classpath=""
522	>	bootclasspath="${bootclasspath6}"
523	>	includeAntRuntime="false"
524	>	includeJavaRuntime="false"
525	>	executable="${javac7}"
526	>	fork="true">
527
528		<include name="**/*.java"/>
726	–	<exclude name="**/dijkstra/**"/>
727	–
529		<compilerarg line="${build.args}"/>
530	<	<classpath refid="j1.classpath"/>
530	>	<compilerarg value="-XDignore.symbol.file=true"/>
531	>	<compilerarg value="-Xlint:all"/>
532
533		</javac>
534
535	<	</target>
536	<
535	>	<jar destfile="${4jdk7product.jar}" index="true">
536	>	<fileset dir="${build.4jdk7.classes.dir}"/>
537	>	</jar>
538
539	<	<target name="sw" depends="compile-j1"
737	<	description="Runs the SwingWorker demo">
539	>	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
540
541	<	<!--
542	<	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
543	<	<classpath refid="j1.classpath"/>
544	<	</java>
545	<	-->
541	>	<javac srcdir="${tck.src.dir}"
542	>	destdir="${build.4jdk7.tck.classes.dir}"
543	>	debug="${build.debug}"
544	>	debuglevel="${build.debuglevel}"
545	>	deprecation="${build.deprecation}"
546	>	source="6"
547	>	classpath="${junit.jar}"
548	>	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
549	>	includeAntRuntime="false"
550	>	includeJavaRuntime="false"
551	>	executable="${javac7}"
552	>	fork="true">
553
554	<	<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
554	>	<include name="**/*.java"/>
555	>	<compilerarg line="${build.args}"/>
556	>	<compilerarg value="-XDignore.symbol.file=true"/>
557	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
558
559	<	<exec dir="${build.j1.dir}" executable="appletviewer.exe">
748	<	<arg value="${build.j1.dir}/SwingWorker.html"/>
749	<	</exec>
559	>	</javac>
560
561		</target>
562
753	–	<target name="j1" depends="compile-j1"
754	–	description="Runs a standalone JavaOne program">
563
564	<	<java classname="${j1.test}" fork="true">
565	<	<classpath refid="j1.classpath"/>
566	<	<jvmarg value="-client"/>
564	>	<target name="4jdk7-test-tck"
565	>	depends="4jdk7compile"
566	>	description="Runs tck tests for jsr166-4jdk7 directly">
567	>	<run-tck-tests
568	>	jvm="${java7}"
569	>	tck.classes="${build.4jdk7.tck.classes.dir}"
570	>	product.jar="${4jdk7product.jar}"/>
571	>	</target>
572
760	–	<!-- TestPseudoRandom args -->
761	–	<arg value="2"/>
762	–	<arg value="25"/>
763	–	<arg value="100000"/>
573
574	<	<!-- WebCrawler args -->
575	<	<!--
576	<	<arg value="jsr166.webcrawler.WebCrawler3"/>
768	<	<arg value="http://www.priorartisans.com"/>
769	<	<arg value="25"/>
770	<	-->
574	>	<target name="4jdk7-test-tck-junit"
575	>	depends="4jdk7compile"
576	>	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
577
578	<	</java>
578	>	<junit printsummary="true"
579	>	showoutput="true"
580	>	errorProperty="junit.failed"
581	>	failureProperty="junit.failed"
582	>	includeantruntime="true"
583	>	jvm="${java7}"
584	>	fork="true">
585
586	<	</target>
586	>	<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
587	>	<jvmarg value="-server"/>
588
589	+	<classpath>
590	+	<pathelement location="${junit.jar}"/>
591	+	<pathelement location="${build.4jdk7.tck.classes.dir}"/>
592	+	</classpath>
593
594	<	<target name="test-j1" depends="compile-j1"
778	<	description="Runs testcases from the JavaOne source directories">
594	>	<formatter type="brief"/>
595
596	<	<junit printsummary="true"
597	<	showoutput="true"
782	<	errorProperty="junit.failed"
783	<	failureProperty="junit.failed"
784	<	dir="${build.j1.dir}"
785	<	fork="true">
596	>	<test name="JSR166TestCase" haltonfailure="no">
597	>	</test>
598
599	<	<!-- <jvmarg value="-server"/> -->
600	<	<classpath refid="j1.classpath"/>
789	<	<formatter type="xml"/>
599	>	</junit>
600	>	</target>
601
791	–	<batchtest todir="${build.j1.dir}">
792	–	<fileset dir="${j1.src.dir}">
793	–	<include name="**/*Test.java"/>
794	–	</fileset>
795	–	</batchtest>
602
603	<	</junit>
603	>	<target name="4jdk7docs"
604	>	description="Builds javadocs for src/jdk7 to dist dir">
605
606	<	<available property="junit.report.format"
607	<	value="frames"
801	<	classname="org.apache.xalan.lib.Redirect"/>
802	<	<property name="junit.report.format" value="noframes"/>
606	>	<delete dir="${dist.4jdk7.docs.dir}"/>
607	>	<mkdir dir="${dist.4jdk7.docs.dir}"/>
608
609	<	<junitreport todir="${build.j1.dir}">
610	<	<fileset dir="${build.j1.dir}">
611	<	<include name="TEST-*.xml"/>
609	>	<javadoc destdir="${dist.4jdk7.docs.dir}"
610	>	packagenames="none"
611	>	link="${jdkapi7docs.url}"
612	>	overview="${4jdk7src.dir}/intro.html"
613	>	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
614	>	classpath=""
615	>	executable="${javadoc7}">
616	>	<arg value="-XDignore.symbol.file=true"/>
617	>	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
618	>	<include name="**/*.java"/>
619		</fileset>
620	<	<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"/>
620	>	</javadoc>
621
622		</target>
623
624
625	+	<target name="4jdk7dist"
626	+	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
627	+	description="Puts all distributable products in single hierarchy"/>
628
820	–	<!-- C++ and JNI definitions and demos -->
821	–
822	–	<target name="configure-cpp">
823	–
824	–	<!-- Define tasks and types -->
629
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"/>
630
631	<	<!-- Set platform property for JNI includes -->
631	>	<target name="4jdk7clean"
632	>	description="Removes all 4jdk7 build products">
633
634	<	<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>
634	>	<delete dir="${build.4jdk7.dir}"/>
635
636		</target>
637
638
847	–	<target name="cppdemo" depends="configure-cpp">
639
640	<	<mkdir dir="${build.dir}"/>
640	>	<target name="4jdk7dist-clean"
641	>	description="Removes all build and distribution products">
642	>
643	>	</target>
644
645	<	<cc multithreaded="true"
646	<	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>
645	>	<target name="4jdk7dist-jar"
646	>	depends="4jdk7clean, 4jdk7compile">
647
648	<	<exec executable="${build.dir}/CppDemo">
860	<	<arg line="count in word frequency of word in command line count"/>
861	<	</exec>
648	>	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
649
650		</target>
651
652
653	<	<target name="jnidemo" depends="init, configure-compiler, configure-cpp">
653	>	<!-- jsr166x -->
654
655	<	<mkdir dir="${build.testcases.dir}"/>
655	>	<target name="jsr166xcompile"
656	>	depends="configure-compiler"
657	>	description="Compiles jsr166x sources to build dir">
658
659	<	<javac srcdir="${test.src.dir}"
660	<	destdir="${build.testcases.dir}"
661	<	debug="${build.debug}"
662	<	debuglevel="${build.debuglevel}"
663	<	deprecation="${build.deprecation}"
664	<	source="${build.sourcelevel}"
665	<	fork="true">
666	<	<compilerarg value="${bootclasspath.args}"/>
659	>	<mkdir dir="${build.jsr166x.dir}"/>
660	>
661	>	<javac srcdir="${topsrc.dir}"
662	>	destdir="${build.jsr166x.dir}"
663	>	debug="${build.debug}"
664	>	debuglevel="${build.debuglevel}"
665	>	deprecation="${build.deprecation}"
666	>	classpath=""
667	>	source="5"
668	>	bootclasspath="${bootclasspath6}"
669	>	includeAntRuntime="false"
670	>	includeJavaRuntime="false"
671	>	executable="${javac7}"
672	>	fork="true">
673	>
674	>	<include name="jsr166x/**/*.java"/>
675		<compilerarg line="${build.args}"/>
676	<	<classpath refid="test.classpath"/>
677	<	<include name="JniDemo.java"/>
881	<	</javac>
676	>	<compilerarg value="-XDignore.symbol.file=true"/>
677	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
678
679	<	<javah destdir="${build.testcases.dir}"
884	<	classpathref="test.classpath">
885	<	<class name="JniDemo"/>
886	<	</javah>
887	<
888	<	<cc multithreaded="true"
889	<	name="g++"
890	<	objdir="${build.dir}"
891	<	outfile="${build.dir}/JniDemo"
892	<	outtype="shared">
893	<
894	<	<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>
679	>	</javac>
680
681		</target>
682
683
684
685	<	<!-- Backward compatibility, work in progress (some files not checked in) -->
685	>	<target name="jsr166xjar"
686	>	depends="jsr166xcompile"
687	>	description="Builds library jar from compiled sources">
688	>
689	>	<jar destfile="${jsr166x.jar}">
690	>	<fileset dir="${build.jsr166x.dir}"/>
691	>	</jar>
692
693	+	</target>
694
695
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"/>
696
697	<	<target name="defang"
698	<	depends="init"
940	<	description="Generates pre-Tiger compatible source">
697	>	<target name="jsr166xdocs"
698	>	description="Builds javadocs to dist dir">
699
700	<	<delete dir="${pretiger.src.dir}"/>
701	<	<mkdir dir="${pretiger.src.dir}"/>
700	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
701	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
702
703	<	<exec executable="perl">
704	<	<arg file="etc/defang.pl"/>
705	<	<!-- <arg value="-v"/> -->
706	<	<arg value="-s"/> <arg file="${src.dir}"/>
707	<	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
708	<	</exec>
703	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
704	>	packagenames="jsr166x.*"
705	>	link="${jdkapidocs.url}"
706	>	source="5"
707	>	bootclasspath="${bootclasspath6}"
708	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
709	>	executable="${javadoc7}"
710	>	additionalparam="-XDignore.symbol.file=true" />
711
712		</target>
713
954	–	<target name="compile-pretiger"
955	–	depends="init, configure-compiler, defang"
956	–	description="Compiles pre-Tiger sources to build folder">
714
715	<	<mkdir dir="${build.pretiger.dir}"/>
715	>	<target name="jsr166xdist"
716	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
717	>	description="Puts all distributable products in single hierarchy"/>
718
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">
719
968	–	<compilerarg line="${build.args}"/>
969	–	<exclude name="**/Thread.java"/>
720
721	<	</javac>
721	>	<target name="jsr166xclean"
722	>	description="Removes all jsr166x build products">
723	>
724	>	<delete dir="${build.jsr166x.dir}"/>
725
726		</target>
727
975	–	<target name="pretiger" depends="compile-pretiger">
728
977	–	<mkdir dir="${build.lib.dir}"/>
729
730	<	<jar destfile="${pretiger.jar}">
731	<	<fileset dir="${build.pretiger.dir}">
981	<	</fileset>
982	<	</jar>
730	>	<target name="jsr166xdist-clean"
731	>	description="Removes all build and distribution products">
732
733		</target>
734
986	–	<!-- jsr166x -->
735
736	+	<target name="jsr166xdist-jar"
737	+	depends="jsr166xclean, jsr166xjar">
738
739	<	<target name="jsr166xcompile"
990	<	depends="init, configure-compiler"
991	<	description="Compiles jsr166x sources">
739	>	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
740
741	<	<mkdir dir="${build.jsr166x.dir}"/>
741	>	</target>
742
743	<	<javac srcdir="${jsr166xsrc.dir}"
996	<	destdir="${build.jsr166x.dir}"
997	<	debug="${build.debug}"
998	<	debuglevel="${build.debuglevel}"
999	<	deprecation="${build.deprecation}"
1000	<	source="${build.sourcelevel}"
1001	<	fork="true">
743	>	<!-- jsr166y -->
744
1003	–	<include name="**/*.java"/>
1004	–	<compilerarg line="${build.args}"/>
745
746	+	<target name="jsr166ycompile"
747	+	depends="configure-compiler"
748	+	description="Compiles jsr166y sources">
749	+
750	+	<mkdir dir="${build.jsr166y.dir}"/>
751	+
752	+	<javac srcdir="${topsrc.dir}"
753	+	destdir="${build.jsr166y.dir}"
754	+	debug="${build.debug}"
755	+	debuglevel="${build.debuglevel}"
756	+	deprecation="${build.deprecation}"
757	+	source="6"
758	+	classpath=""
759	+	bootclasspath="${bootclasspath6}"
760	+	includeAntRuntime="false"
761	+	includeJavaRuntime="false"
762	+	executable="${javac7}"
763	+	fork="true">
764	+
765	+	<include name="jsr166y/**/*.java"/>
766	+	<compilerarg line="${build.args}"/>
767	+	<compilerarg value="-XDignore.symbol.file=true"/>
768	+	<compilerarg value="-Xlint:all"/>
769		</javac>
770	+	</target>
771	+
772	+
773	+	<target name="jsr166yjar"
774	+	depends="jsr166ycompile"
775	+	description="Builds library jar from compiled sources">
776	+
777	+	<jar destfile="${jsr166y.jar}" index="true">
778	+	<fileset dir="${build.jsr166y.dir}"/>
779	+	</jar>
780
781		</target>
782
783
784
785	<	<target name="jsr166xjar"
786	<	depends="jsr166xcompile"
1014	<	description="Builds library jar from compiled sources">
785	>	<target name="jsr166ydocs"
786	>	description="Builds javadocs to dist dir">
787
788	<	<mkdir dir="${build.jsr166xlib.dir}"/>
788	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
789	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
790
791	<	<jar destfile="${jsr166xproduct.jar}">
792	<	<fileset dir="${build.jsr166x.dir}"/>
793	<	</jar>
791	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
792	>	packagenames="jsr166y.*"
793	>	link="${jdkapidocs.url}"
794	>	source="6"
795	>	bootclasspath="${bootclasspath6}"
796	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
797	>	executable="${javadoc7}"
798	>	additionalparam="-XDignore.symbol.file=true" />
799
800		</target>
801
802
803	+	<target name="jsr166ydist"
804	+	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
805	+	description="Puts all distributable products in single hierarchy"/>
806
1026	–	<target name="jsr166xdocs"
1027	–	description="Builds javadocs with custom tags to build folder">
807
1029	–	<delete dir="${build.jsr166xjavadocs.dir}"/>
1030	–	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
808
809	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
810	<	link="http://java.sun.com/javase/6/docs/api/"
809	>	<target name="jsr166yclean"
810	>	description="Removes all jsr166y build products">
811
812	<	sourcepath="${jsr166xsrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
812	>	<delete dir="${build.jsr166y.dir}"/>
813
814	<	>
1038	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
1039	<	<include name="jsr166x"/>
1040	<	</packageset>
814	>	</target>
815
816
817	<	</javadoc>
817	>
818	>	<target name="jsr166ydist-clean"
819	>	description="Removes all build and distribution products">
820
821		</target>
822
823	+	<target name="jsr166ydist-jar"
824	+	depends="jsr166yclean, jsr166yjar">
825
826	<	<target name="jsr166xdist"
1049	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
1050	<	description="Puts all distributable products in single hierarchy"/>
826	>	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
827
828	+	</target>
829
830
831	<	<target name="jsr166xclean"
1055	<	description="Removes all build products">
831	>	<!-- extra166y -->
832
833	<	<delete dir="${build.jsr166x.dir}"/>
834	<	<delete dir="${build.jsr166xlib.dir}"/>
833	>
834	>	<target name="extra166ycompile"
835	>	depends="configure-compiler, jsr166yjar"
836	>	description="Compiles extra166y sources">
837	>
838	>	<mkdir dir="${build.extra166y.dir}"/>
839	>
840	>	<javac srcdir="${topsrc.dir}"
841	>	destdir="${build.extra166y.dir}"
842	>	debug="${build.debug}"
843	>	debuglevel="${build.debuglevel}"
844	>	deprecation="${build.deprecation}"
845	>	classpath=""
846	>	source="6"
847	>	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
848	>	includeAntRuntime="false"
849	>	includeJavaRuntime="false"
850	>	executable="${javac7}"
851	>	fork="true">
852	>
853	>	<include name="extra166y/**/*.java"/>
854	>	<compilerarg line="${build.args}"/>
855	>	<compilerarg value="-XDignore.symbol.file=true"/>
856	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
857	>
858	>	</javac>
859
860		</target>
861
862
863
864	<	<target name="jsr166xdist-clean"
865	<	description="Removes all build and distribution products">
864	>	<target name="extra166yjar"
865	>	depends="extra166ycompile"
866	>	description="Builds library jar from compiled sources">
867	>
868	>	<jar destfile="${extra166y.jar}" index="true">
869	>	<fileset dir="${build.extra166y.dir}"/>
870	>	</jar>
871
872		</target>
873
874
875
876	<	<target name="jsr166xdist-docs"
877	<	description="Builds javadocs without custom tags to dist folder">
876	>	<target name="extra166ydocs"
877	>	description="Builds javadocs to build dir">
878
879	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
880	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
879	>	<delete dir="${dist.extra166yjavadocs.dir}"/>
880	>	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
881
882	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
883	<	link="http://java.sun.com/javase/6/docs/api/"
884	<	source="${build.sourcelevel}">
882	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
883	>	packagenames="extra166y.*"
884	>	link="${jdkapidocs.url}"
885	>	source="6"
886	>	bootclasspath="${bootclasspath6}"
887	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
888	>	executable="${javadoc7}"
889	>	additionalparam="-XDignore.symbol.file=true" />
890
891	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
892	<	<include name="jsr166x"/>
893	<	</packageset>
891	>	</target>
892	>
893	>
894	>	<target name="extra166ydist"
895	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
896	>	description="Puts all distributable products in single hierarchy"/>
897
898	<	</javadoc>
898	>
899	>
900	>	<target name="extra166yclean"
901	>	description="Removes all extra166y build products">
902	>
903	>	<delete dir="${build.extra166y.dir}"/>
904
905		</target>
906
1089	–	<target name="jsr166xdist-jar"
1090	–	depends="jsr166xclean, jsr166xjar">
907
908	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
908	>
909	>	<target name="extra166ydist-clean"
910	>	description="Removes all build and distribution products">
911
912		</target>
913
914	<	<!-- jsr166y -->
914	>	<target name="extra166ydist-jar"
915	>	depends="extra166yclean, extra166yjar">
916
917	+	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
918
919	<	<target name="jsr166ycompile"
1100	<	depends="init, configure-compiler"
1101	<	description="Compiles jsr166y sources">
919	>	</target>
920
921	<	<mkdir dir="${build.jsr166y.dir}"/>
921	>	<!-- jsr166e -->
922
923	<	<javac srcdir="${jsr166ysrc.dir}"
924	<	destdir="${build.jsr166y.dir}"
925	<	debug="${build.debug}"
1108	<	debuglevel="${build.debuglevel}"
1109	<	deprecation="${build.deprecation}"
1110	<	source="${build.sourcelevel}"
1111	<	fork="true">
923	>	<target name="jsr166ecompile"
924	>	depends="configure-compiler"
925	>	description="Compiles jsr166e sources">
926
927	<	<include name="**/*.java"/>
928	<	<compilerarg line="${build.args}"/>
929	<	<compilerarg value="${bootclasspath.args}"/>
927	>	<mkdir dir="${build.jsr166e.dir}"/>
928	>
929	>	<javac srcdir="${topsrc.dir}"
930	>	destdir="${build.jsr166e.dir}"
931	>	debug="${build.debug}"
932	>	debuglevel="${build.debuglevel}"
933	>	deprecation="${build.deprecation}"
934	>	source="7"
935	>	classpath=""
936	>	includeAntRuntime="false"
937	>	includeJavaRuntime="false"
938	>	executable="${javac7}"
939	>	fork="true">
940
941	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
941	>	<include name="jsr166e/**/*.java"/>
942	>	<compilerarg line="${build.args}"/>
943	>	<compilerarg value="-XDignore.symbol.file=true"/>
944	>	<compilerarg value="-Xlint:all"/>
945
946		</javac>
947
#	Line 1122 | Line 949
949
950
951
952	<	<target name="jsr166yjar"
953	<	depends="jsr166ycompile"
952	>	<target name="jsr166ejar"
953	>	depends="jsr166ecompile"
954		description="Builds library jar from compiled sources">
955
956	<	<mkdir dir="${build.jsr166ylib.dir}"/>
957	<
1131	<	<jar destfile="${jsr166yproduct.jar}">
1132	<	<fileset dir="${build.jsr166y.dir}"/>
956	>	<jar destfile="${jsr166e.jar}" index="true">
957	>	<fileset dir="${build.jsr166e.dir}"/>
958		</jar>
959
960		</target>
961
962
963
964	<	<target name="jsr166ydocs"
965	<	description="Builds javadocs with custom tags to build folder">
1141	<
1142	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
1143	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
1144	<
1145	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
1146	<	link="http://java.sun.com/javase/6/docs/api/"
1147	<	sourcepath="${jsr166ysrc.dir}:/home/dl/1.5.0/j2se/martin/j2se/src/share/classes"
1148	<
1149	<	>
1150	<	<packageset dir="${topsrc.dir}" defaultexcludes="no">
1151	<	<include name="jsr166y"/>
1152	<	</packageset>
964	>	<target name="jsr166edocs"
965	>	description="Builds javadocs to build dir">
966
967	+	<delete dir="${dist.jsr166ejavadocs.dir}"/>
968	+	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
969
970	+	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
971	+	packagenames="jsr166e.*"
972	+	link="${jdkapidocs.url}"
973	+	source="7"
974	+	sourcepath="${topsrc.dir}:${jdk7src.dir}"
975	+	executable="${javadoc7}"
976	+	additionalparam="-XDignore.symbol.file=true" >
977		</javadoc>
978
979		</target>
980
981
982	<	<target name="jsr166ydist"
983	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
982	>	<target name="jsr166edist"
983	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
984		description="Puts all distributable products in single hierarchy"/>
985
986
987
988	<	<target name="jsr166yclean"
989	<	description="Removes all build products">
988	>	<target name="jsr166eclean"
989	>	description="Removes all jsr166e build products">
990
991	<	<delete dir="${build.jsr166y.dir}"/>
1170	<	<delete dir="${build.jsr166ylib.dir}"/>
991	>	<delete dir="${build.jsr166e.dir}"/>
992
993		</target>
994
995
996	<
1176	<	<target name="jsr166ydist-clean"
996	>	<target name="jsr166edist-clean"
997		description="Removes all build and distribution products">
998
999		</target>
1000
1001	<	<target name="jsr166ydist-docs"
1002	<	description="Builds javadocs without custom tags to dist folder">
1183	<
1184	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
1185	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
1186	<
1187	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
1188	<	link="http://java.sun.com/javase/6/docs/api/"
1189	<	source="${build.sourcelevel}">
1190	<	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1191	<	<include name="jsr166y/*.java"/>
1192	<	<include name="jsr166y/forkjoin/*.java"/>
1193	<	</fileset>
1194	<	</javadoc>
1195	<
1196	<	</target>
1197	<
1198	<	<target name="jsr166ydist-jar"
1199	<	depends="jsr166yclean, jsr166yjar">
1001	>	<target name="jsr166edist-jar"
1002	>	depends="jsr166eclean, jsr166ejar">
1003
1004	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
1004	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1005
1006		</target>
1007

Diff Legend

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