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.187 by jsr166, Sun Oct 4 05:22:26 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"/>
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="-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	+	<local name="modules"/>
303	+	<condition property="modules">
304	+	<available file="${jdk@{target}.home}/jmods" type="dir"/>
305	+	</condition>
306	+
307		<delete dir="@{workdir}/JTwork"   quiet="true"/>
308		<delete dir="@{workdir}/JTreport" quiet="true"/>
309		<mkdir dir="@{workdir}/JTwork/scratch"/>
310		<mkdir dir="@{workdir}/JTreport"/>
311	<	<jtreg dir="@{jtreg.src.dir}"
311	>	<jtreg dir="${jtreg@{target}.src.dir}"
312		jdk="${jdk@{target}.home}"
313		workDir="@{workdir}/JTwork"
314		reportDir="@{workdir}/JTreport">
315	<
316	<	<arg value="-Xbootclasspath/p:@{classes}"/>
315	>	<patternset refid="jdk@{target}.jtreg.tests"/>
316	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
317	>	<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
318		<arg value="-agentvm"/>
319	<	<arg value="-v:nopass,fail"/>
319	>	<arg value="-verbose:nopass,fail,error"/>
320		<arg value="-vmoptions:-esa -ea"/>
321		<arg value="-automatic"/>
322		<arg value="-k:!ignore"/>
#	Line 292 | Line 347
347		depends="configure-compiler"
348		description="Compiles src/main sources to build dir">
349
350	<	<mkdir dir="${build.classes.dir}"/>
350	>	<local name="modules"/>
351	>	<condition property="modules">
352	>	<and>
353	>	<available file="${jdk9.home}/jmods" type="dir"/>
354	>	<equals arg1="9" arg2="${build.main.java.version}"/>
355	>	</and>
356	>	</condition>
357	>
358	>	<local name="destdir"/>
359	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
360	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
361	>
362	>	<mkdir dir="${destdir}"/>
363
364		<javac srcdir="${src.dir}"
365	<	destdir="${build.classes.dir}"
365	>	destdir="${destdir}"
366		debug="${build.debug}"
367		debuglevel="${build.debuglevel}"
368		deprecation="${build.deprecation}"
#	Line 306 | Line 373
373		fork="true">
374
375		<include name="**/*.java"/>
376	+	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
377		<compilerarg value="-Xprefer:source"/>
378		<compilerarg value="-XDignore.symbol.file=true"/>
379		<compilerarg value="-Xlint:all"/>
380	+	<compilerarg value="-Werror"/>
381		<compilerarg value="-Xdoclint:all/protected"/>
382		<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
383		<compilerarg line="${build.args}"/>
#	Line 323 | Line 392
392
393		<jar destfile="${product.jar}">
394		<fileset dir="${build.classes.dir}"/>
395	+	<manifest>
396	+	<attribute name="Built-By" value="${user.name}"/>
397	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
398	+	</manifest>
399		</jar>
400		</target>
401
#	Line 350 | Line 423
423		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
424		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
425		<arg value="-XDignore.symbol.file=true"/>
426	+	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
427		<arg value="-tag"/>
428		<arg value="${javadoc.jls.option}"/>
429		<arg value="-tag"/>
#	Line 381 | Line 455
455		<exclude name="src/emulation/**"/>
456		<exclude name="**/SyntaxTest.java"/>
457		<exclude name="**/SuperfluousAbstract.java"/>
458	+	<manifest>
459	+	<attribute name="Built-By" value="${user.name}"/>
460	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
461	+	</manifest>
462		</jar>
463		</target>
464
#	Line 412 | Line 490
490		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
491		</target>
492
493	<
416	<	<target name="test-tck"
493	>	<target name="tck"
494		depends="jar"
495		description="Runs tck tests for main directly">
496
#	Line 423 | Line 500
500		classes="${product.jar}"/>
501		</target>
502
503	<	<target name="test-jtreg"
503	>	<target name="tck-parallelism-1"
504	>	description="Runs tck with given common pool parallelism">
505	>	<antcall target="tck">
506	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
507	>	</antcall>
508	>	</target>
509	>
510	>	<target name="tck-parallelism-0"
511	>	description="Runs tck with given common pool parallelism">
512	>	<antcall target="tck">
513	>	<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
514	>	</antcall>
515	>	</target>
516	>
517	>	<target name="jtreg"
518		depends="jar"
519		description="Runs jtreg tests for main using the jtreg ant task">
520		<run-jtreg-tests
#	Line 433 | Line 524
524		</target>
525
526		<target name="test"
527	<	depends="test-tck, test-jtreg"
527	>	depends="tck, tck-parallelism-1, jtreg"
528		description="Runs tck and jtreg tests for main">
529		</target>
530
531	+	<target name="jtreg8" description="Runs jtreg tests with jdk8">
532	+
533	+	<antcall target="jtreg">
534	+	<param name="build.main.java.version" value="8"/>
535	+	<param name="build.main.javac" value="${javac8}"/>
536	+	</antcall>
537	+
538	+	</target>
539	+
540		<target name="test89"
541		description="Runs tck and jtreg tests for main for multiple java versions">
542
#	Line 457 | Line 557
557
558
559		<target name="configure-compiler">
560	+	<fail message="ant version too old">
561	+	<condition>
562	+	<not> <antversion atleast="1.9.1"/> </not>
563	+	</condition>
564	+	</fail>
565
566		<property name="unchecked.option" value="-Xlint:unchecked"/>
567
#	Line 503 | Line 608
608		</target>
609
610
611	+	<target name="compile-test-loops" depends="jar"
612	+	description="compile all the perf tests in src/test/loops">
613	+
614	+	<mkdir dir="${build.dir}/test/loops"/>
615	+
616	+	<javac srcdir="${basedir}/src/test/loops"
617	+	destdir="${build.dir}/test/loops"
618	+	debug="${build.debug}"
619	+	debuglevel="${build.debuglevel}"
620	+	deprecation="${build.deprecation}"
621	+	includeAntRuntime="false"
622	+	includeJavaRuntime="false"
623	+	executable="${javac9}"
624	+	fork="true">
625	+
626	+	<include name="*.java"/>
627	+	<compilerarg value="-XDignore.symbol.file=true"/>
628	+	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
629	+	<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
630	+	<compilerarg line="${build.args}"/>
631	+
632	+	</javac>
633	+
634	+	</target>
635	+
636	+
637		<!-- jsr166 4jdk7 -->
638
639		<target name="4jdk7compile"
#	Line 528 | Line 659
659		<compilerarg value="-Xprefer:source"/>
660		<compilerarg value="-XDignore.symbol.file=true"/>
661		<compilerarg value="-Xlint:all"/>
662	+	<compilerarg value="-Werror"/>
663		<compilerarg line="${build.args}"/>
664
665		</javac>
#	Line 569 | Line 701
701
702		<jar destfile="${4jdk7product.jar}">
703		<fileset dir="${build.4jdk7.classes.dir}"/>
704	+	<manifest>
705	+	<attribute name="Built-By" value="${user.name}"/>
706	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
707	+	</manifest>
708		</jar>
709
710		</target>
711
712
713	<	<target name="4jdk7-test-tck"
713	>	<target name="4jdk7-tck"
714		depends="4jdk7jar"
715		description="Runs tck tests for jsr166-4jdk7 directly">
716
#	Line 586 | Line 722
722		<!-- JDK8+ test classes -->
723		<exclude name="*8Test.java"/>
724		<exclude name="*9Test.java"/>
725	+	<exclude name="*10Test.java"/>
726		<exclude name="DoubleAccumulatorTest.java"/>
727		<exclude name="DoubleAdderTest.java"/>
728		<exclude name="LongAccumulatorTest.java"/>
#	Line 593 | Line 730
730		<exclude name="CompletableFutureTest.java"/>
731		<exclude name="SplittableRandomTest.java"/>
732		<exclude name="StampedLockTest.java"/>
733	+	<exclude name="SubmissionPublisherTest.java"/>
734		</javac-elements>
735		</run-tck-tests>
736		</target>
737
738
739	<	<target name="4jdk7-test-tck-junit"
739	>	<target name="4jdk7-tck-junit"
740		depends="4jdk7compile"
741		description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
742
#	Line 626 | Line 764
764		</junit>
765		</target>
766
767	<	<target name="4jdk7-test-jtreg"
767	>	<target name="4jdk7-jtreg"
768		depends="4jdk7jar"
769		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
770		<run-jtreg-tests
771		target="7"
772		workdir="${build.4jdk7.dir}"
773	<	classes="${4jdk7product.jar}"
636	<	jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/>
773	>	classes="${4jdk7product.jar}"/>
774		</target>
775
776
777		<target name="4jdk7-test"
778	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
778	>	depends="4jdk7-tck, 4jdk7-jtreg"
779		description="Runs tck and jtreg tests for jsr166-4jdk7">
780		</target>
781
#	Line 715 | Line 852
852		<include name="jsr166x/**/*.java"/>
853		<compilerarg value="-XDignore.symbol.file=true"/>
854		<compilerarg value="-Xlint:all,-unchecked,-rawtypes"/>
855	+	<compilerarg value="-Werror"/>
856		<compilerarg line="${build.args}"/>
857
858		</javac>
#	Line 727 | Line 865
865
866		<jar destfile="${jsr166x.jar}">
867		<fileset dir="${build.jsr166x.classes.dir}"/>
868	+	<manifest>
869	+	<attribute name="Built-By" value="${user.name}"/>
870	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
871	+	</manifest>
872		</jar>
873
874		</target>
#	Line 801 | Line 943
943		<include name="jsr166y/**/*.java"/>
944		<compilerarg value="-XDignore.symbol.file=true"/>
945		<compilerarg value="-Xlint:all"/>
946	+	<compilerarg value="-Werror"/>
947		<compilerarg line="${build.args}"/>
948
949		</javac>
#	Line 813 | Line 956
956
957		<jar destfile="${jsr166y.jar}" index="true">
958		<fileset dir="${build.jsr166y.classes.dir}"/>
959	+	<manifest>
960	+	<attribute name="Built-By" value="${user.name}"/>
961	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
962	+	</manifest>
963		</jar>
964
965		</target>
#	Line 888 | Line 1035
1035		<include name="extra166y/**/*.java"/>
1036		<compilerarg value="-XDignore.symbol.file=true"/>
1037		<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
1038	+	<compilerarg value="-Werror"/>
1039		<compilerarg line="${build.args}"/>
1040
1041		</javac>
#	Line 900 | Line 1048
1048
1049		<jar destfile="${extra166y.jar}" index="true">
1050		<fileset dir="${build.extra166y.classes.dir}"/>
1051	+	<manifest>
1052	+	<attribute name="Built-By" value="${user.name}"/>
1053	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1054	+	</manifest>
1055		</jar>
1056
1057		</target>
#	Line 975 | Line 1127
1127		<include name="jsr166e/**/*.java"/>
1128		<compilerarg value="-XDignore.symbol.file=true"/>
1129		<compilerarg value="-Xlint:all"/>
1130	+	<compilerarg value="-Werror"/>
1131		<compilerarg line="${build.args}"/>
1132
1133		</javac>
#	Line 1001 | Line 1154
1154		<include name="jsr166e/**/*.java"/>
1155		<compilerarg value="-XDignore.symbol.file=true"/>
1156		<compilerarg value="-Xlint:all"/>
1157	+	<compilerarg value="-Werror"/>
1158		<compilerarg value="-Xdoclint:all/protected"/>
1159
1160		</javac>
#	Line 1013 | Line 1167
1167
1168		<jar destfile="${jsr166e.jar}" index="true">
1169		<fileset dir="${build.jsr166e.classes.dir}"/>
1170	+	<manifest>
1171	+	<attribute name="Built-By" value="${user.name}"/>
1172	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1173	+	</manifest>
1174		</jar>
1175
1176		</target>
#	Line 1038 | Line 1196
1196		</target>
1197
1198
1199	<	<target name="jsr166e-test-tck-one-java-version"
1199	>	<target name="jsr166e-tck-one-java-version"
1200		depends="jsr166ejar">
1201
1202		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
#	Line 1050 | Line 1208
1208		classes="${jsr166e.jar}"/>
1209		</target>
1210
1211	<	<target name="jsr166e-test-tck"
1211	>	<target name="jsr166e-tck"
1212		description="Runs tck tests for jsr166e for multiple java versions">
1213
1214		<!--     <antcall target="clean"/> -->
1215	<	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1215	>	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1216		<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1217		<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1218		<!--     </antcall> -->
1219
1220		<antcall target="clean"/>
1221	<	<antcall target="jsr166e-test-tck-one-java-version">
1221	>	<antcall target="jsr166e-tck-one-java-version">
1222		<param name="build.jsr166e.java.version" value="7"/>
1223		<param name="build.jsr166e.javac" value="${javac7}"/>
1224		</antcall>
1225
1226		<antcall target="clean"/>
1227	<	<antcall target="jsr166e-test-tck-one-java-version">
1227	>	<antcall target="jsr166e-tck-one-java-version">
1228		<param name="build.jsr166e.java.version" value="6"/>
1229		<param name="build.jsr166e.javac" value="${javac6}"/>
1230		</antcall>
#	Line 1074 | Line 1232
1232
1233
1234		<target name="jsr166e-test"
1235	<	depends="jsr166e-test-tck"
1235	>	depends="jsr166e-tck"
1236		description="Runs all tests for jsr166e">
1237		</target>
1238
#	Line 1104 | Line 1262
1262
1263		<target name="lint">
1264		<antcall target="dists">
1265	+	<param name="build.javadoc.access" value="public"/>
1266	+	</antcall>
1267	+	</target>
1268	+
1269	+	<!-- Generates all doclint warnings, even for private methods (rarely useful) -->
1270	+	<target name="lint-private">
1271	+	<antcall target="dist">
1272		<param name="build.javadoc.access" value="private"/>
1273		</antcall>
1274		</target>

Diff Legend

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