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.138 by jsr166, Fri Mar 22 18:04:56 2013 UTC vs.
Revision 1.146 by jsr166, Thu Jul 18 18:27:55 2013 UTC

#	Line 44 | Line 44 | As of 2013-02, the very latest lambda 8
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"/>
58		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 202 | Line 211 | As of 2013-02, the very latest lambda 8
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 281 | Line 293 | As of 2013-02, the very latest lambda 8
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 297 | Line 311 | As of 2013-02, the very latest lambda 8
311		</target>
312
313
300	–	<target name="test"
301	–	depends="configure-tests, report-tests"
302	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
303	–
304	–
314		<target name="docs"
315		description="Builds javadocs for src/main to dist dir">
316
#	Line 322 | Line 331 | As of 2013-02, the very latest lambda 8
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 368 | Line 384 | As of 2013-02, the very latest lambda 8
384		</target>
385
386
371	–	<!-- Internal targets -->
372	–
373	–
387		<target name="dist-jar"
388		depends="clean, jar">
389		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 382 | Line 395 | As of 2013-02, the very latest lambda 8
395		</target>
396
397
385	–	<target name="compile-tests"
386	–	depends="jar">
387	–
388	–	<mkdir dir="${build.testcases.dir}"/>
389	–
390	–	<javac srcdir="${tck.src.dir}"
391	–	destdir="${build.testcases.dir}"
392	–	debug="${build.debug}"
393	–	debuglevel="${build.debuglevel}"
394	–	deprecation="${build.deprecation}"
395	–	source="6"
396	–	classpath="${junit.jar}"
397	–	bootclasspath="@{product.jar}:${bootclasspath6}"
398	–	includeAntRuntime="false"
399	–	includeJavaRuntime="false"
400	–	executable="${javac8}"
401	–	fork="true">
402	–
403	–	<include name="**/*.java"/>
404	–	<compilerarg value="-XDignore.symbol.file=true"/>
405	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
406	–	<compilerarg line="${build.args}"/>
407	–
408	–	</javac>
409	–
410	–	<javac srcdir="${test.src.dir}"
411	–	destdir="${build.testcases.dir}"
412	–	debug="${build.debug}"
413	–	debuglevel="${build.debuglevel}"
414	–	deprecation="${build.deprecation}"
415	–	source="6"
416	–	classpath=""
417	–	bootclasspath="@{product.jar}:${bootclasspath6}"
418	–	includeAntRuntime="false"
419	–	includeJavaRuntime="false"
420	–	executable="${javac8}"
421	–	fork="true">
422	–
423	–	<include name="jsr166/test/**/*.java"/>
424	–	<compilerarg value="-XDignore.symbol.file=true"/>
425	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
426	–	<compilerarg line="${build.args}"/>
427	–
428	–	</javac>
429	–
430	–	<!--
431	–	<javac srcdir="${jtreg.src.dir}"
432	–	destdir="${build.testcases.dir}"
433	–	debug="${build.debug}"
434	–	debuglevel="${build.debuglevel}"
435	–	deprecation="${build.deprecation}"
436	–	source="${build.sourcelevel}"
437	–	fork="true">
438	–
439	–	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
440	–	<compilerarg value="-XDignore.symbol.file=true"/>
441	–	<compilerarg line="${build.args}"/>
442	–
443	–	</javac>
444	–	-->
445	–
446	–	</target>
447	–
398		<target name="test-tck"
399		depends="jar"
400		description="Runs tck tests for main directly">
#	Line 464 | Line 414 | As of 2013-02, the very latest lambda 8
414		classes="${product.jar}"/>
415		</target>
416
417	<	<target name="test-ng"
417	>	<target name="test"
418		depends="test-tck, test-jtreg"
419		description="Runs tck and jtreg tests for main">
420		</target>
421
472	–	<target name="run-tests"
473	–	depends="compile-tests">
474	–
475	–	<!-- May be overridden by user.properties -->
476	–	<property name="testcase" value="*"/>
477	–
478	–	<mkdir dir="${build.reports.dir}"/>
479	–
480	–	<junit printsummary="true"
481	–	showoutput="true"
482	–	errorProperty="junit.failed"
483	–	failureProperty="junit.failed"
484	–	dir="${build.reports.dir}"
485	–	jvm="${java8}"
486	–	fork="true">
487	–
488	–	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
489	–	<jvmarg value="-server"/>
490	–	<jvmarg value="-showversion"/>
491	–
492	–	<classpath refid="test.classpath"/>
493	–
494	–	<formatter type="xml"/>
495	–
496	–	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
497	–	<fileset dir="${tck.src.dir}">
498	–	<include name="**/${testcase}Test.java"/>
499	–	</fileset>
500	–	</batchtest>
501	–
502	–	<batchtest todir="${build.reports.dir}" if="do.test.old">
503	–	<fileset dir="${test.src.dir}">
504	–	<include name="jsr166/test/**/${testcase}Test.java"/>
505	–	</fileset>
506	–	</batchtest>
507	–
508	–	<!--
509	–	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
510	–	<fileset dir="${jtreg.src.dir}">
511	–	<include name="**/${testcase}Test.java"/>
512	–	</fileset>
513	–	</batchtest>
514	–	-->
515	–
516	–	</junit>
517	–
518	–	</target>
519	–
520	–
521	–	<target name="report-tests"
522	–	depends="run-tests">
523	–
524	–	<!-- Sets junit.report.format to frames if redirection is present,
525	–	otherwise sets it to noframes. -->
526	–	<available property="junit.report.format"
527	–	value="frames"
528	–	classname="org.apache.xalan.lib.Redirect"
529	–	/>
530	–	<property name="junit.report.format" value="noframes"/>
531	–
532	–	<junitreport todir="${build.reports.dir}">
533	–	<fileset dir="${build.reports.dir}">
534	–	<include name="TEST-*.xml"/>
535	–	</fileset>
536	–	<report format="${junit.report.format}" todir="${build.reports.dir}"
537	–	/>
538	–	</junitreport>
539	–
540	–	<fail message="Test Cases Failed" if="junit.failed"/>
541	–
542	–	</target>
422
423
424		<target name="configure-compiler">
#	Line 559 | Line 438 | As of 2013-02, the very latest lambda 8
438		</target>
439
440
562	–	<target name="configure-tests"
563	–	depends="configure-compiler">
564	–
565	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
566	–	<available property="junit.available"
567	–	classname="junit.framework.Protectable"/>
568	–
569	–	<!-- Xalan -->
570	–	<available property="xalan.available"
571	–	classname="org.apache.xalan.Version"/>
572	–
573	–
574	–	<!-- Ant 1.6beta and later don't need or want this check -->
575	–	<!--
576	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
577	–	unless="junit.available"/>
578	–
579	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
580	–	unless="xalan.available"/>
581	–	-->
582	–
583	–	</target>
584	–
441
442		<!-- Various demos and test programs -->
443
#	Line 670 | Line 526 | As of 2013-02, the very latest lambda 8
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>
#	Line 698 | Line 555 | As of 2013-02, the very latest lambda 8
555
556		<formatter type="brief"/>
557
558	<	<test name="JSR166TestCase" haltonfailure="no">
558	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
559		</test>
560
561		</junit>
#	Line 710 | Line 567 | As of 2013-02, the very latest lambda 8
567		<run-jtreg-tests
568		target="7"
569		workdir="${build.4jdk7.dir}"
570	<	classes="${4jdk7product.jar}"/>
570	>	classes="${4jdk7product.jar}"
571	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
572		</target>
573
574
#	Line 1045 | Line 903 | As of 2013-02, the very latest lambda 8
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 1056 | Line 917 | As of 2013-02, the very latest lambda 8
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 1093 | Line 954 | As of 2013-02, the very latest lambda 8
954		packagenames="jsr166e.*"
955		link="${jdkapidocs.url}"
956		access="${build.javadoc.access}"
957	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
958	<	source="7"
957	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
958	>	source="${build.jsr166e.java.version}"
959		executable="${javadoc7}">
960		<arg value="-XDignore.symbol.file=true"/>
961
#	Line 1102 | Line 963 | As of 2013-02, the very latest lambda 8
963		</target>
964
965
966	<	<target name="jsr166e-test-tck"
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	<	target="7"
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="jsr166edist"
1003		depends="jsr166edist-jar, jsr166edist-docs"

Diff Legend

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