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.140 by jsr166, Mon May 20 19:12:23 2013 UTC vs.
Revision 1.147 by jsr166, Sat Jul 20 17:21:45 2013 UTC

#	Line 293 | 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 309 | Line 311 | As of 2013-02, the very latest lambda 8
311		</target>
312
313
312	–	<target name="test"
313	–	depends="configure-tests, report-tests"
314	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
315	–
316	–
314		<target name="docs"
315		description="Builds javadocs for src/main to dist dir">
316
#	Line 334 | 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 380 | Line 384 | As of 2013-02, the very latest lambda 8
384		</target>
385
386
383	–	<!-- Internal targets -->
384	–
385	–
387		<target name="dist-jar"
388		depends="clean, jar">
389		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 394 | Line 395 | As of 2013-02, the very latest lambda 8
395		</target>
396
397
397	–	<target name="compile-tests"
398	–	depends="jar">
399	–
400	–	<mkdir dir="${build.testcases.dir}"/>
401	–
402	–	<javac srcdir="${tck.src.dir}"
403	–	destdir="${build.testcases.dir}"
404	–	debug="${build.debug}"
405	–	debuglevel="${build.debuglevel}"
406	–	deprecation="${build.deprecation}"
407	–	source="6"
408	–	classpath="${junit.jar}"
409	–	bootclasspath="@{product.jar}:${bootclasspath6}"
410	–	includeAntRuntime="false"
411	–	includeJavaRuntime="false"
412	–	executable="${javac8}"
413	–	fork="true">
414	–
415	–	<include name="**/*.java"/>
416	–	<compilerarg value="-XDignore.symbol.file=true"/>
417	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
418	–	<compilerarg line="${build.args}"/>
419	–
420	–	</javac>
421	–
422	–	<javac srcdir="${test.src.dir}"
423	–	destdir="${build.testcases.dir}"
424	–	debug="${build.debug}"
425	–	debuglevel="${build.debuglevel}"
426	–	deprecation="${build.deprecation}"
427	–	source="6"
428	–	classpath=""
429	–	bootclasspath="@{product.jar}:${bootclasspath6}"
430	–	includeAntRuntime="false"
431	–	includeJavaRuntime="false"
432	–	executable="${javac8}"
433	–	fork="true">
434	–
435	–	<include name="jsr166/test/**/*.java"/>
436	–	<compilerarg value="-XDignore.symbol.file=true"/>
437	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
438	–	<compilerarg line="${build.args}"/>
439	–
440	–	</javac>
441	–
442	–	<!--
443	–	<javac srcdir="${jtreg.src.dir}"
444	–	destdir="${build.testcases.dir}"
445	–	debug="${build.debug}"
446	–	debuglevel="${build.debuglevel}"
447	–	deprecation="${build.deprecation}"
448	–	source="${build.sourcelevel}"
449	–	fork="true">
450	–
451	–	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
452	–	<compilerarg value="-XDignore.symbol.file=true"/>
453	–	<compilerarg line="${build.args}"/>
454	–
455	–	</javac>
456	–	-->
457	–
458	–	</target>
459	–
398		<target name="test-tck"
399		depends="jar"
400		description="Runs tck tests for main directly">
#	Line 476 | 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
484	–	<target name="run-tests"
485	–	depends="compile-tests">
486	–
487	–	<!-- May be overridden by user.properties -->
488	–	<property name="testcase" value="*"/>
489	–
490	–	<mkdir dir="${build.reports.dir}"/>
491	–
492	–	<junit printsummary="true"
493	–	showoutput="true"
494	–	errorProperty="junit.failed"
495	–	failureProperty="junit.failed"
496	–	dir="${build.reports.dir}"
497	–	jvm="${java8}"
498	–	fork="true">
499	–
500	–	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
501	–	<jvmarg value="-server"/>
502	–	<jvmarg value="-showversion"/>
503	–
504	–	<classpath refid="test.classpath"/>
505	–
506	–	<formatter type="xml"/>
507	–
508	–	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
509	–	<fileset dir="${tck.src.dir}">
510	–	<include name="**/${testcase}Test.java"/>
511	–	</fileset>
512	–	</batchtest>
513	–
514	–	<batchtest todir="${build.reports.dir}" if="do.test.old">
515	–	<fileset dir="${test.src.dir}">
516	–	<include name="jsr166/test/**/${testcase}Test.java"/>
517	–	</fileset>
518	–	</batchtest>
519	–
520	–	<!--
521	–	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
522	–	<fileset dir="${jtreg.src.dir}">
523	–	<include name="**/${testcase}Test.java"/>
524	–	</fileset>
525	–	</batchtest>
526	–	-->
527	–
528	–	</junit>
529	–
530	–	</target>
531	–
532	–
533	–	<target name="report-tests"
534	–	depends="run-tests">
535	–
536	–	<!-- Sets junit.report.format to frames if redirection is present,
537	–	otherwise sets it to noframes. -->
538	–	<available property="junit.report.format"
539	–	value="frames"
540	–	classname="org.apache.xalan.lib.Redirect"
541	–	/>
542	–	<property name="junit.report.format" value="noframes"/>
543	–
544	–	<junitreport todir="${build.reports.dir}">
545	–	<fileset dir="${build.reports.dir}">
546	–	<include name="TEST-*.xml"/>
547	–	</fileset>
548	–	<report format="${junit.report.format}" todir="${build.reports.dir}"
549	–	/>
550	–	</junitreport>
551	–
552	–	<fail message="Test Cases Failed" if="junit.failed"/>
553	–
554	–	</target>
422
423
424		<target name="configure-compiler">
#	Line 571 | Line 438 | As of 2013-02, the very latest lambda 8
438		</target>
439
440
574	–	<target name="configure-tests"
575	–	depends="configure-compiler">
576	–
577	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
578	–	<available property="junit.available"
579	–	classname="junit.framework.Protectable"/>
580	–
581	–	<!-- Xalan -->
582	–	<available property="xalan.available"
583	–	classname="org.apache.xalan.Version"/>
584	–
585	–
586	–	<!-- Ant 1.6beta and later don't need or want this check -->
587	–	<!--
588	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
589	–	unless="junit.available"/>
590	–
591	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
592	–	unless="xalan.available"/>
593	–	-->
594	–
595	–	</target>
596	–
441
442		<!-- Various demos and test programs -->
443
#	Line 682 | 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 722 | 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 1057 | 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 1068 | 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 1105 | 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 1114 | 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="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"

Diff Legend

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