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.57 by tim, Mon Sep 15 14:07:36 2003 UTC vs.
Revision 1.98 by jsr166, Wed Jan 16 07:39:51 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.
20		------------------------------------------------------------------------------
21		</description>
22
#	Line 21 | Line 30
30
31
32		<!-- Compilation options -->
33	<	<property name="build.sourcelevel"    value="1.5"/>
25	<	<property name="build.docsourcelevel" value="1.4"/>
33	>	<property name="build.sourcelevel"    value="1.6"/>
34		<property name="build.debug"          value="true"/>
35		<property name="build.debuglevel"     value="source,lines,vars"/>
36		<property name="build.deprecation"    value="false"/>
37
38		<!-- Build locations -->
39	<	<property name="build.dir"            location="build"/>
40	<	<property name="build.classes.dir"    location="${build.dir}/classes"/>
41	<	<property name="build.testcases.dir"  location="${build.dir}/testcases"/>
42	<	<property name="build.lib.dir"        location="${build.dir}/lib"/>
43	<	<property name="build.ant.dir"        location="${build.dir}/ant"/>
44	<	<property name="build.javadocs.dir"   location="${build.dir}/javadocs"/>
45	<	<property name="build.sinjdocs.dir"   location="${build.dir}/sinjdocs"/>
46	<	<property name="build.stripped.dir"   location="${build.dir}/stripped"/>
47	<	<property name="build.reports.dir"    location="${build.dir}/reports"/>
48	<	<property name="build.doccheck.dir"   location="${build.dir}/doccheck"/>
49	<	<property name="build.filter.src.dir" location="${build.dir}/filtersrc"/>
50	<	<property name="build.filter.doccheck.dir" location="${build.dir}/filterdocchk"/>
39	>	<property name="build.dir"                   location="build"/>
40	>	<property name="build.classes.dir"           location="${build.dir}/classes"/>
41	>	<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
42	>	<property name="build.loops.dir"             location="${build.dir}/loops"/>
43	>	<property name="build.lib.dir"               location="${build.dir}/lib"/>
44	>	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
45	>	<property name="build.reports.dir"           location="${build.dir}/reports"/>
46	>
47	>	<property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>
48	>	<property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>
49	>	<property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>
50	>	<property name="build.jdk7.tck.classes.dir"  location="${build.jdk7.dir}/tck/classes"/>
51	>	<property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
52	>
53	>	<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
54	>	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
55	>	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
56	>
57	>	<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
58	>	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
59	>	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
60	>
61	>	<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
62	>	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
63	>	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
64	>
65	>	<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
66	>	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
67	>	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
68	>
69	>	<!-- JDK binary locations -->
70	>	<property name="jdks.home"  location="${user.home}/jdk"/>
71	>
72	>	<macrodef name="defjdklocations">
73	>	<attribute name="v"/>
74	>	<sequential>
75	>	<property name="jdk@{v}.home"  location="${jdks.home}/jdk@{v}"/>
76	>	<property name="java@{v}"      location="${jdk@{v}.home}/bin/java"/>
77	>	<property name="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>
78	>	<property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>
79	>	<property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>
80	>	<property name="bootclasspath@{v}"
81	>	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
82	>	</sequential>
83	>	</macrodef>
84	>
85	>	<defjdklocations v="6"/>
86	>	<defjdklocations v="7"/>
87	>	<defjdklocations v="8"/>
88	>
89	>	<macrodef name="run-tck-tests">
90	>	<attribute name="jvm"/>
91	>	<attribute name="tck.classes"/>
92	>	<attribute name="product.jar" default="${product.jar}"/>
93	>	<attribute name="jvmflags" default=""/>
94	>	<sequential>
95	>	<java classname="JSR166TestCase"
96	>	jvm="@{jvm}" fork="true">
97	>	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
98	>	<jvmarg line="@{jvmflags}"/>
99	>	<classpath>
100	>	<pathelement location="${junit.jar}"/>
101	>	<pathelement location="@{tck.classes}"/>
102	>	</classpath>
103	>	</java>
104	>	</sequential>
105	>	</macrodef>
106
107		<!-- Source locations -->
108		<property name="src.dir"              location="${basedir}/src/main"/>
109		<property name="test.src.dir"         location="${basedir}/src/test"/>
110	<	<property name="ant.src.dir"          location="${basedir}/etc/ant"/>
111	<	<property name="stylesheet.dir"       location="${basedir}/etc/xsl"/>
110	>	<property name="loops.src.dir"        location="${basedir}/src/loops"/>
111	>	<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
112	>	<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
113		<property name="lib.dir"              location="${basedir}/lib"/>
114		<property name="dist.dir"             location="${basedir}/dist"/>
115	+	<property name="topsrc.dir"           location="${basedir}/src"/>
116	+	<property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
117	+	<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
118	+	<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
119	+	<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
120	+	<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
121	+	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
122
123		<!-- Distribution locations -->
124	<	<property name="dist.javadocs.dir"    location="${dist.dir}/docs"/>
124	>	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
125	>	<property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
126	>	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
127	>	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
128	>	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
129	>	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
130
131		<!-- Jar locations -->
132		<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
133	+	<property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
134	+	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
135	+	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
136	+	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
137	+	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
138		<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
58	–	<property name="rt.jar"               location="${java.home}/lib/rt.jar"/>
59	–	<property name="sinjdoc.jar"          location="${lib.dir}/sinjdoc.jar"/>
139
140	+	<!-- Bootclasspath argument -->
141	+	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
142
143	<	<!-- Files excluded from dist-docs -->
144	<	<patternset id="docs.exclusion">
145	<	<exclude name="java/util/Random.*"/>
146	<	<exclude name="sun/misc/Unsafe.*"/>
147	<	</patternset>
148	<
143	>	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
144	>	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
145	>	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
146	>	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
147	>
148	>	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
149	>	<!-- The below does not yet exist as of 2012-11 -->
150	>	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
151	>	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
152	>
153	>	<!-- Test classpath -->
154	>	<path id="test.classpath">
155	>	<pathelement location="${build.testcases.dir}"/>
156	>	<pathelement location="${junit.jar}"/>
157	>	</path>
158	>
159	>	<!-- ALoops classpath -->
160	>	<path id="loops.classpath">
161	>	<pathelement location="${build.loops.dir}"/>
162	>	</path>
163
164
165		<!-- Main targets -->
166
167	+	<target name="dists"
168	+	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
169	+	description="Builds all public jars and docs"/>
170	+
171		<target name="compile"
172	<	depends="init, configure-compiler, prepare-src"
172	>	depends="init, configure-compiler"
173		description="Compiles main sources to build folder">
174
76	–	<property name="prepare.src.dir" value="${src.dir}"/>
77	–
175		<mkdir dir="${build.classes.dir}"/>
176
177	<	<!--
81	<	<echo>javac ${build.args}</echo>
82	<	-->
83	<
84	<	<javac srcdir="${prepare.src.dir}"
177	>	<javac srcdir="${src.dir}"
178		destdir="${build.classes.dir}"
179		debug="${build.debug}"
180		debuglevel="${build.debuglevel}"
#	Line 89 | Line 182
182		source="${build.sourcelevel}"
183		fork="true">
184
185	<	<compilerarg    line="${build.args}"/>
185	>	<include name="**/*.java"/>
186	>	<compilerarg value="-XDignore.symbol.file=true"/>
187	>
188	>	<!--
189	>	<exclude name="java/lang/**"/>
190	>	<compilerarg line="${build.args}"/>
191	>	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
192	>	-->
193
194		</javac>
195
196		</target>
197
198
99	–	<target name="jar"
100	–	depends="init-jar, native-jar"
101	–	description="Builds library jar from compiled sources"/>
102	–
199
200	<	<target name="test"
201	<	depends="init, configure-tests, report-tests"
202	<	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
107	<
108	<
109	<	<target name="checkstyle"
110	<	depends="filter-src"
111	<	description="Reports on style errors in Java source (verbose, mostly chaff)">
200	>	<target name="jar"
201	>	depends="compile"
202	>	description="Builds library jar from compiled sources">
203
204	<	<taskdef resource="checkstyletask.properties"
114	<	classpath="${lib.dir}/checkstyle-all-2.4.jar"/>
204	>	<mkdir dir="${build.lib.dir}"/>
205
206	<	<checkstyle>
207	<	<formatter type="plain"/>  <!-- also available: type="xml" -->
208	<	<fileset dir="${build.filter.src.dir}" includes="**/*.java"/>
119	<	</checkstyle>
206	>	<jar destfile="${product.jar}">
207	>	<fileset dir="${build.classes.dir}"/>
208	>	</jar>
209
210		</target>
211
212
124	–	<target name="doccheck"
125	–	depends="filter-doccheck"
126	–	description="Reports on javadoc style errors">
213
214	<	<delete dir="${build.doccheck.dir}"/>
215	<	<mkdir dir="${build.doccheck.dir}"/>
216	<
131	<	<javadoc doclet="com.sun.tools.doclets.doccheck.DocCheck"
132	<	docletpath="${lib.dir}/doccheck.jar"
133	<	destdir="${build.doccheck.dir}">
134	<	<packageset dir="${build.filter.doccheck.dir}"/>
135	<	</javadoc>
136	<
137	<	<echo>DocCheck output is in ${build.doccheck.dir}</echo>
214	>	<target name="test"
215	>	depends="init, configure-tests, report-tests"
216	>	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
217
139	–	</target>
218
219
220		<target name="docs"
143	–	depends="filter-src"
221		description="Builds javadocs with custom tags to build folder">
222
223		<delete dir="${build.javadocs.dir}"/>
224		<mkdir dir="${build.javadocs.dir}"/>
225
226	<	<javadoc destdir="${build.javadocs.dir}"
227	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
151	<	overview="${src.dir}/intro.html"
152	<	source="${build.docsourcelevel}">
153	<
154	<	<tag name="revised" description="Last revised:"/>
155	<	<tag name="spec"    description="Specified by:"/>
156	<	<tag name="editor"  description="Last edited by:"/>
157	<	<tag name="fixme"   description="FIX ME:"/>
158	<
159	<	<packageset dir="${build.filter.src.dir}"/>
226	>	<!-- the packagenames="none" hack below prevents scanning the -->
227	>	<!-- sourcepath for packages -->
228
229	+	<javadoc destdir="${build.javadocs.dir}"
230	+	packagenames="none"
231	+	link="${jdkapidocs.url}"
232	+	overview="${src.dir}/intro.html"
233	+	sourcepath="${src.dir}:${jdksrc.dir}"
234	+	additionalparam="-XDignore.symbol.file=true" >
235	+	<fileset dir="${src.dir}" defaultexcludes="yes">
236	+	<include name="**/*.java"/>
237	+	</fileset>
238		</javadoc>
239
240		</target>
241
242
166	–	<target name="sinjdocs"
167	–	depends="configure-tests"
168	–	description="Builds javadocs with custom tags to build folder">
169	–
170	–	<delete dir="${build.sinjdocs.dir}"/>
171	–	<mkdir dir="${build.sinjdocs.dir}"/>
172	–
173	–	<java classname="net.cscott.sinjdoc.Main" fork="true">
174	–
175	–	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
176	–
177	–	<classpath>
178	–	<pathelement location="${sinjdoc.jar}"/>
179	–	<pathelement location="${lib.dir}/jutil.jar"/>
180	–	<pathelement location="${lib.dir}/cup.jar"/>
181	–	<path refid="test.classpath"/>
182	–	</classpath>
183	–
184	–	<!-- <arg value="-help"/> -->
185	–	<!-- <arg value="-verbose"/> -->
186	–	<!-- <arg value="-link"/>  <arg value="http://java.sun.com/j2se/1.4.1/docs/api"/> -->
187	–
188	–	<arg value="-d"/>          <arg value="${build.sinjdocs.dir}"/>
189	–	<arg value="-sourcepath"/> <arg value="${src.dir}"/>
190	–	<arg value="-overview"/>   <arg value="${src.dir}/intro.html"/>
191	–	<arg value="-source"/>     <arg value="${build.sourcelevel}"/>
192	–
193	–	<arg value="java.lang"/>
194	–	<arg value="java.util"/>
195	–	<arg value="java.util.concurrent"/>
196	–	<arg value="java.util.concurrent.atomic"/>
197	–	<arg value="java.util.concurrent.locks"/>
198	–
199	–
200	–	</java>
201	–
202	–	</target>
203	–
204	–
205	–	<target name="strip"
206	–	depends="init, configure-compiler"
207	–	description="Strip generics from java source (not working yet)">
208	–
209	–	<mkdir dir="${build.stripped.dir}"/>
210	–
211	–	<!--
212	–	# javac -s doesn't reliably generate compilable code. It generates
213	–	# bridge methods (marked as "synthetic") that can have identical
214	–	# signatures to existing methods except for the return value.
215	–	-->
216	–	<javac srcdir="${src.dir}"
217	–	destdir="${build.stripped.dir}"
218	–	debug="${build.debug}"
219	–	debuglevel="${build.debuglevel}"
220	–	deprecation="${build.deprecation}"
221	–	source="${build.sourcelevel}"
222	–	fork="true">
223	–
224	–	<compilerarg    line="${build.args} -s"/>
225	–
226	–	</javac>
227	–
228	–	</target>
229	–
243
244		<target name="dist"
245		depends="init, dist-clean, dist-jar, dist-docs"
246		description="Puts all distributable products in single hierarchy"/>
247
248	+
249		<target name="release"
250		depends="dist"
251		description="Puts entire CVS tree, plus distribution productions, in a jar">
252
239	–	<!--
240	–	#keep build dir? - dl
241	–	<delete dir="${build.dir}"/>
242	–	-->
253		<property name="release.jar" value="dist/jsr166-${version}-dist.jar"/>
254
255		<jar basedir="${basedir}" destfile="${release.jar}">
256	+	<!-- <exclude name="build/**"/> -->
257		<exclude name="${release.jar}"/>
258		<exclude name="user.properties"/>
259		<exclude name="etc/notes/**"/>
260	+	<exclude name="src/emulation/**"/>
261		<exclude name="**/SyntaxTest.java"/>
262	+	<exclude name="**/SuperfluousAbstract.java"/>
263		</jar>
264
265		</target>
266
267	+
268	+
269		<target name="clean"
270		description="Removes all build products">
271
#	Line 261 | Line 276
276		</target>
277
278
279	+
280		<target name="dist-clean"
281		description="Removes all build and distribution products">
282
#	Line 269 | Line 285
285		</target>
286
287
288	+
289		<target name="dist-docs"
273	–	depends="filter-src"
290		description="Builds javadocs without custom tags to dist folder">
291
292		<delete dir="${dist.javadocs.dir}"/>
293		<mkdir dir="${dist.javadocs.dir}"/>
294
295	<	<javadoc destdir="${dist.javadocs.dir}"
296	<	link="http://java.sun.com/j2se/1.4.1/docs/api"
281	<	overview="${src.dir}/intro.html"
282	<	source="${build.docsourcelevel}">
283	<
284	<	<packageset dir="${build.filter.src.dir}"/>
295	>	<!-- the packagenames="none" hack below prevents scanning the -->
296	>	<!-- sourcepath for packages -->
297
298	+	<javadoc destdir="${dist.javadocs.dir}"
299	+	packagenames="none"
300	+	link="${jdkapidocs.url}"
301	+	overview="${src.dir}/intro.html"
302	+	sourcepath="${src.dir}:${jdksrc.dir}"
303	+	additionalparam="-XDignore.symbol.file=true" >
304	+	<fileset dir="${src.dir}" defaultexcludes="yes">
305	+	<include name="**/*.java"/>
306	+	</fileset>
307		</javadoc>
308
309		</target>
#	Line 302 | Line 323
323		</target>
324
325
305	–	<target name="init-jar">
306	–
307	–	<mkdir dir="${build.lib.dir}"/>
308	–
309	–	</target>
310	–
311	–
312	–	<target name="native-jar"
313	–	depends="compile">
314	–
315	–	<jar destfile="${product.jar}">
316	–	<fileset dir="${build.classes.dir}"/>
317	–	</jar>
318	–
319	–	</target>
320	–
321	–
326		<target name="dist-jar"
327		depends="clean, jar">
328
#	Line 327 | Line 331
331		</target>
332
333
334	<	<target name="compile-ant-filter"
335	<	depends="init">
332	<
333	<	<mkdir dir="${build.ant.dir}"/>
334	<
335	<	<javac srcdir="${ant.src.dir}"
336	<	destdir="${build.ant.dir}"
337	<	source="1.4"
338	<	/>
339	<
340	<	</target>
341	<
342	<
343	<	<target name="filter-src"
344	<	depends="compile-ant-filter">
345	<
346	<	<mkdir dir="${build.filter.src.dir}"/>
347	<
348	<	<copy todir="${build.filter.src.dir}">
349	<	<fileset dir="${src.dir}">
350	<	<include name="**/*.html"/>
351	<	</fileset>
352	<	</copy>
353	<
354	<	<copy todir="${build.filter.src.dir}">
355	<	<fileset dir="${src.dir}">
356	<	<exclude name="**/*.html"/>
357	<	<patternset refid="docs.exclusion"/>
358	<	</fileset>
359	<	<filterchain>
360	<
361	<	<!--
362	<	# This filter gets rid of angle-bracketed type parameters
363	<	# so that javadoc can run on the result. The following
364	<	# heuristic seems to work:
365	<	#
366	<	# For all lines not starting with space(s)-asterisk-space(s),
367	<	#   replace <something> with a space, where there may be more
368	<	#   than one right angle bracket at the end, and "something"
369	<	#   must not contain parens or pipes. (This may need some
370	<	#   tweaking.)
371	<	-->
372	<
373	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
374	<	classpath="${build.ant.dir}">
375	<	<param name="notmatching" value="^\s+\*\s.*$"/>
376	<	<param name="pattern"     value="&lt;[^|>()]+?>+"/>
377	<	<param name="replacement" value=" "/>
378	<	</filterreader>
379	<
380	<	</filterchain>
381	<	</copy>
382	<
383	<	</target>
384	<
385	<
386	<
334	>	<target name="compile-tests"
335	>	depends="jar">
336
337	<	<target name="filter-doccheck"
389	<	depends="filter-src">
337	>	<mkdir dir="${build.testcases.dir}"/>
338
339	<	<mkdir dir="${build.filter.doccheck.dir}"/>
339	>	<javac srcdir="${tck.src.dir}"
340	>	destdir="${build.testcases.dir}"
341	>	debug="${build.debug}"
342	>	debuglevel="${build.debuglevel}"
343	>	deprecation="${build.deprecation}"
344	>	source="${build.sourcelevel}"
345	>	fork="true">
346
347	<	<copy todir="${build.filter.doccheck.dir}">
348	<	<fileset dir="${build.filter.src.dir}">
349	<	<include name="**/*.html"/>
396	<	</fileset>
397	<	</copy>
347	>	<compilerarg value="${bootclasspath.args}"/>
348	>	<compilerarg line="${build.args}"/>
349	>	<compilerarg value="-XDignore.symbol.file=true"/>
350
351	<	<property name="generic.declarations"
400	<	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 {}"
401	<	/>
351	>	<classpath refid="test.classpath"/>
352
353	<	<copy todir="${build.filter.doccheck.dir}">
404	<	<fileset dir="${build.filter.src.dir}">
405	<	<exclude name="**/*.html"/>
406	<	</fileset>
407	<	<filterchain>
408	<	<!--
409	<	# These two filters try to make the source look like
410	<	# something that doccheck can process. The first removes
411	<	# -source 1.4 assertions and the second adds in a bunch
412	<	# of single letter public nested marker interfaces so that
413	<	# the generic type parameters are recognized.
414	<	-->
415	<
416	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
417	<	classpath="${build.ant.dir}">
418	<	<param name="matching"    value="^\s*assert[\s ].*$"/>
419	<	<param name="pattern"     value="assert"/>
420	<	<param name="replacement" value="//assert"/>
421	<	</filterreader>
422	<
423	<	<filterreader classname="jsr166.ant.filters.ReplaceFilter"
424	<	classpath="${build.ant.dir}">
425	<	<param name="matching"    value="^([^*]*(class|interface|implements) .*|)\{.*$"/>
426	<	<param name="pattern"     value="$"/>
427	<	<param name="replacement" value=" ${generic.declarations}"/>
428	<	</filterreader>
353	>	</javac>
354
355	<	</filterchain>
356	<	</copy>
355	>	<javac srcdir="${test.src.dir}"
356	>	destdir="${build.testcases.dir}"
357	>	debug="${build.debug}"
358	>	debuglevel="${build.debuglevel}"
359	>	deprecation="${build.deprecation}"
360	>	source="${build.sourcelevel}"
361	>	fork="true">
362
363	<	</target>
363	>	<include name="jsr166/test/**"/>
364
365	+	<compilerarg value="${bootclasspath.args}"/>
366	+	<compilerarg line="${build.args}"/>
367	+	<compilerarg value="-XDignore.symbol.file=true"/>
368
369	<	<target name="compile-tests"
437	<	depends="jar">
369	>	<classpath refid="test.classpath"/>
370
371	<	<mkdir dir="${build.testcases.dir}"/>
371	>	</javac>
372
373		<!--
374	<	<echo>javac ${build.args}</echo>
443	<	<echo>classpath="${test.classpath}"</echo>
444	<	-->
445	<
446	<	<javac srcdir="${test.src.dir}"
374	>	<javac srcdir="${jtreg.src.dir}"
375		destdir="${build.testcases.dir}"
376		debug="${build.debug}"
377		debuglevel="${build.debuglevel}"
#	Line 451 | Line 379
379		source="${build.sourcelevel}"
380		fork="true">
381
382	+	<compilerarg value="${bootclasspath.args}"/>
383		<compilerarg line="${build.args}"/>
384	+	<compilerarg value="-XDignore.symbol.file=true"/>
385	+
386		<classpath refid="test.classpath"/>
456	–
457	–	<include name="java/**"/>
458	–	<include name="jsr166/**"/>
387
388		</javac>
389	+	-->
390
391		</target>
392
#	Line 477 | Line 406
406		dir="${build.reports.dir}"
407		fork="true">
408
409	<	<jvmarg value="-Xbootclasspath:${test.bootclasspath}"/>
409	>	<jvmarg value="${bootclasspath.args}"/>
410	>	<jvmarg value="-server"/>
411	>	<jvmarg value="-showversion"/>
412	>
413	>	<classpath refid="test.classpath"/>
414
415		<formatter type="xml"/>
416
417	<	<batchtest todir="${build.reports.dir}">
417	>	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
418	>	<fileset dir="${tck.src.dir}">
419	>	<include name="**/${testcase}Test.java"/>
420	>	</fileset>
421	>	</batchtest>
422	>
423	>	<batchtest todir="${build.reports.dir}" if="do.test.old">
424		<fileset dir="${test.src.dir}">
425	<	<include name="java/**/${testcase}Test.java"/>
426	<	<include name="jsr166/**/${testcase}Test.java"/>
425	>	<include name="jsr166/test/**/${testcase}Test.java"/>
426	>	</fileset>
427	>	</batchtest>
428	>
429	>	<!--
430	>	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
431	>	<fileset dir="${jtreg.src.dir}">
432	>	<include name="**/${testcase}Test.java"/>
433		</fileset>
434		</batchtest>
435	+	-->
436
437		</junit>
438
#	Line 508 | Line 454
454		<fileset dir="${build.reports.dir}">
455		<include name="TEST-*.xml"/>
456		</fileset>
457	<	<report styledir="${stylesheet.dir}"
512	<	format="${junit.report.format}"
513	<	todir="${build.reports.dir}"
457	>	<report format="${junit.report.format}" todir="${build.reports.dir}"
458		/>
459		</junitreport>
460
#	Line 528 | Line 472
472		</condition>
473
474		<property name="warnunchecked.arg" value=""/>
531	–
532	–	<condition property="prepare.src.dir" value="${build.dir}/prepare-src">
533	–	<istrue value="${build.nothreads}"/>
534	–	</condition>
475
476
477		<!-- Common options in javac invocations -->
#	Line 540 | Line 480
480		</target>
481
482
543	–	<target name="prepare-src"
544	–	depends="configure-compiler"
545	–	if="prepare.src.dir">
546	–
547	–	<mkdir dir="${prepare.src.dir}"/>
548	–	<copy todir="${prepare.src.dir}">
549	–	<fileset dir="${src.dir}">
550	–	<exclude name="java/lang/**"/>
551	–	</fileset>
552	–	</copy>
553	–
554	–	</target>
555	–
556	–
483		<target name="configure-tests"
484		depends="configure-compiler">
485
#	Line 561 | Line 487
487		<available property="junit.available"
488		classname="junit.framework.Protectable"/>
489
564	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
565	–	unless="junit.available"/>
566	–
490		<!-- Xalan -->
491		<available property="xalan.available"
492		classname="org.apache.xalan.Version"/>
493
494	+
495	+	<!-- Ant 1.6beta and later don't need or want this check -->
496	+	<!--
497	+	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
498	+	unless="junit.available"/>
499	+
500		<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
501		unless="xalan.available"/>
502	+	-->
503
504	+	</target>
505
575	–	<!--
576	–	! Bootclasspath munging for testing, so JUnit can test our local
577	–	! modifications to java.*.
578	–	-->
506
507	<	<path id="test.classpath">
508	<	<pathelement location="${product.jar}"/>
582	<	<pathelement location="${rt.jar}"/>
583	<	<pathelement location="${junit.jar}"/>
584	<	<pathelement location="${build.testcases.dir}"/>
585	<	</path>
507	>	<!-- Various demos and test programs -->
508	>
509
510	<	<path id="test.bootclasspath">
511	<	<path refid="test.classpath"/>
589	<	</path>
510	>	<target name="loops" depends="init, configure-compiler"
511	>	description="Benchmark from Doug Lea's AQS paper">
512
513	<	<!-- Flatten test classpaths into platform-appropriate strings -->
592	<	<property name="test.classpath"         refid="test.classpath"/>
593	<	<property name="test.bootclasspath"     refid="test.bootclasspath"/>
513	>	<mkdir dir="${build.loops.dir}"/>
514
515	+	<javac srcdir="${loops.src.dir}"
516	+	destdir="${build.loops.dir}"
517	+	debug="${build.debug}"
518	+	debuglevel="${build.debuglevel}"
519	+	deprecation="${build.deprecation}"
520	+	source="${build.sourcelevel}"
521	+	fork="true">
522	+
523	+	<compilerarg line="${build.args}"/>
524	+	<classpath refid="loops.classpath"/>
525	+	<compilerarg value="-XDignore.symbol.file=true"/>
526	+
527	+	</javac>
528	+
529	+	<java classname="ALoops" fork="true">
530	+	<classpath refid="loops.classpath"/>
531	+	</java>
532	+
533	+	</target>
534	+
535	+
536	+	<!-- jdk7 -->
537	+
538	+
539	+	<target name="jdk7compile"
540	+	depends="configure-compiler"
541	+	description="Compiles src/jdk7 sources">
542	+
543	+	<mkdir dir="${build.jdk7.classes.dir}"/>
544	+
545	+	<javac srcdir="${jdk7src.dir}"
546	+	destdir="${build.jdk7.classes.dir}"
547	+	debug="${build.debug}"
548	+	debuglevel="${build.debuglevel}"
549	+	deprecation="${build.deprecation}"
550	+	source="1.6"
551	+	classpath=""
552	+	bootclasspath="${bootclasspath6}"
553	+	includeAntRuntime="false"
554	+	includeJavaRuntime="false"
555	+	executable="${javac7}"
556	+	fork="true">
557	+
558	+	<include name="**/*.java"/>
559	+	<compilerarg line="${build.args}"/>
560	+	<compilerarg value="-XDignore.symbol.file=true"/>
561	+	<compilerarg value="-Xlint:all"/>
562	+
563	+	</javac>
564	+
565	+	<mkdir dir="${build.jdk7.lib.dir}"/>
566	+
567	+	<jar destfile="${jdk7product.jar}" index="true">
568	+	<fileset dir="${build.jdk7.classes.dir}"/>
569	+	</jar>
570	+
571	+	<mkdir dir="${build.jdk7.tck.classes.dir}"/>
572	+
573	+	<javac srcdir="${tck.src.dir}"
574	+	destdir="${build.jdk7.tck.classes.dir}"
575	+	debug="${build.debug}"
576	+	debuglevel="${build.debuglevel}"
577	+	deprecation="${build.deprecation}"
578	+	source="1.6"
579	+	classpath="${junit.jar}"
580	+	bootclasspath="${jdk7product.jar}:${bootclasspath6}"
581	+	includeAntRuntime="false"
582	+	includeJavaRuntime="false"
583	+	executable="${javac7}"
584	+	fork="true">
585	+
586	+	<include name="**/*.java"/>
587	+	<compilerarg line="${build.args}"/>
588	+	<compilerarg value="-XDignore.symbol.file=true"/>
589	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
590	+
591	+	</javac>
592	+
593	+	</target>
594	+
595	+
596	+	<target name="run-jdk7-tck-tests"
597	+	depends="jdk7compile"
598	+	description="Runs tck tests for jsr166-jdk7 directly">
599	+	<run-tck-tests
600	+	jvm="${java7}"
601	+	tck.classes="${build.jdk7.tck.classes.dir}"
602	+	product.jar="${jdk7product.jar}"/>
603	+	</target>
604	+
605	+
606	+	<target name="run-jdk7-tck-tests-via-junit-task"
607	+	depends="jdk7compile">
608	+
609	+	<junit printsummary="true"
610	+	showoutput="true"
611	+	errorProperty="junit.failed"
612	+	failureProperty="junit.failed"
613	+	includeantruntime="true"
614	+	jvm="${java7}"
615	+	fork="true">
616	+
617	+	<jvmarg value="-Xbootclasspath/p:${jdk7product.jar}"/>
618	+	<jvmarg value="-server"/>
619	+
620	+	<classpath>
621	+	<pathelement location="${junit.jar}"/>
622	+	<pathelement location="${build.jdk7.tck.classes.dir}"/>
623	+	</classpath>
624	+
625	+	<formatter type="brief"/>
626	+
627	+	<test name="JSR166TestCase" haltonfailure="no">
628	+	</test>
629	+
630	+	</junit>
631		</target>
632
633
634	+	<target name="jdk7docs"
635	+	description="Builds javadocs with custom tags to build folder">
636	+
637	+	<delete dir="${build.jdk7.docs.dir}"/>
638	+	<mkdir dir="${build.jdk7.docs.dir}"/>
639
640	<	<!-- Anthill targets -->
640	>	<javadoc destdir="${build.jdk7.docs.dir}"
641	>	packagenames="none"
642	>	link="${jdkapi7docs.url}"
643	>	overview="${jdk7src.dir}/intro.html"
644	>	sourcepath="${jdk7src.dir}"
645	>	bootclasspath="${bootclasspath6}"
646	>	classpath=""
647	>	source="1.6"
648	>	executable="${javadoc7}"
649	>	additionalparam="-XDignore.symbol.file=true" >
650	>	<fileset dir="${jdk7src.dir}" defaultexcludes="yes">
651	>	<include name="**/*.java"/>
652	>	</fileset>
653	>	</javadoc>
654
601	–	<target name="anthill-build">
602	–
603	–	<!-- Override this in user.properties -->
604	–	<property name="tiger.home" location="e:/j2sdk1.5.0"/>
605	–
606	–	<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java">
607	–	<arg value="-Xmx256000000"/>
608	–	<!-- classpath of new JVM -->
609	–	<arg value="-classpath"/> <arg path="${java.class.path}"/>
610	–	<!-- location of Ant home directory -->
611	–	<arg value="-Dant.home=${ant.home}"/>
612	–	<!-- the Ant main class -->
613	–	<arg value="org.apache.tools.ant.Main"/>
614	–	<!-- The build file -->
615	–	<arg value="-buildfile"/>  <arg value="build.xml"/>
616	–	<!-- the target to build on the new Ant instance -->
617	–	<arg value="-DJAVA_HOME=${tiger.home}"/>
618	–	<arg value="do-anthill-build"/>
619	–	</exec>
655		</target>
621	–
622	–	<target name="do-anthill-build"
623	–	depends="jar, test, docs, dist-docs"/>
656
625	–	<target name="anthill-publish">
657
658	<	<copy todir="${deployDir}/docs/private">
659	<	<fileset dir="${build.javadocs.dir}"/>
660	<	</copy>
658	>	<target name="jdk7dist"
659	>	depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
660	>	description="Puts all distributable products in single hierarchy"/>
661	>
662
631	–	<copy todir="${deployDir}/docs/public">
632	–	<fileset dir="${dist.javadocs.dir}"/>
633	–	</copy>
663
664	<	<copy tofile="${deployDir}/index.html"
665	<	file="${basedir}/etc/anthill-index.html"/>
664	>	<target name="jdk7clean"
665	>	description="Removes all build products">
666
667	<	<copy todir="${deployDir}/notes">
639	<	<fileset dir="${basedir}/etc/notes"/>
640	<	</copy>
667	>	<delete dir="${build.jdk7.dir}"/>
668
669		</target>
670
671
645	–	<target name="ng" depends="test">
646	–	<java classname="SuperfluousAbstract" fork="true">
672
673	<	<jvmarg value="-Xbootclasspath/p:${test.bootclasspath}"/>
673	>	<target name="jdk7dist-clean"
674	>	description="Removes all build and distribution products">
675
650	–	</java>
676		</target>
677
678	+	<target name="jdk7dist-docs"
679	+	description="Builds javadocs without custom tags to dist folder">
680	+
681	+	<delete dir="${dist.jdk7.docs.dir}"/>
682	+	<mkdir dir="${dist.jdk7.docs.dir}"/>
683	+
684	+	<javadoc destdir="${dist.jdk7.docs.dir}"
685	+	packagenames="none"
686	+	link="${jdkapi7docs.url}"
687	+	overview="${jdk7src.dir}/intro.html"
688	+	sourcepath="${jdk7src.dir}"
689	+	classpath=""
690	+	executable="${javadoc7}"
691	+	bootclasspath="${bootclasspath6}"
692	+	source="1.6">
693	+	<arg value="-XDignore.symbol.file=true"/>
694	+	<fileset dir="${jdk7src.dir}" defaultexcludes="yes">
695	+	<include name="**/*.java"/>
696	+	</fileset>
697	+	</javadoc>
698	+
699	+	</target>
700	+
701	+	<target name="jdk7dist-jar"
702	+	depends="jdk7clean, jdk7compile">
703	+
704	+	<copy file="${jdk7product.jar}" todir="${dist.dir}"/>
705	+
706	+	</target>
707	+
708	+	<!-- jsr166x -->
709	+
710	+
711	+	<target name="jsr166xcompile"
712	+	depends="init, configure-compiler"
713	+	description="Compiles jsr166x sources">
714	+
715	+	<mkdir dir="${build.jsr166x.dir}"/>
716	+
717	+	<javac srcdir="${jsr166xsrc.dir}"
718	+	destdir="${build.jsr166x.dir}"
719	+	debug="${build.debug}"
720	+	debuglevel="${build.debuglevel}"
721	+	deprecation="${build.deprecation}"
722	+	source="${build.sourcelevel}"
723	+	fork="true">
724	+
725	+	<include name="**/*.java"/>
726	+	<compilerarg line="${build.args}"/>
727	+	<compilerarg value="-XDignore.symbol.file=true"/>
728	+
729	+	</javac>
730	+
731	+	</target>
732	+
733	+
734	+
735	+	<target name="jsr166xjar"
736	+	depends="jsr166xcompile"
737	+	description="Builds library jar from compiled sources">
738	+
739	+	<mkdir dir="${build.jsr166xlib.dir}"/>
740	+
741	+	<jar destfile="${jsr166xproduct.jar}">
742	+	<fileset dir="${build.jsr166x.dir}"/>
743	+	</jar>
744	+
745	+	</target>
746	+
747	+
748	+
749	+	<target name="jsr166xdocs"
750	+	description="Builds javadocs with custom tags to build folder">
751	+
752	+	<delete dir="${build.jsr166xjavadocs.dir}"/>
753	+	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
754	+
755	+	<javadoc destdir="${build.jsr166xjavadocs.dir}"
756	+	packagenames="jsr166x"
757	+	link="${jdkapidocs.url}"
758	+	source="${build.sourcelevel}"
759	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
760	+	additionalparam="-XDignore.symbol.file=true" />
761	+
762	+	</target>
763	+
764	+
765	+	<target name="jsr166xdist"
766	+	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
767	+	description="Puts all distributable products in single hierarchy"/>
768	+
769	+
770	+
771	+	<target name="jsr166xclean"
772	+	description="Removes all build products">
773	+
774	+	<delete dir="${build.jsr166x.dir}"/>
775	+	<delete dir="${build.jsr166xlib.dir}"/>
776	+
777	+	</target>
778	+
779	+
780	+
781	+	<target name="jsr166xdist-clean"
782	+	description="Removes all build and distribution products">
783	+
784	+	</target>
785	+
786	+
787	+
788	+	<target name="jsr166xdist-docs"
789	+	description="Builds javadocs without custom tags to dist folder">
790	+
791	+	<delete dir="${dist.jsr166xjavadocs.dir}"/>
792	+	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
793	+
794	+	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
795	+	packagenames="jsr166x"
796	+	link="${jdkapidocs.url}"
797	+	source="${build.sourcelevel}"
798	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
799	+	additionalparam="-XDignore.symbol.file=true" />
800	+
801	+	</target>
802	+
803	+	<target name="jsr166xdist-jar"
804	+	depends="jsr166xclean, jsr166xjar">
805	+
806	+	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
807	+
808	+	</target>
809	+
810	+	<!-- jsr166y -->
811	+
812	+
813	+	<target name="jsr166ycompile"
814	+	depends="init, configure-compiler"
815	+	description="Compiles jsr166y sources">
816	+
817	+	<mkdir dir="${build.jsr166y.dir}"/>
818	+
819	+	<javac srcdir="${jsr166ysrc.dir}"
820	+	destdir="${build.jsr166y.dir}"
821	+	debug="${build.debug}"
822	+	debuglevel="${build.debuglevel}"
823	+	deprecation="${build.deprecation}"
824	+	source="${build.sourcelevel}"
825	+	fork="true">
826	+
827	+	<include name="**/*.java"/>
828	+	<compilerarg line="${build.args}"/>
829	+	<compilerarg value="-XDignore.symbol.file=true"/>
830	+	<compilerarg value="${bootclasspath.args}"/>
831	+
832	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
833	+
834	+	</javac>
835	+
836	+	</target>
837	+
838	+
839	+
840	+	<target name="jsr166yjar"
841	+	depends="jsr166ycompile"
842	+	description="Builds library jar from compiled sources">
843	+
844	+	<mkdir dir="${build.jsr166ylib.dir}"/>
845	+
846	+	<jar destfile="${jsr166yproduct.jar}" index="true">
847	+	<fileset dir="${build.jsr166y.dir}"/>
848	+	</jar>
849	+
850	+	</target>
851	+
852	+
853	+
854	+	<target name="jsr166ydocs"
855	+	description="Builds javadocs with custom tags to build folder">
856	+
857	+	<delete dir="${build.jsr166yjavadocs.dir}"/>
858	+	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
859	+
860	+	<javadoc destdir="${build.jsr166yjavadocs.dir}"
861	+	packagenames="jsr166y"
862	+	link="${jdkapidocs.url}"
863	+	source="${build.sourcelevel}"
864	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
865	+	additionalparam="-XDignore.symbol.file=true" />
866	+
867	+	</target>
868	+
869	+
870	+	<target name="jsr166ydist"
871	+	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
872	+	description="Puts all distributable products in single hierarchy"/>
873	+
874	+
875	+
876	+	<target name="jsr166yclean"
877	+	description="Removes all build products">
878	+
879	+	<delete dir="${build.jsr166y.dir}"/>
880	+	<delete dir="${build.jsr166ylib.dir}"/>
881	+
882	+	</target>
883	+
884	+
885	+
886	+	<target name="jsr166ydist-clean"
887	+	description="Removes all build and distribution products">
888	+
889	+	</target>
890	+
891	+	<target name="jsr166ydist-docs"
892	+	description="Builds javadocs without custom tags to dist folder">
893	+
894	+	<delete dir="${dist.jsr166yjavadocs.dir}"/>
895	+	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
896	+
897	+	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
898	+	packagenames="jsr166y"
899	+	link="${jdkapidocs.url}"
900	+	source="${build.sourcelevel}"
901	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
902	+	additionalparam="-XDignore.symbol.file=true" />
903	+
904	+	</target>
905	+
906	+	<target name="jsr166ydist-jar"
907	+	depends="jsr166yclean, jsr166yjar">
908	+
909	+	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
910	+
911	+	</target>
912	+
913	+
914	+	<!-- extra166y -->
915	+
916	+
917	+	<target name="extra166ycompile"
918	+	depends="init, configure-compiler, jsr166ycompile"
919	+	description="Compiles extra166y sources">
920	+
921	+	<mkdir dir="${build.extra166y.dir}"/>
922	+
923	+	<javac srcdir="${extra166ysrc.dir}"
924	+	destdir="${build.extra166y.dir}"
925	+	debug="${build.debug}"
926	+	classpath="${jsr166yproduct.jar}"
927	+	debuglevel="${build.debuglevel}"
928	+	deprecation="${build.deprecation}"
929	+	source="${build.sourcelevel}"
930	+	fork="true">
931	+
932	+	<include name="**/*.java"/>
933	+	<compilerarg line="${build.args}"/>
934	+	<compilerarg value="-XDignore.symbol.file=true"/>
935	+	<compilerarg value="${bootclasspath.args}"/>
936	+
937	+	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
938	+
939	+	</javac>
940	+
941	+	</target>
942	+
943	+
944	+
945	+	<target name="extra166yjar"
946	+	depends="extra166ycompile"
947	+	description="Builds library jar from compiled sources">
948	+
949	+	<mkdir dir="${build.extra166ylib.dir}"/>
950	+
951	+	<jar destfile="${extra166yproduct.jar}" index="true">
952	+	<fileset dir="${build.extra166y.dir}"/>
953	+	</jar>
954	+
955	+	</target>
956	+
957	+
958	+
959	+	<target name="extra166ydocs"
960	+	description="Builds javadocs with custom tags to build folder">
961	+
962	+	<delete dir="${build.extra166yjavadocs.dir}"/>
963	+	<mkdir dir="${build.extra166yjavadocs.dir}"/>
964	+
965	+	<javadoc destdir="${build.extra166yjavadocs.dir}"
966	+	packagenames="extra166y"
967	+	link="${jdkapidocs.url}"
968	+	source="${build.sourcelevel}"
969	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
970	+	additionalparam="-XDignore.symbol.file=true" />
971	+
972	+	</target>
973	+
974	+
975	+	<target name="extra166ydist"
976	+	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
977	+	description="Puts all distributable products in single hierarchy"/>
978	+
979	+
980	+
981	+	<target name="extra166yclean"
982	+	description="Removes all build products">
983	+
984	+	<delete dir="${build.extra166y.dir}"/>
985	+	<delete dir="${build.extra166ylib.dir}"/>
986	+
987	+	</target>
988	+
989	+
990	+
991	+	<target name="extra166ydist-clean"
992	+	description="Removes all build and distribution products">
993	+
994	+	</target>
995	+
996	+	<target name="extra166ydist-docs"
997	+	description="Builds javadocs without custom tags to dist folder">
998	+
999	+	<delete dir="${dist.extra166yjavadocs.dir}"/>
1000	+	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
1001	+
1002	+	<javadoc destdir="${dist.extra166yjavadocs.dir}"
1003	+	packagenames="extra166y"
1004	+	link="${jdkapidocs.url}"
1005	+	source="${build.sourcelevel}"
1006	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1007	+	additionalparam="-XDignore.symbol.file=true" />
1008	+
1009	+	</target>
1010	+
1011	+	<target name="extra166ydist-jar"
1012	+	depends="extra166yclean, extra166yjar">
1013	+
1014	+	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1015	+
1016	+	</target>
1017	+
1018	+	<!-- jsr166e -->
1019	+
1020	+	<target name="jsr166ecompile"
1021	+	depends="configure-compiler"
1022	+	description="Compiles jsr166e sources">
1023	+
1024	+	<mkdir dir="${build.jsr166e.dir}"/>
1025	+
1026	+	<javac srcdir="${topsrc.dir}"
1027	+	destdir="${build.jsr166e.dir}"
1028	+	debug="${build.debug}"
1029	+	debuglevel="${build.debuglevel}"
1030	+	deprecation="${build.deprecation}"
1031	+	source="1.7"
1032	+	classpath=""
1033	+	includeAntRuntime="false"
1034	+	includeJavaRuntime="false"
1035	+	executable="${javac7}"
1036	+	fork="true">
1037	+
1038	+	<include name="jsr166e/**/*.java"/>
1039	+	<compilerarg line="${build.args}"/>
1040	+	<compilerarg value="-XDignore.symbol.file=true"/>
1041	+	<compilerarg value="-Xlint:all"/>
1042	+
1043	+	</javac>
1044	+
1045	+	</target>
1046	+
1047	+
1048	+
1049	+	<target name="jsr166ejar"
1050	+	depends="jsr166ecompile"
1051	+	description="Builds library jar from compiled sources">
1052	+
1053	+	<mkdir dir="${build.jsr166elib.dir}"/>
1054	+
1055	+	<jar destfile="${jsr166eproduct.jar}" index="true">
1056	+	<fileset dir="${build.jsr166e.dir}"/>
1057	+	</jar>
1058	+
1059	+	</target>
1060	+
1061	+
1062	+
1063	+	<target name="jsr166edocs"
1064	+	description="Builds javadocs with custom tags to build folder">
1065	+
1066	+	<delete dir="${build.jsr166ejavadocs.dir}"/>
1067	+	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
1068	+
1069	+	<javadoc destdir="${build.jsr166ejavadocs.dir}"
1070	+	packagenames="jsr166e,jsr166e.extra"
1071	+	link="${jdkapi7docs.url}"
1072	+	source="1.7"
1073	+	sourcepath="${topsrc.dir}:${jdk7src.dir}:${jdksrc.dir}"
1074	+	executable="${javadoc7}"
1075	+	additionalparam="-XDignore.symbol.file=true" >
1076	+	<fileset dir="${topsrc.dir}" defaultexcludes="yes">
1077	+	<include name="jsr166e/**/*.java"/>
1078	+	</fileset>
1079	+	</javadoc>
1080	+
1081	+	</target>
1082	+
1083	+
1084	+	<target name="jsr166edist"
1085	+	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1086	+	description="Puts all distributable products in single hierarchy"/>
1087	+
1088	+
1089	+
1090	+	<target name="jsr166eclean"
1091	+	description="Removes all build products">
1092	+
1093	+	<delete dir="${build.jsr166e.dir}"/>
1094	+	<delete dir="${build.jsr166elib.dir}"/>
1095	+
1096	+	</target>
1097	+
1098	+
1099	+
1100	+	<target name="jsr166edist-clean"
1101	+	description="Removes all build and distribution products">
1102	+
1103	+	</target>
1104	+
1105	+	<target name="jsr166edist-docs"
1106	+	description="Builds javadocs without custom tags to dist folder">
1107	+
1108	+	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1109	+	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1110	+
1111	+	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1112	+	packagenames="jsr166e,jsr166e.extra"
1113	+	link="${jdkapidocs.url}"
1114	+	source="1.7"
1115	+	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1116	+	additionalparam="-XDignore.symbol.file=true" />
1117	+
1118	+	</target>
1119	+
1120	+	<target name="jsr166edist-jar"
1121	+	depends="jsr166eclean, jsr166ejar">
1122	+
1123	+	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1124	+
1125	+	</target>
1126
1127		</project>

Diff Legend

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