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.155 by jsr166, Mon Jun 16 18:01:38 2014 UTC vs.
Revision 1.191 by jsr166, Fri Nov 6 00:12:54 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 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 2014-07 -->
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"/>
#	Line 197 | 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 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="-Xoverride:${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="-Xoverride:${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	>	</syspropertyset>
260	>
261		<classpath>
262		<pathelement location="${junit.jar}"/>
263		<pathelement location="@{workdir}/tck-classes"/>
#	Line 241 | Line 267
267		</sequential>
268		</macrodef>
269
270	+	<!-- Define jtreg test sets for different jdk versions -->
271	+	<fileset dir="${jtreg9.src.dir}">
272	+	<patternset id="jdk9.jtreg.tests">
273	+	<include name="**/*.java"/>
274	+	</patternset>
275	+	</fileset>
276	+
277	+	<fileset dir="${jtreg8.src.dir}">
278	+	<patternset id="jdk8.jtreg.tests">
279	+	<include name="**/*.java"/>
280	+	<exclude name="**/SpliteratorCharacteristics.java"/>
281	+	<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
282	+	<exclude name="**/GCDuringIteration.java"/>
283	+	</patternset>
284	+	</fileset>
285	+
286	+	<fileset dir="${jtreg7.src.dir}">
287	+	<patternset id="jdk7.jtreg.tests">
288	+	<include name="**/*.java"/>
289	+	</patternset>
290	+	</fileset>
291	+
292		<macrodef name="run-jtreg-tests">
293	<	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
246	<	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
293	>	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
294		<attribute name="source" default="7"/>
295		<attribute name="target"/>
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"/>
314	<	<jtreg dir="@{jtreg.src.dir}"
314	>	<jtreg dir="${jtreg@{target}.src.dir}"
315		jdk="${jdk@{target}.home}"
316		workDir="@{workdir}/JTwork"
317		reportDir="@{workdir}/JTreport">
318	<
319	<	<arg value="-Xbootclasspath/p:@{classes}"/>
318	>	<patternset refid="jdk@{target}.jtreg.tests"/>
319	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
320	>	<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
321		<arg value="-agentvm"/>
322	<	<arg value="-v:nopass,fail"/>
322	>	<arg value="-verbose:${jtreg.verbose}"/>
323		<arg value="-vmoptions:-esa -ea"/>
324		<arg value="-automatic"/>
325		<arg value="-k:!ignore"/>
#	Line 292 | Line 350
350		depends="configure-compiler"
351		description="Compiles src/main sources to build dir">
352
353	<	<mkdir dir="${build.classes.dir}"/>
353	>	<local name="modules"/>
354	>	<condition property="modules">
355	>	<and>
356	>	<available file="${jdk9.home}/jmods" type="dir"/>
357	>	<equals arg1="9" arg2="${build.main.java.version}"/>
358	>	</and>
359	>	</condition>
360	>
361	>	<local name="destdir"/>
362	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
363	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
364	>
365	>	<mkdir dir="${destdir}"/>
366
367		<javac srcdir="${src.dir}"
368	<	destdir="${build.classes.dir}"
368	>	destdir="${destdir}"
369		debug="${build.debug}"
370		debuglevel="${build.debuglevel}"
371		deprecation="${build.deprecation}"
#	Line 306 | Line 376
376		fork="true">
377
378		<include name="**/*.java"/>
379	+	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
380		<compilerarg value="-Xprefer:source"/>
381		<compilerarg value="-XDignore.symbol.file=true"/>
382		<compilerarg value="-Xlint:all"/>
383	+	<compilerarg value="-Werror"/>
384		<compilerarg value="-Xdoclint:all/protected"/>
385		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
386		<compilerarg line="${build.args}"/>
#	Line 323 | Line 395
395
396		<jar destfile="${product.jar}">
397		<fileset dir="${build.classes.dir}"/>
398	+	<manifest>
399	+	<attribute name="Built-By" value="${user.name}"/>
400	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
401	+	</manifest>
402		</jar>
403		</target>
404
#	Line 350 | Line 426
426		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
427		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
428		<arg value="-XDignore.symbol.file=true"/>
429	+	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
430		<arg value="-tag"/>
431		<arg value="${javadoc.jls.option}"/>
432		<arg value="-tag"/>
#	Line 381 | Line 458
458		<exclude name="src/emulation/**"/>
459		<exclude name="**/SyntaxTest.java"/>
460		<exclude name="**/SuperfluousAbstract.java"/>
461	+	<manifest>
462	+	<attribute name="Built-By" value="${user.name}"/>
463	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
464	+	</manifest>
465		</jar>
466		</target>
467
#	Line 412 | Line 493
493		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
494		</target>
495
496	<
416	<	<target name="test-tck"
496	>	<target name="tck"
497		depends="jar"
498		description="Runs tck tests for main directly">
499
#	Line 423 | Line 503
503		classes="${product.jar}"/>
504		</target>
505
506	<	<target name="test-jtreg"
506	>	<target name="tck-parallelism-1"
507	>	description="Runs tck with given common pool parallelism">
508	>	<antcall target="tck">
509	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
510	>	</antcall>
511	>	</target>
512	>
513	>	<target name="tck-parallelism-0"
514	>	description="Runs tck with given common pool parallelism">
515	>	<antcall target="tck">
516	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
517	>	</antcall>
518	>	</target>
519	>
520	>	<target name="jtreg"
521		depends="jar"
522		description="Runs jtreg tests for main using the jtreg ant task">
523		<run-jtreg-tests
#	Line 433 | Line 527
527		</target>
528
529		<target name="test"
530	<	depends="test-tck, test-jtreg"
530	>	depends="tck, tck-parallelism-1, jtreg"
531		description="Runs tck and jtreg tests for main">
532		</target>
533
534	+	<target name="jtreg8" description="Runs jtreg tests with jdk8">
535	+
536	+	<antcall target="jtreg">
537	+	<param name="build.main.java.version" value="8"/>
538	+	<param name="build.main.javac" value="${javac8}"/>
539	+	</antcall>
540	+
541	+	</target>
542	+
543		<target name="test89"
544		description="Runs tck and jtreg tests for main for multiple java versions">
545
#	Line 457 | Line 560
560
561
562		<target name="configure-compiler">
563	+	<fail message="ant version too old">
564	+	<condition>
565	+	<not> <antversion atleast="1.9.1"/> </not>
566	+	</condition>
567	+	</fail>
568
569		<property name="unchecked.option" value="-Xlint:unchecked"/>
570
#	Line 488 | Line 596
596		debuglevel="${build.debuglevel}"
597		deprecation="${build.deprecation}"
598		source="${build.sourcelevel}"
599	+	target="${build.sourcelevel}"
600		fork="true">
601
602		<compilerarg line="${build.args}"/>
#	Line 503 | Line 612
612		</target>
613
614
615	+	<target name="compile-test-loops" depends="jar"
616	+	description="compile all the perf tests in src/test/loops">
617	+
618	+	<mkdir dir="${build.dir}/test/loops"/>
619	+
620	+	<javac srcdir="${basedir}/src/test/loops"
621	+	destdir="${build.dir}/test/loops"
622	+	debug="${build.debug}"
623	+	debuglevel="${build.debuglevel}"
624	+	deprecation="${build.deprecation}"
625	+	includeAntRuntime="false"
626	+	includeJavaRuntime="false"
627	+	executable="${javac9}"
628	+	fork="true">
629	+
630	+	<include name="*.java"/>
631	+	<compilerarg value="-XDignore.symbol.file=true"/>
632	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
633	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
634	+	<compilerarg line="${build.args}"/>
635	+
636	+	</javac>
637	+
638	+	</target>
639	+
640	+
641		<!-- jsr166 4jdk7 -->
642
643		<target name="4jdk7compile"
#	Line 517 | Line 652
652		debuglevel="${build.debuglevel}"
653		deprecation="${build.deprecation}"
654		source="6"
655	+	target="6"
656		classpath=""
657		bootclasspath="${bootclasspath6}"
658		includeAntRuntime="false"
#	Line 528 | Line 664
664		<compilerarg value="-Xprefer:source"/>
665		<compilerarg value="-XDignore.symbol.file=true"/>
666		<compilerarg value="-Xlint:all"/>
667	+	<compilerarg value="-Werror"/>
668		<compilerarg line="${build.args}"/>
669
670		</javac>
#	Line 545 | Line 682
682		debuglevel="${build.debuglevel}"
683		deprecation="${build.deprecation}"
684		source="6"
685	+	target="6"
686		classpath=""
687	<	bootclasspath="${bootclasspath7}"
687	>	bootclasspath="${bootclasspath6}"
688		includeAntRuntime="false"
689		includeJavaRuntime="false"
690		executable="${javac8}"
#	Line 569 | Line 707
707
708		<jar destfile="${4jdk7product.jar}">
709		<fileset dir="${build.4jdk7.classes.dir}"/>
710	+	<manifest>
711	+	<attribute name="Built-By" value="${user.name}"/>
712	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
713	+	</manifest>
714		</jar>
715
716		</target>
717
718
719	<	<target name="4jdk7-test-tck"
719	>	<target name="4jdk7-tck"
720		depends="4jdk7jar"
721		description="Runs tck tests for jsr166-4jdk7 directly">
722
#	Line 586 | Line 728
728		<!-- JDK8+ test classes -->
729		<exclude name="*8Test.java"/>
730		<exclude name="*9Test.java"/>
731	+	<exclude name="*10Test.java"/>
732		<exclude name="DoubleAccumulatorTest.java"/>
733		<exclude name="DoubleAdderTest.java"/>
734		<exclude name="LongAccumulatorTest.java"/>
#	Line 593 | Line 736
736		<exclude name="CompletableFutureTest.java"/>
737		<exclude name="SplittableRandomTest.java"/>
738		<exclude name="StampedLockTest.java"/>
739	+	<exclude name="SubmissionPublisherTest.java"/>
740		</javac-elements>
741		</run-tck-tests>
742		</target>
743
744
745	<	<target name="4jdk7-test-tck-junit"
745	>	<target name="4jdk7-tck-junit"
746		depends="4jdk7compile"
747		description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
748
#	Line 626 | Line 770
770		</junit>
771		</target>
772
773	<	<target name="4jdk7-test-jtreg"
773	>	<target name="4jdk7-jtreg"
774		depends="4jdk7jar"
775		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
776		<run-jtreg-tests
777		target="7"
778		workdir="${build.4jdk7.dir}"
779	<	classes="${4jdk7product.jar}"
636	<	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
779	>	classes="${4jdk7product.jar}"/>
780		</target>
781
782
783		<target name="4jdk7-test"
784	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
784	>	depends="4jdk7-tck, 4jdk7-jtreg"
785		description="Runs tck and jtreg tests for jsr166-4jdk7">
786		</target>
787
#	Line 707 | Line 850
850		classpath=""
851		bootclasspath="${bootclasspath6}"
852		source="5"
853	+	target="5"
854		includeAntRuntime="false"
855		includeJavaRuntime="false"
856		executable="${javac7}"
#	Line 715 | Line 859
859		<include name="jsr166x/**/*.java"/>
860		<compilerarg value="-XDignore.symbol.file=true"/>
861		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
862	+	<compilerarg value="-Werror"/>
863		<compilerarg line="${build.args}"/>
864
865		</javac>
#	Line 727 | Line 872
872
873		<jar destfile="${jsr166x.jar}">
874		<fileset dir="${build.jsr166x.classes.dir}"/>
875	+	<manifest>
876	+	<attribute name="Built-By" value="${user.name}"/>
877	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
878	+	</manifest>
879		</jar>
880
881		</target>
#	Line 791 | Line 940
940		debuglevel="${build.debuglevel}"
941		deprecation="${build.deprecation}"
942		source="6"
943	+	target="6"
944		classpath=""
945		bootclasspath="${bootclasspath6}"
946		includeAntRuntime="false"
#	Line 801 | Line 951
951		<include name="jsr166y/**/*.java"/>
952		<compilerarg value="-XDignore.symbol.file=true"/>
953		<compilerarg value="-Xlint:all"/>
954	+	<compilerarg value="-Werror"/>
955		<compilerarg line="${build.args}"/>
956
957		</javac>
#	Line 813 | Line 964
964
965		<jar destfile="${jsr166y.jar}" index="true">
966		<fileset dir="${build.jsr166y.classes.dir}"/>
967	+	<manifest>
968	+	<attribute name="Built-By" value="${user.name}"/>
969	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
970	+	</manifest>
971		</jar>
972
973		</target>
#	Line 880 | Line 1035
1035		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1036		classpath=""
1037		source="6"
1038	+	target="6"
1039		includeAntRuntime="false"
1040		includeJavaRuntime="false"
1041		executable="${javac7}"
#	Line 888 | Line 1044
1044		<include name="extra166y/**/*.java"/>
1045		<compilerarg value="-XDignore.symbol.file=true"/>
1046		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1047	+	<compilerarg value="-Werror"/>
1048		<compilerarg line="${build.args}"/>
1049
1050		</javac>
#	Line 900 | Line 1057
1057
1058		<jar destfile="${extra166y.jar}" index="true">
1059		<fileset dir="${build.extra166y.classes.dir}"/>
1060	+	<manifest>
1061	+	<attribute name="Built-By" value="${user.name}"/>
1062	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1063	+	</manifest>
1064		</jar>
1065
1066		</target>
#	Line 966 | Line 1127
1127		debuglevel="${build.debuglevel}"
1128		deprecation="${build.deprecation}"
1129		source="${build.jsr166e.java.version}"
1130	+	target="${build.jsr166e.java.version}"
1131		classpath=""
1132		includeAntRuntime="false"
1133		includeJavaRuntime="false"
#	Line 975 | Line 1137
1137		<include name="jsr166e/**/*.java"/>
1138		<compilerarg value="-XDignore.symbol.file=true"/>
1139		<compilerarg value="-Xlint:all"/>
1140	+	<compilerarg value="-Werror"/>
1141		<compilerarg line="${build.args}"/>
1142
1143		</javac>
#	Line 991 | Line 1154
1154		debuglevel="${build.debuglevel}"
1155		deprecation="${build.deprecation}"
1156		source="${build.jsr166e.java.version}"
1157	+	target="${build.jsr166e.java.version}"
1158		classpath=""
1159	<	bootclasspath="${bootclasspath7}"
1159	>	bootclasspath="${bootclasspath6}"
1160		includeAntRuntime="false"
1161		includeJavaRuntime="false"
1162		executable="${javac8}"
#	Line 1001 | Line 1165
1165		<include name="jsr166e/**/*.java"/>
1166		<compilerarg value="-XDignore.symbol.file=true"/>
1167		<compilerarg value="-Xlint:all"/>
1168	+	<compilerarg value="-Werror"/>
1169		<compilerarg value="-Xdoclint:all/protected"/>
1170
1171		</javac>
#	Line 1013 | Line 1178
1178
1179		<jar destfile="${jsr166e.jar}" index="true">
1180		<fileset dir="${build.jsr166e.classes.dir}"/>
1181	+	<manifest>
1182	+	<attribute name="Built-By" value="${user.name}"/>
1183	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1184	+	</manifest>
1185		</jar>
1186
1187		</target>
#	Line 1038 | Line 1207
1207		</target>
1208
1209
1210	<	<target name="jsr166e-test-tck-one-java-version"
1210	>	<target name="jsr166e-tck-one-java-version"
1211		depends="jsr166ejar">
1212
1213		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
#	Line 1050 | Line 1219
1219		classes="${jsr166e.jar}"/>
1220		</target>
1221
1222	<	<target name="jsr166e-test-tck"
1222	>	<target name="jsr166e-tck"
1223		description="Runs tck tests for jsr166e for multiple java versions">
1224
1225		<!--     <antcall target="clean"/> -->
1226	<	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1226	>	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1227		<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1228		<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1229		<!--     </antcall> -->
1230
1231		<antcall target="clean"/>
1232	<	<antcall target="jsr166e-test-tck-one-java-version">
1232	>	<antcall target="jsr166e-tck-one-java-version">
1233		<param name="build.jsr166e.java.version" value="7"/>
1234		<param name="build.jsr166e.javac" value="${javac7}"/>
1235		</antcall>
1236
1237		<antcall target="clean"/>
1238	<	<antcall target="jsr166e-test-tck-one-java-version">
1238	>	<antcall target="jsr166e-tck-one-java-version">
1239		<param name="build.jsr166e.java.version" value="6"/>
1240		<param name="build.jsr166e.javac" value="${javac6}"/>
1241		</antcall>
#	Line 1074 | Line 1243
1243
1244
1245		<target name="jsr166e-test"
1246	<	depends="jsr166e-test-tck"
1246	>	depends="jsr166e-tck"
1247		description="Runs all tests for jsr166e">
1248		</target>
1249
#	Line 1104 | Line 1273
1273
1274		<target name="lint">
1275		<antcall target="dists">
1276	+	<param name="build.javadoc.access" value="public"/>
1277	+	</antcall>
1278	+	</target>
1279	+
1280	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1281	+	<target name="lint-private">
1282	+	<antcall target="dist">
1283		<param name="build.javadoc.access" value="private"/>
1284		</antcall>
1285		</target>

Diff Legend

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