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.132 by jsr166, Fri Feb 1 21:58:27 2013 UTC vs.
Revision 1.144 by jsr166, Sun Jul 14 19:55:04 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 216 | Line 229 | As of 2013-02, the very latest lambda 8
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 249 | Line 290 | As of 2013-02, the very latest lambda 8
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 267 | Line 309 | As of 2013-02, the very latest lambda 8
309		</target>
310
311
270	–	<target name="test"
271	–	depends="configure-tests, report-tests"
272	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
273	–
274	–
312		<target name="docs"
313		description="Builds javadocs for src/main to dist dir">
314
#	Line 295 | Line 332 | As of 2013-02, the very latest lambda 8
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
#	Line 338 | Line 381 | As of 2013-02, the very latest lambda 8
381		</target>
382
383
341	–	<!-- Internal targets -->
342	–
343	–
384		<target name="dist-jar"
385		depends="clean, jar">
386		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 352 | Line 392 | As of 2013-02, the very latest lambda 8
392		</target>
393
394
355	–	<target name="compile-tests"
356	–	depends="jar">
357	–
358	–	<mkdir dir="${build.testcases.dir}"/>
359	–
360	–	<javac srcdir="${tck.src.dir}"
361	–	destdir="${build.testcases.dir}"
362	–	debug="${build.debug}"
363	–	debuglevel="${build.debuglevel}"
364	–	deprecation="${build.deprecation}"
365	–	source="6"
366	–	classpath="${junit.jar}"
367	–	bootclasspath="@{product.jar}:${bootclasspath6}"
368	–	includeAntRuntime="false"
369	–	includeJavaRuntime="false"
370	–	executable="${javac8}"
371	–	fork="true">
372	–
373	–	<include name="**/*.java"/>
374	–	<compilerarg value="-XDignore.symbol.file=true"/>
375	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
376	–	<compilerarg line="${build.args}"/>
377	–
378	–	</javac>
379	–
380	–	<javac srcdir="${test.src.dir}"
381	–	destdir="${build.testcases.dir}"
382	–	debug="${build.debug}"
383	–	debuglevel="${build.debuglevel}"
384	–	deprecation="${build.deprecation}"
385	–	source="6"
386	–	classpath=""
387	–	bootclasspath="@{product.jar}:${bootclasspath6}"
388	–	includeAntRuntime="false"
389	–	includeJavaRuntime="false"
390	–	executable="${javac8}"
391	–	fork="true">
392	–
393	–	<include name="jsr166/test/**/*.java"/>
394	–	<compilerarg value="-XDignore.symbol.file=true"/>
395	–	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
396	–	<compilerarg line="${build.args}"/>
397	–
398	–	</javac>
399	–
400	–	<!--
401	–	<javac srcdir="${jtreg.src.dir}"
402	–	destdir="${build.testcases.dir}"
403	–	debug="${build.debug}"
404	–	debuglevel="${build.debuglevel}"
405	–	deprecation="${build.deprecation}"
406	–	source="${build.sourcelevel}"
407	–	fork="true">
408	–
409	–	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
410	–	<compilerarg value="-XDignore.symbol.file=true"/>
411	–	<compilerarg line="${build.args}"/>
412	–
413	–	</javac>
414	–	-->
415	–
416	–	</target>
417	–
395		<target name="test-tck"
396		depends="jar"
397		description="Runs tck tests for main directly">
#	Line 425 | Line 402 | As of 2013-02, the very latest lambda 8
402		classes="${product.jar}"/>
403		</target>
404
405	<	<target name="run-tests"
406	<	depends="compile-tests">
407	<
408	<	<!-- May be overridden by user.properties -->
409	<	<property name="testcase" value="*"/>
410	<
411	<	<mkdir dir="${build.reports.dir}"/>
435	<
436	<	<junit printsummary="true"
437	<	showoutput="true"
438	<	errorProperty="junit.failed"
439	<	failureProperty="junit.failed"
440	<	dir="${build.reports.dir}"
441	<	jvm="${java8}"
442	<	fork="true">
443	<
444	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
445	<	<jvmarg value="-server"/>
446	<	<jvmarg value="-showversion"/>
447	<
448	<	<classpath refid="test.classpath"/>
449	<
450	<	<formatter type="xml"/>
451	<
452	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
453	<	<fileset dir="${tck.src.dir}">
454	<	<include name="**/${testcase}Test.java"/>
455	<	</fileset>
456	<	</batchtest>
457	<
458	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
459	<	<fileset dir="${test.src.dir}">
460	<	<include name="jsr166/test/**/${testcase}Test.java"/>
461	<	</fileset>
462	<	</batchtest>
463	<
464	<	<!--
465	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
466	<	<fileset dir="${jtreg.src.dir}">
467	<	<include name="**/${testcase}Test.java"/>
468	<	</fileset>
469	<	</batchtest>
470	<	-->
471	<
472	<	</junit>
473	<
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	<
415	<	<target name="report-tests"
416	<	depends="run-tests">
479	<
480	<	<!-- Sets junit.report.format to frames if redirection is present,
481	<	otherwise sets it to noframes. -->
482	<	<available property="junit.report.format"
483	<	value="frames"
484	<	classname="org.apache.xalan.lib.Redirect"
485	<	/>
486	<	<property name="junit.report.format" value="noframes"/>
487	<
488	<	<junitreport todir="${build.reports.dir}">
489	<	<fileset dir="${build.reports.dir}">
490	<	<include name="TEST-*.xml"/>
491	<	</fileset>
492	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
493	<	/>
494	<	</junitreport>
495	<
496	<	<fail message="Test Cases Failed" if="junit.failed"/>
497	<
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 515 | Line 435 | As of 2013-02, the very latest lambda 8
435		</target>
436
437
518	–	<target name="configure-tests"
519	–	depends="configure-compiler">
520	–
521	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
522	–	<available property="junit.available"
523	–	classname="junit.framework.Protectable"/>
524	–
525	–	<!-- Xalan -->
526	–	<available property="xalan.available"
527	–	classname="org.apache.xalan.Version"/>
528	–
529	–
530	–	<!-- Ant 1.6beta and later don't need or want this check -->
531	–	<!--
532	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
533	–	unless="junit.available"/>
534	–
535	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
536	–	unless="xalan.available"/>
537	–	-->
538	–
539	–	</target>
540	–
438
439		<!-- Various demos and test programs -->
440
#	Line 590 | Line 487 | As of 2013-02, the very latest lambda 8
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 618 | Line 516 | As of 2013-02, the very latest lambda 8
516		workdir="${build.4jdk7.dir}"
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="StampedLockTest.java"/>
527		</javac-elements>
528		</run-tck-tests>
#	Line 646 | Line 551 | As of 2013-02, the very latest lambda 8
551
552		<formatter type="brief"/>
553
554	<	<test name="JSR166TestCase" haltonfailure="no">
554	>	<test name="${jsr166.tckTestClass}" haltonfailure="no">
555		</test>
556
557		</junit>
558		</target>
559
560		<target name="4jdk7-test-jtreg"
561	<	depends="4jdk7compile"
561	>	depends="4jdk7jar"
562		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
563	<	<delete dir="${build.4jdk7.dir}/JTwork"   quiet="true"/>
564	<	<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/>
565	<	<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/>
566	<	<mkdir dir="${build.4jdk7.dir}/JTreport"/>
567	<	<jtreg dir="${jtreg.src.dir}"
663	<	jdk="${jdk7.home}"
664	<	workDir="${build.4jdk7.dir}/JTwork"
665	<	reportDir="${build.4jdk7.dir}/JTreport">
666	<
667	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
668	<	<arg value="-agentvm"/>
669	<	<arg value="-v:nopass,fail"/>
670	<	<arg value="-vmoptions:-esa -ea"/>
671	<	<arg value="-automatic"/>
672	<	<arg value="-k:!ignore"/>
673	<	</jtreg>
563	>	<run-jtreg-tests
564	>	target="7"
565	>	workdir="${build.4jdk7.dir}"
566	>	classes="${4jdk7product.jar}"
567	>	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
568		</target>
569
570
#	Line 1005 | Line 899 | As of 2013-02, the very latest lambda 8
899
900		<!-- jsr166e -->
901
902	+	<property name="build.jsr166e.java.version" value="6"/>
903	+	<property name="build.jsr166e.javac" value="${javac6}"/>
904	+
905		<target name="jsr166ecompile"
906		depends="configure-compiler"
907		description="Compiles jsr166e sources">
#	Line 1016 | Line 913 | As of 2013-02, the very latest lambda 8
913		debug="${build.debug}"
914		debuglevel="${build.debuglevel}"
915		deprecation="${build.deprecation}"
916	<	source="7"
916	>	source="${build.jsr166e.java.version}"
917		classpath=""
918		includeAntRuntime="false"
919		includeJavaRuntime="false"
920	<	executable="${javac7}"
920	>	executable="${build.jsr166e.javac}"
921		fork="true">
922
923		<include name="jsr166e/**/*.java"/>
#	Line 1053 | Line 950 | As of 2013-02, the very latest lambda 8
950		packagenames="jsr166e.*"
951		link="${jdkapidocs.url}"
952		access="${build.javadoc.access}"
953	<	sourcepath="${topsrc.dir}:${jdk7src.dir}"
954	<	source="7"
953	>	sourcepath="${topsrc.dir}:${jdk6src.dir}"
954	>	source="${build.jsr166e.java.version}"
955		executable="${javadoc7}">
956		<arg value="-XDignore.symbol.file=true"/>
957
#	Line 1062 | Line 959 | As of 2013-02, the very latest lambda 8
959		</target>
960
961
962	<	<target name="jsr166e-test-tck"
962	>	<target name="jsr166e-test-tck-one-java-version"
963		depends="jsr166ejar"
964		description="Runs tck tests for jsr166e">
965
966	+	<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
967	+
968		<run-tck-tests
969		tck.src.dir="${test.src.dir}/tck-jsr166e"
970	<	source="7"
1072	<	target="8"
970	>	target="${build.jsr166e.java.version}"
971		workdir="${build.jsr166e.dir}"
972		classes="${jsr166e.jar}"/>
973		</target>
974
975	+	<target name="jsr166e-test-tck"
976	+	description="Runs tck tests for jsr166e for multiple java versions">
977	+
978	+	<!--     <antcall target="clean"/> -->
979	+	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
980	+	<!--       <param name="build.jsr166e.java.version" value="8"/> -->
981	+	<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
982	+	<!--     </antcall> -->
983	+
984	+	<antcall target="clean"/>
985	+	<antcall target="jsr166e-test-tck-one-java-version">
986	+	<param name="build.jsr166e.java.version" value="7"/>
987	+	<param name="build.jsr166e.javac" value="${javac7}"/>
988	+	</antcall>
989	+
990	+	<antcall target="clean"/>
991	+	<antcall target="jsr166e-test-tck-one-java-version">
992	+	<param name="build.jsr166e.java.version" value="6"/>
993	+	<param name="build.jsr166e.javac" value="${javac6}"/>
994	+	</antcall>
995	+	</target>
996	+
997
998		<target name="jsr166edist"
999		depends="jsr166edist-jar, jsr166edist-docs"

Diff Legend

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