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.181 by jsr166, Sun Sep 13 05:26:02 2015 UTC vs.
Revision 1.198 by jsr166, Thu Mar 24 20:44:47 2016 UTC

#	Line 29 | Line 29
29		Alternatively, define ant variables thus:
30		ant -Djdk$N.home=...
31		for $N in 6 7 8 9 ...
32	+
33	+	As of 2015-09, there is incomplete hacky support for jigsaw
34	+	Build for jigsaw using something like:
35	+	ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36	+	"docs" target is still broken.
37		------------------------------------------------------------------------------
38		</description>
39
#	Line 52 | Line 57
57		<property name="build.deprecation"    value="false"/>
58		<property name="build.javadoc.access" value="protected"/>
59
55	–	<!-- Tck options; see JSR166TestCase.java
56	–	To profile a single tck test class:
57	–	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
58	–	To stress test a single tck test class:
59	–	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
60	–	-->
61	–	<property name="jsr166.profileTests"     value="false"/>
62	–	<property name="jsr166.profileThreshold" value="100"/>
63	–	<property name="jsr166.runsPerTest"      value="1"/>
64	–	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
65	–
60		<!-- Build locations -->
61		<property name="build.dir"                   location="build"/>
62		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 102 | Line 96
96		if:set="have.java.base"/>
97		<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
98		unless:set="have.java.base"/>
99	+	<local name="modules"/>
100	+	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
101		<local name="boot.jar.dir"/>
102	<	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
103	<	<path id="bootclasspath@{v}">
102	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
103	>	<path id="bootclasspath@{v}" unless:set="modules">
104		<pathelement path="${boot.jar.dir}/resources.jar"/>
105		<pathelement path="${boot.jar.dir}/rt.jar"/>
106		<pathelement path="${boot.jar.dir}/jsse.jar"/>
107		<pathelement path="${boot.jar.dir}/jce.jar"/>
108		<pathelement path="${boot.jar.dir}/charsets.jar"/>
109		</path>
110	<	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
110	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
111		</sequential>
112		</macrodef>
113
#	Line 179 | Line 175
175		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
176		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
177		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
178	<	<!-- The expected canonical location does not yet exist as of 2014-07 -->
178	>	<!-- The expected canonical location does not yet exist as of 2015-11 -->
179		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
180		<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
181		<!-- Default jdk doc location (latest stable release seems best) -->
#	Line 198 | Line 194
194		<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
195		classpath="${lib.dir}/jtreg.jar" />
196
197	<	<!-- Test classpath -->
198	<	<path id="test.classpath">
199	<	<pathelement location="${build.testcases.dir}"/>
200	<	<pathelement location="${junit.jar}"/>
201	<	</path>
202	<
197	>	<!-- Tck options; see JSR166TestCase.java
198	>	To profile a single tck test class:
199	>	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
200	>	To stress test a single tck test class:
201	>	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
202	>	To stress test a single tck test method:
203	>	ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
204	>	-->
205	>	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
206		<macrodef name="run-tck-tests">
207		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
208		<attribute name="target"/>
#	Line 212 | Line 211
211		<attribute name="classes"/>
212		<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
213		<element name="javac-elements" optional="true"/>
214	+
215		<sequential>
216
217	+	<local name="modules"/>
218	+	<condition property="modules">
219	+	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
220	+	</condition>
221	+
222		<mkdir dir="@{workdir}/tck-classes"/>
223
224		<javac srcdir="@{tck.src.dir}"
#	Line 231 | Line 236
236
237		<include name="*.java"/>
238		<compilerarg value="-XDignore.symbol.file=true"/>
239	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
240	<	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
239	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240	>	<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241	>	<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
242		<compilerarg line="${build.args}"/>
243		<javac-elements/>
244
#	Line 242 | Line 248
248		failonerror="true"
249		jvm="${java@{target}}"
250		fork="true">
251	<	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
251	>	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
252	>	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
253		<jvmarg line="@{jvmflags}"/>
254
255		<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
256	<	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
256	>	<syspropertyset id="system-properties-used-by-tck">
257		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
258	+	<propertyref prefix="jsr166."/>
259	+	<propertyref name="test.timeout.factor"/>
260		</syspropertyset>
261
253	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
254	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
255	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
262		<classpath>
263		<pathelement location="${junit.jar}"/>
264		<pathelement location="@{workdir}/tck-classes"/>
#	Line 284 | Line 290
290		</patternset>
291		</fileset>
292
293	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
294	+	<property name="jtreg.flags" value=""/>
295	+
296		<macrodef name="run-jtreg-tests">
297		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
298		<attribute name="source" default="7"/>
#	Line 291 | Line 300
300		<attribute name="workdir"/>
301		<attribute name="classes"/>
302		<attribute name="jtregflags" default=""/>
303	+
304		<sequential>
305	+
306	+	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
307	+	<property name="jtreg.verbose" value="nopass,fail,error"/>
308	+
309	+	<local name="modules"/>
310	+	<condition property="modules">
311	+	<available file="${jdk@{target}.home}/jmods" type="dir"/>
312	+	</condition>
313	+
314		<delete dir="@{workdir}/JTwork"   quiet="true"/>
315		<delete dir="@{workdir}/JTreport" quiet="true"/>
316		<mkdir dir="@{workdir}/JTwork/scratch"/>
317	<	<mkdir dir="@{workdir}/JTreport"/>
317	>	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
318	>	<mkdir dir="@{workdir}/JTreport/html"/>
319	>	<mkdir dir="@{workdir}/JTreport/text"/>
320		<jtreg dir="${jtreg@{target}.src.dir}"
321		jdk="${jdk@{target}.home}"
322		workDir="@{workdir}/JTwork"
323		reportDir="@{workdir}/JTreport">
324		<patternset refid="jdk@{target}.jtreg.tests"/>
325	<	<arg value="-Xbootclasspath/p:@{classes}"/>
325	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
326	>	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
327		<arg value="-agentvm"/>
328	<	<arg value="-v:nopass,fail"/>
328	>	<arg value="-verbose:${jtreg.verbose}"/>
329		<arg value="-vmoptions:-esa -ea"/>
330		<arg value="-automatic"/>
331		<arg value="-k:!ignore"/>
332		<arg line="@{jtregflags}"/>
333	+	<arg line="${jtreg.flags}"/>
334		</jtreg>
335		</sequential>
336		</macrodef>
#	Line 334 | Line 357
357		depends="configure-compiler"
358		description="Compiles src/main sources to build dir">
359
360	<	<mkdir dir="${build.classes.dir}"/>
360	>	<local name="modules"/>
361	>	<condition property="modules">
362	>	<and>
363	>	<available file="${jdk9.home}/jmods" type="dir"/>
364	>	<equals arg1="9" arg2="${build.main.java.version}"/>
365	>	</and>
366	>	</condition>
367	>
368	>	<local name="destdir"/>
369	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
370	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
371	>
372	>	<mkdir dir="${destdir}"/>
373
374		<javac srcdir="${src.dir}"
375	<	destdir="${build.classes.dir}"
375	>	destdir="${destdir}"
376		debug="${build.debug}"
377		debuglevel="${build.debuglevel}"
378		deprecation="${build.deprecation}"
#	Line 348 | Line 383
383		fork="true">
384
385		<include name="**/*.java"/>
386	+	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
387		<compilerarg value="-Xprefer:source"/>
388		<compilerarg value="-XDignore.symbol.file=true"/>
389		<compilerarg value="-Xlint:all"/>
#	Line 357 | Line 393
393		<compilerarg line="${build.args}"/>
394
395		</javac>
396	+
397	+	<!-- We need jdk9's Contended annotation, but at compile time only -->
398	+	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
399		</target>
400
401
#	Line 397 | Line 436
436		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
437		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
438		<arg value="-XDignore.symbol.file=true"/>
439	+	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
440		<arg value="-tag"/>
441		<arg value="${javadoc.jls.option}"/>
442		<arg value="-tag"/>
#	Line 405 | Line 445
445		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
446		<arg value="-tag"/>
447		<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
448	+	<!-- tags added in jdk9 -->
449	+	<arg value="-tag"/>
450	+	<arg value="revised:X"/>
451	+	<arg value="-tag"/>
452	+	<arg value="spec:X"/>
453		</javadoc>
454		</target>
455
#	Line 566 | Line 611
611		debuglevel="${build.debuglevel}"
612		deprecation="${build.deprecation}"
613		source="${build.sourcelevel}"
614	+	target="${build.sourcelevel}"
615		fork="true">
616
617		<compilerarg line="${build.args}"/>
#	Line 621 | Line 667
667		debuglevel="${build.debuglevel}"
668		deprecation="${build.deprecation}"
669		source="6"
670	+	target="6"
671		classpath=""
672		bootclasspath="${bootclasspath6}"
673		includeAntRuntime="false"
#	Line 650 | Line 697
697		debuglevel="${build.debuglevel}"
698		deprecation="${build.deprecation}"
699		source="6"
700	+	target="6"
701		classpath=""
702	<	bootclasspath="${bootclasspath7}"
702	>	bootclasspath="${bootclasspath6}"
703		includeAntRuntime="false"
704		includeJavaRuntime="false"
705		executable="${javac8}"
#	Line 817 | Line 865
865		classpath=""
866		bootclasspath="${bootclasspath6}"
867		source="5"
868	+	target="5"
869		includeAntRuntime="false"
870		includeJavaRuntime="false"
871		executable="${javac7}"
#	Line 906 | Line 955
955		debuglevel="${build.debuglevel}"
956		deprecation="${build.deprecation}"
957		source="6"
958	+	target="6"
959		classpath=""
960		bootclasspath="${bootclasspath6}"
961		includeAntRuntime="false"
#	Line 1000 | Line 1050
1050		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1051		classpath=""
1052		source="6"
1053	+	target="6"
1054		includeAntRuntime="false"
1055		includeJavaRuntime="false"
1056		executable="${javac7}"
#	Line 1091 | Line 1142
1142		debuglevel="${build.debuglevel}"
1143		deprecation="${build.deprecation}"
1144		source="${build.jsr166e.java.version}"
1145	+	target="${build.jsr166e.java.version}"
1146		classpath=""
1147		includeAntRuntime="false"
1148		includeJavaRuntime="false"
#	Line 1117 | Line 1169
1169		debuglevel="${build.debuglevel}"
1170		deprecation="${build.deprecation}"
1171		source="${build.jsr166e.java.version}"
1172	+	target="${build.jsr166e.java.version}"
1173		classpath=""
1174	<	bootclasspath="${bootclasspath7}"
1174	>	bootclasspath="${bootclasspath6}"
1175		includeAntRuntime="false"
1176		includeJavaRuntime="false"
1177		executable="${javac8}"

Diff Legend

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