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.154 by jsr166, Mon Jun 16 15:55:54 2014 UTC vs.
Revision 1.198 by jsr166, Thu Mar 24 20:44:47 2016 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 24 | Line 25
25		$HOME/jdk/src/jdk9
26		where each of the above is a complete JDK source tree
27		(e.g. mercurial forest) or a symlink to same.
28	+
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 34 | 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 46 | Line 57
57		<property name="build.deprecation"    value="false"/>
58		<property name="build.javadoc.access" value="protected"/>
59
49	–	<!-- Tck options; see JSR166TestCase.java -->
50	–	<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck -->
51	–	<property name="jsr166.profileTests"     value="false"/>
52	–	<property name="jsr166.profileThreshold" value="100"/>
53	–	<property name="jsr166.runsPerTest"      value="1"/>
54	–	<!-- Allow running an individual tck test class -->
55	–	<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck -->
56	–	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
57	–
60		<!-- Build locations -->
61		<property name="build.dir"                   location="build"/>
62		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 87 | 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 123 | Line 133
133		<property name="test.src.dir"         location="${basedir}/src/test"/>
134		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
135		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
136	<	<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
136	>	<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
137	>	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
138	>	<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
139	>	<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
140		<property name="lib.dir"              location="${basedir}/lib"/>
141		<property name="dist.dir"             location="${basedir}/dist"/>
142		<property name="topsrc.dir"           location="${basedir}/src"/>
#	Line 161 | Line 174
174		<property name="java5.docroot.url"      value="http://docs.oracle.com/javase/1.5.0/docs"/>
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	<	<!-- The expected canonical location does not yet exist as of 2014-02 -->
178	<	<!-- <property name="java8.docroot.url" value="http://docs.oracle.com/javase/8/docs"/> -->
166	<	<property name="java8.docroot.url"      value="http://download.java.net/jdk8/docs"/>
167	<	<!-- No published jdk9 docs exist as of 2014-02 -->
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 2015-11 -->
179		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
180	<	<property name="java9.docroot.url"      value="${java8.docroot.url}"/>
180	>	<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
181		<!-- Default jdk doc location (latest stable release seems best) -->
182	<	<property name="java.docroot.url"       value="${java7.docroot.url}"/>
182	>	<property name="java.docroot.url"       value="${java8.docroot.url}"/>
183
184		<!-- Canonical location of jdk API docs, to use with javadoc link attribute -->
185		<property name="java5.api.url"      value="${java5.docroot.url}/api/"/>
#	Line 183 | 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"/>
209		<attribute name="compile-target" default="@{target}"/>
210		<attribute name="workdir"/>
211		<attribute name="classes"/>
212	<	<attribute name="jvmflags" default="-ea -esa"/>
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 209 | Line 229
229		source="@{compile-target}"
230		target="@{compile-target}"
231		classpath="${junit.jar}"
212	–	bootclasspath="@{classes}:${bootclasspath@{compile-target}}"
232		includeAntRuntime="false"
233		includeJavaRuntime="false"
234		executable="${javac@{compile-target}}"
#	Line 217 | Line 236
236
237		<include name="*.java"/>
238		<compilerarg value="-XDignore.symbol.file=true"/>
239	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
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 227 | 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	<	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
255	<	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
256	<	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
254	>
255	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
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	>
262		<classpath>
263		<pathelement location="${junit.jar}"/>
264		<pathelement location="@{workdir}/tck-classes"/>
#	Line 241 | Line 268
268		</sequential>
269		</macrodef>
270
271	+	<!-- Define jtreg test sets for different jdk versions -->
272	+	<fileset dir="${jtreg9.src.dir}">
273	+	<patternset id="jdk9.jtreg.tests">
274	+	<include name="**/*.java"/>
275	+	</patternset>
276	+	</fileset>
277	+
278	+	<fileset dir="${jtreg8.src.dir}">
279	+	<patternset id="jdk8.jtreg.tests">
280	+	<include name="**/*.java"/>
281	+	<exclude name="**/SpliteratorCharacteristics.java"/>
282	+	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
283	+	<exclude name="**/GCDuringIteration.java"/>
284	+	</patternset>
285	+	</fileset>
286	+
287	+	<fileset dir="${jtreg7.src.dir}">
288	+	<patternset id="jdk7.jtreg.tests">
289	+	<include name="**/*.java"/>
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 -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
246	<	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
297	>	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
298		<attribute name="source" default="7"/>
299		<attribute name="target"/>
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"/>
318	<	<jtreg dir="@{jtreg.src.dir}"
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	<
325	<	<arg value="-Xbootclasspath/p:@{classes}"/>
324	>	<patternset refid="jdk@{target}.jtreg.tests"/>
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 292 | 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 306 | 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"/>
390	+	<compilerarg value="-Werror"/>
391		<compilerarg value="-Xdoclint:all/protected"/>
392		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
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 323 | Line 405
405
406		<jar destfile="${product.jar}">
407		<fileset dir="${build.classes.dir}"/>
408	+	<manifest>
409	+	<attribute name="Built-By" value="${user.name}"/>
410	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
411	+	</manifest>
412		</jar>
413		</target>
414
#	Line 350 | 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 358 | 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 381 | Line 473
473		<exclude name="src/emulation/**"/>
474		<exclude name="**/SyntaxTest.java"/>
475		<exclude name="**/SuperfluousAbstract.java"/>
476	+	<manifest>
477	+	<attribute name="Built-By" value="${user.name}"/>
478	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
479	+	</manifest>
480		</jar>
481		</target>
482
#	Line 412 | Line 508
508		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
509		</target>
510
511	<
416	<	<target name="test-tck"
511	>	<target name="tck"
512		depends="jar"
513		description="Runs tck tests for main directly">
514
#	Line 423 | Line 518
518		classes="${product.jar}"/>
519		</target>
520
521	<	<target name="test-jtreg"
521	>	<target name="tck-parallelism-1"
522	>	description="Runs tck with given common pool parallelism">
523	>	<antcall target="tck">
524	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
525	>	</antcall>
526	>	</target>
527	>
528	>	<target name="tck-parallelism-0"
529	>	description="Runs tck with given common pool parallelism">
530	>	<antcall target="tck">
531	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
532	>	</antcall>
533	>	</target>
534	>
535	>	<target name="jtreg"
536		depends="jar"
537		description="Runs jtreg tests for main using the jtreg ant task">
538		<run-jtreg-tests
#	Line 433 | Line 542
542		</target>
543
544		<target name="test"
545	<	depends="test-tck, test-jtreg"
545	>	depends="tck, tck-parallelism-1, jtreg"
546		description="Runs tck and jtreg tests for main">
547		</target>
548
549	+	<target name="jtreg8" description="Runs jtreg tests with jdk8">
550	+
551	+	<antcall target="jtreg">
552	+	<param name="build.main.java.version" value="8"/>
553	+	<param name="build.main.javac" value="${javac8}"/>
554	+	</antcall>
555	+
556	+	</target>
557	+
558		<target name="test89"
559		description="Runs tck and jtreg tests for main for multiple java versions">
560
#	Line 457 | Line 575
575
576
577		<target name="configure-compiler">
578	+	<fail message="ant version too old">
579	+	<condition>
580	+	<not> <antversion atleast="1.9.1"/> </not>
581	+	</condition>
582	+	</fail>
583
584		<property name="unchecked.option" value="-Xlint:unchecked"/>
585
#	Line 488 | 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 503 | Line 627
627		</target>
628
629
630	+	<target name="compile-test-loops" depends="jar"
631	+	description="compile all the perf tests in src/test/loops">
632	+
633	+	<mkdir dir="${build.dir}/test/loops"/>
634	+
635	+	<javac srcdir="${basedir}/src/test/loops"
636	+	destdir="${build.dir}/test/loops"
637	+	debug="${build.debug}"
638	+	debuglevel="${build.debuglevel}"
639	+	deprecation="${build.deprecation}"
640	+	includeAntRuntime="false"
641	+	includeJavaRuntime="false"
642	+	executable="${javac9}"
643	+	fork="true">
644	+
645	+	<include name="*.java"/>
646	+	<compilerarg value="-XDignore.symbol.file=true"/>
647	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
648	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
649	+	<compilerarg line="${build.args}"/>
650	+
651	+	</javac>
652	+
653	+	</target>
654	+
655	+
656		<!-- jsr166 4jdk7 -->
657
658		<target name="4jdk7compile"
#	Line 517 | 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 528 | Line 679
679		<compilerarg value="-Xprefer:source"/>
680		<compilerarg value="-XDignore.symbol.file=true"/>
681		<compilerarg value="-Xlint:all"/>
682	+	<compilerarg value="-Werror"/>
683		<compilerarg line="${build.args}"/>
684
685		</javac>
#	Line 545 | 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 569 | Line 722
722
723		<jar destfile="${4jdk7product.jar}">
724		<fileset dir="${build.4jdk7.classes.dir}"/>
725	+	<manifest>
726	+	<attribute name="Built-By" value="${user.name}"/>
727	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
728	+	</manifest>
729		</jar>
730
731		</target>
732
733
734	<	<target name="4jdk7-test-tck"
734	>	<target name="4jdk7-tck"
735		depends="4jdk7jar"
736		description="Runs tck tests for jsr166-4jdk7 directly">
737
#	Line 586 | Line 743
743		<!-- JDK8+ test classes -->
744		<exclude name="*8Test.java"/>
745		<exclude name="*9Test.java"/>
746	+	<exclude name="*10Test.java"/>
747		<exclude name="DoubleAccumulatorTest.java"/>
748		<exclude name="DoubleAdderTest.java"/>
749		<exclude name="LongAccumulatorTest.java"/>
#	Line 593 | Line 751
751		<exclude name="CompletableFutureTest.java"/>
752		<exclude name="SplittableRandomTest.java"/>
753		<exclude name="StampedLockTest.java"/>
754	+	<exclude name="SubmissionPublisherTest.java"/>
755		</javac-elements>
756		</run-tck-tests>
757		</target>
758
759
760	<	<target name="4jdk7-test-tck-junit"
760	>	<target name="4jdk7-tck-junit"
761		depends="4jdk7compile"
762		description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
763
#	Line 626 | Line 785
785		</junit>
786		</target>
787
788	<	<target name="4jdk7-test-jtreg"
788	>	<target name="4jdk7-jtreg"
789		depends="4jdk7jar"
790		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
791		<run-jtreg-tests
792		target="7"
793		workdir="${build.4jdk7.dir}"
794	<	classes="${4jdk7product.jar}"
636	<	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
794	>	classes="${4jdk7product.jar}"/>
795		</target>
796
797
798		<target name="4jdk7-test"
799	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
799	>	depends="4jdk7-tck, 4jdk7-jtreg"
800		description="Runs tck and jtreg tests for jsr166-4jdk7">
801		</target>
802
#	Line 707 | Line 865
865		classpath=""
866		bootclasspath="${bootclasspath6}"
867		source="5"
868	+	target="5"
869		includeAntRuntime="false"
870		includeJavaRuntime="false"
871		executable="${javac7}"
#	Line 715 | Line 874
874		<include name="jsr166x/**/*.java"/>
875		<compilerarg value="-XDignore.symbol.file=true"/>
876		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
877	+	<compilerarg value="-Werror"/>
878		<compilerarg line="${build.args}"/>
879
880		</javac>
#	Line 727 | Line 887
887
888		<jar destfile="${jsr166x.jar}">
889		<fileset dir="${build.jsr166x.classes.dir}"/>
890	+	<manifest>
891	+	<attribute name="Built-By" value="${user.name}"/>
892	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
893	+	</manifest>
894		</jar>
895
896		</target>
#	Line 791 | 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 801 | Line 966
966		<include name="jsr166y/**/*.java"/>
967		<compilerarg value="-XDignore.symbol.file=true"/>
968		<compilerarg value="-Xlint:all"/>
969	+	<compilerarg value="-Werror"/>
970		<compilerarg line="${build.args}"/>
971
972		</javac>
#	Line 813 | Line 979
979
980		<jar destfile="${jsr166y.jar}" index="true">
981		<fileset dir="${build.jsr166y.classes.dir}"/>
982	+	<manifest>
983	+	<attribute name="Built-By" value="${user.name}"/>
984	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
985	+	</manifest>
986		</jar>
987
988		</target>
#	Line 880 | 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 888 | Line 1059
1059		<include name="extra166y/**/*.java"/>
1060		<compilerarg value="-XDignore.symbol.file=true"/>
1061		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1062	+	<compilerarg value="-Werror"/>
1063		<compilerarg line="${build.args}"/>
1064
1065		</javac>
#	Line 900 | Line 1072
1072
1073		<jar destfile="${extra166y.jar}" index="true">
1074		<fileset dir="${build.extra166y.classes.dir}"/>
1075	+	<manifest>
1076	+	<attribute name="Built-By" value="${user.name}"/>
1077	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1078	+	</manifest>
1079		</jar>
1080
1081		</target>
#	Line 966 | 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 975 | Line 1152
1152		<include name="jsr166e/**/*.java"/>
1153		<compilerarg value="-XDignore.symbol.file=true"/>
1154		<compilerarg value="-Xlint:all"/>
1155	+	<compilerarg value="-Werror"/>
1156		<compilerarg line="${build.args}"/>
1157
1158		</javac>
#	Line 991 | 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}"
#	Line 1001 | Line 1180
1180		<include name="jsr166e/**/*.java"/>
1181		<compilerarg value="-XDignore.symbol.file=true"/>
1182		<compilerarg value="-Xlint:all"/>
1183	+	<compilerarg value="-Werror"/>
1184		<compilerarg value="-Xdoclint:all/protected"/>
1185
1186		</javac>
#	Line 1013 | Line 1193
1193
1194		<jar destfile="${jsr166e.jar}" index="true">
1195		<fileset dir="${build.jsr166e.classes.dir}"/>
1196	+	<manifest>
1197	+	<attribute name="Built-By" value="${user.name}"/>
1198	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1199	+	</manifest>
1200		</jar>
1201
1202		</target>
#	Line 1038 | Line 1222
1222		</target>
1223
1224
1225	<	<target name="jsr166e-test-tck-one-java-version"
1225	>	<target name="jsr166e-tck-one-java-version"
1226		depends="jsr166ejar">
1227
1228		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
#	Line 1050 | Line 1234
1234		classes="${jsr166e.jar}"/>
1235		</target>
1236
1237	<	<target name="jsr166e-test-tck"
1237	>	<target name="jsr166e-tck"
1238		description="Runs tck tests for jsr166e for multiple java versions">
1239
1240		<!--     <antcall target="clean"/> -->
1241	<	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1241	>	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1242		<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1243		<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1244		<!--     </antcall> -->
1245
1246		<antcall target="clean"/>
1247	<	<antcall target="jsr166e-test-tck-one-java-version">
1247	>	<antcall target="jsr166e-tck-one-java-version">
1248		<param name="build.jsr166e.java.version" value="7"/>
1249		<param name="build.jsr166e.javac" value="${javac7}"/>
1250		</antcall>
1251
1252		<antcall target="clean"/>
1253	<	<antcall target="jsr166e-test-tck-one-java-version">
1253	>	<antcall target="jsr166e-tck-one-java-version">
1254		<param name="build.jsr166e.java.version" value="6"/>
1255		<param name="build.jsr166e.javac" value="${javac6}"/>
1256		</antcall>
#	Line 1074 | Line 1258
1258
1259
1260		<target name="jsr166e-test"
1261	<	depends="jsr166e-test-tck"
1261	>	depends="jsr166e-tck"
1262		description="Runs all tests for jsr166e">
1263		</target>
1264
#	Line 1104 | Line 1288
1288
1289		<target name="lint">
1290		<antcall target="dists">
1291	+	<param name="build.javadoc.access" value="public"/>
1292	+	</antcall>
1293	+	</target>
1294	+
1295	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1296	+	<target name="lint-private">
1297	+	<antcall target="dist">
1298		<param name="build.javadoc.access" value="private"/>
1299		</antcall>
1300		</target>

Diff Legend

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