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.179 by jsr166, Sun Sep 13 03:22:29 2015 UTC vs.
Revision 1.222 by jsr166, Mon Oct 10 04:51:19 2016 UTC

#	Line 7 | Line 7
7
8		Usage: ant [target]
9
10	+	See http://gee.cs.oswego.edu/dl/concurrency-interest/index.html for
11	+	more details.
12	+
13		User-specific settings are read from user.properties.
14		See user.properties.sample for an explanation of some useful settings.
15
#	Line 27 | Line 30
30		(e.g. mercurial forest) or a symlink to same.
31
32		Alternatively, define ant variables thus:
33	<	ant -Djdk$N.home=...
33	>	ant -Djdk$N.home=... -Djdk$N.src.home=...
34		for $N in 6 7 8 9 ...
35	+
36	+	As of 2016-03, the sources in src/main are for jdk9+ only.  The "docs"
37	+	target is currently broken.
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 52 | Line 58
58		<property name="build.deprecation"    value="false"/>
59		<property name="build.javadoc.access" value="protected"/>
60
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	–
61		<!-- Build locations -->
62		<property name="build.dir"                   location="build"/>
63		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 75 | Line 70
70		<property name="build.4jdk7.tck.classes.dir" location="${build.4jdk7.dir}/tck-classes"/>
71		<property name="build.4jdk7.docs.dir"        location="${build.4jdk7.dir}/docs"/>
72
73	+	<property name="build.4jdk8.dir"             location="${build.dir}/jsr166-4jdk8"/>
74	+	<property name="build.4jdk8.classes.dir"     location="${build.4jdk8.dir}/classes"/>
75	+	<property name="build.4jdk8.tck.classes.dir" location="${build.4jdk8.dir}/tck-classes"/>
76	+	<property name="build.4jdk8.docs.dir"        location="${build.4jdk8.dir}/docs"/>
77	+
78		<property name="build.jsr166x.dir"           location="${build.dir}/jsr166x"/>
79		<property name="build.jsr166y.dir"           location="${build.dir}/jsr166y"/>
80		<property name="build.jsr166e.dir"           location="${build.dir}/jsr166e"/>
#	Line 91 | Line 91
91		<macrodef name="defjdklocations">
92		<attribute name="v"/>
93		<sequential>
94	<	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
95	<	<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
96	<	<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
97	<	<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
98	<	<available property="jdk@{v}.have.java.base"
99	<	file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
100	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
101	<	if:set="jdk@{v}.have.java.base"/>
102	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
103	<	unless:set="jdk@{v}.have.java.base"/>
94	>	<property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
95	>	<property name="java@{v}"         location="${jdk@{v}.home}/bin/java"/>
96	>	<property name="javac@{v}"        location="${jdk@{v}.home}/bin/javac"/>
97	>	<property name="javadoc@{v}"      location="${jdk@{v}.home}/bin/javadoc"/>
98	>	<property name="jdk@{v}.src.home" location="${jdks.home}/src/jdk@{v}"/>
99	>	<local name="have.java.base"/>
100	>	<available property="have.java.base"
101	>	file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
102	>	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
103	>	if:set="have.java.base"/>
104	>	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
105	>	unless:set="have.java.base"/>
106	>	<local name="modules"/>
107	>	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
108		<local name="boot.jar.dir"/>
109	<	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
110	<	<path id="bootclasspath@{v}">
109	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
110	>	<path id="bootclasspath@{v}" unless:set="modules">
111		<pathelement path="${boot.jar.dir}/resources.jar"/>
112		<pathelement path="${boot.jar.dir}/rt.jar"/>
113		<pathelement path="${boot.jar.dir}/jsse.jar"/>
114		<pathelement path="${boot.jar.dir}/jce.jar"/>
115		<pathelement path="${boot.jar.dir}/charsets.jar"/>
116		</path>
117	<	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
117	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
118		</sequential>
119		</macrodef>
120
#	Line 137 | Line 141
141		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
142		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
143		<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
144	<	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
144	>	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg-jdk8"/>
145		<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
146		<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
147		<property name="lib.dir"              location="${basedir}/lib"/>
148		<property name="dist.dir"             location="${basedir}/dist"/>
149		<property name="topsrc.dir"           location="${basedir}/src"/>
150		<property name="4jdk7src.dir"         location="${topsrc.dir}/jdk7"/>
151	+	<property name="4jdk8src.dir"         location="${topsrc.dir}/jdk8"/>
152		<property name="jsr166xsrc.dir"       location="${topsrc.dir}/jsr166x"/>
153		<property name="jsr166ysrc.dir"       location="${topsrc.dir}/jsr166y"/>
154		<property name="jsr166esrc.dir"       location="${topsrc.dir}/jsr166e"/>
#	Line 152 | Line 157
157		<!-- Javadoc locations -->
158		<property name="docs.dir"          location="${build.dir}/docs"/>
159		<property name="4jdk7docs.dir"     location="${build.4jdk7.dir}/docs"/>
160	+	<property name="4jdk8docs.dir"     location="${build.4jdk8.dir}/docs"/>
161		<property name="jsr166xdocs.dir"   location="${build.jsr166x.dir}/docs"/>
162		<property name="jsr166ydocs.dir"   location="${build.jsr166y.dir}/docs"/>
163		<property name="jsr166edocs.dir"   location="${build.jsr166e.dir}/docs"/>
#	Line 159 | Line 165
165
166		<property name="dist.docs.dir"          location="${dist.dir}/docs"/>
167		<property name="dist.4jdk7docs.dir"     location="${dist.dir}/jsr166-4jdk7docs"/>
168	+	<property name="dist.4jdk8docs.dir"     location="${dist.dir}/jsr166-4jdk8docs"/>
169		<property name="dist.jsr166xdocs.dir"   location="${dist.dir}/jsr166xdocs"/>
170		<property name="dist.jsr166ydocs.dir"   location="${dist.dir}/jsr166ydocs"/>
171		<property name="dist.jsr166edocs.dir"   location="${dist.dir}/jsr166edocs"/>
#	Line 167 | Line 174
174		<!-- Jar locations -->
175		<property name="product.jar"      location="${build.dir}/jsr166.jar"/>
176		<property name="4jdk7product.jar" location="${build.4jdk7.dir}/jsr166-4jdk7.jar"/>
177	+	<property name="4jdk8product.jar" location="${build.4jdk8.dir}/jsr166-4jdk8.jar"/>
178		<property name="jsr166x.jar"      location="${build.jsr166x.dir}/jsr166x.jar"/>
179		<property name="jsr166y.jar"      location="${build.jsr166y.dir}/jsr166y.jar"/>
180		<property name="jsr166e.jar"      location="${build.jsr166e.dir}/jsr166e.jar"/>
#	Line 178 | 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 2014-07 -->
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://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 197 | Line 205
205		<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
206		classpath="${lib.dir}/jtreg.jar" />
207
208	<	<!-- Test classpath -->
209	<	<path id="test.classpath">
210	<	<pathelement location="${build.testcases.dir}"/>
211	<	<pathelement location="${junit.jar}"/>
212	<	</path>
213	<
208	>	<!-- Tck options; see JSR166TestCase.java
209	>	To profile a single tck test class:
210	>	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
211	>	To stress test a single tck test class:
212	>	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
213	>	To stress test a single tck test method:
214	>	ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
215	>	-->
216	>	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
217		<macrodef name="run-tck-tests">
218		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
219		<attribute name="target"/>
220		<attribute name="compile-target" default="@{target}"/>
221		<attribute name="workdir"/>
222		<attribute name="classes"/>
223	<	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
223	>	<!--
224	>	<attribute name="jvmflags" default="-XX:+UseParallelGC -XX:-UseBiasedLocking -ea -esa -Djsr166.testImplementationDetails=true"/>
225	>	-->
226	>	<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
227		<element name="javac-elements" optional="true"/>
228	+
229		<sequential>
230
231	+	<local name="modules"/>
232	+	<condition property="modules">
233	+	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
234	+	</condition>
235	+
236		<mkdir dir="@{workdir}/tck-classes"/>
237
238		<javac srcdir="@{tck.src.dir}"
#	Line 225 | Line 245
245		classpath="${junit.jar}"
246		includeAntRuntime="false"
247		includeJavaRuntime="false"
248	+	encoding="ASCII"
249		executable="${javac@{compile-target}}"
250		fork="true">
251
252		<include name="*.java"/>
253		<compilerarg value="-XDignore.symbol.file=true"/>
254	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
255	<	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
254	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
255	>	<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
256	>	<compilerarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
257		<compilerarg line="${build.args}"/>
258		<javac-elements/>
259
#	Line 241 | Line 263
263		failonerror="true"
264		jvm="${java@{target}}"
265		fork="true">
266	<	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
266	>	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
267	>	<jvmarg line="--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
268		<jvmarg line="@{jvmflags}"/>
269	+	<!-- ant -Dvmoptions="-Xmx8m" -Djsr166.tckTestClass=CompletableFutureTest tck -->
270	+	<jvmarg line="${vmoptions}" if:set="vmoptions"/>
271
272	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
273	<	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
272	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
273	>	<syspropertyset id="system-properties-used-by-tck">
274		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
275	+	<propertyref prefix="jsr166."/>
276	+	<propertyref name="test.timeout.factor"/>
277		</syspropertyset>
278
252	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
253	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
254	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
279		<classpath>
280		<pathelement location="${junit.jar}"/>
281		<pathelement location="@{workdir}/tck-classes"/>
#	Line 283 | Line 307
307		</patternset>
308		</fileset>
309
310	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
311	+	<property name="jtreg.flags" value=""/>
312	+
313		<macrodef name="run-jtreg-tests">
314		<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
315		<attribute name="source" default="7"/>
#	Line 290 | Line 317
317		<attribute name="workdir"/>
318		<attribute name="classes"/>
319		<attribute name="jtregflags" default=""/>
320	+
321		<sequential>
322	+
323	+	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
324	+	<property name="jtreg.verbose" value="nopass,fail,error"/>
325	+
326	+	<local name="modules"/>
327	+	<condition property="modules">
328	+	<available file="${jdk@{target}.home}/jmods" type="dir"/>
329	+	</condition>
330	+
331		<delete dir="@{workdir}/JTwork"   quiet="true"/>
332		<delete dir="@{workdir}/JTreport" quiet="true"/>
296	–	<mkdir dir="@{workdir}/JTwork/scratch"/>
297	–	<mkdir dir="@{workdir}/JTreport"/>
333		<jtreg dir="${jtreg@{target}.src.dir}"
334		jdk="${jdk@{target}.home}"
335		workDir="@{workdir}/JTwork"
336		reportDir="@{workdir}/JTreport">
337		<patternset refid="jdk@{target}.jtreg.tests"/>
338	<	<arg value="-Xbootclasspath/p:@{classes}"/>
338	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
339	>	<arg value="-javacoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
340	>	<arg value="-vmoptions:--patch-module java.base=${build.classes.dir}/java.base" if:set="modules"/>
341		<arg value="-agentvm"/>
342	<	<arg value="-v:nopass,fail"/>
342	>	<arg value="-verbose:${jtreg.verbose}"/>
343		<arg value="-vmoptions:-esa -ea"/>
344		<arg value="-automatic"/>
345		<arg value="-k:!ignore"/>
346		<arg line="@{jtregflags}"/>
347	+	<arg line="${jtreg.flags}"/>
348		</jtreg>
349		</sequential>
350		</macrodef>
#	Line 326 | Line 364
364		<property name="build.main.javac" value="${javac9}"/>
365
366		<target name="dists"
367	<	depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
367	>	depends="dist, 4jdk8dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist"
368		description="Builds all public jars and docs"/>
369
370		<target name="compile"
371		depends="configure-compiler"
372		description="Compiles src/main sources to build dir">
373
374	<	<mkdir dir="${build.classes.dir}"/>
374	>	<local name="modules"/>
375	>	<condition property="modules">
376	>	<and>
377	>	<available file="${jdk9.home}/jmods" type="dir"/>
378	>	<equals arg1="9" arg2="${build.main.java.version}"/>
379	>	</and>
380	>	</condition>
381	>
382	>	<local name="destdir"/>
383	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
384	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
385	>
386	>	<mkdir dir="${destdir}"/>
387
388		<javac srcdir="${src.dir}"
389	<	destdir="${build.classes.dir}"
389	>	destdir="${destdir}"
390		debug="${build.debug}"
391		debuglevel="${build.debuglevel}"
392		deprecation="${build.deprecation}"
393		classpath=""
394		includeAntRuntime="false"
395		includeJavaRuntime="false"
396	+	encoding="ASCII"
397		executable="${build.main.javac}"
398		fork="true">
399
400		<include name="**/*.java"/>
401	+	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
402		<compilerarg value="-Xprefer:source"/>
403		<compilerarg value="-XDignore.symbol.file=true"/>
404		<compilerarg value="-Xlint:all"/>
#	Line 361 | Line 413
413
414		<target name="jar"
415		depends="compile"
416	<	description="Builds library jar from compiled sources">
417	<
416	>	description="Builds library jar for src/main from compiled sources">
417	>	<local name="subdir"/>
418	>	<available property="subdir" file="${build.classes.dir}/java.base" type="dir" value="/java.base"/>
419		<jar destfile="${product.jar}">
420	<	<fileset dir="${build.classes.dir}"/>
420	>	<fileset dir="${build.classes.dir}${subdir}"/>
421		<manifest>
422		<attribute name="Built-By" value="${user.name}"/>
423		<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
#	Line 382 | Line 435
435		<!-- the packagenames="none" hack below prevents scanning the -->
436		<!-- sourcepath for packages -->
437
438	+	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}" -->
439	+	<!--  TODO: sourcepath="${src.dir}:${jdk9.src.dir}:${jdk9.src.home}/jdk/src/java.logging/share/classes" -->
440		<javadoc destdir="${docs.dir}"
441		packagenames="none"
442		link="${java9.api.url}"
443		overview="${src.dir}/intro.html"
444		access="${build.javadoc.access}"
445	<	sourcepath="${src.dir}:${jdk9src.dir}"
445	>	sourcepath="${src.dir}"
446		classpath=""
447		executable="${javadoc9}">
448		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 396 | Line 451
451		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
452		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
453		<arg value="-XDignore.symbol.file=true"/>
454	+	<arg value="-Xmodule:java.base"/>
455		<arg value="-tag"/>
456		<arg value="${javadoc.jls.option}"/>
457	+	<!-- @apiNote currently unused -->
458	+	<!--       <arg value="-tag"/> -->
459	+	<!--       <arg value="apiNote:a:API Note:"/> -->
460		<arg value="-tag"/>
461	<	<arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/>
403	<	<arg value="-tag"/>
404	<	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
461	>	<arg value="implSpec:a:Implementation Requirements:"/>
462		<arg value="-tag"/>
463	<	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
463	>	<arg value="implNote:a:Implementation Note:"/>
464	>	<!-- tags added in jdk9: currently unused -->
465	>	<!--       <arg value="-tag"/> -->
466	>	<!--       <arg value="revised:X"/> -->
467	>	<!--       <arg value="-tag"/> -->
468	>	<!--       <arg value="spec:X"/> -->
469		</javadoc>
470		</target>
471
#	Line 464 | Line 526
526
527		<target name="tck"
528		depends="jar"
529	<	description="Runs tck tests for main directly">
529	>	description="Runs tck tests for src/main directly">
530
531		<run-tck-tests
532		target="${build.main.java.version}"
#	Line 473 | Line 535
535		</target>
536
537		<target name="tck-parallelism-1"
538	<	description="Runs tck with given common pool parallelism">
538	>	description="Runs tck with common pool parallelism 1">
539		<antcall target="tck">
540		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
541		</antcall>
542		</target>
543
544		<target name="tck-parallelism-0"
545	<	description="Runs tck with given common pool parallelism">
545	>	description="Runs tck with common pool parallelism 0">
546		<antcall target="tck">
547		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
548		</antcall>
549		</target>
550
551	+	<target name="tck-security-manager"
552	+	description="Runs tck with a security manager">
553	+	<antcall target="tck">
554	+	<param name="jsr166.useSecurityManager" value="true"/>
555	+	</antcall>
556	+	</target>
557	+
558		<target name="jtreg"
559		depends="jar"
560	<	description="Runs jtreg tests for main using the jtreg ant task">
560	>	description="Runs jtreg tests for src/main using the jtreg ant task">
561		<run-jtreg-tests
562		target="${build.main.java.version}"
563		workdir="${build.dir}"
#	Line 496 | Line 565
565		</target>
566
567		<target name="test"
568	<	depends="tck, tck-parallelism-1, jtreg"
569	<	description="Runs tck and jtreg tests for main">
568	>	depends="tck, tck-parallelism-1, tck-parallelism-0, jtreg"
569	>	description="Runs tck and jtreg tests for src/main">
570		</target>
571
572	<	<target name="jtreg8" description="Runs jtreg tests with jdk8">
572	>	<!--   <target name="jtreg8" description="Runs jtreg tests with jdk8"> -->
573
574	<	<antcall target="jtreg">
575	<	<param name="build.main.java.version" value="8"/>
576	<	<param name="build.main.javac" value="${javac8}"/>
577	<	</antcall>
574	>	<!--     <antcall target="jtreg"> -->
575	>	<!--       <param name="build.main.java.version" value="8"/> -->
576	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
577	>	<!--     </antcall> -->
578
579	<	</target>
579	>	<!--   </target> -->
580
581	<	<target name="test89"
582	<	description="Runs tck and jtreg tests for main for multiple java versions">
581	>	<!--   <target name="test89" -->
582	>	<!--           description="Runs tck and jtreg tests for src/main for multiple java versions"> -->
583
584	<	<antcall target="clean"/>
585	<	<antcall target="test">
586	<	<param name="build.main.java.version" value="8"/>
587	<	<param name="build.main.javac" value="${javac8}"/>
588	<	</antcall>
584	>	<!--     <antcall target="clean"/> -->
585	>	<!--     <antcall target="test"> -->
586	>	<!--       <param name="build.main.java.version" value="8"/> -->
587	>	<!--       <param name="build.main.javac" value="${javac8}"/> -->
588	>	<!--     </antcall> -->
589
590	<	<antcall target="clean"/>
591	<	<antcall target="test">
592	<	<param name="build.main.java.version" value="9"/>
593	<	<param name="build.main.javac" value="${javac9}"/>
594	<	</antcall>
590	>	<!--     <antcall target="clean"/> -->
591	>	<!--     <antcall target="test"> -->
592	>	<!--       <param name="build.main.java.version" value="9"/> -->
593	>	<!--       <param name="build.main.javac" value="${javac9}"/> -->
594	>	<!--     </antcall> -->
595
596	<	</target>
596	>	<!--   </target> -->
597
598
599
600		<target name="configure-compiler">
601	+	<fail message="ant version too old">
602	+	<condition>
603	+	<not> <antversion atleast="1.9.1"/> </not>
604	+	</condition>
605	+	</fail>
606
607		<property name="unchecked.option" value="-Xlint:unchecked"/>
608
#	Line 549 | Line 623
623		<!-- Various demos and test programs -->
624
625
626	<	<target name="loops" depends="configure-compiler"
627	<	description="Benchmark from Doug Lea's AQS paper">
626	>	<!-- description="Benchmark from Doug Lea's AQS paper" -->
627	>	<target name="loops" depends="configure-compiler">
628
629		<mkdir dir="${build.loops.dir}"/>
630
#	Line 560 | Line 634
634		debuglevel="${build.debuglevel}"
635		deprecation="${build.deprecation}"
636		source="${build.sourcelevel}"
637	+	target="${build.sourcelevel}"
638	+	encoding="ASCII"
639		fork="true">
640
641		<compilerarg line="${build.args}"/>
#	Line 587 | Line 663
663		deprecation="${build.deprecation}"
664		includeAntRuntime="false"
665		includeJavaRuntime="false"
666	+	encoding="ASCII"
667		executable="${javac9}"
668		fork="true">
669
#	Line 601 | Line 678
678		</target>
679
680
681	+	<!-- jsr166 4jdk8 -->
682	+
683	+	<target name="4jdk8compile"
684	+	depends="configure-compiler"
685	+	description="Compiles src/jdk8 sources, targeting jdk8">
686	+
687	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
688	+
689	+	<javac srcdir="${4jdk8src.dir}"
690	+	destdir="${build.4jdk8.classes.dir}"
691	+	debug="${build.debug}"
692	+	debuglevel="${build.debuglevel}"
693	+	deprecation="${build.deprecation}"
694	+	source="8"
695	+	target="8"
696	+	classpath=""
697	+	bootclasspath="${bootclasspath8}"
698	+	includeAntRuntime="false"
699	+	includeJavaRuntime="false"
700	+	encoding="ASCII"
701	+	executable="${javac8}"
702	+	fork="true">
703	+
704	+	<include name="**/*.java"/>
705	+	<compilerarg value="-Xprefer:source"/>
706	+	<compilerarg value="-XDignore.symbol.file=true"/>
707	+	<compilerarg value="-Xlint:all"/>
708	+	<compilerarg value="-Werror"/>
709	+	<compilerarg line="${build.args}"/>
710	+
711	+	</javac>
712	+	</target>
713	+
714	+	<target name="4jdk8doclint"
715	+	depends="configure-compiler"
716	+	description="Finds doclint warnings">
717	+
718	+	<mkdir dir="${build.4jdk8.classes.dir}"/>
719	+
720	+	<javac srcdir="${4jdk8src.dir}"
721	+	destdir="${build.4jdk8.classes.dir}"
722	+	debug="${build.debug}"
723	+	debuglevel="${build.debuglevel}"
724	+	deprecation="${build.deprecation}"
725	+	source="8"
726	+	target="8"
727	+	classpath=""
728	+	bootclasspath="${bootclasspath8}"
729	+	includeAntRuntime="false"
730	+	includeJavaRuntime="false"
731	+	encoding="ASCII"
732	+	executable="${javac8}"
733	+	fork="true">
734	+
735	+	<include name="**/*.java"/>
736	+	<compilerarg value="-Xprefer:source"/>
737	+	<compilerarg value="-XDignore.symbol.file=true"/>
738	+	<compilerarg value="-Xlint:all"/>
739	+	<compilerarg value="-Xdoclint:all/protected"/>
740	+	<compilerarg line="${build.args}"/>
741	+
742	+	</javac>
743	+	</target>
744	+
745	+
746	+	<target name="4jdk8jar"
747	+	depends="4jdk8compile"
748	+	description="Builds library jar from compiled sources">
749	+
750	+	<jar destfile="${4jdk8product.jar}">
751	+	<fileset dir="${build.4jdk8.classes.dir}"/>
752	+	<manifest>
753	+	<attribute name="Built-By" value="${user.name}"/>
754	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
755	+	</manifest>
756	+	</jar>
757	+
758	+	</target>
759	+
760	+
761	+	<target name="4jdk8-tck"
762	+	depends="4jdk8jar"
763	+	description="Runs tck tests for jsr166-4jdk8 directly">
764	+
765	+	<run-tck-tests
766	+	target="8"
767	+	workdir="${build.4jdk8.dir}"
768	+	classes="${4jdk8product.jar}">
769	+	<javac-elements>
770	+	<!-- JDK9+ test classes -->
771	+	<exclude name="*9Test.java"/>
772	+	<exclude name="*10Test.java"/>
773	+	</javac-elements>
774	+	</run-tck-tests>
775	+	</target>
776	+
777	+
778	+	<target name="4jdk8-jtreg"
779	+	depends="4jdk8jar"
780	+	description="Runs jtreg tests for jsr166-4jdk8 using the jtreg ant task">
781	+	<run-jtreg-tests
782	+	target="8"
783	+	workdir="${build.4jdk8.dir}"
784	+	classes="${4jdk8product.jar}"/>
785	+	</target>
786	+
787	+
788	+	<target name="4jdk8-test"
789	+	depends="4jdk8-tck, 4jdk8-jtreg"
790	+	description="Runs tck and jtreg tests for jsr166-4jdk8">
791	+	</target>
792	+
793	+
794	+	<target name="4jdk8docs"
795	+	description="Builds javadocs for src/jdk8 to dist dir">
796	+
797	+	<delete dir="${4jdk8docs.dir}"/>
798	+	<mkdir dir="${4jdk8docs.dir}"/>
799	+
800	+	<javadoc destdir="${4jdk8docs.dir}"
801	+	packagenames="none"
802	+	link="${java8.api.url}"
803	+	overview="${4jdk8src.dir}/intro.html"
804	+	access="${build.javadoc.access}"
805	+	sourcepath="${4jdk8src.dir}:${jdk8.src.dir}"
806	+	classpath=""
807	+	executable="${javadoc8}"
808	+	failonerror = "true">
809	+	<fileset dir="${4jdk8src.dir}" defaultexcludes="yes">
810	+	<include name="**/*.java"/>
811	+	</fileset>
812	+	<arg line="-Xdocrootparent ${java8.docroot.url}"/>
813	+	<arg value="-XDignore.symbol.file=true"/>
814	+	<arg value="-tag"/>
815	+	<arg value="${javadoc.jls.option}"/>
816	+	<!-- @apiNote currently unused -->
817	+	<!--       <arg value="-tag"/> -->
818	+	<!--       <arg value="apiNote:a:&lt;em&gt;API Note:&lt;/em&gt;"/> -->
819	+	<arg value="-tag"/>
820	+	<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
821	+	<arg value="-tag"/>
822	+	<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
823	+	</javadoc>
824	+	</target>
825	+
826	+
827	+	<target name="4jdk8dist"
828	+	depends="4jdk8dist-jar, 4jdk8dist-docs"
829	+	description="Puts all distributable products in single hierarchy"/>
830	+
831	+
832	+	<target name="4jdk8clean"
833	+	description="Removes all 4jdk8 build products">
834	+
835	+	<delete dir="${build.4jdk8.dir}"/>
836	+
837	+	</target>
838	+
839	+
840	+	<target name="4jdk8dist-jar"
841	+	depends="4jdk8clean, 4jdk8jar">
842	+	<copy file="${4jdk8product.jar}" todir="${dist.dir}"/>
843	+	</target>
844	+
845	+
846	+	<target name="4jdk8dist-docs"
847	+	depends="4jdk8clean, 4jdk8docs">
848	+	<mirror-dir src="${4jdk8docs.dir}" dst="${dist.4jdk8docs.dir}"/>
849	+	</target>
850	+
851	+
852	+
853		<!-- jsr166 4jdk7 -->
854
855		<target name="4jdk7compile"
#	Line 615 | Line 864
864		debuglevel="${build.debuglevel}"
865		deprecation="${build.deprecation}"
866		source="6"
867	+	target="6"
868		classpath=""
869		bootclasspath="${bootclasspath6}"
870		includeAntRuntime="false"
871		includeJavaRuntime="false"
872	+	encoding="ASCII"
873		executable="${javac7}"
874		fork="true">
875
#	Line 644 | Line 895
895		debuglevel="${build.debuglevel}"
896		deprecation="${build.deprecation}"
897		source="6"
898	+	target="6"
899		classpath=""
900	<	bootclasspath="${bootclasspath7}"
900	>	bootclasspath="${bootclasspath6}"
901		includeAntRuntime="false"
902		includeJavaRuntime="false"
903	+	encoding="ASCII"
904		executable="${javac8}"
905		fork="true">
906
#	Line 703 | Line 956
956		</target>
957
958
959	+	<!-- Runs tck tests for jsr166-4jdk7 via junit task (dead experiment) -->
960		<target name="4jdk7-tck-junit"
961	<	depends="4jdk7compile"
708	<	description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
961	>	depends="4jdk7compile">
962
963		<junit printsummary="true"
964		showoutput="true"
#	Line 758 | Line 1011
1011		link="${java7.api.url}"
1012		overview="${4jdk7src.dir}/intro.html"
1013		access="${build.javadoc.access}"
1014	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
1014	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
1015		classpath=""
1016	<	executable="${javadoc7}">
1016	>	executable="${javadoc7}"
1017	>	failonerror = "true">
1018		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
1019		<include name="**/*.java"/>
1020		</fileset>
#	Line 811 | Line 1065
1065		classpath=""
1066		bootclasspath="${bootclasspath6}"
1067		source="5"
1068	+	target="5"
1069		includeAntRuntime="false"
1070		includeJavaRuntime="false"
1071	+	encoding="ASCII"
1072		executable="${javac7}"
1073		fork="true">
1074
#	Line 851 | Line 1107
1107		packagenames="jsr166x.*"
1108		link="${java.api.url}"
1109		access="${build.javadoc.access}"
1110	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1110	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1111		bootclasspath="${bootclasspath6}"
1112		source="5"
1113	<	executable="${javadoc7}">
1113	>	executable="${javadoc7}"
1114	>	failonerror = "true">
1115		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1116		<arg value="-XDignore.symbol.file=true"/>
1117
#	Line 900 | Line 1157
1157		debuglevel="${build.debuglevel}"
1158		deprecation="${build.deprecation}"
1159		source="6"
1160	+	target="6"
1161		classpath=""
1162		bootclasspath="${bootclasspath6}"
1163		includeAntRuntime="false"
1164		includeJavaRuntime="false"
1165	+	encoding="ASCII"
1166		executable="${javac7}"
1167		fork="true">
1168
#	Line 942 | Line 1201
1201		packagenames="jsr166y.*"
1202		link="${java.api.url}"
1203		access="${build.javadoc.access}"
1204	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1204	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1205		bootclasspath="${bootclasspath6}"
1206		source="6"
1207	<	executable="${javadoc7}">
1207	>	executable="${javadoc7}"
1208	>	failonerror = "true">
1209		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1210		<arg value="-XDignore.symbol.file=true"/>
1211
#	Line 994 | Line 1254
1254		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1255		classpath=""
1256		source="6"
1257	+	target="6"
1258		includeAntRuntime="false"
1259		includeJavaRuntime="false"
1260	+	encoding="ASCII"
1261		executable="${javac7}"
1262		fork="true">
1263
#	Line 1034 | Line 1296
1296		packagenames="extra166y.*"
1297		link="${java.api.url}"
1298		access="${build.javadoc.access}"
1299	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1299	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1300		bootclasspath="${bootclasspath6}"
1301		source="6"
1302		executable="${javadoc7}">
#	Line 1085 | Line 1347
1347		debuglevel="${build.debuglevel}"
1348		deprecation="${build.deprecation}"
1349		source="${build.jsr166e.java.version}"
1350	+	target="${build.jsr166e.java.version}"
1351		classpath=""
1352		includeAntRuntime="false"
1353		includeJavaRuntime="false"
#	Line 1111 | Line 1374
1374		debuglevel="${build.debuglevel}"
1375		deprecation="${build.deprecation}"
1376		source="${build.jsr166e.java.version}"
1377	+	target="${build.jsr166e.java.version}"
1378		classpath=""
1379	<	bootclasspath="${bootclasspath7}"
1379	>	bootclasspath="${bootclasspath6}"
1380		includeAntRuntime="false"
1381		includeJavaRuntime="false"
1382		executable="${javac8}"
#	Line 1153 | Line 1417
1417		packagenames="jsr166e.*"
1418		link="${java.api.url}"
1419		access="${build.javadoc.access}"
1420	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1420	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1421		source="${build.jsr166e.java.version}"
1422	<	executable="${javadoc7}">
1422	>	executable="${javadoc7}"
1423	>	failonerror = "true">
1424		<arg line="-Xdocrootparent ${java.docroot.url}"/>
1425		<arg value="-XDignore.symbol.file=true"/>
1426

Diff Legend

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