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.178 by jsr166, Sun Sep 13 02:09:35 2015 UTC vs.
Revision 1.196 by jsr166, Sat Jan 2 21:02:44 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 95 | Line 89
89		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
90		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
91		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
92	<	<available property="jdk@{v}.have.java.base"
92	>	<local name="have.java.base"/>
93	>	<available property="have.java.base"
94		file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
95		<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
96	<	if:set="jdk@{v}.have.java.base"/>
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="jdk@{v}.have.java.base"/>
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 178 | 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 197 | 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 211 | 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 230 | 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 241 | 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		</syspropertyset>
260
252	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
253	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
254	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
261		<classpath>
262		<pathelement location="${junit.jar}"/>
263		<pathelement location="@{workdir}/tck-classes"/>
#	Line 283 | Line 289
289		</patternset>
290		</fileset>
291
292	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
293	+	<property name="jtreg.flags" value=""/>
294	+
295		<macrodef name="run-jtreg-tests">
296		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
297		<attribute name="source" default="7"/>
#	Line 290 | Line 299
299		<attribute name="workdir"/>
300		<attribute name="classes"/>
301		<attribute name="jtregflags" default=""/>
302	+
303		<sequential>
304	+
305	+	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
306	+	<property name="jtreg.verbose" value="nopass,fail,error"/>
307	+
308	+	<local name="modules"/>
309	+	<condition property="modules">
310	+	<available file="${jdk@{target}.home}/jmods" type="dir"/>
311	+	</condition>
312	+
313		<delete dir="@{workdir}/JTwork"   quiet="true"/>
314		<delete dir="@{workdir}/JTreport" quiet="true"/>
315		<mkdir dir="@{workdir}/JTwork/scratch"/>
316	<	<mkdir dir="@{workdir}/JTreport"/>
316	>	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
317	>	<mkdir dir="@{workdir}/JTreport/html"/>
318	>	<mkdir dir="@{workdir}/JTreport/text"/>
319		<jtreg dir="${jtreg@{target}.src.dir}"
320		jdk="${jdk@{target}.home}"
321		workDir="@{workdir}/JTwork"
322		reportDir="@{workdir}/JTreport">
323		<patternset refid="jdk@{target}.jtreg.tests"/>
324	<	<arg value="-Xbootclasspath/p:@{classes}"/>
324	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
325	>	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
326		<arg value="-agentvm"/>
327	<	<arg value="-v:nopass,fail"/>
327	>	<arg value="-verbose:${jtreg.verbose}"/>
328		<arg value="-vmoptions:-esa -ea"/>
329		<arg value="-automatic"/>
330		<arg value="-k:!ignore"/>
331		<arg line="@{jtregflags}"/>
332	+	<arg line="${jtreg.flags}"/>
333		</jtreg>
334		</sequential>
335		</macrodef>
#	Line 333 | Line 356
356		depends="configure-compiler"
357		description="Compiles src/main sources to build dir">
358
359	<	<mkdir dir="${build.classes.dir}"/>
359	>	<local name="modules"/>
360	>	<condition property="modules">
361	>	<and>
362	>	<available file="${jdk9.home}/jmods" type="dir"/>
363	>	<equals arg1="9" arg2="${build.main.java.version}"/>
364	>	</and>
365	>	</condition>
366	>
367	>	<local name="destdir"/>
368	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
369	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
370	>
371	>	<mkdir dir="${destdir}"/>
372
373		<javac srcdir="${src.dir}"
374	<	destdir="${build.classes.dir}"
374	>	destdir="${destdir}"
375		debug="${build.debug}"
376		debuglevel="${build.debuglevel}"
377		deprecation="${build.deprecation}"
#	Line 347 | Line 382
382		fork="true">
383
384		<include name="**/*.java"/>
385	+	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
386		<compilerarg value="-Xprefer:source"/>
387		<compilerarg value="-XDignore.symbol.file=true"/>
388		<compilerarg value="-Xlint:all"/>
#	Line 356 | Line 392
392		<compilerarg line="${build.args}"/>
393
394		</javac>
395	+
396	+	<!-- We need jdk9's Contended annotation, but at compile time only -->
397	+	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
398		</target>
399
400
#	Line 366 | Line 405
405		<jar destfile="${product.jar}">
406		<fileset dir="${build.classes.dir}"/>
407		<manifest>
408	<	<attribute name="Built-By" value="${user.name}"/>
409	<	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
408	>	<attribute name="Built-By" value="${user.name}"/>
409	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
410		</manifest>
411		</jar>
412		</target>
#	Line 396 | Line 435
435		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
436		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
437		<arg value="-XDignore.symbol.file=true"/>
438	+	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
439		<arg value="-tag"/>
440		<arg value="${javadoc.jls.option}"/>
441		<arg value="-tag"/>
#	Line 428 | Line 468
468		<exclude name="**/SyntaxTest.java"/>
469		<exclude name="**/SuperfluousAbstract.java"/>
470		<manifest>
471	<	<attribute name="Built-By" value="${user.name}"/>
472	<	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
471	>	<attribute name="Built-By" value="${user.name}"/>
472	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
473		</manifest>
474		</jar>
475		</target>
#	Line 529 | Line 569
569
570
571		<target name="configure-compiler">
572	+	<fail message="ant version too old">
573	+	<condition>
574	+	<not> <antversion atleast="1.9.1"/> </not>
575	+	</condition>
576	+	</fail>
577
578		<property name="unchecked.option" value="-Xlint:unchecked"/>
579
#	Line 560 | Line 605
605		debuglevel="${build.debuglevel}"
606		deprecation="${build.deprecation}"
607		source="${build.sourcelevel}"
608	+	target="${build.sourcelevel}"
609		fork="true">
610
611		<compilerarg line="${build.args}"/>
#	Line 615 | Line 661
661		debuglevel="${build.debuglevel}"
662		deprecation="${build.deprecation}"
663		source="6"
664	+	target="6"
665		classpath=""
666		bootclasspath="${bootclasspath6}"
667		includeAntRuntime="false"
#	Line 644 | Line 691
691		debuglevel="${build.debuglevel}"
692		deprecation="${build.deprecation}"
693		source="6"
694	+	target="6"
695		classpath=""
696	<	bootclasspath="${bootclasspath7}"
696	>	bootclasspath="${bootclasspath6}"
697		includeAntRuntime="false"
698		includeJavaRuntime="false"
699		executable="${javac8}"
#	Line 669 | Line 717
717		<jar destfile="${4jdk7product.jar}">
718		<fileset dir="${build.4jdk7.classes.dir}"/>
719		<manifest>
720	<	<attribute name="Built-By" value="${user.name}"/>
721	<	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
720	>	<attribute name="Built-By" value="${user.name}"/>
721	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
722		</manifest>
723		</jar>
724
#	Line 811 | Line 859
859		classpath=""
860		bootclasspath="${bootclasspath6}"
861		source="5"
862	+	target="5"
863		includeAntRuntime="false"
864		includeJavaRuntime="false"
865		executable="${javac7}"
#	Line 833 | Line 882
882		<jar destfile="${jsr166x.jar}">
883		<fileset dir="${build.jsr166x.classes.dir}"/>
884		<manifest>
885	<	<attribute name="Built-By" value="${user.name}"/>
886	<	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
885	>	<attribute name="Built-By" value="${user.name}"/>
886	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
887		</manifest>
888		</jar>
889
#	Line 900 | Line 949
949		debuglevel="${build.debuglevel}"
950		deprecation="${build.deprecation}"
951		source="6"
952	+	target="6"
953		classpath=""
954		bootclasspath="${bootclasspath6}"
955		includeAntRuntime="false"
#	Line 924 | Line 974
974		<jar destfile="${jsr166y.jar}" index="true">
975		<fileset dir="${build.jsr166y.classes.dir}"/>
976		<manifest>
977	<	<attribute name="Built-By" value="${user.name}"/>
978	<	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
977	>	<attribute name="Built-By" value="${user.name}"/>
978	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
979		</manifest>
980		</jar>
981
#	Line 994 | Line 1044
1044		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1045		classpath=""
1046		source="6"
1047	+	target="6"
1048		includeAntRuntime="false"
1049		includeJavaRuntime="false"
1050		executable="${javac7}"
#	Line 1016 | Line 1067
1067		<jar destfile="${extra166y.jar}" index="true">
1068		<fileset dir="${build.extra166y.classes.dir}"/>
1069		<manifest>
1070	<	<attribute name="Built-By" value="${user.name}"/>
1071	<	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1070	>	<attribute name="Built-By" value="${user.name}"/>
1071	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1072		</manifest>
1073		</jar>
1074
#	Line 1085 | Line 1136
1136		debuglevel="${build.debuglevel}"
1137		deprecation="${build.deprecation}"
1138		source="${build.jsr166e.java.version}"
1139	+	target="${build.jsr166e.java.version}"
1140		classpath=""
1141		includeAntRuntime="false"
1142		includeJavaRuntime="false"
#	Line 1111 | Line 1163
1163		debuglevel="${build.debuglevel}"
1164		deprecation="${build.deprecation}"
1165		source="${build.jsr166e.java.version}"
1166	+	target="${build.jsr166e.java.version}"
1167		classpath=""
1168	<	bootclasspath="${bootclasspath7}"
1168	>	bootclasspath="${bootclasspath6}"
1169		includeAntRuntime="false"
1170		includeJavaRuntime="false"
1171		executable="${javac8}"
#	Line 1135 | Line 1188
1188		<jar destfile="${jsr166e.jar}" index="true">
1189		<fileset dir="${build.jsr166e.classes.dir}"/>
1190		<manifest>
1191	<	<attribute name="Built-By" value="${user.name}"/>
1192	<	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1191	>	<attribute name="Built-By" value="${user.name}"/>
1192	>	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1193		</manifest>
1194		</jar>
1195

Diff Legend

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