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.108 by jsr166, Sat Jan 19 23:58:12 2013 UTC vs.
Revision 1.137 by jsr166, Wed Feb 6 19:55:06 2013 UTC

#	Line 22 | Line 22
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 35 | 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"/>
48	–	<property name="build.lib.dir"               location="${build.dir}/lib"/>
52		<property name="build.reports.dir"           location="${build.dir}/reports"/>
53
54	<	<property name="build.4jdk7.dir"              location="${build.dir}/4jdk7"/>
55	<	<property name="build.4jdk7.lib.dir"          location="${build.4jdk7.dir}"/>
56	<	<property name="build.4jdk7.classes.dir"      location="${build.4jdk7.dir}/classes"/>
57	<	<property name="build.4jdk7.tck.classes.dir"  location="${build.4jdk7.dir}/tck/classes"/>
55	<	<property name="build.4jdk7.docs.dir"         location="${build.4jdk7.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"/>
58	–	<property name="build.jsr166xlib.dir"        location="${build.dir}/jsr166xlib"/>
59	–
60		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
61	–	<property name="build.jsr166ylib.dir"        location="${build.dir}/jsr166ylib"/>
62	–
61		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
64	–	<property name="build.jsr166elib.dir"        location="${build.dir}/jsr166elib"/>
65	–
62		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
67	–	<property name="build.extra166ylib.dir"      location="${build.dir}/extra166ylib"/>
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">
#	Line 76 | Line 76
76		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
77		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
78		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
79	–	<property name="bootdir@{v}"    location="${jdk@{v}.home}/jre/lib"/>
79		<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
80	<	<property name="bootclasspath@{v}"
81	<	value="${bootdir@{v}}/resources.jar:${bootdir@{v}}/rt.jar:${bootdir@{v}}/jsse.jar:${bootdir@{v}}/jce.jar:${bootdir@{v}}/:${bootdir@{v}}/charsets.jar"/>
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	<	<defjdklocations v="6"/>
94	<	<defjdklocations v="7"/>
95	<	<defjdklocations v="8"/>
89	<
90	<	<macrodef name="run-tck-tests">
91	<	<attribute name="jvm"/>
92	<	<attribute name="tck.classes"/>
93	<	<attribute name="product.jar" default="${product.jar}"/>
94	<	<attribute name="jvmflags" default=""/>
93	>	<macrodef name="mirror-dir">
94	>	<attribute name="src"/>
95	>	<attribute name="dst"/>
96		<sequential>
97	<	<java classname="JSR166TestCase"
98	<	jvm="@{jvm}" fork="true">
99	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
100	<	<jvmarg line="@{jvmflags}"/>
101	<	<classpath>
101	<	<pathelement location="${junit.jar}"/>
102	<	<pathelement location="@{tck.classes}"/>
103	<	</classpath>
104	<	</java>
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
105	+	<defjdklocations v="6"/>
106	+	<defjdklocations v="7"/>
107	+	<defjdklocations v="8"/>
108	+
109		<!-- Source locations -->
110		<property name="src.dir"              location="${basedir}/src/main"/>
111		<property name="test.src.dir"         location="${basedir}/src/test"/>
#	Line 119 | Line 120
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"/>
122	–	<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.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
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="4jdk7product.jar" location="${build.4jdk7.lib.dir}/jsr166-4jdk7.jar"/>
142	<	<property name="jsr166x.jar"      location="${build.jsr166xlib.dir}/jsr166x.jar"/>
143	<	<property name="jsr166y.jar"      location="${build.jsr166ylib.dir}/jsr166y.jar"/>
144	<	<property name="jsr166e.jar"      location="${build.jsr166elib.dir}/jsr166e.jar"/>
145	<	<property name="extra166y.jar"    location="${build.extra166ylib.dir}/extra166y.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
141	–	<!-- Bootclasspath argument -->
142	–	<property name="bootclasspath.args"   value="-Xbootclasspath/p:${product.jar}"/>
143	–
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/"/>
150		<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
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	<	<!-- TODO: How do we get &trade to work? -->
169	<	<!-- TODO: Why isn't @jls a "standard" tag? -->
170	<	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
171	<	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
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 -->
#	Line 195 | Line 277
277		fork="true">
278
279		<include name="**/*.java"/>
280	<	<compilerarg line="${build.args}"/>
280	>	<compilerarg value="-Xprefer:source"/>
281		<compilerarg value="-XDignore.symbol.file=true"/>
282		<compilerarg value="-Xlint:all"/>
201	–
202	–	<!--
203	–	<exclude name="java/lang/**"/>
283		<compilerarg line="${build.args}"/>
205	–	<compilerarg line="-Xlint -Xmaxwarns 1000"/>
206	–	-->
284
285		</javac>
209	–
286		</target>
287
288
213	–
289		<target name="jar"
290		depends="compile"
291		description="Builds library jar from compiled sources">
292
218	–	<mkdir dir="${build.lib.dir}"/>
219	–
293		<jar destfile="${product.jar}">
294		<fileset dir="${build.classes.dir}"/>
295		</jar>
223	–
296		</target>
297
298
227	–
299		<target name="test"
300		depends="configure-tests, report-tests"
301		description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
302
303
233	–
304		<target name="docs"
305		description="Builds javadocs for src/main to dist dir">
306
307	<	<delete dir="${dist.javadocs.dir}"/>
308	<	<mkdir dir="${dist.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="${dist.javadocs.dir}"
313	>	<javadoc destdir="${docs.dir}"
314		packagenames="none"
315		link="${jdkapi8docs.url}"
316		overview="${src.dir}/intro.html"
317	+	access="${build.javadoc.access}"
318		sourcepath="${src.dir}:${jdk8src.dir}"
319		classpath=""
320		executable="${javadoc8}">
250	–	<arg value="-XDignore.symbol.file=true"/>
251	–	<arg value="-tag"/>
252	–	<arg value="${javadoc.jls.option}"/>
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>
257	–
328		</target>
329
330
261	–
331		<target name="dist"
332	<	depends="dist-clean, dist-jar, docs"
332	>	depends="dist-clean, dist-jar, dist-docs"
333		description="Puts all distributable products in single hierarchy"/>
334
335
#	Line 279 | Line 348
348		<exclude name="**/SyntaxTest.java"/>
349		<exclude name="**/SuperfluousAbstract.java"/>
350		</jar>
282	–
351		</target>
352
353
286	–
354		<target name="clean"
355		description="Removes all build products">
356
357		<delete dir="${build.dir}"/>
291	–	<delete dir="${build.classes.dir}"/>
292	–	<delete dir="${build.lib.dir}"/>
358
359		</target>
360
361
297	–
362		<target name="dist-clean"
363		description="Removes all build and distribution products">
364
#	Line 303 | Line 367
367		</target>
368
369
306	–
370		<!-- Internal targets -->
371
372
373		<target name="dist-jar"
374		depends="clean, jar">
312	–
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 321 | 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}"/>
332	<	<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}"/>
350	<	<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 363 | Line 435
435		source="${build.sourcelevel}"
436		fork="true">
437
438	<	<compilerarg value="${bootclasspath.args}"/>
367	<	<compilerarg line="${build.args}"/>
438	>	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
439		<compilerarg value="-XDignore.symbol.file=true"/>
440	<
370	<	<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 388 | 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 519 | Line 613
613
614		<!-- jsr166 4jdk7 -->
615
522	–
616		<target name="4jdk7compile"
617		depends="configure-compiler"
618		description="Compiles src/jdk7 sources, targeting jdk7">
#	Line 540 | Line 633
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
549	–	<mkdir dir="${build.4jdk7.lib.dir}"/>
644
645	<	<jar destfile="${4jdk7product.jar}" index="true">
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
555	–	<mkdir dir="${build.4jdk7.tck.classes.dir}"/>
556	–
557	–	<javac srcdir="${tck.src.dir}"
558	–	destdir="${build.4jdk7.tck.classes.dir}"
559	–	debug="${build.debug}"
560	–	debuglevel="${build.debuglevel}"
561	–	deprecation="${build.deprecation}"
562	–	source="6"
563	–	classpath="${junit.jar}"
564	–	bootclasspath="${4jdk7product.jar}:${bootclasspath6}"
565	–	includeAntRuntime="false"
566	–	includeJavaRuntime="false"
567	–	executable="${javac7}"
568	–	fork="true">
569	–
570	–	<include name="**/*.java"/>
571	–	<compilerarg line="${build.args}"/>
572	–	<compilerarg value="-XDignore.symbol.file=true"/>
573	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
574	–
575	–	</javac>
576	–
653		</target>
654
655
656		<target name="4jdk7-test-tck"
657	<	depends="4jdk7compile"
657	>	depends="4jdk7jar"
658		description="Runs tck tests for jsr166-4jdk7 directly">
659	+
660		<run-tck-tests
661	<	jvm="${java7}"
662	<	tck.classes="${build.4jdk7.tck.classes.dir}"
663	<	product.jar="${4jdk7product.jar}"/>
661	>	target="7"
662	>	workdir="${build.4jdk7.dir}"
663	>	classes="${4jdk7product.jar}">
664	>	<javac-elements>
665	>	<!-- JDK8+ test classes -->
666	>	<exclude name="*8Test.java"/>
667	>	<exclude name="CompletableFutureTest.java"/>
668	>	<exclude name="StampedLockTest.java"/>
669	>	</javac-elements>
670	>	</run-tck-tests>
671		</target>
672
673
#	Line 615 | Line 699
699		</junit>
700		</target>
701
702	+	<target name="4jdk7-test-jtreg"
703	+	depends="4jdk7jar"
704	+	description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
705	+	<run-jtreg-tests
706	+	target="7"
707	+	workdir="${build.4jdk7.dir}"
708	+	classes="${4jdk7product.jar}"/>
709	+	</target>
710	+
711	+
712	+	<target name="4jdk7-test"
713	+	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
714	+	description="Runs tck and jtreg tests for jsr166-4jdk7">
715	+	</target>
716	+
717
718		<target name="4jdk7docs"
719		description="Builds javadocs for src/jdk7 to dist dir">
720
721	<	<delete dir="${dist.4jdk7.docs.dir}"/>
722	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
721	>	<delete dir="${4jdk7docs.dir}"/>
722	>	<mkdir dir="${4jdk7docs.dir}"/>
723
724	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
724	>	<javadoc destdir="${4jdk7docs.dir}"
725		packagenames="none"
726		link="${jdkapi7docs.url}"
727		overview="${4jdk7src.dir}/intro.html"
728	+	access="${build.javadoc.access}"
729		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
730		classpath=""
731		executable="${javadoc7}">
632	–	<arg value="-XDignore.symbol.file=true"/>
732		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
733		<include name="**/*.java"/>
734		</fileset>
735	+	<arg value="-XDignore.symbol.file=true"/>
736		</javadoc>
637	–
737		</target>
738
739
740		<target name="4jdk7dist"
741	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
741	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
742		description="Puts all distributable products in single hierarchy"/>
743
744
646	–
745		<target name="4jdk7clean"
746	<	description="Removes all build products">
746	>	description="Removes all 4jdk7 build products">
747
748		<delete dir="${build.4jdk7.dir}"/>
749
750		</target>
751
752
655	–
753		<target name="4jdk7dist-clean"
754		description="Removes all build and distribution products">
755
756		</target>
757
758		<target name="4jdk7dist-jar"
759	<	depends="4jdk7clean, 4jdk7compile">
663	<
759	>	depends="4jdk7clean, 4jdk7jar">
760		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
761	+	</target>
762
763	+
764	+	<target name="4jdk7dist-docs"
765	+	depends="4jdk7clean, 4jdk7docs">
766	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
767		</target>
768
668	–	<!-- jsr166x -->
769
770	+	<!-- jsr166x -->
771
772		<target name="jsr166xcompile"
773		depends="configure-compiler"
774		description="Compiles jsr166x sources to build dir">
775
776	<	<mkdir dir="${build.jsr166x.dir}"/>
776	>	<mkdir dir="${build.jsr166x.classes.dir}"/>
777
778		<javac srcdir="${topsrc.dir}"
779	<	destdir="${build.jsr166x.dir}"
779	>	destdir="${build.jsr166x.classes.dir}"
780		debug="${build.debug}"
781		debuglevel="${build.debuglevel}"
782		deprecation="${build.deprecation}"
783		classpath=""
683	–	source="5"
784		bootclasspath="${bootclasspath6}"
785	+	source="5"
786		includeAntRuntime="false"
787		includeJavaRuntime="false"
788		executable="${javac7}"
789		fork="true">
790
791		<include name="jsr166x/**/*.java"/>
691	–	<compilerarg line="${build.args}"/>
792		<compilerarg value="-XDignore.symbol.file=true"/>
793		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
794	+	<compilerarg line="${build.args}"/>
795
796		</javac>
696	–
797		</target>
798
799
700	–
800		<target name="jsr166xjar"
801		depends="jsr166xcompile"
802		description="Builds library jar from compiled sources">
803
705	–	<mkdir dir="${build.jsr166xlib.dir}"/>
706	–
804		<jar destfile="${jsr166x.jar}">
805	<	<fileset dir="${build.jsr166x.dir}"/>
805	>	<fileset dir="${build.jsr166x.classes.dir}"/>
806		</jar>
807
808		</target>
809
810
714	–
811		<target name="jsr166xdocs"
812		description="Builds javadocs to dist dir">
813
814	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
815	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
814	>	<delete dir="${jsr166xdocs.dir}"/>
815	>	<mkdir dir="${jsr166xdocs.dir}"/>
816
817	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
817	>	<javadoc destdir="${jsr166xdocs.dir}"
818		packagenames="jsr166x.*"
819		link="${jdkapidocs.url}"
820	<	source="5"
725	<	bootclasspath="${bootclasspath6}"
820	>	access="${build.javadoc.access}"
821		sourcepath="${topsrc.dir}:${jdk6src.dir}"
822	<	executable="${javadoc7}"
823	<	additionalparam="-XDignore.symbol.file=true" />
822	>	bootclasspath="${bootclasspath6}"
823	>	source="5"
824	>	executable="${javadoc7}">
825	>	<arg value="-XDignore.symbol.file=true"/>
826
827	+	</javadoc>
828		</target>
829
830
831		<target name="jsr166xdist"
832	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
832	>	depends="jsr166xdist-jar, jsr166xdist-docs"
833		description="Puts all distributable products in single hierarchy"/>
834
835
738	–
836		<target name="jsr166xclean"
837	<	description="Removes all build products">
837	>	description="Removes all jsr166x build products">
838
839		<delete dir="${build.jsr166x.dir}"/>
743	–	<delete dir="${build.jsr166xlib.dir}"/>
840
841		</target>
842
843
748	–
844		<target name="jsr166xdist-clean"
845		description="Removes all build and distribution products">
846
#	Line 754 | Line 849
849
850		<target name="jsr166xdist-jar"
851		depends="jsr166xclean, jsr166xjar">
757	–
852		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
853	+	</target>
854
855	+	<target name="jsr166xdist-docs"
856	+	depends="jsr166xclean, jsr166xdocs">
857	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
858		</target>
859
860		<!-- jsr166y -->
#	Line 766 | Line 864
864		depends="configure-compiler"
865		description="Compiles jsr166y sources">
866
867	<	<mkdir dir="${build.jsr166y.dir}"/>
867	>	<mkdir dir="${build.jsr166y.classes.dir}"/>
868
869		<javac srcdir="${topsrc.dir}"
870	<	destdir="${build.jsr166y.dir}"
870	>	destdir="${build.jsr166y.classes.dir}"
871		debug="${build.debug}"
872		debuglevel="${build.debuglevel}"
873		deprecation="${build.deprecation}"
#	Line 782 | Line 880
880		fork="true">
881
882		<include name="jsr166y/**/*.java"/>
785	–	<compilerarg line="${build.args}"/>
883		<compilerarg value="-XDignore.symbol.file=true"/>
884		<compilerarg value="-Xlint:all"/>
885	+	<compilerarg line="${build.args}"/>
886	+
887		</javac>
888		</target>
889
#	Line 793 | Line 892
892		depends="jsr166ycompile"
893		description="Builds library jar from compiled sources">
894
796	–	<mkdir dir="${build.jsr166ylib.dir}"/>
797	–
895		<jar destfile="${jsr166y.jar}" index="true">
896	<	<fileset dir="${build.jsr166y.dir}"/>
896	>	<fileset dir="${build.jsr166y.classes.dir}"/>
897		</jar>
898
899		</target>
900
901
805	–
902		<target name="jsr166ydocs"
903		description="Builds javadocs to dist dir">
904
905	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
906	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
905	>	<delete dir="${jsr166ydocs.dir}"/>
906	>	<mkdir dir="${jsr166ydocs.dir}"/>
907
908	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
908	>	<javadoc destdir="${jsr166ydocs.dir}"
909		packagenames="jsr166y.*"
910		link="${jdkapidocs.url}"
911	<	source="6"
816	<	bootclasspath="${bootclasspath6}"
911	>	access="${build.javadoc.access}"
912		sourcepath="${topsrc.dir}:${jdk6src.dir}"
913	<	executable="${javadoc7}"
914	<	additionalparam="-XDignore.symbol.file=true" />
913	>	bootclasspath="${bootclasspath6}"
914	>	source="6"
915	>	executable="${javadoc7}">
916	>	<arg value="-XDignore.symbol.file=true"/>
917
918	+	</javadoc>
919		</target>
920
921
922		<target name="jsr166ydist"
923	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
923	>	depends="jsr166ydist-jar, jsr166ydist-docs"
924		description="Puts all distributable products in single hierarchy"/>
925
926
829	–
927		<target name="jsr166yclean"
928	<	description="Removes all build products">
928	>	description="Removes all jsr166y build products">
929
930		<delete dir="${build.jsr166y.dir}"/>
834	–	<delete dir="${build.jsr166ylib.dir}"/>
931
932		</target>
933
934
839	–
935		<target name="jsr166ydist-clean"
936		description="Removes all build and distribution products">
937
#	Line 844 | Line 939
939
940		<target name="jsr166ydist-jar"
941		depends="jsr166yclean, jsr166yjar">
847	–
942		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
943	+	</target>
944
945	+	<target name="jsr166ydist-docs"
946	+	depends="jsr166yclean, jsr166ydocs">
947	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
948		</target>
949
950
#	Line 857 | Line 955
955		depends="configure-compiler, jsr166yjar"
956		description="Compiles extra166y sources">
957
958	<	<mkdir dir="${build.extra166y.dir}"/>
958	>	<mkdir dir="${build.extra166y.classes.dir}"/>
959
960		<javac srcdir="${topsrc.dir}"
961	<	destdir="${build.extra166y.dir}"
961	>	destdir="${build.extra166y.classes.dir}"
962		debug="${build.debug}"
963		debuglevel="${build.debuglevel}"
964		deprecation="${build.deprecation}"
965	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
966		classpath=""
967		source="6"
869	–	bootclasspath="${jsr166y.jar}:${bootclasspath6}"
968		includeAntRuntime="false"
969		includeJavaRuntime="false"
970		executable="${javac7}"
971		fork="true">
972
973		<include name="extra166y/**/*.java"/>
876	–	<compilerarg line="${build.args}"/>
974		<compilerarg value="-XDignore.symbol.file=true"/>
975		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
976	+	<compilerarg line="${build.args}"/>
977
978		</javac>
881	–
979		</target>
980
981
885	–
982		<target name="extra166yjar"
983		depends="extra166ycompile"
984		description="Builds library jar from compiled sources">
985
890	–	<mkdir dir="${build.extra166ylib.dir}"/>
891	–
986		<jar destfile="${extra166y.jar}" index="true">
987	<	<fileset dir="${build.extra166y.dir}"/>
987	>	<fileset dir="${build.extra166y.classes.dir}"/>
988		</jar>
989
990		</target>
991
992
899	–
993		<target name="extra166ydocs"
994		description="Builds javadocs to build dir">
995
996	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
997	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
996	>	<delete dir="${extra166ydocs.dir}"/>
997	>	<mkdir dir="${extra166ydocs.dir}"/>
998
999	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
999	>	<javadoc destdir="${extra166ydocs.dir}"
1000		packagenames="extra166y.*"
1001		link="${jdkapidocs.url}"
1002	<	source="6"
910	<	bootclasspath="${bootclasspath6}"
1002	>	access="${build.javadoc.access}"
1003		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1004	<	executable="${javadoc7}"
1005	<	additionalparam="-XDignore.symbol.file=true" />
1004	>	bootclasspath="${bootclasspath6}"
1005	>	source="6"
1006	>	executable="${javadoc7}">
1007	>	<arg value="-XDignore.symbol.file=true"/>
1008
1009	+	</javadoc>
1010		</target>
1011
1012
1013		<target name="extra166ydist"
1014	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
1014	>	depends="extra166ydist-jar, extra166ydist-docs"
1015		description="Puts all distributable products in single hierarchy"/>
1016
1017
923	–
1018		<target name="extra166yclean"
1019	<	description="Removes all build products">
1019	>	description="Removes all extra166y build products">
1020
1021		<delete dir="${build.extra166y.dir}"/>
928	–	<delete dir="${build.extra166ylib.dir}"/>
1022
1023		</target>
1024
1025
933	–
1026		<target name="extra166ydist-clean"
1027		description="Removes all build and distribution products">
1028
#	Line 938 | Line 1030
1030
1031		<target name="extra166ydist-jar"
1032		depends="extra166yclean, extra166yjar">
941	–
1033		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
1034	+	</target>
1035
1036	+	<target name="extra166ydist-docs"
1037	+	depends="extra166yclean, extra166ydocs">
1038	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
1039		</target>
1040
1041		<!-- jsr166e -->
#	Line 949 | Line 1044
1044		depends="configure-compiler"
1045		description="Compiles jsr166e sources">
1046
1047	<	<mkdir dir="${build.jsr166e.dir}"/>
1047	>	<mkdir dir="${build.jsr166e.classes.dir}"/>
1048
1049		<javac srcdir="${topsrc.dir}"
1050	<	destdir="${build.jsr166e.dir}"
1050	>	destdir="${build.jsr166e.classes.dir}"
1051		debug="${build.debug}"
1052		debuglevel="${build.debuglevel}"
1053		deprecation="${build.deprecation}"
#	Line 964 | Line 1059
1059		fork="true">
1060
1061		<include name="jsr166e/**/*.java"/>
967	–	<compilerarg line="${build.args}"/>
1062		<compilerarg value="-XDignore.symbol.file=true"/>
1063		<compilerarg value="-Xlint:all"/>
1064	+	<compilerarg line="${build.args}"/>
1065
1066		</javac>
972	–
1067		</target>
1068
1069
976	–
1070		<target name="jsr166ejar"
1071		depends="jsr166ecompile"
1072		description="Builds library jar from compiled sources">
1073
981	–	<mkdir dir="${build.jsr166elib.dir}"/>
982	–
1074		<jar destfile="${jsr166e.jar}" index="true">
1075	<	<fileset dir="${build.jsr166e.dir}"/>
1075	>	<fileset dir="${build.jsr166e.classes.dir}"/>
1076		</jar>
1077
1078		</target>
1079
1080
990	–
1081		<target name="jsr166edocs"
1082		description="Builds javadocs to build dir">
1083
1084	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
1085	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
1084	>	<delete dir="${jsr166edocs.dir}"/>
1085	>	<mkdir dir="${jsr166edocs.dir}"/>
1086
1087	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
1087	>	<javadoc destdir="${jsr166edocs.dir}"
1088		packagenames="jsr166e.*"
1089		link="${jdkapidocs.url}"
1090	<	source="7"
1090	>	access="${build.javadoc.access}"
1091		sourcepath="${topsrc.dir}:${jdk7src.dir}"
1092	<	executable="${javadoc7}"
1093	<	additionalparam="-XDignore.symbol.file=true" >
1092	>	source="7"
1093	>	executable="${javadoc7}">
1094	>	<arg value="-XDignore.symbol.file=true"/>
1095	>
1096		</javadoc>
1097	+	</target>
1098	+
1099
1100	+	<target name="jsr166e-test-tck"
1101	+	depends="jsr166ejar"
1102	+	description="Runs tck tests for jsr166e">
1103	+
1104	+	<run-tck-tests
1105	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
1106	+	source="7"
1107	+	target="8"
1108	+	workdir="${build.jsr166e.dir}"
1109	+	classes="${jsr166e.jar}"/>
1110		</target>
1111
1112
1113		<target name="jsr166edist"
1114	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1114	>	depends="jsr166edist-jar, jsr166edist-docs"
1115		description="Puts all distributable products in single hierarchy"/>
1116
1117
1014	–
1118		<target name="jsr166eclean"
1119	<	description="Removes all build products">
1017	<
1119	>	description="Removes all jsr166e build products">
1120		<delete dir="${build.jsr166e.dir}"/>
1019	–	<delete dir="${build.jsr166elib.dir}"/>
1020	–
1121		</target>
1122
1123
#	Line 1028 | Line 1128
1128
1129		<target name="jsr166edist-jar"
1130		depends="jsr166eclean, jsr166ejar">
1031	–
1131		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1132	+	</target>
1133
1134	+	<target name="jsr166edist-docs"
1135	+	depends="jsr166eclean, jsr166edocs">
1136	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1137		</target>
1138
1139	+
1140	+	<!-- Find buglets that can be detected by static build tools -->
1141	+
1142	+	<target name="lint">
1143	+	<antcall target="dists">
1144	+	<param name="build.javadoc.access" value="private"/>
1145	+	</antcall>
1146	+	</target>
1147	+
1148	+
1149		</project>

Diff Legend

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