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.118 by jsr166, Mon Jan 21 01:05:01 2013 UTC vs.
Revision 1.142 by jsr166, Tue Jun 18 20:54:57 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 39 | Line 42
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	+	<!-- Tck options; see JSR166TestCase.java -->
48	+	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49	+	<property name="jsr166.profileTests"     value="false"/>
50	+	<property name="jsr166.profileThreshold" value="100"/>
51	+	<property name="jsr166.runsPerTest"      value="1"/>
52	+	<!-- Allow running an individual tck test class -->
53	+	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
54	+	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
55
56		<!-- Build locations -->
57		<property name="build.dir"                   location="build"/>
#	Line 57 | Line 70
70		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
71		<property name="build.extra166y.dir"         location="${build.dir}/extra166y"/>
72
73	<	<property name="build.jsr166x.classes.dir"    location="${build.jsr166x.dir}/classes"/>
74	<	<property name="build.jsr166y.classes.dir"    location="${build.jsr166y.dir}/classes"/>
75	<	<property name="build.jsr166e.classes.dir"    location="${build.jsr166e.dir}/classes"/>
76	<	<property name="build.extra166y.classes.dir"  location="${build.extra166y.dir}/classes"/>
73	>	<property name="build.jsr166x.classes.dir"   location="${build.jsr166x.dir}/classes"/>
74	>	<property name="build.jsr166y.classes.dir"   location="${build.jsr166y.dir}/classes"/>
75	>	<property name="build.jsr166e.classes.dir"   location="${build.jsr166e.dir}/classes"/>
76	>	<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/>
77
78		<!-- JDK locations -->
79		<property name="jdks.home"  location="${user.home}/jdk"/>
#	Line 86 | Line 99
99		</sequential>
100		</macrodef>
101
102	+	<macrodef name="mirror-dir">
103	+	<attribute name="src"/>
104	+	<attribute name="dst"/>
105	+	<sequential>
106	+	<delete dir="@{dst}"/>
107	+	<mkdir dir="@{dst}"/>
108	+	<copy todir="@{dst}" preservelastmodified="true">
109	+	<fileset dir="@{src}"/>
110	+	</copy>
111	+	</sequential>
112	+	</macrodef>
113	+
114		<defjdklocations v="6"/>
115		<defjdklocations v="7"/>
116		<defjdklocations v="8"/>
#	Line 105 | Line 130
130		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
131		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
132
133	<	<!-- Distribution locations -->
134	<	<property name="dist.javadocs.dir"          location="${dist.dir}/jsr166.docs"/>
135	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7.docs"/>
136	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166x.docs"/>
137	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166y.docs"/>
138	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166e.docs"/>
139	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/>
133	>	<!-- Javadoc locations -->
134	>	<property name="docs.dir"          location="${build.dir}/docs"/>
135	>	<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
136	>	<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
137	>	<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
138	>	<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
139	>	<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/>
140	>
141	>	<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
142	>	<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143	>	<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144	>	<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145	>	<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
146	>	<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/>
147
148		<!-- Jar locations -->
149		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
#	Line 128 | Line 160
160		<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
161
162		<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
163	<	<!-- The below does not yet exist as of 2012-11 -->
163	>	<!-- The below does not yet exist as of 2013-01 -->
164		<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
165
166		<!-- Default jdk api doc location (latest stable release seems best) -->
#	Line 146 | Line 178
178		</path>
179
180		<macrodef name="run-tck-tests">
181	+	<attribute name="tck.src.dir" default="${tck.src.dir}"/>
182		<attribute name="target"/>
183	+	<attribute name="compile-target" default="@{target}"/>
184		<attribute name="workdir"/>
185	<	<attribute name="product.jar" default="${product.jar}"/>
185	>	<attribute name="classes"/>
186		<attribute name="jvmflags" default=""/>
187	+	<element name="javac-elements" optional="true"/>
188		<sequential>
189
190		<mkdir dir="@{workdir}/tck-classes"/>
191
192	<	<javac srcdir="${tck.src.dir}"
192	>	<javac srcdir="@{tck.src.dir}"
193		destdir="@{workdir}/tck-classes"
194		debug="${build.debug}"
195		debuglevel="${build.debuglevel}"
196		deprecation="${build.deprecation}"
197	<	source="6"
197	>	source="@{compile-target}"
198	>	target="@{compile-target}"
199		classpath="${junit.jar}"
200	+	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
201		includeAntRuntime="false"
202		includeJavaRuntime="false"
203	<	executable="${javac@{target}}"
203	>	executable="${javac@{compile-target}}"
204		fork="true">
205
206	<	<include name="**/*.java"/>
170	<	<bootclasspath path="@{product.jar}"/>
171	<	<bootclasspath path="${bootclasspath6}"/>
206	>	<include name="*.java"/>
207		<compilerarg value="-XDignore.symbol.file=true"/>
208		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
209		<compilerarg line="${build.args}"/>
210	+	<javac-elements/>
211
212		</javac>
213
214	<	<java classname="JSR166TestCase"
214	>	<java classname="${jsr166.tckTestClass}"
215		failonerror="true"
216		jvm="${java@{target}}"
217		fork="true">
218	<	<jvmarg value="-Xbootclasspath/p:@{product.jar}"/>
218	>	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
219		<jvmarg line="@{jvmflags}"/>
220	+	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
221	+	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
222	+	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
223		<classpath>
224		<pathelement location="${junit.jar}"/>
225		<pathelement location="@{workdir}/tck-classes"/>
#	Line 190 | Line 229
229		</sequential>
230		</macrodef>
231
232	+	<macrodef name="run-jtreg-tests">
233	+	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
234	+	<attribute name="source" default="7"/>
235	+	<attribute name="target"/>
236	+	<attribute name="workdir"/>
237	+	<attribute name="classes"/>
238	+	<attribute name="jtregflags" default=""/>
239	+	<sequential>
240	+	<delete dir="@{workdir}/JTwork"   quiet="true"/>
241	+	<delete dir="@{workdir}/JTreport" quiet="true"/>
242	+	<mkdir dir="@{workdir}/JTwork/scratch"/>
243	+	<mkdir dir="@{workdir}/JTreport"/>
244	+	<jtreg dir="@{jtreg.src.dir}"
245	+	jdk="${jdk@{target}.home}"
246	+	workDir="@{workdir}/JTwork"
247	+	reportDir="@{workdir}/JTreport">
248	+
249	+	<arg value="-Xbootclasspath/p:@{classes}"/>
250	+	<arg value="-agentvm"/>
251	+	<arg value="-v:nopass,fail"/>
252	+	<arg value="-vmoptions:-esa -ea"/>
253	+	<arg value="-automatic"/>
254	+	<arg value="-k:!ignore"/>
255	+	<arg line="@{jtregflags}"/>
256	+	</jtreg>
257	+	</sequential>
258	+	</macrodef>
259	+
260		<!-- ALoops classpath -->
261		<path id="loops.classpath">
262		<pathelement location="${build.loops.dir}"/>
263		</path>
264
265		<!-- Support @jls tag, used in jdk8+ javadoc -->
266	<	<!-- TODO: How do we get &trade to work? -->
200	<	<!-- TODO: Why isn't @jls a "standard" tag? -->
201	<	<!--   property name="javadoc.jls.cite" value="The Java&trade; Language Specification" -->
202	<	<property name="javadoc.jls.cite" value="The Java Language Specification"/>
266	>	<property name="javadoc.jls.cite" value="The Java&amp;trade; Language Specification"/>
267		<property name="javadoc.jls.option" value="jls:a:See &lt;cite&gt;${javadoc.jls.cite}&lt;/cite&gt;:"/>
268
269		<!-- Main targets -->
#	Line 226 | Line 290
290		fork="true">
291
292		<include name="**/*.java"/>
293	+	<compilerarg value="-Xprefer:source"/>
294		<compilerarg value="-XDignore.symbol.file=true"/>
295		<compilerarg value="-Xlint:all"/>
296		<compilerarg line="${build.args}"/>
#	Line 244 | Line 309
309		</target>
310
311
247	–	<target name="test"
248	–	depends="configure-tests, report-tests"
249	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
250	–
251	–
312		<target name="docs"
313		description="Builds javadocs for src/main to dist dir">
314
315	<	<delete dir="${dist.javadocs.dir}"/>
316	<	<mkdir dir="${dist.javadocs.dir}"/>
315	>	<delete dir="${docs.dir}"/>
316	>	<mkdir dir="${docs.dir}"/>
317
318		<!-- the packagenames="none" hack below prevents scanning the -->
319		<!-- sourcepath for packages -->
320
321	<	<javadoc destdir="${dist.javadocs.dir}"
321	>	<javadoc destdir="${docs.dir}"
322		packagenames="none"
323		link="${jdkapi8docs.url}"
324		overview="${src.dir}/intro.html"
325	+	access="${build.javadoc.access}"
326	+	sourcepath="${src.dir}:${jdk8src.dir}"
327		classpath=""
328		executable="${javadoc8}">
267	–	<sourcepath path="${src.dir}"/>
268	–	<sourcepath path="${jdk8src.dir}"/>
269	–	<arg value="-XDignore.symbol.file=true"/>
270	–	<arg value="-tag"/>
271	–	<arg value="${javadoc.jls.option}"/>
329		<fileset dir="${src.dir}" defaultexcludes="yes">
330		<include name="**/*.java"/>
331		</fileset>
332	+	<arg value="-XDignore.symbol.file=true"/>
333	+	<arg value="-tag"/>
334	+	<arg value="${javadoc.jls.option}"/>
335		</javadoc>
336		</target>
337
338
339		<target name="dist"
340	<	depends="dist-clean, dist-jar, docs"
340	>	depends="dist-clean, dist-jar, dist-docs"
341		description="Puts all distributable products in single hierarchy"/>
342
343
#	Line 315 | Line 375
375		</target>
376
377
318	–	<!-- Internal targets -->
319	–
320	–
378		<target name="dist-jar"
379		depends="clean, jar">
323	–
380		<copy file="${product.jar}" todir="${dist.dir}"/>
325	–
381		</target>
382
383	<
384	<	<target name="compile-tests"
385	<	depends="jar">
331	<
332	<	<mkdir dir="${build.testcases.dir}"/>
333	<
334	<	<javac srcdir="${tck.src.dir}"
335	<	destdir="${build.testcases.dir}"
336	<	debug="${build.debug}"
337	<	debuglevel="${build.debuglevel}"
338	<	deprecation="${build.deprecation}"
339	<	source="6"
340	<	classpath="${junit.jar}"
341	<	includeAntRuntime="false"
342	<	includeJavaRuntime="false"
343	<	executable="${javac8}"
344	<	fork="true">
345	<
346	<	<include name="**/*.java"/>
347	<	<bootclasspath path="@{product.jar}"/>
348	<	<bootclasspath path="${bootclasspath6}"/>
349	<	<compilerarg value="-XDignore.symbol.file=true"/>
350	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
351	<	<compilerarg line="${build.args}"/>
352	<
353	<	</javac>
354	<
355	<	<javac srcdir="${test.src.dir}"
356	<	destdir="${build.testcases.dir}"
357	<	debug="${build.debug}"
358	<	debuglevel="${build.debuglevel}"
359	<	deprecation="${build.deprecation}"
360	<	source="6"
361	<	classpath=""
362	<	includeAntRuntime="false"
363	<	includeJavaRuntime="false"
364	<	executable="${javac8}"
365	<	fork="true">
366	<
367	<	<include name="jsr166/test/**/*.java"/>
368	<	<bootclasspath path="${product.jar}"/>
369	<	<bootclasspath path="${bootclasspath6}"/>
370	<	<compilerarg value="-XDignore.symbol.file=true"/>
371	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
372	<	<compilerarg line="${build.args}"/>
373	<
374	<	</javac>
375	<
376	<	<!--
377	<	<javac srcdir="${jtreg.src.dir}"
378	<	destdir="${build.testcases.dir}"
379	<	debug="${build.debug}"
380	<	debuglevel="${build.debuglevel}"
381	<	deprecation="${build.deprecation}"
382	<	source="${build.sourcelevel}"
383	<	fork="true">
384	<
385	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
386	<	<compilerarg value="-XDignore.symbol.file=true"/>
387	<	<compilerarg line="${build.args}"/>
388	<
389	<	</javac>
390	<	-->
391	<
383	>	<target name="dist-docs"
384	>	depends="clean, docs">
385	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
386		</target>
387
388
389	<	<target name="run-tests"
390	<	depends="compile-tests">
391	<
398	<	<!-- May be overridden by user.properties -->
399	<	<property name="testcase" value="*"/>
400	<
401	<	<mkdir dir="${build.reports.dir}"/>
402	<
403	<	<junit printsummary="true"
404	<	showoutput="true"
405	<	errorProperty="junit.failed"
406	<	failureProperty="junit.failed"
407	<	dir="${build.reports.dir}"
408	<	jvm="${java8}"
409	<	fork="true">
410	<
411	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
412	<	<jvmarg value="-server"/>
413	<	<jvmarg value="-showversion"/>
414	<
415	<	<classpath refid="test.classpath"/>
416	<
417	<	<formatter type="xml"/>
418	<
419	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
420	<	<fileset dir="${tck.src.dir}">
421	<	<include name="**/${testcase}Test.java"/>
422	<	</fileset>
423	<	</batchtest>
424	<
425	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
426	<	<fileset dir="${test.src.dir}">
427	<	<include name="jsr166/test/**/${testcase}Test.java"/>
428	<	</fileset>
429	<	</batchtest>
430	<
431	<	<!--
432	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
433	<	<fileset dir="${jtreg.src.dir}">
434	<	<include name="**/${testcase}Test.java"/>
435	<	</fileset>
436	<	</batchtest>
437	<	-->
438	<
439	<	</junit>
389	>	<target name="test-tck"
390	>	depends="jar"
391	>	description="Runs tck tests for main directly">
392
393	+	<run-tck-tests
394	+	target="8"
395	+	workdir="${build.dir}"
396	+	classes="${product.jar}"/>
397		</target>
398
399	+	<target name="test-jtreg"
400	+	depends="jar"
401	+	description="Runs jtreg tests for main using the jtreg ant task">
402	+	<run-jtreg-tests
403	+	target="8"
404	+	workdir="${build.dir}"
405	+	classes="${product.jar}"/>
406	+	</target>
407
408	<	<target name="report-tests"
409	<	depends="run-tests">
410	<
447	<	<!-- Sets junit.report.format to frames if redirection is present,
448	<	otherwise sets it to noframes. -->
449	<	<available property="junit.report.format"
450	<	value="frames"
451	<	classname="org.apache.xalan.lib.Redirect"
452	<	/>
453	<	<property name="junit.report.format" value="noframes"/>
454	<
455	<	<junitreport todir="${build.reports.dir}">
456	<	<fileset dir="${build.reports.dir}">
457	<	<include name="TEST-*.xml"/>
458	<	</fileset>
459	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
460	<	/>
461	<	</junitreport>
462	<
463	<	<fail message="Test Cases Failed" if="junit.failed"/>
464	<
408	>	<target name="test"
409	>	depends="test-tck, test-jtreg"
410	>	description="Runs tck and jtreg tests for main">
411		</target>
412
413
414	+
415		<target name="configure-compiler">
416
417		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 482 | Line 429
429		</target>
430
431
485	–	<target name="configure-tests"
486	–	depends="configure-compiler">
487	–
488	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
489	–	<available property="junit.available"
490	–	classname="junit.framework.Protectable"/>
491	–
492	–	<!-- Xalan -->
493	–	<available property="xalan.available"
494	–	classname="org.apache.xalan.Version"/>
495	–
496	–
497	–	<!-- Ant 1.6beta and later don't need or want this check -->
498	–	<!--
499	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
500	–	unless="junit.available"/>
501	–
502	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
503	–	unless="xalan.available"/>
504	–	-->
505	–
506	–	</target>
507	–
432
433		<!-- Various demos and test programs -->
434
#	Line 550 | Line 474
474		deprecation="${build.deprecation}"
475		source="6"
476		classpath=""
477	+	bootclasspath="${bootclasspath6}"
478		includeAntRuntime="false"
479		includeJavaRuntime="false"
480		executable="${javac7}"
481		fork="true">
482
483		<include name="**/*.java"/>
484	<	<bootclasspath path="${bootclasspath6}"/>
484	>	<compilerarg value="-Xprefer:source"/>
485		<compilerarg value="-XDignore.symbol.file=true"/>
486		<compilerarg value="-Xlint:all"/>
487		<compilerarg line="${build.args}"/>
#	Line 565 | Line 490
490		</target>
491
492
493	<	<target name="4jdk7-jar"
493	>	<target name="4jdk7jar"
494		depends="4jdk7compile"
495		description="Builds library jar from compiled sources">
496
#	Line 577 | Line 502
502
503
504		<target name="4jdk7-test-tck"
505	<	depends="4jdk7-jar"
505	>	depends="4jdk7jar"
506		description="Runs tck tests for jsr166-4jdk7 directly">
507
508		<run-tck-tests
509		target="7"
510		workdir="${build.4jdk7.dir}"
511	<	product.jar="${4jdk7product.jar}"/>
511	>	classes="${4jdk7product.jar}">
512	>	<javac-elements>
513	>	<!-- JDK8+ test classes -->
514	>	<exclude name="*8Test.java"/>
515	>	<exclude name="DoubleAccumulatorTest.java"/>
516	>	<exclude name="DoubleAdderTest.java"/>
517	>	<exclude name="LongAccumulatorTest.java"/>
518	>	<exclude name="LongAdderTest.java"/>
519	>	<exclude name="CompletableFutureTest.java"/>
520	>	<exclude name="StampedLockTest.java"/>
521	>	</javac-elements>
522	>	</run-tck-tests>
523		</target>
524
525
#	Line 609 | Line 545
545
546		<formatter type="brief"/>
547
548	<	<test name="JSR166TestCase" haltonfailure="no">
548	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
549		</test>
550
551		</junit>
552		</target>
553
554		<target name="4jdk7-test-jtreg"
555	<	depends="4jdk7compile"
555	>	depends="4jdk7jar"
556		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
557	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
558	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
559	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
560	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
561	<	<jtreg dir="${jtreg.src.dir}"
626	<	jdk="${jdk7.home}"
627	<	workDir="${build.4jdk7.dir}/JTwork"
628	<	reportDir="${build.4jdk7.dir}/JTreport">
629	<
630	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
631	<	<arg value="-agentvm"/>
632	<	<arg value="-v:nopass,fail"/>
633	<	<arg value="-vmoptions:-esa -ea"/>
634	<	<arg value="-automatic"/>
635	<	<arg value="-k:!ignore"/>
636	<	</jtreg>
557	>	<run-jtreg-tests
558	>	target="7"
559	>	workdir="${build.4jdk7.dir}"
560	>	classes="${4jdk7product.jar}"
561	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
562		</target>
563
564
#	Line 646 | Line 571
571		<target name="4jdk7docs"
572		description="Builds javadocs for src/jdk7 to dist dir">
573
574	<	<delete dir="${dist.4jdk7.docs.dir}"/>
575	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
574	>	<delete dir="${4jdk7docs.dir}"/>
575	>	<mkdir dir="${4jdk7docs.dir}"/>
576
577	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
577	>	<javadoc destdir="${4jdk7docs.dir}"
578		packagenames="none"
579		link="${jdkapi7docs.url}"
580		overview="${4jdk7src.dir}/intro.html"
581	+	access="${build.javadoc.access}"
582	+	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
583		classpath=""
584		executable="${javadoc7}">
658	–	<sourcepath path="${4jdk7src.dir}"/>
659	–	<sourcepath path="${jdk7src.dir}"/>
660	–	<arg value="-XDignore.symbol.file=true"/>
585		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
586		<include name="**/*.java"/>
587		</fileset>
588	+	<arg value="-XDignore.symbol.file=true"/>
589		</javadoc>
590		</target>
591
592
593		<target name="4jdk7dist"
594	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
594	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
595		description="Puts all distributable products in single hierarchy"/>
596
597
#	Line 684 | Line 609
609		</target>
610
611		<target name="4jdk7dist-jar"
612	<	depends="4jdk7clean, 4jdk7-jar">
688	<
612	>	depends="4jdk7clean, 4jdk7jar">
613		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
614	+	</target>
615	+
616
617	+	<target name="4jdk7dist-docs"
618	+	depends="4jdk7clean, 4jdk7docs">
619	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
620		</target>
621
622
#	Line 705 | Line 634
634		debuglevel="${build.debuglevel}"
635		deprecation="${build.deprecation}"
636		classpath=""
637	+	bootclasspath="${bootclasspath6}"
638		source="5"
639		includeAntRuntime="false"
640		includeJavaRuntime="false"
#	Line 712 | Line 642
642		fork="true">
643
644		<include name="jsr166x/**/*.java"/>
715	–	<bootclasspath path="${bootclasspath6}"/>
645		<compilerarg value="-XDignore.symbol.file=true"/>
646		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
647		<compilerarg line="${build.args}"/>
#	Line 721 | Line 650
650		</target>
651
652
653	<	<target name="jsr166x-jar"
653	>	<target name="jsr166xjar"
654		depends="jsr166xcompile"
655		description="Builds library jar from compiled sources">
656
#	Line 735 | Line 664
664		<target name="jsr166xdocs"
665		description="Builds javadocs to dist dir">
666
667	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
668	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
667	>	<delete dir="${jsr166xdocs.dir}"/>
668	>	<mkdir dir="${jsr166xdocs.dir}"/>
669
670	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
670	>	<javadoc destdir="${jsr166xdocs.dir}"
671		packagenames="jsr166x.*"
672		link="${jdkapidocs.url}"
673	+	access="${build.javadoc.access}"
674	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
675	+	bootclasspath="${bootclasspath6}"
676		source="5"
677		executable="${javadoc7}">
746	–	<sourcepath path="${topsrc.dir}"/>
747	–	<sourcepath path="${jdk6src.dir}"/>
748	–	<bootclasspath path="${bootclasspath6}"/>
678		<arg value="-XDignore.symbol.file=true"/>
679
680		</javadoc>
#	Line 753 | Line 682
682
683
684		<target name="jsr166xdist"
685	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
685	>	depends="jsr166xdist-jar, jsr166xdist-docs"
686		description="Puts all distributable products in single hierarchy"/>
687
688
#	Line 772 | Line 701
701
702
703		<target name="jsr166xdist-jar"
704	<	depends="jsr166xclean, jsr166x-jar">
776	<
704	>	depends="jsr166xclean, jsr166xjar">
705		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
706	+	</target>
707
708	+	<target name="jsr166xdist-docs"
709	+	depends="jsr166xclean, jsr166xdocs">
710	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
711		</target>
712
713		<!-- jsr166y -->
#	Line 794 | Line 726
726		deprecation="${build.deprecation}"
727		source="6"
728		classpath=""
729	+	bootclasspath="${bootclasspath6}"
730		includeAntRuntime="false"
731		includeJavaRuntime="false"
732		executable="${javac7}"
733		fork="true">
734
735		<include name="jsr166y/**/*.java"/>
803	–	<bootclasspath path="${bootclasspath6}"/>
736		<compilerarg value="-XDignore.symbol.file=true"/>
737		<compilerarg value="-Xlint:all"/>
738		<compilerarg line="${build.args}"/>
#	Line 809 | Line 741
741		</target>
742
743
744	<	<target name="jsr166y-jar"
744	>	<target name="jsr166yjar"
745		depends="jsr166ycompile"
746		description="Builds library jar from compiled sources">
747
#	Line 823 | Line 755
755		<target name="jsr166ydocs"
756		description="Builds javadocs to dist dir">
757
758	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
759	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
758	>	<delete dir="${jsr166ydocs.dir}"/>
759	>	<mkdir dir="${jsr166ydocs.dir}"/>
760
761	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
761	>	<javadoc destdir="${jsr166ydocs.dir}"
762		packagenames="jsr166y.*"
763		link="${jdkapidocs.url}"
764	+	access="${build.javadoc.access}"
765	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
766	+	bootclasspath="${bootclasspath6}"
767		source="6"
768		executable="${javadoc7}">
834	–	<sourcepath path="${topsrc.dir}"/>
835	–	<sourcepath path="${jdk6src.dir}"/>
836	–	<bootclasspath path="${bootclasspath6}"/>
769		<arg value="-XDignore.symbol.file=true"/>
770
771		</javadoc>
#	Line 841 | Line 773
773
774
775		<target name="jsr166ydist"
776	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
776	>	depends="jsr166ydist-jar, jsr166ydist-docs"
777		description="Puts all distributable products in single hierarchy"/>
778
779
#	Line 859 | Line 791
791		</target>
792
793		<target name="jsr166ydist-jar"
794	<	depends="jsr166yclean, jsr166y-jar">
863	<
794	>	depends="jsr166yclean, jsr166yjar">
795		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
796	+	</target>
797
798	+	<target name="jsr166ydist-docs"
799	+	depends="jsr166yclean, jsr166ydocs">
800	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
801		</target>
802
803
#	Line 870 | Line 805
805
806
807		<target name="extra166ycompile"
808	<	depends="configure-compiler, jsr166y-jar"
808	>	depends="configure-compiler, jsr166yjar"
809		description="Compiles extra166y sources">
810
811		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 880 | Line 815
815		debug="${build.debug}"
816		debuglevel="${build.debuglevel}"
817		deprecation="${build.deprecation}"
818	+	bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
819		classpath=""
820		source="6"
821		includeAntRuntime="false"
#	Line 888 | Line 824
824		fork="true">
825
826		<include name="extra166y/**/*.java"/>
891	–	<bootclasspath path="${jsr166y.jar}"/>
892	–	<bootclasspath path="${bootclasspath6}"/>
827		<compilerarg value="-XDignore.symbol.file=true"/>
828		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
829		<compilerarg line="${build.args}"/>
#	Line 898 | Line 832
832		</target>
833
834
835	<	<target name="extra166y-jar"
835	>	<target name="extra166yjar"
836		depends="extra166ycompile"
837		description="Builds library jar from compiled sources">
838
#	Line 912 | Line 846
846		<target name="extra166ydocs"
847		description="Builds javadocs to build dir">
848
849	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
850	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
849	>	<delete dir="${extra166ydocs.dir}"/>
850	>	<mkdir dir="${extra166ydocs.dir}"/>
851
852	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
852	>	<javadoc destdir="${extra166ydocs.dir}"
853		packagenames="extra166y.*"
854		link="${jdkapidocs.url}"
855	+	access="${build.javadoc.access}"
856	+	sourcepath="${topsrc.dir}:${jdk6src.dir}"
857	+	bootclasspath="${bootclasspath6}"
858		source="6"
859		executable="${javadoc7}">
923	–	<sourcepath path="${topsrc.dir}"/>
924	–	<sourcepath path="${jdk6src.dir}"/>
925	–	<bootclasspath path="${bootclasspath6}"/>
860		<arg value="-XDignore.symbol.file=true"/>
861
862		</javadoc>
#	Line 930 | Line 864
864
865
866		<target name="extra166ydist"
867	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
867	>	depends="extra166ydist-jar, extra166ydist-docs"
868		description="Puts all distributable products in single hierarchy"/>
869
870
#	Line 948 | Line 882
882		</target>
883
884		<target name="extra166ydist-jar"
885	<	depends="extra166yclean, extra166y-jar">
952	<
885	>	depends="extra166yclean, extra166yjar">
886		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
887	+	</target>
888
889	+	<target name="extra166ydist-docs"
890	+	depends="extra166yclean, extra166ydocs">
891	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
892		</target>
893
894		<!-- jsr166e -->
#	Line 983 | Line 920
920		</target>
921
922
923	<	<target name="jsr166e-jar"
923	>	<target name="jsr166ejar"
924		depends="jsr166ecompile"
925		description="Builds library jar from compiled sources">
926
#	Line 997 | Line 934
934		<target name="jsr166edocs"
935		description="Builds javadocs to build dir">
936
937	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
938	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
937	>	<delete dir="${jsr166edocs.dir}"/>
938	>	<mkdir dir="${jsr166edocs.dir}"/>
939
940	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
940	>	<javadoc destdir="${jsr166edocs.dir}"
941		packagenames="jsr166e.*"
942		link="${jdkapidocs.url}"
943	+	access="${build.javadoc.access}"
944	+	sourcepath="${topsrc.dir}:${jdk7src.dir}"
945		source="7"
946		executable="${javadoc7}">
1008	–	<sourcepath path="${topsrc.dir}"/>
1009	–	<sourcepath path="${jdk7src.dir}"/>
947		<arg value="-XDignore.symbol.file=true"/>
948
949		</javadoc>
950		</target>
951
952
953	+	<target name="jsr166e-test-tck"
954	+	depends="jsr166ejar"
955	+	description="Runs tck tests for jsr166e">
956	+
957	+	<run-tck-tests
958	+	tck.src.dir="${test.src.dir}/tck-jsr166e"
959	+	target="7"
960	+	workdir="${build.jsr166e.dir}"
961	+	classes="${jsr166e.jar}"/>
962	+	</target>
963	+
964	+
965		<target name="jsr166edist"
966	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
966	>	depends="jsr166edist-jar, jsr166edist-docs"
967		description="Puts all distributable products in single hierarchy"/>
968
969
970		<target name="jsr166eclean"
971		description="Removes all jsr166e build products">
1023	–
972		<delete dir="${build.jsr166e.dir}"/>
1025	–
973		</target>
974
975
#	Line 1032 | Line 979
979		</target>
980
981		<target name="jsr166edist-jar"
982	<	depends="jsr166eclean, jsr166e-jar">
1036	<
982	>	depends="jsr166eclean, jsr166ejar">
983		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
984	+	</target>
985	+
986	+	<target name="jsr166edist-docs"
987	+	depends="jsr166eclean, jsr166edocs">
988	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
989	+	</target>
990	+
991
992	+	<!-- Find buglets that can be detected by static build tools -->
993	+
994	+	<target name="lint">
995	+	<antcall target="dists">
996	+	<param name="build.javadoc.access" value="private"/>
997	+	</antcall>
998		</target>
999
1000	+
1001		</project>

Diff Legend

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