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.137 by jsr166, Wed Feb 6 19:55:06 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 170 | Line 179 | As of 2013-02, the very latest lambda 8
179
180		<macrodef name="run-tck-tests">
181		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
173	–	<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=""/>
#	Line 185 | Line 194 | As of 2013-02, the very latest lambda 8
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"/>
#	Line 201 | 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 280 | 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 296 | Line 311 | As of 2013-02, the very latest lambda 8
311		</target>
312
313
299	–	<target name="test"
300	–	depends="configure-tests, report-tests"
301	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
302	–
303	–
314		<target name="docs"
315		description="Builds javadocs for src/main to dist dir">
316
#	Line 321 | 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 367 | Line 384 | As of 2013-02, the very latest lambda 8
384		</target>
385
386
370	–	<!-- Internal targets -->
371	–
372	–
387		<target name="dist-jar"
388		depends="clean, jar">
389		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 381 | Line 395 | As of 2013-02, the very latest lambda 8
395		</target>
396
397
384	–	<target name="compile-tests"
385	–	depends="jar">
386	–
387	–	<mkdir dir="${build.testcases.dir}"/>
388	–
389	–	<javac srcdir="${tck.src.dir}"
390	–	destdir="${build.testcases.dir}"
391	–	debug="${build.debug}"
392	–	debuglevel="${build.debuglevel}"
393	–	deprecation="${build.deprecation}"
394	–	source="6"
395	–	classpath="${junit.jar}"
396	–	bootclasspath="@{product.jar}:${bootclasspath6}"
397	–	includeAntRuntime="false"
398	–	includeJavaRuntime="false"
399	–	executable="${javac8}"
400	–	fork="true">
401	–
402	–	<include name="**/*.java"/>
403	–	<compilerarg value="-XDignore.symbol.file=true"/>
404	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
405	–	<compilerarg line="${build.args}"/>
406	–
407	–	</javac>
408	–
409	–	<javac srcdir="${test.src.dir}"
410	–	destdir="${build.testcases.dir}"
411	–	debug="${build.debug}"
412	–	debuglevel="${build.debuglevel}"
413	–	deprecation="${build.deprecation}"
414	–	source="6"
415	–	classpath=""
416	–	bootclasspath="@{product.jar}:${bootclasspath6}"
417	–	includeAntRuntime="false"
418	–	includeJavaRuntime="false"
419	–	executable="${javac8}"
420	–	fork="true">
421	–
422	–	<include name="jsr166/test/**/*.java"/>
423	–	<compilerarg value="-XDignore.symbol.file=true"/>
424	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
425	–	<compilerarg line="${build.args}"/>
426	–
427	–	</javac>
428	–
429	–	<!--
430	–	<javac srcdir="${jtreg.src.dir}"
431	–	destdir="${build.testcases.dir}"
432	–	debug="${build.debug}"
433	–	debuglevel="${build.debuglevel}"
434	–	deprecation="${build.deprecation}"
435	–	source="${build.sourcelevel}"
436	–	fork="true">
437	–
438	–	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
439	–	<compilerarg value="-XDignore.symbol.file=true"/>
440	–	<compilerarg line="${build.args}"/>
441	–
442	–	</javac>
443	–	-->
444	–
445	–	</target>
446	–
398		<target name="test-tck"
399		depends="jar"
400		description="Runs tck tests for main directly">
#	Line 463 | 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
471	–	<target name="run-tests"
472	–	depends="compile-tests">
473	–
474	–	<!-- May be overridden by user.properties -->
475	–	<property name="testcase" value="*"/>
476	–
477	–	<mkdir dir="${build.reports.dir}"/>
478	–
479	–	<junit printsummary="true"
480	–	showoutput="true"
481	–	errorProperty="junit.failed"
482	–	failureProperty="junit.failed"
483	–	dir="${build.reports.dir}"
484	–	jvm="${java8}"
485	–	fork="true">
486	–
487	–	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
488	–	<jvmarg value="-server"/>
489	–	<jvmarg value="-showversion"/>
490	–
491	–	<classpath refid="test.classpath"/>
492	–
493	–	<formatter type="xml"/>
494	–
495	–	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
496	–	<fileset dir="${tck.src.dir}">
497	–	<include name="**/${testcase}Test.java"/>
498	–	</fileset>
499	–	</batchtest>
500	–
501	–	<batchtest todir="${build.reports.dir}" if="do.test.old">
502	–	<fileset dir="${test.src.dir}">
503	–	<include name="jsr166/test/**/${testcase}Test.java"/>
504	–	</fileset>
505	–	</batchtest>
506	–
507	–	<!--
508	–	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
509	–	<fileset dir="${jtreg.src.dir}">
510	–	<include name="**/${testcase}Test.java"/>
511	–	</fileset>
512	–	</batchtest>
513	–	-->
514	–
515	–	</junit>
516	–
517	–	</target>
518	–
519	–
520	–	<target name="report-tests"
521	–	depends="run-tests">
522	–
523	–	<!-- Sets junit.report.format to frames if redirection is present,
524	–	otherwise sets it to noframes. -->
525	–	<available property="junit.report.format"
526	–	value="frames"
527	–	classname="org.apache.xalan.lib.Redirect"
528	–	/>
529	–	<property name="junit.report.format" value="noframes"/>
530	–
531	–	<junitreport todir="${build.reports.dir}">
532	–	<fileset dir="${build.reports.dir}">
533	–	<include name="TEST-*.xml"/>
534	–	</fileset>
535	–	<report format="${junit.report.format}" todir="${build.reports.dir}"
536	–	/>
537	–	</junitreport>
538	–
539	–	<fail message="Test Cases Failed" if="junit.failed"/>
540	–
541	–	</target>
422
423
424		<target name="configure-compiler">
#	Line 558 | Line 438 | As of 2013-02, the very latest lambda 8
438		</target>
439
440
561	–	<target name="configure-tests"
562	–	depends="configure-compiler">
563	–
564	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
565	–	<available property="junit.available"
566	–	classname="junit.framework.Protectable"/>
567	–
568	–	<!-- Xalan -->
569	–	<available property="xalan.available"
570	–	classname="org.apache.xalan.Version"/>
571	–
572	–
573	–	<!-- Ant 1.6beta and later don't need or want this check -->
574	–	<!--
575	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
576	–	unless="junit.available"/>
577	–
578	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
579	–	unless="xalan.available"/>
580	–	-->
581	–
582	–	</target>
583	–
441
442		<!-- Various demos and test programs -->
443
#	Line 664 | Line 521 | As of 2013-02, the very latest lambda 8
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>
#	Line 693 | 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 705 | 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 1040 | 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 1051 | 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 1088 | 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 1097 | 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	<	source="7"
1107	<	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="jsr166edist"
1003		depends="jsr166edist-jar, jsr166edist-docs"

Diff Legend

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