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.93 by jsr166, Mon Jan 14 08:58:47 2013 UTC vs.
Revision 1.135 by jsr166, Mon Feb 4 19:37:52 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	+	As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
26		------------------------------------------------------------------------------
27		</description>
28
29	<	<target name="usage" description="Advises user to run with -projecthelp">
30	<	<echo>Run "ant -projecthelp" for full usage information.</echo>
29	>	<target name="usage" description="Display main targets by running 'ant -projecthelp'">
30	>	<java classname="org.apache.tools.ant.Main">
31	>	<arg value="-projecthelp" />
32	>	</java>
33		</target>
34
35
#	Line 21 | Line 38
38
39
40		<!-- Compilation options -->
41	<	<property name="build.sourcelevel"    value="1.6"/>
41	>	<property name="build.sourcelevel"    value="6"/>
42		<property name="build.debug"          value="true"/>
43		<property name="build.debuglevel"     value="source,lines,vars"/>
44		<property name="build.deprecation"    value="false"/>
45	+	<property name="build.javadoc.access" value="protected"/>
46
47		<!-- Build locations -->
48		<property name="build.dir"                   location="build"/>
49		<property name="build.classes.dir"           location="${build.dir}/classes"/>
50		<property name="build.testcases.dir"         location="${build.dir}/testcases"/>
51		<property name="build.loops.dir"             location="${build.dir}/loops"/>
34	–	<property name="build.lib.dir"               location="${build.dir}/lib"/>
35	–	<property name="build.javadocs.dir"          location="${build.dir}/javadocs"/>
52		<property name="build.reports.dir"           location="${build.dir}/reports"/>
53
54	<	<property name="build.jdk7.dir"              location="${build.dir}/jdk7"/>
55	<	<property name="build.jdk7.lib.dir"          location="${build.jdk7.dir}"/>
56	<	<property name="build.jdk7.classes.dir"      location="${build.jdk7.dir}/classes"/>
57	<	<property name="build.jdk7.docs.dir"         location="${build.jdk7.dir}/docs"/>
54	>	<property name="build.4jdk7.dir"             location="${build.dir}/jsr166-4jdk7"/>
55	>	<property name="build.4jdk7.classes.dir"     location="${build.4jdk7.dir}/classes"/>
56	>	<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
57	>	<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
58
59		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
44	–	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
45	–	<property name="build.jsr166xjavadocs.dir"   location="${build.dir}/jsr166xjavadocs"/>
46	–
60		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
48	–	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
49	–	<property name="build.jsr166yjavadocs.dir"   location="${build.dir}/jsr166yjavadocs"/>
50	–
61		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
52	–	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
53	–	<property name="build.jsr166ejavadocs.dir"   location="${build.dir}/jsr166ejavadocs"/>
54	–
62		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
56	–	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
57	–	<property name="build.extra166yjavadocs.dir" location="${build.dir}/extra166yjavadocs"/>
63
64	<	<!-- JDK binary locations -->
64	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
65	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
66	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
67	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
68	>
69	>	<!-- JDK 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="javac@{v}"     location="${jdk@{v}.home}/bin/javac"/>
77	<	<property name="javadoc@{v}"   location="${jdk@{v}.home}/bin/javadoc"/>
78	<	<property name="bootdir@{v}"   location="${jdk@{v}.home}/jre/lib"/>
79	<	<property name="bootclasspath@{v}"
80	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
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="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
80	>	<local name="boot.jar.dir"/>
81	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
82	>	<path id="bootclasspath@{v}">
83	>	<pathelement path="${boot.jar.dir}/resources.jar"/>
84	>	<pathelement path="${boot.jar.dir}/rt.jar"/>
85	>	<pathelement path="${boot.jar.dir}/jsse.jar"/>
86	>	<pathelement path="${boot.jar.dir}/jce.jar"/>
87	>	<pathelement path="${boot.jar.dir}/charsets.jar"/>
88	>	</path>
89	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
90	>	</sequential>
91	>	</macrodef>
92	>
93	>	<macrodef name="mirror-dir">
94	>	<attribute name="src"/>
95	>	<attribute name="dst"/>
96	>	<sequential>
97	>	<delete dir="@{dst}"/>
98	>	<mkdir dir="@{dst}"/>
99	>	<copy todir="@{dst}" preservelastmodified="true">
100	>	<fileset dir="@{src}"/>
101	>	</copy>
102		</sequential>
103		</macrodef>
104
#	Line 84 | Line 115
115		<property name="lib.dir"              location="${basedir}/lib"/>
116		<property name="dist.dir"             location="${basedir}/dist"/>
117		<property name="topsrc.dir"           location="${basedir}/src"/>
118	<	<property name="jdk7src.dir"          location="${topsrc.dir}/jdk7"/>
118	>	<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
119		<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
120		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
121		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
122		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
92	–	<property name="jdksrc.dir"           location="/home/dl/1.6.0/j2se/martin/j2se/src/share/classes"/>
123
124	<	<!-- Distribution locations -->
125	<	<property name="dist.javadocs.dir"           location="${dist.dir}/docs"/>
126	<	<property name="dist.jdk7.docs.dir"          location="${dist.dir}/jsr166-jdk7docs"/>
127	<	<property name="dist.jsr166xjavadocs.dir"    location="${dist.dir}/jsr166xdocs"/>
128	<	<property name="dist.jsr166yjavadocs.dir"    location="${dist.dir}/jsr166ydocs"/>
129	<	<property name="dist.jsr166ejavadocs.dir"    location="${dist.dir}/jsr166edocs"/>
130	<	<property name="dist.extra166yjavadocs.dir"  location="${dist.dir}/extra166ydocs"/>
124	>	<!-- Javadoc locations -->
125	>	<property name="docs.dir"          location="${build.dir}/docs"/>
126	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
127	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
128	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
129	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
130	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
131	>
132	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
133	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
134	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
135	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
136	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
137	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
138
139		<!-- Jar locations -->
140	<	<property name="product.jar"          location="${build.lib.dir}/jsr166.jar"/>
141	<	<property name="jdk7product.jar"      location="${build.jdk7.lib.dir}/jsr166-jdk7.jar"/>
142	<	<property name="jsr166xproduct.jar"   location="${build.jsr166xlib.dir}/jsr166x.jar"/>
143	<	<property name="jsr166yproduct.jar"   location="${build.jsr166ylib.dir}/jsr166y.jar"/>
144	<	<property name="jsr166eproduct.jar"   location="${build.jsr166elib.dir}/jsr166e.jar"/>
145	<	<property name="extra166yproduct.jar" location="${build.extra166ylib.dir}/extra166y.jar"/>
146	<	<property name="junit.jar"            location="${lib.dir}/junit.jar"/>
110	<
111	<	<!-- Bootclasspath argument -->
112	<	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
140	>	<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
141	>	<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
142	>	<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
143	>	<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
144	>	<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
145	>	<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
146	>	<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
147
148		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
149		<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
#	Line 117 | Line 151
151		<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
152
153		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
154	<	<!-- The below does not yet exist as of 2012-11 -->
154	>	<!-- The below does not yet exist as of 2013-01 -->
155		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
156	+
157	+	<!-- Default jdk api doc location (latest stable release seems best) -->
158		<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
159
160	+	<!-- Define the "jtreg" task -->
161	+	<!-- See the docs in "jtreg -onlineHelp" -->
162	+	<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
163	+	classpath="${lib.dir}/jtreg.jar" />
164	+
165		<!-- Test classpath -->
166		<path id="test.classpath">
167		<pathelement location="${build.testcases.dir}"/>
168		<pathelement location="${junit.jar}"/>
169		</path>
170
171	+	<macrodef name="run-tck-tests">
172	+	<attribute name="tck.src.dir" default="${tck.src.dir}"/>
173	+	<attribute name="source" default="6"/>
174	+	<attribute name="target"/>
175	+	<attribute name="workdir"/>
176	+	<attribute name="classes"/>
177	+	<attribute name="jvmflags" default=""/>
178	+	<element name="javac-elements" optional="true"/>
179	+	<sequential>
180	+
181	+	<mkdir dir="@{workdir}/tck-classes"/>
182	+
183	+	<javac srcdir="@{tck.src.dir}"
184	+	destdir="@{workdir}/tck-classes"
185	+	debug="${build.debug}"
186	+	debuglevel="${build.debuglevel}"
187	+	deprecation="${build.deprecation}"
188	+	source="@{source}"
189	+	classpath="${junit.jar}"
190	+	bootclasspath="@{classes}:${bootclasspath@{source}}"
191	+	includeAntRuntime="false"
192	+	includeJavaRuntime="false"
193	+	executable="${javac@{target}}"
194	+	fork="true">
195	+
196	+	<include name="*.java"/>
197	+	<compilerarg value="-XDignore.symbol.file=true"/>
198	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
199	+	<compilerarg line="${build.args}"/>
200	+	<javac-elements/>
201	+
202	+	</javac>
203	+
204	+	<java classname="JSR166TestCase"
205	+	failonerror="true"
206	+	jvm="${java@{target}}"
207	+	fork="true">
208	+	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
209	+	<jvmarg line="@{jvmflags}"/>
210	+	<classpath>
211	+	<pathelement location="${junit.jar}"/>
212	+	<pathelement location="@{workdir}/tck-classes"/>
213	+	</classpath>
214	+	</java>
215	+
216	+	</sequential>
217	+	</macrodef>
218	+
219	+	<macrodef name="run-jtreg-tests">
220	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
221	+	<attribute name="source" default="7"/>
222	+	<attribute name="target"/>
223	+	<attribute name="workdir"/>
224	+	<attribute name="classes"/>
225	+	<attribute name="jtregflags" default=""/>
226	+	<sequential>
227	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
228	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
229	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
230	+	<mkdir dir="@{workdir}/JTreport"/>
231	+	<jtreg dir="@{jtreg.src.dir}"
232	+	jdk="${jdk@{target}.home}"
233	+	workDir="@{workdir}/JTwork"
234	+	reportDir="@{workdir}/JTreport">
235	+
236	+	<arg value="-Xbootclasspath/p:@{classes}"/>
237	+	<arg value="-agentvm"/>
238	+	<arg value="-v:nopass,fail"/>
239	+	<arg value="-vmoptions:-esa -ea"/>
240	+	<arg value="-automatic"/>
241	+	<arg value="-k:!ignore"/>
242	+	<arg line="@{jtregflags}"/>
243	+	</jtreg>
244	+	</sequential>
245	+	</macrodef>
246	+
247		<!-- ALoops classpath -->
248		<path id="loops.classpath">
249		<pathelement location="${build.loops.dir}"/>
250		</path>
251
252	+	<!-- Support @jls tag, used in jdk8+ javadoc -->
253	+	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
254	+	<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
255
256		<!-- Main targets -->
257
258		<target name="dists"
259	<	depends="dist, jsr166xdist, jsr166ydist,jsr166edist,  extra166ydist"
259	>	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
260		description="Builds all public jars and docs"/>
261
262		<target name="compile"
263	<	depends="init, configure-compiler"
264	<	description="Compiles main sources to build folder">
263	>	depends="configure-compiler"
264	>	description="Compiles src/main sources to build dir">
265
266		<mkdir dir="${build.classes.dir}"/>
267
268		<javac srcdir="${src.dir}"
269	<	destdir="${build.classes.dir}"
270	<	debug="${build.debug}"
271	<	debuglevel="${build.debuglevel}"
272	<	deprecation="${build.deprecation}"
273	<	source="${build.sourcelevel}"
274	<	fork="true">
269	>	destdir="${build.classes.dir}"
270	>	debug="${build.debug}"
271	>	debuglevel="${build.debuglevel}"
272	>	deprecation="${build.deprecation}"
273	>	classpath=""
274	>	includeAntRuntime="false"
275	>	includeJavaRuntime="false"
276	>	executable="${javac8}"
277	>	fork="true">
278
279		<include name="**/*.java"/>
280	+	<compilerarg value="-Xprefer:source"/>
281		<compilerarg value="-XDignore.symbol.file=true"/>
282	<
159	<	<!--
160	<	<exclude name="java/lang/**"/>
282	>	<compilerarg value="-Xlint:all"/>
283		<compilerarg line="${build.args}"/>
162	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
163	–	-->
284
285		</javac>
166	–
286		</target>
287
288
170	–
289		<target name="jar"
290		depends="compile"
291		description="Builds library jar from compiled sources">
292
175	–	<mkdir dir="${build.lib.dir}"/>
176	–
293		<jar destfile="${product.jar}">
294		<fileset dir="${build.classes.dir}"/>
295		</jar>
180	–
296		</target>
297
298
184	–
299		<target name="test"
300	<	depends="init, configure-tests, report-tests"
300	>	depends="configure-tests, report-tests"
301		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
302
303
190	–
304		<target name="docs"
305	<	description="Builds javadocs with custom tags to build folder">
305	>	description="Builds javadocs for src/main to dist dir">
306
307	<	<delete dir="${build.javadocs.dir}"/>
308	<	<mkdir dir="${build.javadocs.dir}"/>
307	>	<delete dir="${docs.dir}"/>
308	>	<mkdir dir="${docs.dir}"/>
309
310		<!-- the packagenames="none" hack below prevents scanning the -->
311		<!-- sourcepath for packages -->
312
313	<	<javadoc destdir="${build.javadocs.dir}"
313	>	<javadoc destdir="${docs.dir}"
314		packagenames="none"
315	<	link="${jdkapidocs.url}"
315	>	link="${jdkapi8docs.url}"
316		overview="${src.dir}/intro.html"
317	<	sourcepath="${src.dir}:${jdksrc.dir}"
318	<	additionalparam="-XDignore.symbol.file=true" >
317	>	access="${build.javadoc.access}"
318	>	sourcepath="${src.dir}:${jdk8src.dir}"
319	>	classpath=""
320	>	executable="${javadoc8}">
321		<fileset dir="${src.dir}" defaultexcludes="yes">
322		<include name="**/*.java"/>
323		</fileset>
324	+	<arg value="-XDignore.symbol.file=true"/>
325	+	<arg value="-tag"/>
326	+	<arg value="${javadoc.jls.option}"/>
327		</javadoc>
210	–
328		</target>
329
330
214	–
331		<target name="dist"
332	<	depends="init, dist-clean, dist-jar, dist-docs"
332	>	depends="dist-clean, dist-jar, dist-docs"
333		description="Puts all distributable products in single hierarchy"/>
334
335
#	Line 232 | Line 348
348		<exclude name="**/SyntaxTest.java"/>
349		<exclude name="**/SuperfluousAbstract.java"/>
350		</jar>
235	–
351		</target>
352
353
239	–
354		<target name="clean"
355		description="Removes all build products">
356
357		<delete dir="${build.dir}"/>
244	–	<delete dir="${build.classes.dir}"/>
245	–	<delete dir="${build.lib.dir}"/>
358
359		</target>
360
361
250	–
362		<target name="dist-clean"
363		description="Removes all build and distribution products">
364
#	Line 256 | Line 367
367		</target>
368
369
259	–
260	–	<target name="dist-docs"
261	–	description="Builds javadocs without custom tags to dist folder">
262	–
263	–	<delete dir="${dist.javadocs.dir}"/>
264	–	<mkdir dir="${dist.javadocs.dir}"/>
265	–
266	–	<!-- the packagenames="none" hack below prevents scanning the -->
267	–	<!-- sourcepath for packages -->
268	–
269	–	<javadoc destdir="${dist.javadocs.dir}"
270	–	packagenames="none"
271	–	link="${jdkapidocs.url}"
272	–	overview="${src.dir}/intro.html"
273	–	sourcepath="${src.dir}:${jdksrc.dir}"
274	–	additionalparam="-XDignore.symbol.file=true" >
275	–	<fileset dir="${src.dir}" defaultexcludes="yes">
276	–	<include name="**/*.java"/>
277	–	</fileset>
278	–	</javadoc>
279	–
280	–	</target>
281	–
282	–
283	–
370		<!-- Internal targets -->
371
372
287	–	<target name="init">
288	–
289	–	<!-- Version is kept in a separate file -->
290	–	<loadfile property="version" srcFile="version.properties"/>
291	–	<echo>Building JSR-166 version ${version}</echo>
292	–	<echo>java.home is ${java.home}</echo>
293	–
294	–	</target>
295	–
296	–
373		<target name="dist-jar"
374		depends="clean, jar">
299	–
375		<copy file="${product.jar}" todir="${dist.dir}"/>
376	+	</target>
377
378	+	<target name="dist-docs"
379	+	depends="clean, docs">
380	+	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
381		</target>
382
383
#	Line 308 | Line 387
387		<mkdir dir="${build.testcases.dir}"/>
388
389		<javac srcdir="${tck.src.dir}"
390	<	destdir="${build.testcases.dir}"
391	<	debug="${build.debug}"
392	<	debuglevel="${build.debuglevel}"
393	<	deprecation="${build.deprecation}"
394	<	source="${build.sourcelevel}"
395	<	fork="true">
390	>	destdir="${build.testcases.dir}"
391	>	debug="${build.debug}"
392	>	debuglevel="${build.debuglevel}"
393	>	deprecation="${build.deprecation}"
394	>	source="6"
395	>	classpath="${junit.jar}"
396	>	bootclasspath="@{product.jar}:${bootclasspath6}"
397	>	includeAntRuntime="false"
398	>	includeJavaRuntime="false"
399	>	executable="${javac8}"
400	>	fork="true">
401
402	<	<compilerarg value="${bootclasspath.args}"/>
319	<	<compilerarg line="${build.args}"/>
402	>	<include name="**/*.java"/>
403		<compilerarg value="-XDignore.symbol.file=true"/>
404	<
405	<	<classpath refid="test.classpath"/>
404	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
405	>	<compilerarg line="${build.args}"/>
406
407		</javac>
408
409		<javac srcdir="${test.src.dir}"
410	<	destdir="${build.testcases.dir}"
411	<	debug="${build.debug}"
412	<	debuglevel="${build.debuglevel}"
413	<	deprecation="${build.deprecation}"
414	<	source="${build.sourcelevel}"
415	<	fork="true">
416	<
417	<	<include name="jsr166/test/**"/>
410	>	destdir="${build.testcases.dir}"
411	>	debug="${build.debug}"
412	>	debuglevel="${build.debuglevel}"
413	>	deprecation="${build.deprecation}"
414	>	source="6"
415	>	classpath=""
416	>	bootclasspath="@{product.jar}:${bootclasspath6}"
417	>	includeAntRuntime="false"
418	>	includeJavaRuntime="false"
419	>	executable="${javac8}"
420	>	fork="true">
421
422	<	<compilerarg value="${bootclasspath.args}"/>
337	<	<compilerarg line="${build.args}"/>
422	>	<include name="jsr166/test/**/*.java"/>
423		<compilerarg value="-XDignore.symbol.file=true"/>
424	<
425	<	<classpath refid="test.classpath"/>
424	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
425	>	<compilerarg line="${build.args}"/>
426
427		</javac>
428
#	Line 350 | Line 435
435		source="${build.sourcelevel}"
436		fork="true">
437
438	<	<compilerarg value="${bootclasspath.args}"/>
354	<	<compilerarg line="${build.args}"/>
438	>	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
439		<compilerarg value="-XDignore.symbol.file=true"/>
440	<
357	<	<classpath refid="test.classpath"/>
440	>	<compilerarg line="${build.args}"/>
441
442		</javac>
443		-->
444
445		</target>
446
447	+	<target name="test-tck"
448	+	depends="jar"
449	+	description="Runs tck tests for main directly">
450	+
451	+	<run-tck-tests
452	+	target="8"
453	+	workdir="${build.dir}"
454	+	classes="${product.jar}"/>
455	+	</target>
456	+
457	+	<target name="test-jtreg"
458	+	depends="jar"
459	+	description="Runs jtreg tests for main using the jtreg ant task">
460	+	<run-jtreg-tests
461	+	target="8"
462	+	workdir="${build.dir}"
463	+	classes="${product.jar}"/>
464	+	</target>
465	+
466	+	<target name="test-ng"
467	+	depends="test-tck, test-jtreg"
468	+	description="Runs tck and jtreg tests for main">
469	+	</target>
470
471		<target name="run-tests"
472		depends="compile-tests">
#	Line 375 | Line 481
481		errorProperty="junit.failed"
482		failureProperty="junit.failed"
483		dir="${build.reports.dir}"
484	+	jvm="${java8}"
485		fork="true">
486
487	<	<jvmarg value="${bootclasspath.args}"/>
487	>	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
488		<jvmarg value="-server"/>
489		<jvmarg value="-showversion"/>
490
#	Line 478 | Line 585
585		<!-- Various demos and test programs -->
586
587
588	<	<target name="loops" depends="init, configure-compiler"
588	>	<target name="loops" depends="configure-compiler"
589		description="Benchmark from Doug Lea's AQS paper">
590
591		<mkdir dir="${build.loops.dir}"/>
#	Line 504 | Line 611
611		</target>
612
613
614	<	<!-- jdk7 -->
614	>	<!-- jsr166 4jdk7 -->
615
616	<
510	<	<target name="jdk7compile"
616	>	<target name="4jdk7compile"
617		depends="configure-compiler"
618	<	description="Compiles src/jdk7 sources">
618	>	description="Compiles src/jdk7 sources, targeting jdk7">
619
620	<	<mkdir dir="${build.jdk7.classes.dir}"/>
620	>	<mkdir dir="${build.4jdk7.classes.dir}"/>
621
622	<	<javac srcdir="${jdk7src.dir}"
623	<	destdir="${build.jdk7.classes.dir}"
622	>	<javac srcdir="${4jdk7src.dir}"
623	>	destdir="${build.4jdk7.classes.dir}"
624		debug="${build.debug}"
625		debuglevel="${build.debuglevel}"
626		deprecation="${build.deprecation}"
627	<	source="1.6"
627	>	source="6"
628		classpath=""
629		bootclasspath="${bootclasspath6}"
630		includeAntRuntime="false"
631		includeJavaRuntime="false"
632	<	executable="${javac6}"
632	>	executable="${javac7}"
633		fork="true">
634
635		<include name="**/*.java"/>
636	<	<compilerarg line="${build.args}"/>
636	>	<compilerarg value="-Xprefer:source"/>
637		<compilerarg value="-XDignore.symbol.file=true"/>
638		<compilerarg value="-Xlint:all"/>
639	+	<compilerarg line="${build.args}"/>
640
641		</javac>
642	+	</target>
643	+
644	+
645	+	<target name="4jdk7jar"
646	+	depends="4jdk7compile"
647	+	description="Builds library jar from compiled sources">
648	+
649	+	<jar destfile="${4jdk7product.jar}">
650	+	<fileset dir="${build.4jdk7.classes.dir}"/>
651	+	</jar>
652
653		</target>
654
655
656	+	<target name="4jdk7-test-tck"
657	+	depends="4jdk7jar"
658	+	description="Runs tck tests for jsr166-4jdk7 directly">
659	+
660	+	<run-tck-tests
661	+	target="7"
662	+	workdir="${build.4jdk7.dir}"
663	+	classes="${4jdk7product.jar}">
664	+	<javac-elements>
665	+	<!-- JDK8+ test classes -->
666	+	<exclude name="StampedLockTest.java"/>
667	+	</javac-elements>
668	+	</run-tck-tests>
669	+	</target>
670
540	–	<target name="jdk7jar"
541	–	depends="jdk7compile"
542	–	description="Builds library jar from compiled sources">
671
672	<	<mkdir dir="${build.jdk7.lib.dir}"/>
672	>	<target name="4jdk7-test-tck-junit"
673	>	depends="4jdk7compile"
674	>	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
675
676	<	<jar destfile="${jdk7product.jar}" index="true">
677	<	<fileset dir="${build.jdk7.classes.dir}"/>
678	<	</jar>
676	>	<junit printsummary="true"
677	>	showoutput="true"
678	>	errorProperty="junit.failed"
679	>	failureProperty="junit.failed"
680	>	includeantruntime="true"
681	>	jvm="${java7}"
682	>	fork="true">
683	>
684	>	<jvmarg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
685	>	<jvmarg value="-server"/>
686	>
687	>	<classpath>
688	>	<pathelement location="${junit.jar}"/>
689	>	<pathelement location="${build.4jdk7.tck.classes.dir}"/>
690	>	</classpath>
691	>
692	>	<formatter type="brief"/>
693
694	+	<test name="JSR166TestCase" haltonfailure="no">
695	+	</test>
696	+
697	+	</junit>
698		</target>
699
700	+	<target name="4jdk7-test-jtreg"
701	+	depends="4jdk7jar"
702	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
703	+	<run-jtreg-tests
704	+	target="7"
705	+	workdir="${build.4jdk7.dir}"
706	+	classes="${4jdk7product.jar}"/>
707	+	</target>
708
709
710	<	<target name="jdk7docs"
711	<	description="Builds javadocs with custom tags to build folder">
710	>	<target name="4jdk7-test"
711	>	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
712	>	description="Runs tck and jtreg tests for jsr166-4jdk7">
713	>	</target>
714	>
715
716	<	<delete dir="${build.jdk7.docs.dir}"/>
717	<	<mkdir dir="${build.jdk7.docs.dir}"/>
716	>	<target name="4jdk7docs"
717	>	description="Builds javadocs for src/jdk7 to dist dir">
718
719	<	<javadoc destdir="${build.jdk7.docs.dir}"
719	>	<delete dir="${4jdk7docs.dir}"/>
720	>	<mkdir dir="${4jdk7docs.dir}"/>
721	>
722	>	<javadoc destdir="${4jdk7docs.dir}"
723		packagenames="none"
724		link="${jdkapi7docs.url}"
725	<	overview="${jdk7src.dir}/intro.html"
726	<	sourcepath="${jdk7src.dir}"
727	<	bootclasspath="${bootclasspath6}"
725	>	overview="${4jdk7src.dir}/intro.html"
726	>	access="${build.javadoc.access}"
727	>	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
728		classpath=""
729	<	source="1.6"
730	<	executable="${javadoc7}"
569	<	additionalparam="-XDignore.symbol.file=true" >
570	<	<fileset dir="${jdk7src.dir}" defaultexcludes="yes">
729	>	executable="${javadoc7}">
730	>	<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
731		<include name="**/*.java"/>
732		</fileset>
733	+	<arg value="-XDignore.symbol.file=true"/>
734		</javadoc>
574	–
735		</target>
736
737
738	<	<target name="jdk7dist"
739	<	depends="jdk7dist-clean, jdk7dist-jar, jdk7dist-docs"
738	>	<target name="4jdk7dist"
739	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
740		description="Puts all distributable products in single hierarchy"/>
741
742
743	+	<target name="4jdk7clean"
744	+	description="Removes all 4jdk7 build products">
745
746	<	<target name="jdk7clean"
585	<	description="Removes all build products">
586	<
587	<	<delete dir="${build.jdk7.dir}"/>
746	>	<delete dir="${build.4jdk7.dir}"/>
747
748		</target>
749
750
751	<
593	<	<target name="jdk7dist-clean"
751	>	<target name="4jdk7dist-clean"
752		description="Removes all build and distribution products">
753
754		</target>
755
756	<	<target name="jdk7dist-docs"
757	<	description="Builds javadocs without custom tags to dist folder">
758	<
601	<	<delete dir="${dist.jdk7.docs.dir}"/>
602	<	<mkdir dir="${dist.jdk7.docs.dir}"/>
603	<
604	<	<javadoc destdir="${dist.jdk7.docs.dir}"
605	<	packagenames="none"
606	<	link="${jdkapi7docs.url}"
607	<	overview="${jdk7src.dir}/intro.html"
608	<	sourcepath="${jdk7src.dir}"
609	<	classpath=""
610	<	executable="${javadoc7}"
611	<	bootclasspath="${bootclasspath6}"
612	<	source="1.6">
613	<	<arg value="-XDignore.symbol.file=true"/>
614	<	<fileset dir="${jdk7src.dir}" defaultexcludes="yes">
615	<	<include name="**/*.java"/>
616	<	</fileset>
617	<	</javadoc>
618	<
756	>	<target name="4jdk7dist-jar"
757	>	depends="4jdk7clean, 4jdk7jar">
758	>	<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
759		</target>
760
621	–	<target name="jdk7dist-jar"
622	–	depends="jdk7clean, jdk7jar">
623	–
624	–	<copy file="${jdk7product.jar}" todir="${dist.dir}"/>
761
762	+	<target name="4jdk7dist-docs"
763	+	depends="4jdk7clean, 4jdk7docs">
764	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
765		</target>
766
628	–	<!-- jsr166x -->
767
768	+	<!-- jsr166x -->
769
770		<target name="jsr166xcompile"
771	<	depends="init, configure-compiler"
772	<	description="Compiles jsr166x sources">
771	>	depends="configure-compiler"
772	>	description="Compiles jsr166x sources to build dir">
773
774	<	<mkdir dir="${build.jsr166x.dir}"/>
774	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
775
776	<	<javac srcdir="${jsr166xsrc.dir}"
777	<	destdir="${build.jsr166x.dir}"
778	<	debug="${build.debug}"
779	<	debuglevel="${build.debuglevel}"
780	<	deprecation="${build.deprecation}"
781	<	source="${build.sourcelevel}"
782	<	fork="true">
776	>	<javac srcdir="${topsrc.dir}"
777	>	destdir="${build.jsr166x.classes.dir}"
778	>	debug="${build.debug}"
779	>	debuglevel="${build.debuglevel}"
780	>	deprecation="${build.deprecation}"
781	>	classpath=""
782	>	bootclasspath="${bootclasspath6}"
783	>	source="5"
784	>	includeAntRuntime="false"
785	>	includeJavaRuntime="false"
786	>	executable="${javac7}"
787	>	fork="true">
788
789	<	<include name="**/*.java"/>
646	<	<compilerarg line="${build.args}"/>
789	>	<include name="jsr166x/**/*.java"/>
790		<compilerarg value="-XDignore.symbol.file=true"/>
791	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
792	+	<compilerarg line="${build.args}"/>
793
794		</javac>
650	–
795		</target>
796
797
654	–
798		<target name="jsr166xjar"
799		depends="jsr166xcompile"
800		description="Builds library jar from compiled sources">
801
802	<	<mkdir dir="${build.jsr166xlib.dir}"/>
803	<
661	<	<jar destfile="${jsr166xproduct.jar}">
662	<	<fileset dir="${build.jsr166x.dir}"/>
802	>	<jar destfile="${jsr166x.jar}">
803	>	<fileset dir="${build.jsr166x.classes.dir}"/>
804		</jar>
805
806		</target>
807
808
668	–
809		<target name="jsr166xdocs"
810	<	description="Builds javadocs with custom tags to build folder">
810	>	description="Builds javadocs to dist dir">
811
812	<	<delete dir="${build.jsr166xjavadocs.dir}"/>
813	<	<mkdir dir="${build.jsr166xjavadocs.dir}"/>
812	>	<delete dir="${jsr166xdocs.dir}"/>
813	>	<mkdir dir="${jsr166xdocs.dir}"/>
814
815	<	<javadoc destdir="${build.jsr166xjavadocs.dir}"
816	<	packagenames="jsr166x"
815	>	<javadoc destdir="${jsr166xdocs.dir}"
816	>	packagenames="jsr166x.*"
817		link="${jdkapidocs.url}"
818	<	source="${build.sourcelevel}"
819	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
820	<	additionalparam="-XDignore.symbol.file=true" />
818	>	access="${build.javadoc.access}"
819	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
820	>	bootclasspath="${bootclasspath6}"
821	>	source="5"
822	>	executable="${javadoc7}">
823	>	<arg value="-XDignore.symbol.file=true"/>
824
825	+	</javadoc>
826		</target>
827
828
829		<target name="jsr166xdist"
830	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdist-docs"
830	>	depends="jsr166xdist-jar, jsr166xdist-docs"
831		description="Puts all distributable products in single hierarchy"/>
832
833
690	–
834		<target name="jsr166xclean"
835	<	description="Removes all build products">
835	>	description="Removes all jsr166x build products">
836
837		<delete dir="${build.jsr166x.dir}"/>
695	–	<delete dir="${build.jsr166xlib.dir}"/>
838
839		</target>
840
841
700	–
842		<target name="jsr166xdist-clean"
843		description="Removes all build and distribution products">
844
845		</target>
846
847
707	–
708	–	<target name="jsr166xdist-docs"
709	–	description="Builds javadocs without custom tags to dist folder">
710	–
711	–	<delete dir="${dist.jsr166xjavadocs.dir}"/>
712	–	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
713	–
714	–	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
715	–	packagenames="jsr166x"
716	–	link="${jdkapidocs.url}"
717	–	source="${build.sourcelevel}"
718	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
719	–	additionalparam="-XDignore.symbol.file=true" />
720	–
721	–	</target>
722	–
848		<target name="jsr166xdist-jar"
849		depends="jsr166xclean, jsr166xjar">
850	+	<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
851	+	</target>
852
853	<	<copy file="${jsr166xproduct.jar}" todir="${dist.dir}"/>
854	<
853	>	<target name="jsr166xdist-docs"
854	>	depends="jsr166xclean, jsr166xdocs">
855	>	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
856		</target>
857
858		<!-- jsr166y -->
859
860
861		<target name="jsr166ycompile"
862	<	depends="init, configure-compiler"
862	>	depends="configure-compiler"
863		description="Compiles jsr166y sources">
864
865	<	<mkdir dir="${build.jsr166y.dir}"/>
865	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
866
867	<	<javac srcdir="${jsr166ysrc.dir}"
868	<	destdir="${build.jsr166y.dir}"
869	<	debug="${build.debug}"
870	<	debuglevel="${build.debuglevel}"
871	<	deprecation="${build.deprecation}"
872	<	source="${build.sourcelevel}"
873	<	fork="true">
867	>	<javac srcdir="${topsrc.dir}"
868	>	destdir="${build.jsr166y.classes.dir}"
869	>	debug="${build.debug}"
870	>	debuglevel="${build.debuglevel}"
871	>	deprecation="${build.deprecation}"
872	>	source="6"
873	>	classpath=""
874	>	bootclasspath="${bootclasspath6}"
875	>	includeAntRuntime="false"
876	>	includeJavaRuntime="false"
877	>	executable="${javac7}"
878	>	fork="true">
879
880	<	<include name="**/*.java"/>
748	<	<compilerarg line="${build.args}"/>
880	>	<include name="jsr166y/**/*.java"/>
881		<compilerarg value="-XDignore.symbol.file=true"/>
882	<	<compilerarg value="${bootclasspath.args}"/>
883	<
752	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
882	>	<compilerarg value="-Xlint:all"/>
883	>	<compilerarg line="${build.args}"/>
884
885		</javac>
755	–
886		</target>
887
888
759	–
889		<target name="jsr166yjar"
890		depends="jsr166ycompile"
891		description="Builds library jar from compiled sources">
892
893	<	<mkdir dir="${build.jsr166ylib.dir}"/>
894	<
766	<	<jar destfile="${jsr166yproduct.jar}" index="true">
767	<	<fileset dir="${build.jsr166y.dir}"/>
893	>	<jar destfile="${jsr166y.jar}" index="true">
894	>	<fileset dir="${build.jsr166y.classes.dir}"/>
895		</jar>
896
897		</target>
898
899
773	–
900		<target name="jsr166ydocs"
901	<	description="Builds javadocs with custom tags to build folder">
901	>	description="Builds javadocs to dist dir">
902
903	<	<delete dir="${build.jsr166yjavadocs.dir}"/>
904	<	<mkdir dir="${build.jsr166yjavadocs.dir}"/>
903	>	<delete dir="${jsr166ydocs.dir}"/>
904	>	<mkdir dir="${jsr166ydocs.dir}"/>
905
906	<	<javadoc destdir="${build.jsr166yjavadocs.dir}"
907	<	packagenames="jsr166y"
906	>	<javadoc destdir="${jsr166ydocs.dir}"
907	>	packagenames="jsr166y.*"
908		link="${jdkapidocs.url}"
909	<	source="${build.sourcelevel}"
910	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
911	<	additionalparam="-XDignore.symbol.file=true" />
909	>	access="${build.javadoc.access}"
910	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
911	>	bootclasspath="${bootclasspath6}"
912	>	source="6"
913	>	executable="${javadoc7}">
914	>	<arg value="-XDignore.symbol.file=true"/>
915
916	+	</javadoc>
917		</target>
918
919
920		<target name="jsr166ydist"
921	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydist-docs"
921	>	depends="jsr166ydist-jar, jsr166ydist-docs"
922		description="Puts all distributable products in single hierarchy"/>
923
924
795	–
925		<target name="jsr166yclean"
926	<	description="Removes all build products">
926	>	description="Removes all jsr166y build products">
927
928		<delete dir="${build.jsr166y.dir}"/>
800	–	<delete dir="${build.jsr166ylib.dir}"/>
929
930		</target>
931
932
805	–
933		<target name="jsr166ydist-clean"
934		description="Removes all build and distribution products">
935
936		</target>
937
811	–	<target name="jsr166ydist-docs"
812	–	description="Builds javadocs without custom tags to dist folder">
813	–
814	–	<delete dir="${dist.jsr166yjavadocs.dir}"/>
815	–	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
816	–
817	–	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
818	–	packagenames="jsr166y"
819	–	link="${jdkapidocs.url}"
820	–	source="${build.sourcelevel}"
821	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
822	–	additionalparam="-XDignore.symbol.file=true" />
823	–
824	–	</target>
825	–
938		<target name="jsr166ydist-jar"
939		depends="jsr166yclean, jsr166yjar">
940	+	<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
941	+	</target>
942
943	<	<copy file="${jsr166yproduct.jar}" todir="${dist.dir}"/>
944	<
943	>	<target name="jsr166ydist-docs"
944	>	depends="jsr166yclean, jsr166ydocs">
945	>	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
946		</target>
947
948
#	Line 835 | Line 950
950
951
952		<target name="extra166ycompile"
953	<	depends="init, configure-compiler, jsr166ycompile"
953	>	depends="configure-compiler, jsr166yjar"
954		description="Compiles extra166y sources">
955
956	<	<mkdir dir="${build.extra166y.dir}"/>
956	>	<mkdir dir="${build.extra166y.classes.dir}"/>
957
958	<	<javac srcdir="${extra166ysrc.dir}"
959	<	destdir="${build.extra166y.dir}"
960	<	debug="${build.debug}"
961	<	classpath="${jsr166yproduct.jar}"
962	<	debuglevel="${build.debuglevel}"
963	<	deprecation="${build.deprecation}"
964	<	source="${build.sourcelevel}"
965	<	fork="true">
958	>	<javac srcdir="${topsrc.dir}"
959	>	destdir="${build.extra166y.classes.dir}"
960	>	debug="${build.debug}"
961	>	debuglevel="${build.debuglevel}"
962	>	deprecation="${build.deprecation}"
963	>	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
964	>	classpath=""
965	>	source="6"
966	>	includeAntRuntime="false"
967	>	includeJavaRuntime="false"
968	>	executable="${javac7}"
969	>	fork="true">
970
971	<	<include name="**/*.java"/>
853	<	<compilerarg line="${build.args}"/>
971	>	<include name="extra166y/**/*.java"/>
972		<compilerarg value="-XDignore.symbol.file=true"/>
973	<	<compilerarg value="${bootclasspath.args}"/>
974	<
857	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
973	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
974	>	<compilerarg line="${build.args}"/>
975
976		</javac>
860	–
977		</target>
978
979
864	–
980		<target name="extra166yjar"
981		depends="extra166ycompile"
982		description="Builds library jar from compiled sources">
983
984	<	<mkdir dir="${build.extra166ylib.dir}"/>
985	<
871	<	<jar destfile="${extra166yproduct.jar}" index="true">
872	<	<fileset dir="${build.extra166y.dir}"/>
984	>	<jar destfile="${extra166y.jar}" index="true">
985	>	<fileset dir="${build.extra166y.classes.dir}"/>
986		</jar>
987
988		</target>
989
990
878	–
991		<target name="extra166ydocs"
992	<	description="Builds javadocs with custom tags to build folder">
992	>	description="Builds javadocs to build dir">
993
994	<	<delete dir="${build.extra166yjavadocs.dir}"/>
995	<	<mkdir dir="${build.extra166yjavadocs.dir}"/>
994	>	<delete dir="${extra166ydocs.dir}"/>
995	>	<mkdir dir="${extra166ydocs.dir}"/>
996
997	<	<javadoc destdir="${build.extra166yjavadocs.dir}"
998	<	packagenames="extra166y"
997	>	<javadoc destdir="${extra166ydocs.dir}"
998	>	packagenames="extra166y.*"
999		link="${jdkapidocs.url}"
1000	<	source="${build.sourcelevel}"
1001	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1002	<	additionalparam="-XDignore.symbol.file=true" />
1000	>	access="${build.javadoc.access}"
1001	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1002	>	bootclasspath="${bootclasspath6}"
1003	>	source="6"
1004	>	executable="${javadoc7}">
1005	>	<arg value="-XDignore.symbol.file=true"/>
1006
1007	+	</javadoc>
1008		</target>
1009
1010
1011		<target name="extra166ydist"
1012	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydist-docs"
1012	>	depends="extra166ydist-jar, extra166ydist-docs"
1013		description="Puts all distributable products in single hierarchy"/>
1014
1015
900	–
1016		<target name="extra166yclean"
1017	<	description="Removes all build products">
1017	>	description="Removes all extra166y build products">
1018
1019		<delete dir="${build.extra166y.dir}"/>
905	–	<delete dir="${build.extra166ylib.dir}"/>
1020
1021		</target>
1022
1023
910	–
1024		<target name="extra166ydist-clean"
1025		description="Removes all build and distribution products">
1026
1027		</target>
1028
916	–	<target name="extra166ydist-docs"
917	–	description="Builds javadocs without custom tags to dist folder">
918	–
919	–	<delete dir="${dist.extra166yjavadocs.dir}"/>
920	–	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
921	–
922	–	<javadoc destdir="${dist.extra166yjavadocs.dir}"
923	–	packagenames="extra166y"
924	–	link="${jdkapidocs.url}"
925	–	source="${build.sourcelevel}"
926	–	sourcepath="${topsrc.dir}:${jdksrc.dir}"
927	–	additionalparam="-XDignore.symbol.file=true" />
928	–
929	–	</target>
930	–
1029		<target name="extra166ydist-jar"
1030		depends="extra166yclean, extra166yjar">
1031	+	<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1032	+	</target>
1033
1034	<	<copy file="${extra166yproduct.jar}" todir="${dist.dir}"/>
1035	<
1034	>	<target name="extra166ydist-docs"
1035	>	depends="extra166yclean, extra166ydocs">
1036	>	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1037		</target>
1038
1039		<!-- jsr166e -->
1040
940	–
1041		<target name="jsr166ecompile"
1042	<	depends="init, configure-compiler"
1042	>	depends="configure-compiler"
1043		description="Compiles jsr166e sources">
1044
1045	<	<mkdir dir="${build.jsr166e.dir}"/>
1045	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
1046
1047	<	<javac srcdir="${jsr166esrc.dir}"
1048	<	destdir="${build.jsr166e.dir}"
1049	<	debug="${build.debug}"
1050	<	debuglevel="${build.debuglevel}"
1051	<	deprecation="${build.deprecation}"
1052	<	source="1.7"
1053	<	fork="true">
1047	>	<javac srcdir="${topsrc.dir}"
1048	>	destdir="${build.jsr166e.classes.dir}"
1049	>	debug="${build.debug}"
1050	>	debuglevel="${build.debuglevel}"
1051	>	deprecation="${build.deprecation}"
1052	>	source="7"
1053	>	classpath=""
1054	>	includeAntRuntime="false"
1055	>	includeJavaRuntime="false"
1056	>	executable="${javac7}"
1057	>	fork="true">
1058
1059	<	<include name="**/*.java"/>
956	<	<compilerarg line="${build.args}"/>
1059	>	<include name="jsr166e/**/*.java"/>
1060		<compilerarg value="-XDignore.symbol.file=true"/>
1061	<	<compilerarg value="${bootclasspath.args}"/>
1062	<
960	<	<!--       <compilerarg line="-Xlint -Xmaxwarns 1000"/> -->
1061	>	<compilerarg value="-Xlint:all"/>
1062	>	<compilerarg line="${build.args}"/>
1063
1064		</javac>
963	–
1065		</target>
1066
1067
967	–
1068		<target name="jsr166ejar"
1069		depends="jsr166ecompile"
1070		description="Builds library jar from compiled sources">
1071
1072	<	<mkdir dir="${build.jsr166elib.dir}"/>
1073	<
974	<	<jar destfile="${jsr166eproduct.jar}" index="true">
975	<	<fileset dir="${build.jsr166e.dir}"/>
1072	>	<jar destfile="${jsr166e.jar}" index="true">
1073	>	<fileset dir="${build.jsr166e.classes.dir}"/>
1074		</jar>
1075
1076		</target>
1077
1078
981	–
1079		<target name="jsr166edocs"
1080	<	description="Builds javadocs with custom tags to build folder">
1080	>	description="Builds javadocs to build dir">
1081
1082	<	<delete dir="${build.jsr166ejavadocs.dir}"/>
1083	<	<mkdir dir="${build.jsr166ejavadocs.dir}"/>
1082	>	<delete dir="${jsr166edocs.dir}"/>
1083	>	<mkdir dir="${jsr166edocs.dir}"/>
1084
1085	<	<javadoc destdir="${build.jsr166ejavadocs.dir}"
1086	<	packagenames="jsr166e,jsr166e.extra"
1085	>	<javadoc destdir="${jsr166edocs.dir}"
1086	>	packagenames="jsr166e.*"
1087		link="${jdkapidocs.url}"
1088	<	source="1.7"
1089	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1090	<	additionalparam="-XDignore.symbol.file=true" />
1088	>	access="${build.javadoc.access}"
1089	>	sourcepath="${topsrc.dir}:${jdk7src.dir}"
1090	>	source="7"
1091	>	executable="${javadoc7}">
1092	>	<arg value="-XDignore.symbol.file=true"/>
1093
1094	+	</javadoc>
1095	+	</target>
1096	+
1097	+
1098	+	<target name="jsr166e-test-tck"
1099	+	depends="jsr166ejar"
1100	+	description="Runs tck tests for jsr166e">
1101	+
1102	+	<run-tck-tests
1103	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1104	+	source="7"
1105	+	target="8"
1106	+	workdir="${build.jsr166e.dir}"
1107	+	classes="${jsr166e.jar}"/>
1108		</target>
1109
1110
1111		<target name="jsr166edist"
1112	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edist-docs"
1112	>	depends="jsr166edist-jar, jsr166edist-docs"
1113		description="Puts all distributable products in single hierarchy"/>
1114
1115
1003	–
1116		<target name="jsr166eclean"
1117	<	description="Removes all build products">
1006	<
1117	>	description="Removes all jsr166e build products">
1118		<delete dir="${build.jsr166e.dir}"/>
1008	–	<delete dir="${build.jsr166elib.dir}"/>
1009	–
1119		</target>
1120
1121
1013	–
1122		<target name="jsr166edist-clean"
1123		description="Removes all build and distribution products">
1124
1125		</target>
1126
1127	<	<target name="jsr166edist-docs"
1128	<	description="Builds javadocs without custom tags to dist folder">
1129	<
1130	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1023	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1024	<
1025	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1026	<	packagenames="jsr166e,jsr166e.extra"
1027	<	link="${jdkapidocs.url}"
1028	<	source="1.7"
1029	<	sourcepath="${topsrc.dir}:${jdksrc.dir}"
1030	<	additionalparam="-XDignore.symbol.file=true" />
1127	>	<target name="jsr166edist-jar"
1128	>	depends="jsr166eclean, jsr166ejar">
1129	>	<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1130	>	</target>
1131
1132	+	<target name="jsr166edist-docs"
1133	+	depends="jsr166eclean, jsr166edocs">
1134	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1135		</target>
1136
1034	–	<target name="jsr166edist-jar"
1035	–	depends="jsr166eclean, jsr166ejar">
1137
1138	<	<copy file="${jsr166eproduct.jar}" todir="${dist.dir}"/>
1138	>	<!-- Find buglets that can be detected by static build tools -->
1139
1140	+	<target name="lint">
1141	+	<antcall target="dists">
1142	+	<param name="build.javadoc.access" value="private"/>
1143	+	</antcall>
1144		</target>
1145
1146	+
1147		</project>

Diff Legend

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