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

Diff Legend

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