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.70 by dl, Wed Aug 11 10:57:33 2004 UTC vs.
Revision 1.113 by jsr166, Sun Jan 20 03:51:38 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"/>
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"/>
50	–	<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"/>
54	–	<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
55	–	<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"/>
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"/>
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="junit.jar"            location="${lib.dir}/junit.jar"/>
126	<	<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 82 | Line 154
154		<pathelement location="${build.loops.dir}"/>
155		</path>
156
157	<	<!-- J1 classpath -->
158	<	<path id="j1.classpath">
159	<	<pathelement location="${build.j1.dir}"/>
160	<	<pathelement location="${junit.jar}"/>
161	<	<pathelement location="${concurrent.jar}"/>
162	<	</path>
91	<
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 line="${build.args}"/>
189	+	<compilerarg value="-XDignore.symbol.file=true"/>
190	+	<compilerarg value="-Xlint:all"/>
191	+
192	+	<!--
193		<exclude name="java/lang/**"/>
194		<compilerarg line="${build.args}"/>
195	+	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
196	+	-->
197
198		</javac>
199
#	Line 121 | Line 205
205		depends="compile"
206		description="Builds library jar from compiled sources">
207
124	–	<mkdir dir="${build.lib.dir}"/>
125	–
208		<jar destfile="${product.jar}">
209		<fileset dir="${build.classes.dir}"/>
210		</jar>
#	Line 132 | 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">
142	<
143	<	<delete dir="${build.javadocs.dir}"/>
144	<	<mkdir dir="${build.javadocs.dir}"/>
145	<
146	<	<javadoc destdir="${build.javadocs.dir}"
147	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
148	<	overview="${src.dir}/intro.html"
149	<	source="${build.sourcelevel}">
150	<
151	<	<tag name="revised" description="Last revised:"/>
152	<	<tag name="spec"    description="Specified by:"/>
153	<
154	<	<packageset dir="${src.dir}"/>
155	<
156	<	</javadoc>
157	<
158	<	</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
175	–	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
176	–
177	–	</target>
178	–
179	–
180	–
181	–	<target name="checkstyle"
182	–	depends="filter-src"
183	–	description="Reports on style errors in Java source (verbose, mostly chaff)">
184	–
185	–	<taskdef resource="checkstyletask.properties"
186	–	classpath="${lib.dir}/checkstyle-all-3.1.jar"/>
187	–
188	–	<mkdir dir="${build.checkstyle.dir}"/>
189	–
190	–	<checkstyle config="etc/checkstyle/sun_checks.xml"
191	–	failOnViolation="false">
192	–	<formatter type="xml" toFile="${build.checkstyle.dir}/checkstyle-report.xml"/>
193	–	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
194	–	</checkstyle>
195	–
196	–	<style in="${build.checkstyle.dir}/checkstyle-report.xml"
197	–	out="${build.checkstyle.dir}/checkstyle-report.html"
198	–	style="${stylesheet.dir}/checkstyle-frames.xsl"/>
199	–
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
209	–
255		<target name="release"
256		depends="dist"
257		description="Puts entire CVS tree, plus distribution productions, in a jar">
#	Line 231 | Line 276
276		description="Removes all build products">
277
278		<delete dir="${build.dir}"/>
234	–	<delete dir="${build.classes.dir}"/>
235	–	<delete dir="${build.lib.dir}"/>
279
280		</target>
281
#	Line 247 | Line 290
290
291
292
250	–	<target name="dist-docs"
251	–	description="Builds javadocs without custom tags to dist folder">
252	–
253	–	<delete dir="${dist.javadocs.dir}"/>
254	–	<mkdir dir="${dist.javadocs.dir}"/>
255	–
256	–	<javadoc destdir="${dist.javadocs.dir}"
257	–	link="http://java.sun.com/j2se/1.4.2/docs/api"
258	–	overview="${src.dir}/intro.html"
259	–	source="${build.sourcelevel}">
260	–
261	–	<packageset dir="${src.dir}"/>
262	–
263	–	</javadoc>
264	–
265	–	</target>
266	–
267	–
268	–
293		<!-- Internal targets -->
294
295
272	–	<target name="init">
273	–
274	–	<!-- Version is kept in a separate file -->
275	–	<loadfile property="version" srcFile="version.properties"/>
276	–	<echo>Building JSR-166 version ${version}</echo>
277	–	<echo>java.home is ${java.home}</echo>
278	–
279	–	</target>
280	–
281	–
296		<target name="dist-jar"
297		depends="clean, jar">
298
#	Line 287 | Line 301
301		</target>
302
303
290	–	<target name="compile-ant-filter"
291	–	depends="init">
292	–
293	–	<mkdir dir="${build.ant.dir}"/>
294	–
295	–	<javac srcdir="${ant.src.dir}"
296	–	destdir="${build.ant.dir}"
297	–	source="1.4"/>
298	–
299	–	</target>
300	–
301	–
302	–	<target name="filter-src"
303	–	depends="compile-ant-filter">
304	–
305	–	<mkdir dir="${build.filter.src.dir}"/>
306	–
307	–	<copy todir="${build.filter.src.dir}">
308	–	<fileset dir="${src.dir}">
309	–	<include name="**/*.html"/>
310	–	</fileset>
311	–	</copy>
312	–
313	–	<copy todir="${build.filter.src.dir}">
314	–	<fileset dir="${src.dir}">
315	–	<exclude name="**/*.html"/>
316	–	<!-- Files excluded from dist-docs -->
317	–	<exclude name="java/util/Random.*"/>
318	–	<exclude name="sun/misc/Unsafe.*"/>
319	–	</fileset>
320	–	<!--
321	–	<filterchain>
322	–	-->
323	–
324	–	<!--
325	–	# This filter gets rid of angle-bracketed type parameters
326	–	# so that javadoc can run on the result. The following
327	–	# heuristic seems to work:
328	–	#
329	–	# For all lines not starting with space(s)-asterisk-space(s),
330	–	#   replace <something> with a space, where there may be more
331	–	#   than one right angle bracket at the end, and "something"
332	–	#   must not contain parens or pipes. (This may need some
333	–	#   tweaking.)
334	–	-->
335	–
336	–	<!--
337	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
338	–	classpath="${build.ant.dir}">
339	–	<param name="notmatching" value="^\s+\*\s.*$"/>
340	–	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
341	–	<param name="replacement" value=" "/>
342	–	</filterreader>
343	–	-->
344	–
345	–	<!--
346	–	</filterchain>
347	–	-->
348	–	</copy>
349	–
350	–	</target>
351	–
352	–
353	–	<target name="filter-doccheck"
354	–	depends="filter-src">
355	–
356	–	<mkdir dir="${build.dc-filter.dir}"/>
357	–
358	–	<copy todir="${build.dc-filter.dir}">
359	–	<fileset dir="${build.filter.src.dir}">
360	–	<include name="**/*.html"/>
361	–	</fileset>
362	–	</copy>
363	–
364	–	<property name="generic.declarations"
365	–	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 {}"
366	–	/>
367	–
368	–	<copy todir="${build.dc-filter.dir}">
369	–	<fileset dir="${build.filter.src.dir}">
370	–	<exclude name="**/*.html"/>
371	–	</fileset>
372	–	<filterchain>
373	–	<!--
374	–	# These two filters try to make the source look like
375	–	# something that doccheck can process. The first removes
376	–	# -source 1.4 assertions and the second adds in a bunch
377	–	# of single letter public nested marker interfaces so that
378	–	# the generic type parameters are recognized.
379	–	-->
380	–
381	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
382	–	classpath="${build.ant.dir}">
383	–	<param name="matching"    value="^\s*assert[\s ].*$"/>
384	–	<param name="pattern"     value="assert"/>
385	–	<param name="replacement" value="//assert"/>
386	–	</filterreader>
387	–
388	–	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
389	–	classpath="${build.ant.dir}">
390	–	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
391	–	<param name="pattern"     value="$"/>
392	–	<param name="replacement" value=" ${generic.declarations}"/>
393	–	</filterreader>
394	–
395	–	</filterchain>
396	–	</copy>
397	–
398	–	</target>
399	–
400	–
304		<target name="compile-tests"
305		depends="jar">
306
307		<mkdir dir="${build.testcases.dir}"/>
308
309		<javac srcdir="${tck.src.dir}"
310	<	destdir="${build.testcases.dir}"
311	<	debug="${build.debug}"
312	<	debuglevel="${build.debuglevel}"
313	<	deprecation="${build.deprecation}"
314	<	source="${build.sourcelevel}"
315	<	fork="true">
310	>	destdir="${build.testcases.dir}"
311	>	debug="${build.debug}"
312	>	debuglevel="${build.debuglevel}"
313	>	deprecation="${build.deprecation}"
314	>	source="6"
315	>	classpath="${junit.jar}"
316	>	bootclasspath="${product.jar}:${bootclasspath6}"
317	>	includeAntRuntime="false"
318	>	includeJavaRuntime="false"
319	>	executable="${javac8}"
320	>	fork="true">
321
322	<	<compilerarg value="${bootclasspath.args}"/>
322	>	<include name="**/*.java"/>
323		<compilerarg line="${build.args}"/>
324	<
325	<	<classpath refid="test.classpath"/>
324	>	<compilerarg value="-XDignore.symbol.file=true"/>
325	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
326
327		</javac>
328
329		<javac srcdir="${test.src.dir}"
330	<	destdir="${build.testcases.dir}"
331	<	debug="${build.debug}"
332	<	debuglevel="${build.debuglevel}"
333	<	deprecation="${build.deprecation}"
334	<	source="${build.sourcelevel}"
335	<	fork="true">
330	>	destdir="${build.testcases.dir}"
331	>	debug="${build.debug}"
332	>	debuglevel="${build.debuglevel}"
333	>	deprecation="${build.deprecation}"
334	>	source="6"
335	>	classpath=""
336	>	bootclasspath="${product.jar}:${bootclasspath6}"
337	>	includeAntRuntime="false"
338	>	includeJavaRuntime="false"
339	>	executable="${javac8}"
340	>	fork="true">
341
342	<	<include name="jsr166/test/**"/>
342	>	<include name="jsr166/test/**/*.java"/>
343
431	–	<compilerarg value="${bootclasspath.args}"/>
344		<compilerarg line="${build.args}"/>
345	<
346	<	<classpath refid="test.classpath"/>
345	>	<compilerarg value="-XDignore.symbol.file=true"/>
346	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
347
348		</javac>
349
#	Line 446 | Line 358
358
359		<compilerarg value="${bootclasspath.args}"/>
360		<compilerarg line="${build.args}"/>
361	<
450	<	<classpath refid="test.classpath"/>
361	>	<compilerarg value="-XDignore.symbol.file=true"/>
362
363		</javac>
364		-->
#	Line 468 | Line 379
379		errorProperty="junit.failed"
380		failureProperty="junit.failed"
381		dir="${build.reports.dir}"
382	+	jvm="${java8}"
383		fork="true">
384
385	<	<jvmarg value="${bootclasspath.args}"/>
385	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
386		<jvmarg value="-server"/>
387		<jvmarg value="-showversion"/>
388
#	Line 518 | Line 430
430		<fileset dir="${build.reports.dir}">
431		<include name="TEST-*.xml"/>
432		</fileset>
433	<	<report styledir="${stylesheet.dir}"
522	<	format="${junit.report.format}"
523	<	todir="${build.reports.dir}"
433	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
434		/>
435		</junitreport>
436
#	Line 570 | Line 480
480		</target>
481
482
573	–
574	–	<!-- Anthill targets -->
575	–
576	–	<target name="anthill-build">
577	–
578	–	<!-- Override this in user.properties -->
579	–	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
580	–
581	–	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
582	–	<arg value="-Xmx256000000"/>
583	–	<!-- classpath of new JVM -->
584	–	<arg value="-classpath"/> <arg path="${java.class.path}"/>
585	–	<!-- location of Ant home directory -->
586	–	<arg value="-Dant.home=${ant.home}"/>
587	–	<!-- the Ant main class -->
588	–	<arg value="org.apache.tools.ant.Main"/>
589	–	<!-- The build file -->
590	–	<arg value="-buildfile"/>  <arg value="build.xml"/>
591	–	<!-- the target to build on the new Ant instance -->
592	–	<arg value="-DJAVA_HOME=${tiger.home}"/>
593	–	<arg value="do-anthill-build"/>
594	–	</exec>
595	–	</target>
596	–
597	–	<target name="do-anthill-build"
598	–	depends="jar, test, docs, dist-docs"/>
599	–
600	–	<target name="anthill-publish">
601	–
602	–	<copy todir="${deployDir}/docs/private">
603	–	<fileset dir="${build.javadocs.dir}"/>
604	–	</copy>
605	–
606	–	<copy todir="${deployDir}/docs/public">
607	–	<fileset dir="${dist.javadocs.dir}"/>
608	–	</copy>
609	–
610	–	<copy tofile="${deployDir}/index.html"
611	–	file="${basedir}/etc/anthill-index.html"/>
612	–
613	–	<copy todir="${deployDir}/notes">
614	–	<fileset dir="${basedir}/etc/notes"/>
615	–	</copy>
616	–
617	–	</target>
618	–
619	–
620	–
483		<!-- Various demos and test programs -->
484
485
486	<	<target name="sample" depends="init, configure-compiler"
625	<	description="Standalone demo program">
626	<
627	<	<mkdir dir="${build.testcases.dir}"/>
628	<
629	<	<javac srcdir="${test.src.dir}"
630	<	destdir="${build.testcases.dir}"
631	<	debug="${build.debug}"
632	<	debuglevel="${build.debuglevel}"
633	<	deprecation="${build.deprecation}"
634	<	source="${build.sourcelevel}"
635	<	fork="true">
636	<
637	<	<include name="jsr166/test/Sample.java"/>
638	<
639	<	</javac>
640	<
641	<	<copy todir="${build.testcases.dir}">
642	<	<fileset dir="${test.src.dir}">
643	<	<include name="**/*.properties"/>
644	<	</fileset>
645	<	</copy>
646	<
647	<
648	<	<java classname="jsr166.test.Sample" fork="true">
649	<	<classpath refid="test.classpath"/>
650	<	<!-- <jvmarg value="-ea"/> -->
651	<	<!-- <jvmarg value="-server"/> -->
652	<	<!-- <arg value="1000"/> -->
653	<	</java>
654	<	</target>
655	<
656	<
657	<	<target name="loops" depends="init, configure-compiler"
486	>	<target name="loops" depends="configure-compiler"
487		description="Benchmark from Doug Lea's AQS paper">
488
489		<mkdir dir="${build.loops.dir}"/>
#	Line 669 | Line 498
498
499		<compilerarg line="${build.args}"/>
500		<classpath refid="loops.classpath"/>
501	+	<compilerarg value="-XDignore.symbol.file=true"/>
502
503		</javac>
504
#	Line 679 | Line 509
509		</target>
510
511
512	<	<target name="compile-j1" depends="init, configure-compiler">
512	>	<!-- jsr166 4jdk7 -->
513
684	–	<mkdir dir="${build.j1.dir}"/>
514
515	<	<javac srcdir="${j1.src.dir}"
516	<	destdir="${build.j1.dir}"
517	<	debug="${build.debug}"
518	<	debuglevel="${build.debuglevel}"
519	<	deprecation="${build.deprecation}"
520	<	source="${build.sourcelevel}" >
515	>	<target name="4jdk7compile"
516	>	depends="configure-compiler"
517	>	description="Compiles src/jdk7 sources, targeting jdk7">
518	>
519	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
520	>
521	>	<javac srcdir="${4jdk7src.dir}"
522	>	destdir="${build.4jdk7.classes.dir}"
523	>	debug="${build.debug}"
524	>	debuglevel="${build.debuglevel}"
525	>	deprecation="${build.deprecation}"
526	>	source="6"
527	>	classpath=""
528	>	bootclasspath="${bootclasspath6}"
529	>	includeAntRuntime="false"
530	>	includeJavaRuntime="false"
531	>	executable="${javac7}"
532	>	fork="true">
533
534		<include name="**/*.java"/>
535	<	<exclude name="**/dijkstra/**"/>
535	>	<compilerarg line="${build.args}"/>
536	>	<compilerarg value="-XDignore.symbol.file=true"/>
537	>	<compilerarg value="-Xlint:all"/>
538	>
539	>	</javac>
540	>
541	>	<jar destfile="${4jdk7product.jar}" index="true">
542	>	<fileset dir="${build.4jdk7.classes.dir}"/>
543	>	</jar>
544
545	+	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
546	+
547	+	<javac srcdir="${tck.src.dir}"
548	+	destdir="${build.4jdk7.tck.classes.dir}"
549	+	debug="${build.debug}"
550	+	debuglevel="${build.debuglevel}"
551	+	deprecation="${build.deprecation}"
552	+	source="6"
553	+	classpath="${junit.jar}"
554	+	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
555	+	includeAntRuntime="false"
556	+	includeJavaRuntime="false"
557	+	executable="${javac7}"
558	+	fork="true">
559	+
560	+	<include name="**/*.java"/>
561		<compilerarg line="${build.args}"/>
562	<	<classpath refid="j1.classpath"/>
562	>	<compilerarg value="-XDignore.symbol.file=true"/>
563	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
564
565		</javac>
566
567		</target>
568
569
570	<	<target name="sw" depends="compile-j1"
571	<	description="Runs the SwingWorker demo">
570	>	<target name="4jdk7-test-tck"
571	>	depends="4jdk7compile"
572	>	description="Runs tck tests for jsr166-4jdk7 directly">
573	>	<run-tck-tests
574	>	jvm="${java7}"
575	>	tck.classes="${build.4jdk7.tck.classes.dir}"
576	>	product.jar="${4jdk7product.jar}"/>
577	>	</target>
578
707	–	<!--
708	–	<java classname="jsr166.swing.SwingWorkerDemo" fork="true">
709	–	<classpath refid="j1.classpath"/>
710	–	</java>
711	–	-->
579
580	<	<copy todir="${build.j1.dir}" file="${j1.src.dir}/jsr166/swing/SwingWorker.html"/>
580	>	<target name="4jdk7-test-tck-junit"
581	>	depends="4jdk7compile"
582	>	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
583	>
584	>	<junit printsummary="true"
585	>	showoutput="true"
586	>	errorProperty="junit.failed"
587	>	failureProperty="junit.failed"
588	>	includeantruntime="true"
589	>	jvm="${java7}"
590	>	fork="true">
591	>
592	>	<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
593	>	<jvmarg value="-server"/>
594	>
595	>	<classpath>
596	>	<pathelement location="${junit.jar}"/>
597	>	<pathelement location="${build.4jdk7.tck.classes.dir}"/>
598	>	</classpath>
599	>
600	>	<formatter type="brief"/>
601
602	<	<exec dir="${build.j1.dir}" executable="appletviewer.exe">
603	<	<arg value="${build.j1.dir}/SwingWorker.html"/>
717	<	</exec>
602	>	<test name="JSR166TestCase" haltonfailure="no">
603	>	</test>
604
605	+	</junit>
606		</target>
607
721	–	<target name="j1" depends="compile-j1"
722	–	description="Runs a standalone JavaOne program">
608
609	<	<java classname="${j1.test}" fork="true">
610	<	<classpath refid="j1.classpath"/>
611	<	<jvmarg value="-client"/>
609	>	<target name="4jdk7docs"
610	>	description="Builds javadocs for src/jdk7 to dist dir">
611	>
612	>	<delete dir="${dist.4jdk7.docs.dir}"/>
613	>	<mkdir dir="${dist.4jdk7.docs.dir}"/>
614	>
615	>	<javadoc destdir="${dist.4jdk7.docs.dir}"
616	>	packagenames="none"
617	>	link="${jdkapi7docs.url}"
618	>	overview="${4jdk7src.dir}/intro.html"
619	>	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
620	>	classpath=""
621	>	executable="${javadoc7}">
622	>	<arg value="-XDignore.symbol.file=true"/>
623	>	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
624	>	<include name="**/*.java"/>
625	>	</fileset>
626	>	</javadoc>
627
628	<	<!-- TestPseudoRandom args -->
729	<	<arg value="2"/>
730	<	<arg value="25"/>
731	<	<arg value="100000"/>
628	>	</target>
629
733	–	<!-- WebCrawler args -->
734	–	<!--
735	–	<arg value="jsr166.webcrawler.WebCrawler3"/>
736	–	<arg value="http://www.priorartisans.com"/>
737	–	<arg value="25"/>
738	–	-->
630
631	<	</java>
631	>	<target name="4jdk7dist"
632	>	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
633	>	description="Puts all distributable products in single hierarchy"/>
634	>
635	>
636	>
637	>	<target name="4jdk7clean"
638	>	description="Removes all 4jdk7 build products">
639	>
640	>	<delete dir="${build.4jdk7.dir}"/>
641
642		</target>
643
644
745	–	<target name="test-j1" depends="compile-j1"
746	–	description="Runs testcases from the JavaOne source directories">
645
646	<	<junit printsummary="true"
647	<	showoutput="true"
750	<	errorProperty="junit.failed"
751	<	failureProperty="junit.failed"
752	<	dir="${build.j1.dir}"
753	<	fork="true">
646	>	<target name="4jdk7dist-clean"
647	>	description="Removes all build and distribution products">
648
649	<	<!-- <jvmarg value="-server"/> -->
756	<	<classpath refid="j1.classpath"/>
757	<	<formatter type="xml"/>
649	>	</target>
650
651	<	<batchtest todir="${build.j1.dir}">
652	<	<fileset dir="${j1.src.dir}">
761	<	<include name="**/*Test.java"/>
762	<	</fileset>
763	<	</batchtest>
651	>	<target name="4jdk7dist-jar"
652	>	depends="4jdk7clean, 4jdk7compile">
653
654	<	</junit>
654	>	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
655
656	<	<available property="junit.report.format"
768	<	value="frames"
769	<	classname="org.apache.xalan.lib.Redirect"/>
770	<	<property name="junit.report.format" value="noframes"/>
656	>	</target>
657
772	–	<junitreport todir="${build.j1.dir}">
773	–	<fileset dir="${build.j1.dir}">
774	–	<include name="TEST-*.xml"/>
775	–	</fileset>
776	–	<report styledir="${stylesheet.dir}"
777	–	format="${junit.report.format}"
778	–	todir="${build.j1.dir}"
779	–	/>
780	–	</junitreport>
658
659	<	<fail message="Test Cases Failed" if="junit.failed"/>
659	>	<!-- jsr166x -->
660	>
661	>	<target name="jsr166xcompile"
662	>	depends="configure-compiler"
663	>	description="Compiles jsr166x sources to build dir">
664	>
665	>	<mkdir dir="${build.jsr166x.dir}"/>
666	>
667	>	<javac srcdir="${topsrc.dir}"
668	>	destdir="${build.jsr166x.dir}"
669	>	debug="${build.debug}"
670	>	debuglevel="${build.debuglevel}"
671	>	deprecation="${build.deprecation}"
672	>	classpath=""
673	>	source="5"
674	>	bootclasspath="${bootclasspath6}"
675	>	includeAntRuntime="false"
676	>	includeJavaRuntime="false"
677	>	executable="${javac7}"
678	>	fork="true">
679	>
680	>	<include name="jsr166x/**/*.java"/>
681	>	<compilerarg line="${build.args}"/>
682	>	<compilerarg value="-XDignore.symbol.file=true"/>
683	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
684	>
685	>	</javac>
686
687		</target>
688
689
690
691	<	<!-- C++ and JNI definitions and demos -->
691	>	<target name="jsr166xjar"
692	>	depends="jsr166xcompile"
693	>	description="Builds library jar from compiled sources">
694
695	<	<target name="configure-cpp">
695	>	<jar destfile="${jsr166x.jar}">
696	>	<fileset dir="${build.jsr166x.dir}"/>
697	>	</jar>
698
699	<	<!-- Define tasks and types -->
699	>	</target>
700
794	–	<path id="cpptasks.path">
795	–	<pathelement location="${lib.dir}/cpptasks.jar"/>
796	–	</path>
797	–	<taskdef resource="cpptasks.tasks" classpathref="cpptasks.path"/>
798	–	<typedef resource="cpptasks.types" classpathref="cpptasks.path"/>
701
800	–	<!-- Set platform property for JNI includes -->
702
703	<	<condition property="platform" value="linux">
704	<	<os name="Linux"/>
705	<	</condition>
706	<	<condition property="platform" value="win32">
707	<	<os family="windows"/>
708	<	</condition>
709	<	<condition property="platform" value="solaris">
710	<	<os name="SunOS"/>
711	<	</condition>
703	>	<target name="jsr166xdocs"
704	>	description="Builds javadocs to dist dir">
705	>
706	>	<delete dir="${dist.jsr166xjavadocs.dir}"/>
707	>	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
708	>
709	>	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
710	>	packagenames="jsr166x.*"
711	>	link="${jdkapidocs.url}"
712	>	source="5"
713	>	bootclasspath="${bootclasspath6}"
714	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
715	>	executable="${javadoc7}"
716	>	additionalparam="-XDignore.symbol.file=true" />
717
718		</target>
719
720
721	<	<target name="cppdemo" depends="configure-cpp">
721	>	<target name="jsr166xdist"
722	>	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
723	>	description="Puts all distributable products in single hierarchy"/>
724
817	–	<mkdir dir="${build.dir}"/>
725
819	–	<cc multithreaded="true"
820	–	name="g++"
821	–	objdir="${build.dir}"
822	–	outfile="${build.dir}/CppDemo">
823	–	<fileset dir="${test.src.dir}" includes="CppDemo.cpp"/>
824	–	<libset libs="stdc++"/>
825	–	</cc>
726
727	<	<exec executable="${build.dir}/CppDemo">
728	<	<arg line="count in word frequency of word in command line count"/>
729	<	</exec>
727	>	<target name="jsr166xclean"
728	>	description="Removes all jsr166x build products">
729	>
730	>	<delete dir="${build.jsr166x.dir}"/>
731
732		</target>
733
734
834	–	<target name="jnidemo" depends="init, configure-compiler, configure-cpp">
735
736	<	<mkdir dir="${build.testcases.dir}"/>
736	>	<target name="jsr166xdist-clean"
737	>	description="Removes all build and distribution products">
738
739	<	<javac srcdir="${test.src.dir}"
839	<	destdir="${build.testcases.dir}"
840	<	debug="${build.debug}"
841	<	debuglevel="${build.debuglevel}"
842	<	deprecation="${build.deprecation}"
843	<	source="${build.sourcelevel}"
844	<	fork="true">
845	<	<compilerarg value="${bootclasspath.args}"/>
846	<	<compilerarg line="${build.args}"/>
847	<	<classpath refid="test.classpath"/>
848	<	<include name="JniDemo.java"/>
849	<	</javac>
739	>	</target>
740
741	<	<javah destdir="${build.testcases.dir}"
742	<	classpathref="test.classpath">
743	<	<class name="JniDemo"/>
744	<	</javah>
745	<
856	<	<cc multithreaded="true"
857	<	name="g++"
858	<	objdir="${build.dir}"
859	<	outfile="${build.dir}/JniDemo"
860	<	outtype="shared">
861	<
862	<	<compiler>
863	<	<defineset>
864	<	<define name="__int64" value="long long"/>
865	<	</defineset>
866	<	<includepath location="${java.home}/../include"/>
867	<	<includepath location="${java.home}/../include/${platform}"/>
868	<	<compilerarg value="-mno-cygwin"/>
869	<	</compiler>
870	<
871	<	<linker>
872	<	<linkerarg value="--add-stdcall-alias"/>
873	<	</linker>
874	<
875	<	<includepath location="${build.testcases.dir}"/>
876	<
877	<	<fileset dir="${test.src.dir}" includes="JniDemo.cpp"/>
878	<
879	<	<libset libs="stdc++"/>
880	<
881	<	</cc>
882	<
883	<	<!-- Necessary if windows, harmless if not -->
884	<	<copy file="${build.dir}/libJniDemo.so" tofile="${build.dir}/JniDemo.dll"/>
885	<
886	<	<java classname="JniDemo" fork="true">
887	<	<!-- Watch out: path separator hardwired to semicolon here! -->
888	<	<sysproperty key="java.library.path" path="${java.library.path};${build.dir}"/>
889	<	<classpath refid="test.classpath"/>
890	<	<arg line="count in word frequency of word in command line count"/>
891	<	</java>
741	>
742	>	<target name="jsr166xdist-jar"
743	>	depends="jsr166xclean, jsr166xjar">
744	>
745	>	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
746
747		</target>
748
749	+	<!-- jsr166y -->
750
751
752	<	<!-- Backward compatibility, work in progress (some files not checked in) -->
752	>	<target name="jsr166ycompile"
753	>	depends="configure-compiler"
754	>	description="Compiles jsr166y sources">
755
756	+	<mkdir dir="${build.jsr166y.dir}"/>
757
758	+	<javac srcdir="${topsrc.dir}"
759	+	destdir="${build.jsr166y.dir}"
760	+	debug="${build.debug}"
761	+	debuglevel="${build.debuglevel}"
762	+	deprecation="${build.deprecation}"
763	+	source="6"
764	+	classpath=""
765	+	bootclasspath="${bootclasspath6}"
766	+	includeAntRuntime="false"
767	+	includeJavaRuntime="false"
768	+	executable="${javac7}"
769	+	fork="true">
770
771	<	<property name="pretiger.src.dir"     location="${build.dir}/pretiger/src"/>
772	<	<property name="build.pretiger.dir"   location="${build.dir}/pretiger/classes"/>
773	<	<property name="pretiger.jar"         location="${build.lib.dir}/jsr166-pretiger.jar"/>
774	<	<property name="pretiger.sourcelevel" value="1.4"/>
771	>	<include name="jsr166y/**/*.java"/>
772	>	<compilerarg line="${build.args}"/>
773	>	<compilerarg value="-XDignore.symbol.file=true"/>
774	>	<compilerarg value="-Xlint:all"/>
775	>	</javac>
776	>	</target>
777
906	–	<target name="defang"
907	–	depends="init"
908	–	description="Generates pre-Tiger compatible source">
778
779	<	<delete dir="${pretiger.src.dir}"/>
780	<	<mkdir dir="${pretiger.src.dir}"/>
779	>	<target name="jsr166yjar"
780	>	depends="jsr166ycompile"
781	>	description="Builds library jar from compiled sources">
782
783	<	<exec executable="perl">
784	<	<arg file="etc/defang.pl"/>
785	<	<!-- <arg value="-v"/> -->
916	<	<arg value="-s"/> <arg file="${src.dir}"/>
917	<	<arg value="-t"/> <arg file="${pretiger.src.dir}"/>
918	<	</exec>
783	>	<jar destfile="${jsr166y.jar}" index="true">
784	>	<fileset dir="${build.jsr166y.dir}"/>
785	>	</jar>
786
787		</target>
788
922	–	<target name="compile-pretiger"
923	–	depends="init, configure-compiler, defang"
924	–	description="Compiles pre-Tiger sources to build folder">
789
926	–	<mkdir dir="${build.pretiger.dir}"/>
790
791	<	<javac srcdir="${pretiger.src.dir}"
792	<	destdir="${build.pretiger.dir}"
930	<	debug="${build.debug}"
931	<	debuglevel="${build.debuglevel}"
932	<	deprecation="${build.deprecation}"
933	<	source="${pretiger.sourcelevel}"
934	<	fork="true">
791	>	<target name="jsr166ydocs"
792	>	description="Builds javadocs to dist dir">
793
794	<	<compilerarg line="${build.args}"/>
795	<	<exclude name="**/Thread.java"/>
794	>	<delete dir="${dist.jsr166yjavadocs.dir}"/>
795	>	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
796
797	<	</javac>
797	>	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
798	>	packagenames="jsr166y.*"
799	>	link="${jdkapidocs.url}"
800	>	source="6"
801	>	bootclasspath="${bootclasspath6}"
802	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
803	>	executable="${javadoc7}"
804	>	additionalparam="-XDignore.symbol.file=true" />
805
806		</target>
807
943	–	<target name="pretiger" depends="compile-pretiger">
808
809	<	<mkdir dir="${build.lib.dir}"/>
809	>	<target name="jsr166ydist"
810	>	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
811	>	description="Puts all distributable products in single hierarchy"/>
812
813	<	<jar destfile="${pretiger.jar}">
814	<	<fileset dir="${build.pretiger.dir}">
815	<	</fileset>
816	<	</jar>
813	>
814	>
815	>	<target name="jsr166yclean"
816	>	description="Removes all jsr166y build products">
817	>
818	>	<delete dir="${build.jsr166y.dir}"/>
819
820		</target>
821
954	–	<!-- jsr166x -->
822
823
824	<	<target name="jsr166xcompile"
825	<	depends="init, configure-compiler"
959	<	description="Compiles jsr166x sources">
824	>	<target name="jsr166ydist-clean"
825	>	description="Removes all build and distribution products">
826
827	<	<mkdir dir="${build.jsr166x.dir}"/>
827	>	</target>
828
829	<	<javac srcdir="${jsr166xsrc.dir}"
830	<	destdir="${build.jsr166x.dir}"
965	<	debug="${build.debug}"
966	<	debuglevel="${build.debuglevel}"
967	<	deprecation="${build.deprecation}"
968	<	source="${build.sourcelevel}"
969	<	fork="true">
829	>	<target name="jsr166ydist-jar"
830	>	depends="jsr166yclean, jsr166yjar">
831
832	<	<include name="**/*.java"/>
832	>	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
833	>
834	>	</target>
835	>
836	>
837	>	<!-- extra166y -->
838	>
839	>
840	>	<target name="extra166ycompile"
841	>	depends="configure-compiler, jsr166yjar"
842	>	description="Compiles extra166y sources">
843	>
844	>	<mkdir dir="${build.extra166y.dir}"/>
845	>
846	>	<javac srcdir="${topsrc.dir}"
847	>	destdir="${build.extra166y.dir}"
848	>	debug="${build.debug}"
849	>	debuglevel="${build.debuglevel}"
850	>	deprecation="${build.deprecation}"
851	>	classpath=""
852	>	source="6"
853	>	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
854	>	includeAntRuntime="false"
855	>	includeJavaRuntime="false"
856	>	executable="${javac7}"
857	>	fork="true">
858	>
859	>	<include name="extra166y/**/*.java"/>
860		<compilerarg line="${build.args}"/>
861	+	<compilerarg value="-XDignore.symbol.file=true"/>
862	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
863
864		</javac>
865
#	Line 977 | Line 867
867
868
869
870	<	<target name="jsr166xjar"
871	<	depends="jsr166xcompile"
870	>	<target name="extra166yjar"
871	>	depends="extra166ycompile"
872		description="Builds library jar from compiled sources">
873
874	<	<mkdir dir="${build.jsr166xlib.dir}"/>
875	<
986	<	<jar destfile="${jsr166xproduct.jar}">
987	<	<fileset dir="${build.jsr166x.dir}"/>
874	>	<jar destfile="${extra166y.jar}" index="true">
875	>	<fileset dir="${build.extra166y.dir}"/>
876		</jar>
877
878		</target>
879
880
881
882	<	<target name="jsr166xdocs"
883	<	description="Builds javadocs with custom tags to build folder">
996	<
997	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
998	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
999	<
1000	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
1001	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
1002	<	>
1003	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
1004	<	<include name="jsr166x"/>
1005	<	</packageset>
882	>	<target name="extra166ydocs"
883	>	description="Builds javadocs to build dir">
884
885	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
886	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
887
888	<	</javadoc>
888	>	<javadoc destdir="${dist.extra166yjavadocs.dir}"
889	>	packagenames="extra166y.*"
890	>	link="${jdkapidocs.url}"
891	>	source="6"
892	>	bootclasspath="${bootclasspath6}"
893	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
894	>	executable="${javadoc7}"
895	>	additionalparam="-XDignore.symbol.file=true" />
896
897		</target>
898
899
900	<	<target name="jsr166xdist"
901	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
900	>	<target name="extra166ydist"
901	>	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
902		description="Puts all distributable products in single hierarchy"/>
903
904
905
906	<	<target name="jsr166xclean"
907	<	description="Removes all build products">
906	>	<target name="extra166yclean"
907	>	description="Removes all extra166y build products">
908
909	<	<delete dir="${build.jsr166x.dir}"/>
1023	<	<delete dir="${build.jsr166xlib.dir}"/>
909	>	<delete dir="${build.extra166y.dir}"/>
910
911		</target>
912
913
914
915	<	<target name="jsr166xdist-clean"
915	>	<target name="extra166ydist-clean"
916		description="Removes all build and distribution products">
917
918		</target>
919
920	+	<target name="extra166ydist-jar"
921	+	depends="extra166yclean, extra166yjar">
922
923	+	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
924
925	<	<target name="jsr166xdist-docs"
1037	<	description="Builds javadocs without custom tags to dist folder">
925	>	</target>
926
927	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
1040	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
927	>	<!-- jsr166e -->
928
929	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
930	<	link="http://java.sun.com/j2se/1.5.0/docs/api/"
931	<	source="${build.sourcelevel}">
929	>	<target name="jsr166ecompile"
930	>	depends="configure-compiler"
931	>	description="Compiles jsr166e sources">
932
933	<	<packageset dir="${topsrc.dir}" defaultexcludes="yes">
934	<	<include name="jsr166x"/>
935	<	</packageset>
933	>	<mkdir dir="${build.jsr166e.dir}"/>
934	>
935	>	<javac srcdir="${topsrc.dir}"
936	>	destdir="${build.jsr166e.dir}"
937	>	debug="${build.debug}"
938	>	debuglevel="${build.debuglevel}"
939	>	deprecation="${build.deprecation}"
940	>	source="7"
941	>	classpath=""
942	>	includeAntRuntime="false"
943	>	includeJavaRuntime="false"
944	>	executable="${javac7}"
945	>	fork="true">
946	>
947	>	<include name="jsr166e/**/*.java"/>
948	>	<compilerarg line="${build.args}"/>
949	>	<compilerarg value="-XDignore.symbol.file=true"/>
950	>	<compilerarg value="-Xlint:all"/>
951	>
952	>	</javac>
953	>
954	>	</target>
955	>
956	>
957	>
958	>	<target name="jsr166ejar"
959	>	depends="jsr166ecompile"
960	>	description="Builds library jar from compiled sources">
961	>
962	>	<jar destfile="${jsr166e.jar}" index="true">
963	>	<fileset dir="${build.jsr166e.dir}"/>
964	>	</jar>
965	>
966	>	</target>
967
968	+
969	+
970	+	<target name="jsr166edocs"
971	+	description="Builds javadocs to build dir">
972	+
973	+	<delete dir="${dist.jsr166ejavadocs.dir}"/>
974	+	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
975	+
976	+	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
977	+	packagenames="jsr166e.*"
978	+	link="${jdkapidocs.url}"
979	+	source="7"
980	+	sourcepath="${topsrc.dir}:${jdk7src.dir}"
981	+	executable="${javadoc7}"
982	+	additionalparam="-XDignore.symbol.file=true" >
983		</javadoc>
984
985		</target>
986
1054	–	<target name="jsr166xdist-jar"
1055	–	depends="jsr166xclean, jsr166xjar">
987
988	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
988	>	<target name="jsr166edist"
989	>	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
990	>	description="Puts all distributable products in single hierarchy"/>
991	>
992	>
993	>
994	>	<target name="jsr166eclean"
995	>	description="Removes all jsr166e build products">
996	>
997	>	<delete dir="${build.jsr166e.dir}"/>
998	>
999	>	</target>
1000	>
1001	>
1002	>	<target name="jsr166edist-clean"
1003	>	description="Removes all build and distribution products">
1004	>
1005	>	</target>
1006	>
1007	>	<target name="jsr166edist-jar"
1008	>	depends="jsr166eclean, jsr166ejar">
1009	>
1010	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1011
1012		</target>
1013

Diff Legend

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