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.214 by jsr166, Sun Jun 26 23:44:19 2016 UTC

#	Line 38 | Line 38
38		------------------------------------------------------------------------------
39		</description>
40
41	<	<!-- Display main targets by running 'ant -projecthelp' -->
41	>	<!-- Run 'ant -projecthelp' (default target) -->
42		<target name="usage">
43		<java classname="org.apache.tools.ant.Main">
44		<arg value="-projecthelp" />
#	Line 186 | Line 186
186		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
187		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
188		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
189	<	<!-- The expected canonical location does not yet exist as of 2016-03 -->
189	>	<!-- The expected canonical location does not yet exist as of 2016-04 -->
190		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
191	<	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
191	>	<property name="java9.docroot.url"      value="http://http://download.java.net/java/jdk9/docs"/>
192		<!-- Default jdk doc location (latest stable release seems best) -->
193		<property name="java.docroot.url"       value="${java8.docroot.url}"/>
194
#	Line 252 | Line 252
252		<compilerarg value="-XDignore.symbol.file=true"/>
253		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
254		<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
255	<	<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
255	>	<compilerarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
256		<compilerarg line="${build.args}"/>
257		<javac-elements/>
258
#	Line 263 | Line 263
263		jvm="${java@{target}}"
264		fork="true">
265		<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
266	<	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
266	>	<jvmarg value="-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
267		<jvmarg line="@{jvmflags}"/>
268	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
269	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
270
271	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
271	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
272		<syspropertyset id="system-properties-used-by-tck">
273		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
274		<propertyref prefix="jsr166."/>
#	Line 327 | Line 329
329
330		<delete dir="@{workdir}/JTwork"   quiet="true"/>
331		<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"/>
332		<jtreg dir="${jtreg@{target}.src.dir}"
333		jdk="${jdk@{target}.home}"
334		workDir="@{workdir}/JTwork"
335		reportDir="@{workdir}/JTreport">
336		<patternset refid="jdk@{target}.jtreg.tests"/>
337		<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
338	<	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
338	>	<arg value="-vmoption:-Xpatch:java.base=${build.classes.dir}/java.base" if:set="modules"/>
339		<arg value="-agentvm"/>
340		<arg value="-verbose:${jtreg.verbose}"/>
341		<arg value="-vmoptions:-esa -ea"/>
#	Line 407 | Line 405
405		<compilerarg line="${build.args}"/>
406
407		</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	–	-->
408		</target>
409
410
411		<target name="jar"
412		depends="compile"
413	<	description="Builds library jar from compiled sources">
414	<
413	>	description="Builds library jar for src/main from compiled sources">
414	>	<local name="subdir"/>
415	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
416		<jar destfile="${product.jar}">
417	<	<fileset dir="${build.classes.dir}"/>
417	>	<fileset dir="${build.classes.dir}${subdir}"/>
418		<manifest>
419		<attribute name="Built-By" value="${user.name}"/>
420		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
#	Line 526 | Line 520
520
521		<target name="tck"
522		depends="jar"
523	<	description="Runs tck tests for main directly">
523	>	description="Runs tck tests for src/main directly">
524
525		<run-tck-tests
526		target="${build.main.java.version}"
#	Line 535 | Line 529
529		</target>
530
531		<target name="tck-parallelism-1"
532	<	description="Runs tck with given common pool parallelism">
532	>	description="Runs tck with common pool parallelism 1">
533		<antcall target="tck">
534		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
535		</antcall>
536		</target>
537
538		<target name="tck-parallelism-0"
539	<	description="Runs tck with given common pool parallelism">
539	>	description="Runs tck with common pool parallelism 0">
540		<antcall target="tck">
541		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
542		</antcall>
543		</target>
544
545	+	<target name="tck-security-manager"
546	+	description="Runs tck with a security manager">
547	+	<antcall target="tck">
548	+	<param name="jsr166.useSecurityManager" value="true"/>
549	+	</antcall>
550	+	</target>
551	+
552		<target name="jtreg"
553		depends="jar"
554	<	description="Runs jtreg tests for main using the jtreg ant task">
554	>	description="Runs jtreg tests for src/main using the jtreg ant task">
555		<run-jtreg-tests
556		target="${build.main.java.version}"
557		workdir="${build.dir}"
#	Line 558 | Line 559
559		</target>
560
561		<target name="test"
562	<	depends="tck, tck-parallelism-1, jtreg"
563	<	description="Runs tck and jtreg tests for main">
562	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
563	>	description="Runs tck and jtreg tests for src/main">
564		</target>
565
566	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
566	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
567
568	<	<antcall target="jtreg">
569	<	<param name="build.main.java.version" value="8"/>
570	<	<param name="build.main.javac" value="${javac8}"/>
571	<	</antcall>
568	>	<!--     <antcall target="jtreg"> -->
569	>	<!--       <param name="build.main.java.version" value="8"/> -->
570	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
571	>	<!--     </antcall> -->
572
573	<	</target>
573	>	<!--   </target> -->
574
575	<	<target name="test89"
576	<	description="Runs tck and jtreg tests for main for multiple java versions">
575	>	<!--   <target name="test89" -->
576	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
577
578	<	<antcall target="clean"/>
579	<	<antcall target="test">
580	<	<param name="build.main.java.version" value="8"/>
581	<	<param name="build.main.javac" value="${javac8}"/>
582	<	</antcall>
578	>	<!--     <antcall target="clean"/> -->
579	>	<!--     <antcall target="test"> -->
580	>	<!--       <param name="build.main.java.version" value="8"/> -->
581	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
582	>	<!--     </antcall> -->
583
584	<	<antcall target="clean"/>
585	<	<antcall target="test">
586	<	<param name="build.main.java.version" value="9"/>
587	<	<param name="build.main.javac" value="${javac9}"/>
588	<	</antcall>
584	>	<!--     <antcall target="clean"/> -->
585	>	<!--     <antcall target="test"> -->
586	>	<!--       <param name="build.main.java.version" value="9"/> -->
587	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
588	>	<!--     </antcall> -->
589
590	<	</target>
590	>	<!--   </target> -->
591
592
593
#	Line 616 | Line 617
617		<!-- Various demos and test programs -->
618
619
620	<	<target name="loops" depends="configure-compiler"
621	<	description="Benchmark from Doug Lea's AQS paper">
620	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
621	>	<target name="loops" depends="configure-compiler">
622
623		<mkdir dir="${build.loops.dir}"/>
624
#	Line 793 | Line 794
794		access="${build.javadoc.access}"
795		sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
796		classpath=""
797	<	executable="${javadoc8}">
797	>	executable="${javadoc8}"
798	>	failonerror = "true">
799		<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
800		<include name="**/*.java"/>
801		</fileset>
#	Line 941 | Line 943
943		</target>
944
945
946	+	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
947		<target name="4jdk7-tck-junit"
948	<	depends="4jdk7compile"
946	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
948	>	depends="4jdk7compile">
949
950		<junit printsummary="true"
951		showoutput="true"
#	Line 998 | Line 1000
1000		access="${build.javadoc.access}"
1001		sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1002		classpath=""
1003	<	executable="${javadoc7}">
1003	>	executable="${javadoc7}"
1004	>	failonerror = "true">
1005		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1006		<include name="**/*.java"/>
1007		</fileset>
#	Line 1093 | Line 1096
1096		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1097		bootclasspath="${bootclasspath6}"
1098		source="5"
1099	<	executable="${javadoc7}">
1099	>	executable="${javadoc7}"
1100	>	failonerror = "true">
1101		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1102		<arg value="-XDignore.symbol.file=true"/>
1103
#	Line 1185 | Line 1189
1189		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1190		bootclasspath="${bootclasspath6}"
1191		source="6"
1192	<	executable="${javadoc7}">
1192	>	executable="${javadoc7}"
1193	>	failonerror = "true">
1194		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1195		<arg value="-XDignore.symbol.file=true"/>
1196
#	Line 1398 | Line 1403
1403		access="${build.javadoc.access}"
1404		sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1405		source="${build.jsr166e.java.version}"
1406	<	executable="${javadoc7}">
1406	>	executable="${javadoc7}"
1407	>	failonerror = "true">
1408		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1409		<arg value="-XDignore.symbol.file=true"/>
1410

Diff Legend

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