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.176 by jsr166, Tue Sep 8 16:54:43 2015 UTC vs.
Revision 1.193 by jsr166, Fri Dec 11 23:58:52 2015 UTC

#	Line 1 | Line 1
1	<	<project name="jsr166" default="usage">
1	>	<project name="jsr166" default="usage"
2	>	xmlns:if="ant:if" xmlns:unless="ant:unless">
3
4		<description>
5		------------------------------------------------------------------------------
#	Line 28 | 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 38 | Line 44
44		</java>
45		</target>
46
47	+	<!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
48
49		<!-- User-specific settings -->
50		<property file="user.properties"/>
#	Line 50 | Line 57
57		<property name="build.deprecation"    value="false"/>
58		<property name="build.javadoc.access" value="protected"/>
59
53	–	<!-- Tck options; see JSR166TestCase.java
54	–	To profile a single tck test class:
55	–	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
56	–	To stress test a single tck test class:
57	–	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
58	–	-->
59	–	<property name="jsr166.profileTests"     value="false"/>
60	–	<property name="jsr166.profileThreshold" value="100"/>
61	–	<property name="jsr166.runsPerTest"      value="1"/>
62	–	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63	–
60		<!-- Build locations -->
61		<property name="build.dir"                   location="build"/>
62		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 93 | 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	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
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="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 171 | 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 190 | 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 204 | 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 223 | 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="-Xoverride:${build.classes.dir}" if:set="modules"/>
242		<compilerarg line="${build.args}"/>
243		<javac-elements/>
244
#	Line 234 | 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="-Xoverride:${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
245	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
246	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
247	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
261		<classpath>
262		<pathelement location="${junit.jar}"/>
263		<pathelement location="@{workdir}/tck-classes"/>
#	Line 283 | Line 296
296		<attribute name="workdir"/>
297		<attribute name="classes"/>
298		<attribute name="jtregflags" default=""/>
299	+
300		<sequential>
301	+
302	+	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
303	+	<property name="jtreg.verbose" value="nopass,fail,error"/>
304	+
305	+	<local name="modules"/>
306	+	<condition property="modules">
307	+	<available file="${jdk@{target}.home}/jmods" type="dir"/>
308	+	</condition>
309	+
310		<delete dir="@{workdir}/JTwork"   quiet="true"/>
311		<delete dir="@{workdir}/JTreport" quiet="true"/>
312		<mkdir dir="@{workdir}/JTwork/scratch"/>
313	<	<mkdir dir="@{workdir}/JTreport"/>
313	>	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
314	>	<mkdir dir="@{workdir}/JTreport/html"/>
315	>	<mkdir dir="@{workdir}/JTreport/text"/>
316		<jtreg dir="${jtreg@{target}.src.dir}"
317		jdk="${jdk@{target}.home}"
318		workDir="@{workdir}/JTwork"
319		reportDir="@{workdir}/JTreport">
320		<patternset refid="jdk@{target}.jtreg.tests"/>
321	<	<arg value="-Xbootclasspath/p:@{classes}"/>
321	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
322	>	<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
323		<arg value="-agentvm"/>
324	<	<arg value="-v:nopass,fail"/>
324	>	<arg value="-verbose:${jtreg.verbose}"/>
325		<arg value="-vmoptions:-esa -ea"/>
326		<arg value="-automatic"/>
327		<arg value="-k:!ignore"/>
#	Line 326 | Line 352
352		depends="configure-compiler"
353		description="Compiles src/main sources to build dir">
354
355	<	<mkdir dir="${build.classes.dir}"/>
355	>	<local name="modules"/>
356	>	<condition property="modules">
357	>	<and>
358	>	<available file="${jdk9.home}/jmods" type="dir"/>
359	>	<equals arg1="9" arg2="${build.main.java.version}"/>
360	>	</and>
361	>	</condition>
362	>
363	>	<local name="destdir"/>
364	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
365	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
366	>
367	>	<mkdir dir="${destdir}"/>
368
369		<javac srcdir="${src.dir}"
370	<	destdir="${build.classes.dir}"
370	>	destdir="${destdir}"
371		debug="${build.debug}"
372		debuglevel="${build.debuglevel}"
373		deprecation="${build.deprecation}"
#	Line 340 | Line 378
378		fork="true">
379
380		<include name="**/*.java"/>
381	+	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
382		<compilerarg value="-Xprefer:source"/>
383		<compilerarg value="-XDignore.symbol.file=true"/>
384		<compilerarg value="-Xlint:all"/>
#	Line 358 | Line 397
397
398		<jar destfile="${product.jar}">
399		<fileset dir="${build.classes.dir}"/>
400	+	<manifest>
401	+	<attribute name="Built-By" value="${user.name}"/>
402	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
403	+	</manifest>
404		</jar>
405		</target>
406
#	Line 385 | Line 428
428		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
429		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
430		<arg value="-XDignore.symbol.file=true"/>
431	+	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
432		<arg value="-tag"/>
433		<arg value="${javadoc.jls.option}"/>
434		<arg value="-tag"/>
#	Line 416 | Line 460
460		<exclude name="src/emulation/**"/>
461		<exclude name="**/SyntaxTest.java"/>
462		<exclude name="**/SuperfluousAbstract.java"/>
463	+	<manifest>
464	+	<attribute name="Built-By" value="${user.name}"/>
465	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
466	+	</manifest>
467		</jar>
468		</target>
469
#	Line 514 | Line 562
562
563
564		<target name="configure-compiler">
565	+	<fail message="ant version too old">
566	+	<condition>
567	+	<not> <antversion atleast="1.9.1"/> </not>
568	+	</condition>
569	+	</fail>
570
571		<property name="unchecked.option" value="-Xlint:unchecked"/>
572
#	Line 545 | Line 598
598		debuglevel="${build.debuglevel}"
599		deprecation="${build.deprecation}"
600		source="${build.sourcelevel}"
601	+	target="${build.sourcelevel}"
602		fork="true">
603
604		<compilerarg line="${build.args}"/>
#	Line 600 | Line 654
654		debuglevel="${build.debuglevel}"
655		deprecation="${build.deprecation}"
656		source="6"
657	+	target="6"
658		classpath=""
659		bootclasspath="${bootclasspath6}"
660		includeAntRuntime="false"
#	Line 629 | Line 684
684		debuglevel="${build.debuglevel}"
685		deprecation="${build.deprecation}"
686		source="6"
687	+	target="6"
688		classpath=""
689	<	bootclasspath="${bootclasspath7}"
689	>	bootclasspath="${bootclasspath6}"
690		includeAntRuntime="false"
691		includeJavaRuntime="false"
692		executable="${javac8}"
#	Line 653 | Line 709
709
710		<jar destfile="${4jdk7product.jar}">
711		<fileset dir="${build.4jdk7.classes.dir}"/>
712	+	<manifest>
713	+	<attribute name="Built-By" value="${user.name}"/>
714	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
715	+	</manifest>
716		</jar>
717
718		</target>
#	Line 792 | Line 852
852		classpath=""
853		bootclasspath="${bootclasspath6}"
854		source="5"
855	+	target="5"
856		includeAntRuntime="false"
857		includeJavaRuntime="false"
858		executable="${javac7}"
#	Line 813 | Line 874
874
875		<jar destfile="${jsr166x.jar}">
876		<fileset dir="${build.jsr166x.classes.dir}"/>
877	+	<manifest>
878	+	<attribute name="Built-By" value="${user.name}"/>
879	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
880	+	</manifest>
881		</jar>
882
883		</target>
#	Line 877 | Line 942
942		debuglevel="${build.debuglevel}"
943		deprecation="${build.deprecation}"
944		source="6"
945	+	target="6"
946		classpath=""
947		bootclasspath="${bootclasspath6}"
948		includeAntRuntime="false"
#	Line 900 | Line 966
966
967		<jar destfile="${jsr166y.jar}" index="true">
968		<fileset dir="${build.jsr166y.classes.dir}"/>
969	+	<manifest>
970	+	<attribute name="Built-By" value="${user.name}"/>
971	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
972	+	</manifest>
973		</jar>
974
975		</target>
#	Line 967 | Line 1037
1037		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1038		classpath=""
1039		source="6"
1040	+	target="6"
1041		includeAntRuntime="false"
1042		includeJavaRuntime="false"
1043		executable="${javac7}"
#	Line 988 | Line 1059
1059
1060		<jar destfile="${extra166y.jar}" index="true">
1061		<fileset dir="${build.extra166y.classes.dir}"/>
1062	+	<manifest>
1063	+	<attribute name="Built-By" value="${user.name}"/>
1064	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1065	+	</manifest>
1066		</jar>
1067
1068		</target>
#	Line 1054 | Line 1129
1129		debuglevel="${build.debuglevel}"
1130		deprecation="${build.deprecation}"
1131		source="${build.jsr166e.java.version}"
1132	+	target="${build.jsr166e.java.version}"
1133		classpath=""
1134		includeAntRuntime="false"
1135		includeJavaRuntime="false"
#	Line 1080 | Line 1156
1156		debuglevel="${build.debuglevel}"
1157		deprecation="${build.deprecation}"
1158		source="${build.jsr166e.java.version}"
1159	+	target="${build.jsr166e.java.version}"
1160		classpath=""
1161	<	bootclasspath="${bootclasspath7}"
1161	>	bootclasspath="${bootclasspath6}"
1162		includeAntRuntime="false"
1163		includeJavaRuntime="false"
1164		executable="${javac8}"
#	Line 1103 | Line 1180
1180
1181		<jar destfile="${jsr166e.jar}" index="true">
1182		<fileset dir="${build.jsr166e.classes.dir}"/>
1183	+	<manifest>
1184	+	<attribute name="Built-By" value="${user.name}"/>
1185	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1186	+	</manifest>
1187		</jar>
1188
1189		</target>

Diff Legend

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