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.126 by jsr166, Wed Jan 23 06:46:27 2013 UTC vs.
Revision 1.147 by jsr166, Sat Jul 20 17:21:45 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 118 | Line 131
131		<property name="extra166ysrc.dir"     location="${topsrc.dir}/extra166y"/>
132
133		<!-- Javadoc locations -->
134	<	<property name="javadocs.dir"          location="${build.dir}/javadocs"/>
135	<	<property name="4jdk7javadocs.dir"     location="${build.4jdk7.dir}/javadocs"/>
136	<	<property name="jsr166xjavadocs.dir"   location="${build.jsr166x.dir}/javadocs"/>
137	<	<property name="jsr166yjavadocs.dir"   location="${build.jsr166y.dir}/javadocs"/>
138	<	<property name="jsr166ejavadocs.dir"   location="${build.jsr166e.dir}/javadocs"/>
139	<	<property name="extra166yjavadocs.dir" location="${build.extra166y.dir}/javadocs"/>
140	<
141	<	<property name="dist.javadocs.dir"          location="${dist.dir}/docs"/>
142	<	<property name="dist.4jdk7javadocs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
143	<	<property name="dist.jsr166xjavadocs.dir"   location="${dist.dir}/jsr166xdocs"/>
144	<	<property name="dist.jsr166yjavadocs.dir"   location="${dist.dir}/jsr166ydocs"/>
145	<	<property name="dist.jsr166ejavadocs.dir"   location="${dist.dir}/jsr166edocs"/>
146	<	<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/>
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 166 | Line 179
179
180		<macrodef name="run-tck-tests">
181		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
169	–	<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 180 | 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 210 | 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 243 | 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 value="-Xdoclint:all/protected"/>
297	+	<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
298		<compilerarg line="${build.args}"/>
299
300		</javac>
#	Line 261 | Line 311
311		</target>
312
313
264	–	<target name="test"
265	–	depends="configure-tests, report-tests"
266	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
267	–
268	–
314		<target name="docs"
315		description="Builds javadocs for src/main to dist dir">
316
317	<	<delete dir="${javadocs.dir}"/>
318	<	<mkdir dir="${javadocs.dir}"/>
317	>	<delete dir="${docs.dir}"/>
318	>	<mkdir dir="${docs.dir}"/>
319
320		<!-- the packagenames="none" hack below prevents scanning the -->
321		<!-- sourcepath for packages -->
322
323	<	<javadoc destdir="${javadocs.dir}"
323	>	<javadoc destdir="${docs.dir}"
324		packagenames="none"
325		link="${jdkapi8docs.url}"
326		overview="${src.dir}/intro.html"
327	+	access="${build.javadoc.access}"
328		sourcepath="${src.dir}:${jdk8src.dir}"
329		classpath=""
330		executable="${javadoc8}">
331		<fileset dir="${src.dir}" defaultexcludes="yes">
332		<include name="**/*.java"/>
333		</fileset>
334	+	<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
335		<arg value="-XDignore.symbol.file=true"/>
336		<arg value="-tag"/>
337		<arg value="${javadoc.jls.option}"/>
338	+	<arg value="-tag"/>
339	+	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
340	+	<arg value="-tag"/>
341	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
342	+	<arg value="-tag"/>
343	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
344		</javadoc>
345		</target>
346
#	Line 331 | Line 384
384		</target>
385
386
334	–	<!-- Internal targets -->
335	–
336	–
387		<target name="dist-jar"
388		depends="clean, jar">
389		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 341 | Line 391
391
392		<target name="dist-docs"
393		depends="clean, docs">
394	<	<mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/>
394	>	<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
395		</target>
396
397
398	<	<target name="compile-tests"
399	<	depends="jar">
400	<
351	<	<mkdir dir="${build.testcases.dir}"/>
352	<
353	<	<javac srcdir="${tck.src.dir}"
354	<	destdir="${build.testcases.dir}"
355	<	debug="${build.debug}"
356	<	debuglevel="${build.debuglevel}"
357	<	deprecation="${build.deprecation}"
358	<	source="6"
359	<	classpath="${junit.jar}"
360	<	bootclasspath="@{product.jar}:${bootclasspath6}"
361	<	includeAntRuntime="false"
362	<	includeJavaRuntime="false"
363	<	executable="${javac8}"
364	<	fork="true">
365	<
366	<	<include name="**/*.java"/>
367	<	<compilerarg value="-XDignore.symbol.file=true"/>
368	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
369	<	<compilerarg line="${build.args}"/>
370	<
371	<	</javac>
372	<
373	<	<javac srcdir="${test.src.dir}"
374	<	destdir="${build.testcases.dir}"
375	<	debug="${build.debug}"
376	<	debuglevel="${build.debuglevel}"
377	<	deprecation="${build.deprecation}"
378	<	source="6"
379	<	classpath=""
380	<	bootclasspath="@{product.jar}:${bootclasspath6}"
381	<	includeAntRuntime="false"
382	<	includeJavaRuntime="false"
383	<	executable="${javac8}"
384	<	fork="true">
385	<
386	<	<include name="jsr166/test/**/*.java"/>
387	<	<compilerarg value="-XDignore.symbol.file=true"/>
388	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
389	<	<compilerarg line="${build.args}"/>
390	<
391	<	</javac>
392	<
393	<	<!--
394	<	<javac srcdir="${jtreg.src.dir}"
395	<	destdir="${build.testcases.dir}"
396	<	debug="${build.debug}"
397	<	debuglevel="${build.debuglevel}"
398	<	deprecation="${build.deprecation}"
399	<	source="${build.sourcelevel}"
400	<	fork="true">
401	<
402	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
403	<	<compilerarg value="-XDignore.symbol.file=true"/>
404	<	<compilerarg line="${build.args}"/>
405	<
406	<	</javac>
407	<	-->
398	>	<target name="test-tck"
399	>	depends="jar"
400	>	description="Runs tck tests for main directly">
401
402	+	<run-tck-tests
403	+	target="8"
404	+	workdir="${build.dir}"
405	+	classes="${product.jar}"/>
406		</target>
407
408	<
409	<	<target name="run-tests"
410	<	depends="compile-tests">
411	<
412	<	<!-- May be overridden by user.properties -->
413	<	<property name="testcase" value="*"/>
414	<
418	<	<mkdir dir="${build.reports.dir}"/>
419	<
420	<	<junit printsummary="true"
421	<	showoutput="true"
422	<	errorProperty="junit.failed"
423	<	failureProperty="junit.failed"
424	<	dir="${build.reports.dir}"
425	<	jvm="${java8}"
426	<	fork="true">
427	<
428	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
429	<	<jvmarg value="-server"/>
430	<	<jvmarg value="-showversion"/>
431	<
432	<	<classpath refid="test.classpath"/>
433	<
434	<	<formatter type="xml"/>
435	<
436	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
437	<	<fileset dir="${tck.src.dir}">
438	<	<include name="**/${testcase}Test.java"/>
439	<	</fileset>
440	<	</batchtest>
441	<
442	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
443	<	<fileset dir="${test.src.dir}">
444	<	<include name="jsr166/test/**/${testcase}Test.java"/>
445	<	</fileset>
446	<	</batchtest>
447	<
448	<	<!--
449	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
450	<	<fileset dir="${jtreg.src.dir}">
451	<	<include name="**/${testcase}Test.java"/>
452	<	</fileset>
453	<	</batchtest>
454	<	-->
455	<
456	<	</junit>
457	<
408	>	<target name="test-jtreg"
409	>	depends="jar"
410	>	description="Runs jtreg tests for main using the jtreg ant task">
411	>	<run-jtreg-tests
412	>	target="8"
413	>	workdir="${build.dir}"
414	>	classes="${product.jar}"/>
415		</target>
416
417	<
418	<	<target name="report-tests"
419	<	depends="run-tests">
463	<
464	<	<!-- Sets junit.report.format to frames if redirection is present,
465	<	otherwise sets it to noframes. -->
466	<	<available property="junit.report.format"
467	<	value="frames"
468	<	classname="org.apache.xalan.lib.Redirect"
469	<	/>
470	<	<property name="junit.report.format" value="noframes"/>
471	<
472	<	<junitreport todir="${build.reports.dir}">
473	<	<fileset dir="${build.reports.dir}">
474	<	<include name="TEST-*.xml"/>
475	<	</fileset>
476	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
477	<	/>
478	<	</junitreport>
479	<
480	<	<fail message="Test Cases Failed" if="junit.failed"/>
481	<
417	>	<target name="test"
418	>	depends="test-tck, test-jtreg"
419	>	description="Runs tck and jtreg tests for main">
420		</target>
421
422
423	+
424		<target name="configure-compiler">
425
426		<property name="unchecked.option" value="-Xlint:unchecked"/>
#	Line 499 | Line 438
438		</target>
439
440
502	–	<target name="configure-tests"
503	–	depends="configure-compiler">
504	–
505	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
506	–	<available property="junit.available"
507	–	classname="junit.framework.Protectable"/>
508	–
509	–	<!-- Xalan -->
510	–	<available property="xalan.available"
511	–	classname="org.apache.xalan.Version"/>
512	–
513	–
514	–	<!-- Ant 1.6beta and later don't need or want this check -->
515	–	<!--
516	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
517	–	unless="junit.available"/>
518	–
519	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
520	–	unless="xalan.available"/>
521	–	-->
522	–
523	–	</target>
524	–
441
442		<!-- Various demos and test programs -->
443
#	Line 574 | Line 490
490		fork="true">
491
492		<include name="**/*.java"/>
493	+	<compilerarg value="-Xprefer:source"/>
494		<compilerarg value="-XDignore.symbol.file=true"/>
495		<compilerarg value="-Xlint:all"/>
496		<compilerarg line="${build.args}"/>
#	Line 582 | Line 499
499		</target>
500
501
502	<	<target name="4jdk7-jar"
502	>	<target name="4jdk7jar"
503		depends="4jdk7compile"
504		description="Builds library jar from compiled sources">
505
#	Line 594 | Line 511
511
512
513		<target name="4jdk7-test-tck"
514	<	depends="4jdk7-jar"
514	>	depends="4jdk7jar"
515		description="Runs tck tests for jsr166-4jdk7 directly">
516
517		<run-tck-tests
518		target="7"
519		workdir="${build.4jdk7.dir}"
520	<	classes="${4jdk7product.jar}"/>
520	>	classes="${4jdk7product.jar}">
521	>	<javac-elements>
522	>	<!-- JDK8+ test classes -->
523	>	<exclude name="*8Test.java"/>
524	>	<exclude name="DoubleAccumulatorTest.java"/>
525	>	<exclude name="DoubleAdderTest.java"/>
526	>	<exclude name="LongAccumulatorTest.java"/>
527	>	<exclude name="LongAdderTest.java"/>
528	>	<exclude name="CompletableFutureTest.java"/>
529	>	<exclude name="SplittableRandomTest.java"/>
530	>	<exclude name="StampedLockTest.java"/>
531	>	</javac-elements>
532	>	</run-tck-tests>
533		</target>
534
535
#	Line 626 | Line 555
555
556		<formatter type="brief"/>
557
558	<	<test name="JSR166TestCase" haltonfailure="no">
558	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
559		</test>
560
561		</junit>
562		</target>
563
564		<target name="4jdk7-test-jtreg"
565	<	depends="4jdk7compile"
565	>	depends="4jdk7jar"
566		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
567	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
568	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
569	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
570	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
571	<	<jtreg dir="${jtreg.src.dir}"
643	<	jdk="${jdk7.home}"
644	<	workDir="${build.4jdk7.dir}/JTwork"
645	<	reportDir="${build.4jdk7.dir}/JTreport">
646	<
647	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
648	<	<arg value="-agentvm"/>
649	<	<arg value="-v:nopass,fail"/>
650	<	<arg value="-vmoptions:-esa -ea"/>
651	<	<arg value="-automatic"/>
652	<	<arg value="-k:!ignore"/>
653	<	</jtreg>
567	>	<run-jtreg-tests
568	>	target="7"
569	>	workdir="${build.4jdk7.dir}"
570	>	classes="${4jdk7product.jar}"
571	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
572		</target>
573
574
#	Line 663 | Line 581
581		<target name="4jdk7docs"
582		description="Builds javadocs for src/jdk7 to dist dir">
583
584	<	<delete dir="${4jdk7javadocs.dir}"/>
585	<	<mkdir dir="${4jdk7javadocs.dir}"/>
584	>	<delete dir="${4jdk7docs.dir}"/>
585	>	<mkdir dir="${4jdk7docs.dir}"/>
586
587	<	<javadoc destdir="${4jdk7javadocs.dir}"
587	>	<javadoc destdir="${4jdk7docs.dir}"
588		packagenames="none"
589		link="${jdkapi7docs.url}"
590		overview="${4jdk7src.dir}/intro.html"
591	+	access="${build.javadoc.access}"
592		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
593		classpath=""
594		executable="${javadoc7}">
#	Line 700 | Line 619
619		</target>
620
621		<target name="4jdk7dist-jar"
622	<	depends="4jdk7clean, 4jdk7-jar">
622	>	depends="4jdk7clean, 4jdk7jar">
623		<copy file="${4jdk7product.jar}" todir="${dist.dir}"/>
624		</target>
625
626
627		<target name="4jdk7dist-docs"
628		depends="4jdk7clean, 4jdk7docs">
629	<	<mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/>
629	>	<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/>
630		</target>
631
632
#	Line 741 | Line 660
660		</target>
661
662
663	<	<target name="jsr166x-jar"
663	>	<target name="jsr166xjar"
664		depends="jsr166xcompile"
665		description="Builds library jar from compiled sources">
666
#	Line 755 | Line 674
674		<target name="jsr166xdocs"
675		description="Builds javadocs to dist dir">
676
677	<	<delete dir="${jsr166xjavadocs.dir}"/>
678	<	<mkdir dir="${jsr166xjavadocs.dir}"/>
677	>	<delete dir="${jsr166xdocs.dir}"/>
678	>	<mkdir dir="${jsr166xdocs.dir}"/>
679
680	<	<javadoc destdir="${jsr166xjavadocs.dir}"
680	>	<javadoc destdir="${jsr166xdocs.dir}"
681		packagenames="jsr166x.*"
682		link="${jdkapidocs.url}"
683	+	access="${build.javadoc.access}"
684		sourcepath="${topsrc.dir}:${jdk6src.dir}"
685		bootclasspath="${bootclasspath6}"
686		source="5"
#	Line 791 | Line 711
711
712
713		<target name="jsr166xdist-jar"
714	<	depends="jsr166xclean, jsr166x-jar">
714	>	depends="jsr166xclean, jsr166xjar">
715		<copy file="${jsr166x.jar}" todir="${dist.dir}"/>
716		</target>
717
718		<target name="jsr166xdist-docs"
719		depends="jsr166xclean, jsr166xdocs">
720	<	<mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/>
720	>	<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/>
721		</target>
722
723		<!-- jsr166y -->
#	Line 831 | Line 751
751		</target>
752
753
754	<	<target name="jsr166y-jar"
754	>	<target name="jsr166yjar"
755		depends="jsr166ycompile"
756		description="Builds library jar from compiled sources">
757
#	Line 845 | Line 765
765		<target name="jsr166ydocs"
766		description="Builds javadocs to dist dir">
767
768	<	<delete dir="${jsr166yjavadocs.dir}"/>
769	<	<mkdir dir="${jsr166yjavadocs.dir}"/>
768	>	<delete dir="${jsr166ydocs.dir}"/>
769	>	<mkdir dir="${jsr166ydocs.dir}"/>
770
771	<	<javadoc destdir="${jsr166yjavadocs.dir}"
771	>	<javadoc destdir="${jsr166ydocs.dir}"
772		packagenames="jsr166y.*"
773		link="${jdkapidocs.url}"
774	+	access="${build.javadoc.access}"
775		sourcepath="${topsrc.dir}:${jdk6src.dir}"
776		bootclasspath="${bootclasspath6}"
777		source="6"
#	Line 880 | Line 801
801		</target>
802
803		<target name="jsr166ydist-jar"
804	<	depends="jsr166yclean, jsr166y-jar">
804	>	depends="jsr166yclean, jsr166yjar">
805		<copy file="${jsr166y.jar}" todir="${dist.dir}"/>
806		</target>
807
808		<target name="jsr166ydist-docs"
809		depends="jsr166yclean, jsr166ydocs">
810	<	<mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/>
810	>	<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/>
811		</target>
812
813
#	Line 894 | Line 815
815
816
817		<target name="extra166ycompile"
818	<	depends="configure-compiler, jsr166y-jar"
818	>	depends="configure-compiler, jsr166yjar"
819		description="Compiles extra166y sources">
820
821		<mkdir dir="${build.extra166y.classes.dir}"/>
#	Line 921 | Line 842
842		</target>
843
844
845	<	<target name="extra166y-jar"
845	>	<target name="extra166yjar"
846		depends="extra166ycompile"
847		description="Builds library jar from compiled sources">
848
#	Line 935 | Line 856
856		<target name="extra166ydocs"
857		description="Builds javadocs to build dir">
858
859	<	<delete dir="${extra166yjavadocs.dir}"/>
860	<	<mkdir dir="${extra166yjavadocs.dir}"/>
859	>	<delete dir="${extra166ydocs.dir}"/>
860	>	<mkdir dir="${extra166ydocs.dir}"/>
861
862	<	<javadoc destdir="${extra166yjavadocs.dir}"
862	>	<javadoc destdir="${extra166ydocs.dir}"
863		packagenames="extra166y.*"
864		link="${jdkapidocs.url}"
865	+	access="${build.javadoc.access}"
866		sourcepath="${topsrc.dir}:${jdk6src.dir}"
867		bootclasspath="${bootclasspath6}"
868		source="6"
#	Line 970 | Line 892
892		</target>
893
894		<target name="extra166ydist-jar"
895	<	depends="extra166yclean, extra166y-jar">
895	>	depends="extra166yclean, extra166yjar">
896		<copy file="${extra166y.jar}" todir="${dist.dir}"/>
897		</target>
898
899		<target name="extra166ydist-docs"
900		depends="extra166yclean, extra166ydocs">
901	<	<mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/>
901	>	<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/>
902		</target>
903
904		<!-- jsr166e -->
905
906	+	<property name="build.jsr166e.java.version" value="6"/>
907	+	<property name="build.jsr166e.javac" value="${javac6}"/>
908	+
909		<target name="jsr166ecompile"
910		depends="configure-compiler"
911		description="Compiles jsr166e sources">
#	Line 992 | Line 917
917		debug="${build.debug}"
918		debuglevel="${build.debuglevel}"
919		deprecation="${build.deprecation}"
920	<	source="7"
920	>	source="${build.jsr166e.java.version}"
921		classpath=""
922		includeAntRuntime="false"
923		includeJavaRuntime="false"
924	<	executable="${javac7}"
924	>	executable="${build.jsr166e.javac}"
925		fork="true">
926
927		<include name="jsr166e/**/*.java"/>
#	Line 1008 | Line 933
933		</target>
934
935
936	<	<target name="jsr166e-jar"
936	>	<target name="jsr166ejar"
937		depends="jsr166ecompile"
938		description="Builds library jar from compiled sources">
939
#	Line 1022 | Line 947
947		<target name="jsr166edocs"
948		description="Builds javadocs to build dir">
949
950	<	<delete dir="${jsr166ejavadocs.dir}"/>
951	<	<mkdir dir="${jsr166ejavadocs.dir}"/>
950	>	<delete dir="${jsr166edocs.dir}"/>
951	>	<mkdir dir="${jsr166edocs.dir}"/>
952
953	<	<javadoc destdir="${jsr166ejavadocs.dir}"
953	>	<javadoc destdir="${jsr166edocs.dir}"
954		packagenames="jsr166e.*"
955		link="${jdkapidocs.url}"
956	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
957	<	source="7"
956	>	access="${build.javadoc.access}"
957	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
958	>	source="${build.jsr166e.java.version}"
959		executable="${javadoc7}">
960		<arg value="-XDignore.symbol.file=true"/>
961
#	Line 1037 | Line 963
963		</target>
964
965
966	<	<target name="jsr166e-test-tck"
967	<	depends="jsr166e-jar"
966	>	<target name="jsr166e-test-tck-one-java-version"
967	>	depends="jsr166ejar"
968		description="Runs tck tests for jsr166e">
969
970	+	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
971	+
972		<run-tck-tests
973		tck.src.dir="${test.src.dir}/tck-jsr166e"
974	<	source="7"
1047	<	target="8"
974	>	target="${build.jsr166e.java.version}"
975		workdir="${build.jsr166e.dir}"
976		classes="${jsr166e.jar}"/>
977		</target>
978
979	+	<target name="jsr166e-test-tck"
980	+	description="Runs tck tests for jsr166e for multiple java versions">
981	+
982	+	<!--     <antcall target="clean"/> -->
983	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
984	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
985	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
986	+	<!--     </antcall> -->
987	+
988	+	<antcall target="clean"/>
989	+	<antcall target="jsr166e-test-tck-one-java-version">
990	+	<param name="build.jsr166e.java.version" value="7"/>
991	+	<param name="build.jsr166e.javac" value="${javac7}"/>
992	+	</antcall>
993	+
994	+	<antcall target="clean"/>
995	+	<antcall target="jsr166e-test-tck-one-java-version">
996	+	<param name="build.jsr166e.java.version" value="6"/>
997	+	<param name="build.jsr166e.javac" value="${javac6}"/>
998	+	</antcall>
999	+	</target>
1000	+
1001	+
1002	+	<target name="jsr166e-test"
1003	+	depends="jsr166e-test-tck"
1004	+	description="Runs all tests for jsr166e">
1005	+	</target>
1006
1007		<target name="jsr166edist"
1008		depends="jsr166edist-jar, jsr166edist-docs"
#	Line 1067 | Line 1021
1021		</target>
1022
1023		<target name="jsr166edist-jar"
1024	<	depends="jsr166eclean, jsr166e-jar">
1024	>	depends="jsr166eclean, jsr166ejar">
1025		<copy file="${jsr166e.jar}" todir="${dist.dir}"/>
1026		</target>
1027
1028		<target name="jsr166edist-docs"
1029		depends="jsr166eclean, jsr166edocs">
1030	<	<mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/>
1030	>	<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/>
1031		</target>
1032
1033	+
1034	+	<!-- Find buglets that can be detected by static build tools -->
1035	+
1036	+	<target name="lint">
1037	+	<antcall target="dists">
1038	+	<param name="build.javadoc.access" value="private"/>
1039	+	</antcall>
1040	+	</target>
1041	+
1042	+
1043		</project>

Diff Legend

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