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.148 by jsr166, Sat Jul 20 18:26:16 2013 UTC vs.
Revision 1.156 by jsr166, Wed Jun 25 08:29:01 2014 UTC

#	Line 16 | Line 16
16		$HOME/jdk/jdk6
17		$HOME/jdk/jdk7
18		$HOME/jdk/jdk8
19	+	$HOME/jdk/jdk9
20		where each of the above is a JDK or a symlink to same, and
21		$HOME/jdk/src/jdk6
22		$HOME/jdk/src/jdk7
23		$HOME/jdk/src/jdk8
24	+	$HOME/jdk/src/jdk9
25		where each of the above is a complete JDK source tree
26		(e.g. mercurial forest) or a symlink to same.
25	–	As of 2013-02, the very latest lambda 8 jdk is needed for jdk8.
27		------------------------------------------------------------------------------
28		</description>
29
#	Line 45 | Line 46 | As of 2013-02, the very latest lambda 8
46		<property name="build.deprecation"    value="false"/>
47		<property name="build.javadoc.access" value="protected"/>
48
49	<	<!-- Tck options; see JSR166TestCase.java -->
50	<	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
49	>	<!-- Tck options; see JSR166TestCase.java
50	>	Profiling a tck test class:
51	>	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
52	>	Stress test a tck test class:
53	>	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
54	>	-->
55		<property name="jsr166.profileTests"     value="false"/>
56		<property name="jsr166.profileThreshold" value="100"/>
57		<property name="jsr166.runsPerTest"      value="1"/>
58	<	<!-- Allow running an individual tck test class -->
59	<	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
58	>	<!-- Stress test an individual tck test class:
59	>	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
60	>	-->
61		<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
62
63		<!-- Build locations -->
#	Line 115 | Line 121 | As of 2013-02, the very latest lambda 8
121		<defjdklocations v="6"/>
122		<defjdklocations v="7"/>
123		<defjdklocations v="8"/>
124	+	<defjdklocations v="9"/>
125
126		<!-- Source locations -->
127		<property name="src.dir"              location="${basedir}/src/main"/>
#	Line 155 | Line 162 | As of 2013-02, the very latest lambda 8
162		<property name="extra166y.jar"    location="${build.extra166y.dir}/extra166y.jar"/>
163		<property name="junit.jar"        location="${lib.dir}/junit.jar"/>
164
165	<	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
166	<	<property name="jdkapi5docs.url"      value="http://docs.oracle.com/javase/1.5.0/docs/api/"/>
167	<	<property name="jdkapi6docs.url"      value="http://docs.oracle.com/javase/6/docs/api/"/>
168	<	<property name="jdkapi7docs.url"      value="http://docs.oracle.com/javase/7/docs/api/"/>
169	<
170	<	<property name="jdkapi8docs.url"      value="http://download.java.net/jdk8/docs/api/"/>
171	<	<!-- The below does not yet exist as of 2013-01 -->
172	<	<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> -->
165	>	<!-- Canonical location of jdk docs root, to use with javadoc -Xdocrootparent flag -->
166	>	<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
167	>	<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
168	>	<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
169	>	<!-- The expected canonical location does not yet exist as of 2014-02 -->
170	>	<!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
171	>	<property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
172	>	<!-- No published jdk9 docs exist as of 2014-02 -->
173	>	<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
174	>	<property name="java9.docroot.url"      value="${java8.docroot.url}"/>
175	>	<!-- Default jdk doc location (latest stable release seems best) -->
176	>	<property name="java.docroot.url"       value="${java7.docroot.url}"/>
177
178	<	<!-- Default jdk api doc location (latest stable release seems best) -->
179	<	<property name="jdkapidocs.url"       value="${jdkapi7docs.url}"/>
178	>	<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
179	>	<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
180	>	<property name="java6.api.url"      value="${java6.docroot.url}/api/"/>
181	>	<property name="java7.api.url"      value="${java7.docroot.url}/api/"/>
182	>	<property name="java8.api.url"      value="${java8.docroot.url}/api/"/>
183	>	<property name="java9.api.url"      value="${java9.docroot.url}/api/"/>
184	>	<property name="java.api.url"       value="${java.docroot.url}/api/"/>
185
186		<!-- Define the "jtreg" task -->
187		<!-- See the docs in "jtreg -onlineHelp" -->
#	Line 184 | Line 200 | As of 2013-02, the very latest lambda 8
200		<attribute name="compile-target" default="@{target}"/>
201		<attribute name="workdir"/>
202		<attribute name="classes"/>
203	<	<attribute name="jvmflags" default=""/>
203	>	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
204		<element name="javac-elements" optional="true"/>
205		<sequential>
206
#	Line 231 | Line 247 | As of 2013-02, the very latest lambda 8
247		</macrodef>
248
249		<macrodef name="run-jtreg-tests">
250	+	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
251		<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
252		<attribute name="source" default="7"/>
253		<attribute name="target"/>
#	Line 269 | Line 286 | As of 2013-02, the very latest lambda 8
286
287		<!-- Main targets -->
288
289	+	<property name="build.main.java.version" value="9"/>
290	+	<property name="build.main.javac" value="${javac9}"/>
291	+
292		<target name="dists"
293		depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
294		description="Builds all public jars and docs"/>
#	Line 287 | Line 307 | As of 2013-02, the very latest lambda 8
307		classpath=""
308		includeAntRuntime="false"
309		includeJavaRuntime="false"
310	<	executable="${javac8}"
310	>	executable="${build.main.javac}"
311		fork="true">
312
313		<include name="**/*.java"/>
#	Line 323 | Line 343 | As of 2013-02, the very latest lambda 8
343
344		<javadoc destdir="${docs.dir}"
345		packagenames="none"
346	<	link="${jdkapi8docs.url}"
346	>	link="${java9.api.url}"
347		overview="${src.dir}/intro.html"
348		access="${build.javadoc.access}"
349	<	sourcepath="${src.dir}:${jdk8src.dir}"
349	>	sourcepath="${src.dir}:${jdk9src.dir}"
350		classpath=""
351	<	executable="${javadoc8}">
351	>	executable="${javadoc9}">
352		<fileset dir="${src.dir}" defaultexcludes="yes">
353		<include name="**/*.java"/>
354		</fileset>
355	+	<arg line="-Xdocrootparent ${java9.docroot.url}"/>
356		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
357		<arg value="-XDignore.symbol.file=true"/>
358		<arg value="-tag"/>
#	Line 402 | Line 423 | As of 2013-02, the very latest lambda 8
423		description="Runs tck tests for main directly">
424
425		<run-tck-tests
426	<	target="8"
426	>	target="${build.main.java.version}"
427		workdir="${build.dir}"
428		classes="${product.jar}"/>
429		</target>
#	Line 411 | Line 432 | As of 2013-02, the very latest lambda 8
432		depends="jar"
433		description="Runs jtreg tests for main using the jtreg ant task">
434		<run-jtreg-tests
435	<	target="8"
435	>	target="${build.main.java.version}"
436		workdir="${build.dir}"
437		classes="${product.jar}"/>
438		</target>
#	Line 421 | Line 442 | As of 2013-02, the very latest lambda 8
442		description="Runs tck and jtreg tests for main">
443		</target>
444
445	+	<target name="test89"
446	+	description="Runs tck and jtreg tests for main for multiple java versions">
447	+
448	+	<antcall target="clean"/>
449	+	<antcall target="test">
450	+	<param name="build.main.java.version" value="8"/>
451	+	<param name="build.main.javac" value="${javac8}"/>
452	+	</antcall>
453	+
454	+	<antcall target="clean"/>
455	+	<antcall target="test">
456	+	<param name="build.main.java.version" value="9"/>
457	+	<param name="build.main.javac" value="${javac9}"/>
458	+	</antcall>
459	+
460	+	</target>
461	+
462
463
464		<target name="configure-compiler">
#	Line 500 | Line 538 | As of 2013-02, the very latest lambda 8
538		</javac>
539		</target>
540
541	+	<target name="4jdk7doclint"
542	+	depends="configure-compiler"
543	+	description="Finds doclint warnings">
544	+
545	+	<mkdir dir="${build.4jdk7.classes.dir}"/>
546	+
547	+	<javac srcdir="${4jdk7src.dir}"
548	+	destdir="${build.4jdk7.classes.dir}"
549	+	debug="${build.debug}"
550	+	debuglevel="${build.debuglevel}"
551	+	deprecation="${build.deprecation}"
552	+	source="6"
553	+	classpath=""
554	+	bootclasspath="${bootclasspath7}"
555	+	includeAntRuntime="false"
556	+	includeJavaRuntime="false"
557	+	executable="${javac8}"
558	+	fork="true">
559	+
560	+	<include name="**/*.java"/>
561	+	<compilerarg value="-Xprefer:source"/>
562	+	<compilerarg value="-XDignore.symbol.file=true"/>
563	+	<compilerarg value="-Xlint:all"/>
564	+	<compilerarg value="-Xdoclint:all/protected"/>
565	+	<compilerarg line="${build.args}"/>
566	+
567	+	</javac>
568	+	</target>
569	+
570
571		<target name="4jdk7jar"
572		depends="4jdk7compile"
#	Line 523 | Line 590 | As of 2013-02, the very latest lambda 8
590		<javac-elements>
591		<!-- JDK8+ test classes -->
592		<exclude name="*8Test.java"/>
593	+	<exclude name="*9Test.java"/>
594		<exclude name="DoubleAccumulatorTest.java"/>
595		<exclude name="DoubleAdderTest.java"/>
596		<exclude name="LongAccumulatorTest.java"/>
#	Line 588 | Line 656 | As of 2013-02, the very latest lambda 8
656
657		<javadoc destdir="${4jdk7docs.dir}"
658		packagenames="none"
659	<	link="${jdkapi7docs.url}"
659	>	link="${java7.api.url}"
660		overview="${4jdk7src.dir}/intro.html"
661		access="${build.javadoc.access}"
662		sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
#	Line 597 | Line 665 | As of 2013-02, the very latest lambda 8
665		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
666		<include name="**/*.java"/>
667		</fileset>
668	+	<arg line="-Xdocrootparent ${java7.docroot.url}"/>
669		<arg value="-XDignore.symbol.file=true"/>
670		</javadoc>
671		</target>
#	Line 676 | Line 745 | As of 2013-02, the very latest lambda 8
745
746		<javadoc destdir="${jsr166xdocs.dir}"
747		packagenames="jsr166x.*"
748	<	link="${jdkapidocs.url}"
748	>	link="${java.api.url}"
749		access="${build.javadoc.access}"
750		sourcepath="${topsrc.dir}:${jdk6src.dir}"
751		bootclasspath="${bootclasspath6}"
752		source="5"
753		executable="${javadoc7}">
754	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
755		<arg value="-XDignore.symbol.file=true"/>
756
757		</javadoc>
#	Line 761 | Line 831 | As of 2013-02, the very latest lambda 8
831
832		<javadoc destdir="${jsr166ydocs.dir}"
833		packagenames="jsr166y.*"
834	<	link="${jdkapidocs.url}"
834	>	link="${java.api.url}"
835		access="${build.javadoc.access}"
836		sourcepath="${topsrc.dir}:${jdk6src.dir}"
837		bootclasspath="${bootclasspath6}"
838		source="6"
839		executable="${javadoc7}">
840	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
841		<arg value="-XDignore.symbol.file=true"/>
842
843		</javadoc>
#	Line 847 | Line 918 | As of 2013-02, the very latest lambda 8
918
919		<javadoc destdir="${extra166ydocs.dir}"
920		packagenames="extra166y.*"
921	<	link="${jdkapidocs.url}"
921	>	link="${java.api.url}"
922		access="${build.javadoc.access}"
923		sourcepath="${topsrc.dir}:${jdk6src.dir}"
924		bootclasspath="${bootclasspath6}"
925		source="6"
926		executable="${javadoc7}">
927	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
928		<arg value="-XDignore.symbol.file=true"/>
929
930		</javadoc>
#	Line 913 | Line 985 | As of 2013-02, the very latest lambda 8
985		</javac>
986		</target>
987
988	+	<!-- jsr166e: find doclint errors -->
989	+	<target name="jsr166edoclint">
990	+
991	+	<mkdir dir="${build.jsr166e.classes.dir}"/>
992	+
993	+	<javac srcdir="${topsrc.dir}"
994	+	destdir="${build.jsr166e.classes.dir}"
995	+	debug="${build.debug}"
996	+	debuglevel="${build.debuglevel}"
997	+	deprecation="${build.deprecation}"
998	+	source="${build.jsr166e.java.version}"
999	+	classpath=""
1000	+	bootclasspath="${bootclasspath7}"
1001	+	includeAntRuntime="false"
1002	+	includeJavaRuntime="false"
1003	+	executable="${javac8}"
1004	+	fork="true">
1005	+
1006	+	<include name="jsr166e/**/*.java"/>
1007	+	<compilerarg value="-XDignore.symbol.file=true"/>
1008	+	<compilerarg value="-Xlint:all"/>
1009	+	<compilerarg value="-Xdoclint:all/protected"/>
1010	+
1011	+	</javac>
1012	+	</target>
1013	+
1014
1015		<target name="jsr166ejar"
1016		depends="jsr166ecompile"
#	Line 933 | Line 1031 | As of 2013-02, the very latest lambda 8
1031
1032		<javadoc destdir="${jsr166edocs.dir}"
1033		packagenames="jsr166e.*"
1034	<	link="${jdkapidocs.url}"
1034	>	link="${java.api.url}"
1035		access="${build.javadoc.access}"
1036		sourcepath="${topsrc.dir}:${jdk6src.dir}"
1037		source="${build.jsr166e.java.version}"
1038		executable="${javadoc7}">
1039	+	<arg line="-Xdocrootparent ${java.docroot.url}"/>
1040		<arg value="-XDignore.symbol.file=true"/>
1041
1042		</javadoc>

Diff Legend

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