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.124 by jsr166, Tue Jan 22 21:22:57 2013 UTC vs.
Revision 1.145 by jsr166, Sun Jul 14 22:39:31 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}/jsr166docs"/>
135	<	<property name="dist.4jdk7.docs.dir"        location="${dist.dir}/jsr166-4jdk7docs"/>
136	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
137	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
138	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
139	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
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 147 | Line 179
179
180		<macrodef name="run-tck-tests">
181		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
150	–	<attribute name="source" default="6"/>
182		<attribute name="target"/>
183	+	<attribute name="compile-target" default="@{target}"/>
184		<attribute name="workdir"/>
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"/>
#	Line 161 | Line 194
194		debug="${build.debug}"
195		debuglevel="${build.debuglevel}"
196		deprecation="${build.deprecation}"
197	<	source="@{source}"
197	>	source="@{compile-target}"
198	>	target="@{compile-target}"
199		classpath="${junit.jar}"
200	<	bootclasspath="@{classes}:${bootclasspath@{source}}"
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"/>
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:@{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 191 | 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}"/>
#	Line 224 | 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 242 | Line 309
309		</target>
310
311
245	–	<target name="test"
246	–	depends="configure-tests, report-tests"
247	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
248	–
249	–
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}">
#	Line 269 | Line 332
332		<arg value="-XDignore.symbol.file=true"/>
333		<arg value="-tag"/>
334		<arg value="${javadoc.jls.option}"/>
335	+	<arg value="-tag"/>
336	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
337	+	<arg value="-tag"/>
338	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
339	+	<arg value="-tag"/>
340	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
341		</javadoc>
342		</target>
343
344
345		<target name="dist"
346	<	depends="dist-clean, dist-jar, docs"
346	>	depends="dist-clean, dist-jar, dist-docs"
347		description="Puts all distributable products in single hierarchy"/>
348
349
#	Line 312 | Line 381
381		</target>
382
383
315	–	<!-- Internal targets -->
316	–
317	–
384		<target name="dist-jar"
385		depends="clean, jar">
320	–
386		<copy file="${product.jar}" todir="${dist.dir}"/>
322	–
387		</target>
388
389	<
390	<	<target name="compile-tests"
391	<	depends="jar">
328	<
329	<	<mkdir dir="${build.testcases.dir}"/>
330	<
331	<	<javac srcdir="${tck.src.dir}"
332	<	destdir="${build.testcases.dir}"
333	<	debug="${build.debug}"
334	<	debuglevel="${build.debuglevel}"
335	<	deprecation="${build.deprecation}"
336	<	source="6"
337	<	classpath="${junit.jar}"
338	<	bootclasspath="@{product.jar}:${bootclasspath6}"
339	<	includeAntRuntime="false"
340	<	includeJavaRuntime="false"
341	<	executable="${javac8}"
342	<	fork="true">
343	<
344	<	<include name="**/*.java"/>
345	<	<compilerarg value="-XDignore.symbol.file=true"/>
346	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
347	<	<compilerarg line="${build.args}"/>
348	<
349	<	</javac>
350	<
351	<	<javac srcdir="${test.src.dir}"
352	<	destdir="${build.testcases.dir}"
353	<	debug="${build.debug}"
354	<	debuglevel="${build.debuglevel}"
355	<	deprecation="${build.deprecation}"
356	<	source="6"
357	<	classpath=""
358	<	bootclasspath="@{product.jar}:${bootclasspath6}"
359	<	includeAntRuntime="false"
360	<	includeJavaRuntime="false"
361	<	executable="${javac8}"
362	<	fork="true">
363	<
364	<	<include name="jsr166/test/**/*.java"/>
365	<	<compilerarg value="-XDignore.symbol.file=true"/>
366	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
367	<	<compilerarg line="${build.args}"/>
368	<
369	<	</javac>
370	<
371	<	<!--
372	<	<javac srcdir="${jtreg.src.dir}"
373	<	destdir="${build.testcases.dir}"
374	<	debug="${build.debug}"
375	<	debuglevel="${build.debuglevel}"
376	<	deprecation="${build.deprecation}"
377	<	source="${build.sourcelevel}"
378	<	fork="true">
379	<
380	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
381	<	<compilerarg value="-XDignore.symbol.file=true"/>
382	<	<compilerarg line="${build.args}"/>
383	<
384	<	</javac>
385	<	-->
386	<
389	>	<target name="dist-docs"
390	>	depends="clean, docs">
391	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
392		</target>
393
394
395	<	<target name="run-tests"
396	<	depends="compile-tests">
397	<
393	<	<!-- May be overridden by user.properties -->
394	<	<property name="testcase" value="*"/>
395	<
396	<	<mkdir dir="${build.reports.dir}"/>
397	<
398	<	<junit printsummary="true"
399	<	showoutput="true"
400	<	errorProperty="junit.failed"
401	<	failureProperty="junit.failed"
402	<	dir="${build.reports.dir}"
403	<	jvm="${java8}"
404	<	fork="true">
405	<
406	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
407	<	<jvmarg value="-server"/>
408	<	<jvmarg value="-showversion"/>
409	<
410	<	<classpath refid="test.classpath"/>
411	<
412	<	<formatter type="xml"/>
413	<
414	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
415	<	<fileset dir="${tck.src.dir}">
416	<	<include name="**/${testcase}Test.java"/>
417	<	</fileset>
418	<	</batchtest>
419	<
420	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
421	<	<fileset dir="${test.src.dir}">
422	<	<include name="jsr166/test/**/${testcase}Test.java"/>
423	<	</fileset>
424	<	</batchtest>
425	<
426	<	<!--
427	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
428	<	<fileset dir="${jtreg.src.dir}">
429	<	<include name="**/${testcase}Test.java"/>
430	<	</fileset>
431	<	</batchtest>
432	<	-->
433	<
434	<	</junit>
395	>	<target name="test-tck"
396	>	depends="jar"
397	>	description="Runs tck tests for main directly">
398
399	+	<run-tck-tests
400	+	target="8"
401	+	workdir="${build.dir}"
402	+	classes="${product.jar}"/>
403		</target>
404
405	+	<target name="test-jtreg"
406	+	depends="jar"
407	+	description="Runs jtreg tests for main using the jtreg ant task">
408	+	<run-jtreg-tests
409	+	target="8"
410	+	workdir="${build.dir}"
411	+	classes="${product.jar}"/>
412	+	</target>
413
414	<	<target name="report-tests"
415	<	depends="run-tests">
416	<
442	<	<!-- Sets junit.report.format to frames if redirection is present,
443	<	otherwise sets it to noframes. -->
444	<	<available property="junit.report.format"
445	<	value="frames"
446	<	classname="org.apache.xalan.lib.Redirect"
447	<	/>
448	<	<property name="junit.report.format" value="noframes"/>
449	<
450	<	<junitreport todir="${build.reports.dir}">
451	<	<fileset dir="${build.reports.dir}">
452	<	<include name="TEST-*.xml"/>
453	<	</fileset>
454	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
455	<	/>
456	<	</junitreport>
457	<
458	<	<fail message="Test Cases Failed" if="junit.failed"/>
459	<
414	>	<target name="test"
415	>	depends="test-tck, test-jtreg"
416	>	description="Runs tck and jtreg tests for main">
417		</target>
418
419
420	+
421		<target name="configure-compiler">
422
423		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 477 | Line 435
435		</target>
436
437
480	–	<target name="configure-tests"
481	–	depends="configure-compiler">
482	–
483	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
484	–	<available property="junit.available"
485	–	classname="junit.framework.Protectable"/>
486	–
487	–	<!-- Xalan -->
488	–	<available property="xalan.available"
489	–	classname="org.apache.xalan.Version"/>
490	–
491	–
492	–	<!-- Ant 1.6beta and later don't need or want this check -->
493	–	<!--
494	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
495	–	unless="junit.available"/>
496	–
497	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
498	–	unless="xalan.available"/>
499	–	-->
500	–
501	–	</target>
502	–
438
439		<!-- Various demos and test programs -->
440
#	Line 552 | Line 487
487		fork="true">
488
489		<include name="**/*.java"/>
490	+	<compilerarg value="-Xprefer:source"/>
491		<compilerarg value="-XDignore.symbol.file=true"/>
492		<compilerarg value="-Xlint:all"/>
493		<compilerarg line="${build.args}"/>
#	Line 560 | Line 496
496		</target>
497
498
499	<	<target name="4jdk7-jar"
499	>	<target name="4jdk7jar"
500		depends="4jdk7compile"
501		description="Builds library jar from compiled sources">
502
#	Line 572 | Line 508
508
509
510		<target name="4jdk7-test-tck"
511	<	depends="4jdk7-jar"
511	>	depends="4jdk7jar"
512		description="Runs tck tests for jsr166-4jdk7 directly">
513
514		<run-tck-tests
515		target="7"
516		workdir="${build.4jdk7.dir}"
517	<	classes="${4jdk7product.jar}"/>
517	>	classes="${4jdk7product.jar}">
518	>	<javac-elements>
519	>	<!-- JDK8+ test classes -->
520	>	<exclude name="*8Test.java"/>
521	>	<exclude name="DoubleAccumulatorTest.java"/>
522	>	<exclude name="DoubleAdderTest.java"/>
523	>	<exclude name="LongAccumulatorTest.java"/>
524	>	<exclude name="LongAdderTest.java"/>
525	>	<exclude name="CompletableFutureTest.java"/>
526	>	<exclude name="SplittableRandomTest.java"/>
527	>	<exclude name="StampedLockTest.java"/>
528	>	</javac-elements>
529	>	</run-tck-tests>
530		</target>
531
532
#	Line 604 | Line 552
552
553		<formatter type="brief"/>
554
555	<	<test name="JSR166TestCase" haltonfailure="no">
555	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
556		</test>
557
558		</junit>
559		</target>
560
561		<target name="4jdk7-test-jtreg"
562	<	depends="4jdk7compile"
562	>	depends="4jdk7jar"
563		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
564	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
565	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
566	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
567	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
568	<	<jtreg dir="${jtreg.src.dir}"
621	<	jdk="${jdk7.home}"
622	<	workDir="${build.4jdk7.dir}/JTwork"
623	<	reportDir="${build.4jdk7.dir}/JTreport">
624	<
625	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
626	<	<arg value="-agentvm"/>
627	<	<arg value="-v:nopass,fail"/>
628	<	<arg value="-vmoptions:-esa -ea"/>
629	<	<arg value="-automatic"/>
630	<	<arg value="-k:!ignore"/>
631	<	</jtreg>
564	>	<run-jtreg-tests
565	>	target="7"
566	>	workdir="${build.4jdk7.dir}"
567	>	classes="${4jdk7product.jar}"
568	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
569		</target>
570
571
#	Line 641 | Line 578
578		<target name="4jdk7docs"
579		description="Builds javadocs for src/jdk7 to dist dir">
580
581	<	<delete dir="${dist.4jdk7.docs.dir}"/>
582	<	<mkdir dir="${dist.4jdk7.docs.dir}"/>
581	>	<delete dir="${4jdk7docs.dir}"/>
582	>	<mkdir dir="${4jdk7docs.dir}"/>
583
584	<	<javadoc destdir="${dist.4jdk7.docs.dir}"
584	>	<javadoc destdir="${4jdk7docs.dir}"
585		packagenames="none"
586		link="${jdkapi7docs.url}"
587		overview="${4jdk7src.dir}/intro.html"
588	+	access="${build.javadoc.access}"
589		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
590		classpath=""
591		executable="${javadoc7}">
#	Line 660 | Line 598
598
599
600		<target name="4jdk7dist"
601	<	depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs"
601	>	depends="4jdk7dist-jar, 4jdk7dist-docs"
602		description="Puts all distributable products in single hierarchy"/>
603
604
#	Line 678 | Line 616
616		</target>
617
618		<target name="4jdk7dist-jar"
619	<	depends="4jdk7clean, 4jdk7-jar">
682	<
619	>	depends="4jdk7clean, 4jdk7jar">
620		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
621	+	</target>
622	+
623
624	+	<target name="4jdk7dist-docs"
625	+	depends="4jdk7clean, 4jdk7docs">
626	+	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
627		</target>
628
629
#	Line 715 | Line 657
657		</target>
658
659
660	<	<target name="jsr166x-jar"
660	>	<target name="jsr166xjar"
661		depends="jsr166xcompile"
662		description="Builds library jar from compiled sources">
663
#	Line 729 | Line 671
671		<target name="jsr166xdocs"
672		description="Builds javadocs to dist dir">
673
674	<	<delete dir="${dist.jsr166xjavadocs.dir}"/>
675	<	<mkdir dir="${dist.jsr166xjavadocs.dir}"/>
674	>	<delete dir="${jsr166xdocs.dir}"/>
675	>	<mkdir dir="${jsr166xdocs.dir}"/>
676
677	<	<javadoc destdir="${dist.jsr166xjavadocs.dir}"
677	>	<javadoc destdir="${jsr166xdocs.dir}"
678		packagenames="jsr166x.*"
679		link="${jdkapidocs.url}"
680	+	access="${build.javadoc.access}"
681		sourcepath="${topsrc.dir}:${jdk6src.dir}"
682		bootclasspath="${bootclasspath6}"
683		source="5"
#	Line 746 | Line 689
689
690
691		<target name="jsr166xdist"
692	<	depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs"
692	>	depends="jsr166xdist-jar, jsr166xdist-docs"
693		description="Puts all distributable products in single hierarchy"/>
694
695
#	Line 765 | Line 708
708
709
710		<target name="jsr166xdist-jar"
711	<	depends="jsr166xclean, jsr166x-jar">
769	<
711	>	depends="jsr166xclean, jsr166xjar">
712		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
713	+	</target>
714
715	+	<target name="jsr166xdist-docs"
716	+	depends="jsr166xclean, jsr166xdocs">
717	+	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
718		</target>
719
720		<!-- jsr166y -->
#	Line 802 | Line 748
748		</target>
749
750
751	<	<target name="jsr166y-jar"
751	>	<target name="jsr166yjar"
752		depends="jsr166ycompile"
753		description="Builds library jar from compiled sources">
754
#	Line 816 | Line 762
762		<target name="jsr166ydocs"
763		description="Builds javadocs to dist dir">
764
765	<	<delete dir="${dist.jsr166yjavadocs.dir}"/>
766	<	<mkdir dir="${dist.jsr166yjavadocs.dir}"/>
765	>	<delete dir="${jsr166ydocs.dir}"/>
766	>	<mkdir dir="${jsr166ydocs.dir}"/>
767
768	<	<javadoc destdir="${dist.jsr166yjavadocs.dir}"
768	>	<javadoc destdir="${jsr166ydocs.dir}"
769		packagenames="jsr166y.*"
770		link="${jdkapidocs.url}"
771	+	access="${build.javadoc.access}"
772		sourcepath="${topsrc.dir}:${jdk6src.dir}"
773		bootclasspath="${bootclasspath6}"
774		source="6"
#	Line 833 | Line 780
780
781
782		<target name="jsr166ydist"
783	<	depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs"
783	>	depends="jsr166ydist-jar, jsr166ydist-docs"
784		description="Puts all distributable products in single hierarchy"/>
785
786
#	Line 851 | Line 798
798		</target>
799
800		<target name="jsr166ydist-jar"
801	<	depends="jsr166yclean, jsr166y-jar">
855	<
801	>	depends="jsr166yclean, jsr166yjar">
802		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
803	+	</target>
804
805	+	<target name="jsr166ydist-docs"
806	+	depends="jsr166yclean, jsr166ydocs">
807	+	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
808		</target>
809
810
#	Line 862 | Line 812
812
813
814		<target name="extra166ycompile"
815	<	depends="configure-compiler, jsr166y-jar"
815	>	depends="configure-compiler, jsr166yjar"
816		description="Compiles extra166y sources">
817
818		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 889 | Line 839
839		</target>
840
841
842	<	<target name="extra166y-jar"
842	>	<target name="extra166yjar"
843		depends="extra166ycompile"
844		description="Builds library jar from compiled sources">
845
#	Line 903 | Line 853
853		<target name="extra166ydocs"
854		description="Builds javadocs to build dir">
855
856	<	<delete dir="${dist.extra166yjavadocs.dir}"/>
857	<	<mkdir dir="${dist.extra166yjavadocs.dir}"/>
856	>	<delete dir="${extra166ydocs.dir}"/>
857	>	<mkdir dir="${extra166ydocs.dir}"/>
858
859	<	<javadoc destdir="${dist.extra166yjavadocs.dir}"
859	>	<javadoc destdir="${extra166ydocs.dir}"
860		packagenames="extra166y.*"
861		link="${jdkapidocs.url}"
862	+	access="${build.javadoc.access}"
863		sourcepath="${topsrc.dir}:${jdk6src.dir}"
864		bootclasspath="${bootclasspath6}"
865		source="6"
#	Line 920 | Line 871
871
872
873		<target name="extra166ydist"
874	<	depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs"
874	>	depends="extra166ydist-jar, extra166ydist-docs"
875		description="Puts all distributable products in single hierarchy"/>
876
877
#	Line 938 | Line 889
889		</target>
890
891		<target name="extra166ydist-jar"
892	<	depends="extra166yclean, extra166y-jar">
942	<
892	>	depends="extra166yclean, extra166yjar">
893		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
894	+	</target>
895
896	+	<target name="extra166ydist-docs"
897	+	depends="extra166yclean, extra166ydocs">
898	+	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
899		</target>
900
901		<!-- jsr166e -->
902
903	+	<property name="build.jsr166e.java.version" value="6"/>
904	+	<property name="build.jsr166e.javac" value="${javac6}"/>
905	+
906		<target name="jsr166ecompile"
907		depends="configure-compiler"
908		description="Compiles jsr166e sources">
#	Line 957 | Line 914
914		debug="${build.debug}"
915		debuglevel="${build.debuglevel}"
916		deprecation="${build.deprecation}"
917	<	source="7"
917	>	source="${build.jsr166e.java.version}"
918		classpath=""
919		includeAntRuntime="false"
920		includeJavaRuntime="false"
921	<	executable="${javac7}"
921	>	executable="${build.jsr166e.javac}"
922		fork="true">
923
924		<include name="jsr166e/**/*.java"/>
#	Line 973 | Line 930
930		</target>
931
932
933	<	<target name="jsr166e-jar"
933	>	<target name="jsr166ejar"
934		depends="jsr166ecompile"
935		description="Builds library jar from compiled sources">
936
#	Line 987 | Line 944
944		<target name="jsr166edocs"
945		description="Builds javadocs to build dir">
946
947	<	<delete dir="${dist.jsr166ejavadocs.dir}"/>
948	<	<mkdir dir="${dist.jsr166ejavadocs.dir}"/>
947	>	<delete dir="${jsr166edocs.dir}"/>
948	>	<mkdir dir="${jsr166edocs.dir}"/>
949
950	<	<javadoc destdir="${dist.jsr166ejavadocs.dir}"
950	>	<javadoc destdir="${jsr166edocs.dir}"
951		packagenames="jsr166e.*"
952		link="${jdkapidocs.url}"
953	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
954	<	source="7"
953	>	access="${build.javadoc.access}"
954	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
955	>	source="${build.jsr166e.java.version}"
956		executable="${javadoc7}">
957		<arg value="-XDignore.symbol.file=true"/>
958
#	Line 1002 | Line 960
960		</target>
961
962
963	<	<target name="jsr166e-test-tck"
964	<	depends="jsr166e-jar"
963	>	<target name="jsr166e-test-tck-one-java-version"
964	>	depends="jsr166ejar"
965		description="Runs tck tests for jsr166e">
966
967	+	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
968	+
969		<run-tck-tests
970		tck.src.dir="${test.src.dir}/tck-jsr166e"
971	<	source="7"
1012	<	target="8"
971	>	target="${build.jsr166e.java.version}"
972		workdir="${build.jsr166e.dir}"
973		classes="${jsr166e.jar}"/>
974		</target>
975
976	+	<target name="jsr166e-test-tck"
977	+	description="Runs tck tests for jsr166e for multiple java versions">
978	+
979	+	<!--     <antcall target="clean"/> -->
980	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
981	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
982	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
983	+	<!--     </antcall> -->
984	+
985	+	<antcall target="clean"/>
986	+	<antcall target="jsr166e-test-tck-one-java-version">
987	+	<param name="build.jsr166e.java.version" value="7"/>
988	+	<param name="build.jsr166e.javac" value="${javac7}"/>
989	+	</antcall>
990	+
991	+	<antcall target="clean"/>
992	+	<antcall target="jsr166e-test-tck-one-java-version">
993	+	<param name="build.jsr166e.java.version" value="6"/>
994	+	<param name="build.jsr166e.javac" value="${javac6}"/>
995	+	</antcall>
996	+	</target>
997	+
998
999		<target name="jsr166edist"
1000	<	depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs"
1000	>	depends="jsr166edist-jar, jsr166edist-docs"
1001		description="Puts all distributable products in single hierarchy"/>
1002
1003
1004		<target name="jsr166eclean"
1005		description="Removes all jsr166e build products">
1025	–
1006		<delete dir="${build.jsr166e.dir}"/>
1027	–
1007		</target>
1008
1009
#	Line 1034 | Line 1013
1013		</target>
1014
1015		<target name="jsr166edist-jar"
1016	<	depends="jsr166eclean, jsr166e-jar">
1038	<
1016	>	depends="jsr166eclean, jsr166ejar">
1017		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1018	+	</target>
1019	+
1020	+	<target name="jsr166edist-docs"
1021	+	depends="jsr166eclean, jsr166edocs">
1022	+	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1023	+	</target>
1024	+
1025
1026	+	<!-- Find buglets that can be detected by static build tools -->
1027	+
1028	+	<target name="lint">
1029	+	<antcall target="dists">
1030	+	<param name="build.javadoc.access" value="private"/>
1031	+	</antcall>
1032		</target>
1033
1034	+
1035		</project>

Diff Legend

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