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.130 by jsr166, Mon Jan 28 22:00:34 2013 UTC vs.
Revision 1.143 by dl, Wed Jul 10 17:09: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
#	Line 43 | Line 44
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 169 | Line 179
179
180		<macrodef name="run-tck-tests">
181		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
172	–	<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 183 | 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 213 | 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 246 | 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 line="${build.args}"/>
#	Line 264 | Line 309
309		</target>
310
311
267	–	<target name="test"
268	–	depends="configure-tests, report-tests"
269	–	description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" />
270	–
271	–
312		<target name="docs"
313		description="Builds javadocs for src/main to dist dir">
314
#	Line 292 | Line 332
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 335 | Line 381
381		</target>
382
383
338	–	<!-- Internal targets -->
339	–
340	–
384		<target name="dist-jar"
385		depends="clean, jar">
386		<copy file="${product.jar}" todir="${dist.dir}"/>
#	Line 349 | Line 392
392		</target>
393
394
395	<	<target name="compile-tests"
396	<	depends="jar">
397	<
355	<	<mkdir dir="${build.testcases.dir}"/>
356	<
357	<	<javac srcdir="${tck.src.dir}"
358	<	destdir="${build.testcases.dir}"
359	<	debug="${build.debug}"
360	<	debuglevel="${build.debuglevel}"
361	<	deprecation="${build.deprecation}"
362	<	source="6"
363	<	classpath="${junit.jar}"
364	<	bootclasspath="@{product.jar}:${bootclasspath6}"
365	<	includeAntRuntime="false"
366	<	includeJavaRuntime="false"
367	<	executable="${javac8}"
368	<	fork="true">
369	<
370	<	<include name="**/*.java"/>
371	<	<compilerarg value="-XDignore.symbol.file=true"/>
372	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
373	<	<compilerarg line="${build.args}"/>
374	<
375	<	</javac>
376	<
377	<	<javac srcdir="${test.src.dir}"
378	<	destdir="${build.testcases.dir}"
379	<	debug="${build.debug}"
380	<	debuglevel="${build.debuglevel}"
381	<	deprecation="${build.deprecation}"
382	<	source="6"
383	<	classpath=""
384	<	bootclasspath="@{product.jar}:${bootclasspath6}"
385	<	includeAntRuntime="false"
386	<	includeJavaRuntime="false"
387	<	executable="${javac8}"
388	<	fork="true">
389	<
390	<	<include name="jsr166/test/**/*.java"/>
391	<	<compilerarg value="-XDignore.symbol.file=true"/>
392	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
393	<	<compilerarg line="${build.args}"/>
394	<
395	<	</javac>
396	<
397	<	<!--
398	<	<javac srcdir="${jtreg.src.dir}"
399	<	destdir="${build.testcases.dir}"
400	<	debug="${build.debug}"
401	<	debuglevel="${build.debuglevel}"
402	<	deprecation="${build.deprecation}"
403	<	source="${build.sourcelevel}"
404	<	fork="true">
405	<
406	<	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
407	<	<compilerarg value="-XDignore.symbol.file=true"/>
408	<	<compilerarg line="${build.args}"/>
409	<
410	<	</javac>
411	<	-->
395	>	<target name="test-tck"
396	>	depends="jar"
397	>	description="Runs tck tests for main directly">
398
399	+	<run-tck-tests
400	+	target="8"
401	+	workdir="${build.dir}"
402	+	classes="${product.jar}"/>
403		</target>
404
405	<
406	<	<target name="run-tests"
407	<	depends="compile-tests">
408	<
409	<	<!-- May be overridden by user.properties -->
410	<	<property name="testcase" value="*"/>
411	<
422	<	<mkdir dir="${build.reports.dir}"/>
423	<
424	<	<junit printsummary="true"
425	<	showoutput="true"
426	<	errorProperty="junit.failed"
427	<	failureProperty="junit.failed"
428	<	dir="${build.reports.dir}"
429	<	jvm="${java8}"
430	<	fork="true">
431	<
432	<	<jvmarg value="-Xbootclasspath/p:${product.jar}"/>
433	<	<jvmarg value="-server"/>
434	<	<jvmarg value="-showversion"/>
435	<
436	<	<classpath refid="test.classpath"/>
437	<
438	<	<formatter type="xml"/>
439	<
440	<	<batchtest todir="${build.reports.dir}" unless="no.test.tck">
441	<	<fileset dir="${tck.src.dir}">
442	<	<include name="**/${testcase}Test.java"/>
443	<	</fileset>
444	<	</batchtest>
445	<
446	<	<batchtest todir="${build.reports.dir}" if="do.test.old">
447	<	<fileset dir="${test.src.dir}">
448	<	<include name="jsr166/test/**/${testcase}Test.java"/>
449	<	</fileset>
450	<	</batchtest>
451	<
452	<	<!--
453	<	<batchtest todir="${build.reports.dir}" if="do.test.jtreg">
454	<	<fileset dir="${jtreg.src.dir}">
455	<	<include name="**/${testcase}Test.java"/>
456	<	</fileset>
457	<	</batchtest>
458	<	-->
459	<
460	<	</junit>
461	<
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">
467	<
468	<	<!-- Sets junit.report.format to frames if redirection is present,
469	<	otherwise sets it to noframes. -->
470	<	<available property="junit.report.format"
471	<	value="frames"
472	<	classname="org.apache.xalan.lib.Redirect"
473	<	/>
474	<	<property name="junit.report.format" value="noframes"/>
475	<
476	<	<junitreport todir="${build.reports.dir}">
477	<	<fileset dir="${build.reports.dir}">
478	<	<include name="TEST-*.xml"/>
479	<	</fileset>
480	<	<report format="${junit.report.format}" todir="${build.reports.dir}"
481	<	/>
482	<	</junitreport>
483	<
484	<	<fail message="Test Cases Failed" if="junit.failed"/>
485	<
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 503 | Line 435
435		</target>
436
437
506	–	<target name="configure-tests"
507	–	depends="configure-compiler">
508	–
509	–	<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 -->
510	–	<available property="junit.available"
511	–	classname="junit.framework.Protectable"/>
512	–
513	–	<!-- Xalan -->
514	–	<available property="xalan.available"
515	–	classname="org.apache.xalan.Version"/>
516	–
517	–
518	–	<!-- Ant 1.6beta and later don't need or want this check -->
519	–	<!--
520	–	<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests"
521	–	unless="junit.available"/>
522	–
523	–	<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests"
524	–	unless="xalan.available"/>
525	–	-->
526	–
527	–	</target>
528	–
438
439		<!-- Various demos and test programs -->
440
#	Line 578 | Line 487
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 604 | Line 514
514		<run-tck-tests
515		target="7"
516		workdir="${build.4jdk7.dir}"
517	<	classes="${4jdk7product.jar}"/>
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>
529		</target>
530
531
#	Line 630 | Line 551
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}"
647	<	jdk="${jdk7.home}"
648	<	workDir="${build.4jdk7.dir}/JTwork"
649	<	reportDir="${build.4jdk7.dir}/JTreport">
650	<
651	<	<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/>
652	<	<arg value="-agentvm"/>
653	<	<arg value="-v:nopass,fail"/>
654	<	<arg value="-vmoptions:-esa -ea"/>
655	<	<arg value="-automatic"/>
656	<	<arg value="-k:!ignore"/>
657	<	</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 1052 | Line 962
962
963		<run-tck-tests
964		tck.src.dir="${test.src.dir}/tck-jsr166e"
965	<	source="7"
1056	<	target="8"
965	>	target="7"
966		workdir="${build.jsr166e.dir}"
967		classes="${jsr166e.jar}"/>
968		</target>

Diff Legend

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