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.202 by jsr166, Sat Mar 26 15:10:14 2016 UTC vs.
Revision 1.208 by jsr166, Sat Apr 2 16:09:42 2016 UTC

#	Line 327 | Line 327
327
328		<delete dir="@{workdir}/JTwork"   quiet="true"/>
329		<delete dir="@{workdir}/JTreport" quiet="true"/>
330	–	<mkdir dir="@{workdir}/JTwork/scratch"/>
331	–	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
332	–	<mkdir dir="@{workdir}/JTreport/html"/>
333	–	<mkdir dir="@{workdir}/JTreport/text"/>
330		<jtreg dir="${jtreg@{target}.src.dir}"
331		jdk="${jdk@{target}.home}"
332		workDir="@{workdir}/JTwork"
#	Line 407 | Line 403
403		<compilerarg line="${build.args}"/>
404
405		</javac>
410	–
411	–	<!-- We need jdk9's Contended annotation, but at compile time only -->
412	–	<!--
413	–	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
414	–	-->
406		</target>
407
408
409		<target name="jar"
410		depends="compile"
411	<	description="Builds library jar from compiled sources">
411	>	description="Builds library jar for src/main from compiled sources">
412
413		<jar destfile="${product.jar}">
414		<fileset dir="${build.classes.dir}"/>
#	Line 526 | Line 517
517
518		<target name="tck"
519		depends="jar"
520	<	description="Runs tck tests for main directly">
520	>	description="Runs tck tests for src/main directly">
521
522		<run-tck-tests
523		target="${build.main.java.version}"
#	Line 535 | Line 526
526		</target>
527
528		<target name="tck-parallelism-1"
529	<	description="Runs tck with given common pool parallelism">
529	>	description="Runs tck with common pool parallelism 1">
530		<antcall target="tck">
531		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
532		</antcall>
533		</target>
534
535		<target name="tck-parallelism-0"
536	<	description="Runs tck with given common pool parallelism">
536	>	description="Runs tck with common pool parallelism 0">
537		<antcall target="tck">
538		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
539		</antcall>
#	Line 550 | Line 541
541
542		<target name="jtreg"
543		depends="jar"
544	<	description="Runs jtreg tests for main using the jtreg ant task">
544	>	description="Runs jtreg tests for src/main using the jtreg ant task">
545		<run-jtreg-tests
546		target="${build.main.java.version}"
547		workdir="${build.dir}"
#	Line 558 | Line 549
549		</target>
550
551		<target name="test"
552	<	depends="tck, tck-parallelism-1, jtreg"
553	<	description="Runs tck and jtreg tests for main">
552	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
553	>	description="Runs tck and jtreg tests for src/main">
554		</target>
555
556	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
556	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
557
558	<	<antcall target="jtreg">
559	<	<param name="build.main.java.version" value="8"/>
560	<	<param name="build.main.javac" value="${javac8}"/>
561	<	</antcall>
558	>	<!--     <antcall target="jtreg"> -->
559	>	<!--       <param name="build.main.java.version" value="8"/> -->
560	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
561	>	<!--     </antcall> -->
562
563	<	</target>
563	>	<!--   </target> -->
564
565	<	<target name="test89"
566	<	description="Runs tck and jtreg tests for main for multiple java versions">
565	>	<!--   <target name="test89" -->
566	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
567
568	<	<antcall target="clean"/>
569	<	<antcall target="test">
570	<	<param name="build.main.java.version" value="8"/>
571	<	<param name="build.main.javac" value="${javac8}"/>
572	<	</antcall>
568	>	<!--     <antcall target="clean"/> -->
569	>	<!--     <antcall target="test"> -->
570	>	<!--       <param name="build.main.java.version" value="8"/> -->
571	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
572	>	<!--     </antcall> -->
573
574	<	<antcall target="clean"/>
575	<	<antcall target="test">
576	<	<param name="build.main.java.version" value="9"/>
577	<	<param name="build.main.javac" value="${javac9}"/>
578	<	</antcall>
574	>	<!--     <antcall target="clean"/> -->
575	>	<!--     <antcall target="test"> -->
576	>	<!--       <param name="build.main.java.version" value="9"/> -->
577	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
578	>	<!--     </antcall> -->
579
580	<	</target>
580	>	<!--   </target> -->
581
582
583
#	Line 616 | Line 607
607		<!-- Various demos and test programs -->
608
609
610	<	<target name="loops" depends="configure-compiler"
611	<	description="Benchmark from Doug Lea's AQS paper">
610	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
611	>	<target name="loops" depends="configure-compiler">
612
613		<mkdir dir="${build.loops.dir}"/>
614
#	Line 793 | Line 784
784		access="${build.javadoc.access}"
785		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
786		classpath=""
787	<	executable="${javadoc8}">
787	>	executable="${javadoc8}"
788	>	failonerror = "true">
789		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
790		<include name="**/*.java"/>
791		</fileset>
#	Line 941 | Line 933
933		</target>
934
935
936	+	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
937		<target name="4jdk7-tck-junit"
938	<	depends="4jdk7compile"
946	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
938	>	depends="4jdk7compile">
939
940		<junit printsummary="true"
941		showoutput="true"
#	Line 998 | Line 990
990		access="${build.javadoc.access}"
991		sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
992		classpath=""
993	<	executable="${javadoc7}">
993	>	executable="${javadoc7}"
994	>	failonerror = "true">
995		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
996		<include name="**/*.java"/>
997		</fileset>
#	Line 1093 | Line 1086
1086		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1087		bootclasspath="${bootclasspath6}"
1088		source="5"
1089	<	executable="${javadoc7}">
1089	>	executable="${javadoc7}"
1090	>	failonerror = "true">
1091		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1092		<arg value="-XDignore.symbol.file=true"/>
1093
#	Line 1185 | Line 1179
1179		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1180		bootclasspath="${bootclasspath6}"
1181		source="6"
1182	<	executable="${javadoc7}">
1182	>	executable="${javadoc7}"
1183	>	failonerror = "true">
1184		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1185		<arg value="-XDignore.symbol.file=true"/>
1186
#	Line 1398 | Line 1393
1393		access="${build.javadoc.access}"
1394		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1395		source="${build.jsr166e.java.version}"
1396	<	executable="${javadoc7}">
1396	>	executable="${javadoc7}"
1397	>	failonerror = "true">
1398		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1399		<arg value="-XDignore.symbol.file=true"/>
1400

Diff Legend

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