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.166 by jsr166, Mon Aug 10 06:32:23 2015 UTC vs.
Revision 1.197 by jsr166, Fri Mar 4 21:00:45 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 28 | Line 29
29		Alternatively, define ant variables thus:
30		ant -Djdk$N.home=...
31		for $N in 6 7 8 9 ...
32	+
33	+	As of 2015-09, there is incomplete hacky support for jigsaw
34	+	Build for jigsaw using something like:
35	+	ant -Djdk9.home="$HOME/jdk/jigsaw" -Djdk9.src.dir="$HOME/jdk/src/jigsaw" clean test dist
36	+	"docs" target is still broken.
37		------------------------------------------------------------------------------
38		</description>
39
#	Line 38 | Line 44
44		</java>
45		</target>
46
47	+	<!-- HOWTO printf debug: <echo message="prop=${prop}"/> -->
48
49		<!-- User-specific settings -->
50		<property file="user.properties"/>
#	Line 50 | Line 57
57		<property name="build.deprecation"    value="false"/>
58		<property name="build.javadoc.access" value="protected"/>
59
53	–	<!-- Tck options; see JSR166TestCase.java
54	–	To profile a single tck test class:
55	–	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=100 -Djsr166.tckTestClass=CompletableFutureTest test-tck
56	–	To stress test a single tck test class:
57	–	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck
58	–	-->
59	–	<property name="jsr166.profileTests"     value="false"/>
60	–	<property name="jsr166.profileThreshold" value="100"/>
61	–	<property name="jsr166.runsPerTest"      value="1"/>
62	–	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
63	–
60		<!-- Build locations -->
61		<property name="build.dir"                   location="build"/>
62		<property name="build.classes.dir"           location="${build.dir}/classes"/>
#	Line 93 | Line 89
89		<property name="java@{v}"       location="${jdk@{v}.home}/bin/java"/>
90		<property name="javac@{v}"      location="${jdk@{v}.home}/bin/javac"/>
91		<property name="javadoc@{v}"    location="${jdk@{v}.home}/bin/javadoc"/>
92	<	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"/>
92	>	<local name="have.java.base"/>
93	>	<available property="have.java.base"
94	>	file="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes" type="dir"/>
95	>	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/java.base/share/classes"
96	>	if:set="have.java.base"/>
97	>	<property name="jdk@{v}src.dir" location="${jdks.home}/src/jdk@{v}/jdk/src/share/classes"
98	>	unless:set="have.java.base"/>
99	>	<local name="modules"/>
100	>	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
101		<local name="boot.jar.dir"/>
102	<	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
103	<	<path id="bootclasspath@{v}">
102	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
103	>	<path id="bootclasspath@{v}" unless:set="modules">
104		<pathelement path="${boot.jar.dir}/resources.jar"/>
105		<pathelement path="${boot.jar.dir}/rt.jar"/>
106		<pathelement path="${boot.jar.dir}/jsse.jar"/>
107		<pathelement path="${boot.jar.dir}/jce.jar"/>
108		<pathelement path="${boot.jar.dir}/charsets.jar"/>
109		</path>
110	<	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
110	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
111		</sequential>
112		</macrodef>
113
#	Line 129 | 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 168 | Line 175
175		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
176		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
177		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
178	<	<!-- The expected canonical location does not yet exist as of 2014-07 -->
178	>	<!-- The expected canonical location does not yet exist as of 2015-11 -->
179		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
180		<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
181		<!-- Default jdk doc location (latest stable release seems best) -->
#	Line 187 | 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 201 | 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 220 | Line 236
236
237		<include name="*.java"/>
238		<compilerarg value="-XDignore.symbol.file=true"/>
239	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
240	<	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
239	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
240	>	<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
241	>	<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
242		<compilerarg line="${build.args}"/>
243		<javac-elements/>
244
#	Line 231 | 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
255	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
256	<	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
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
242	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
262		<classpath>
263		<pathelement location="${junit.jar}"/>
264		<pathelement location="@{workdir}/tck-classes"/>
#	Line 252 | Line 269
269		</macrodef>
270
271		<!-- Define jtreg test sets for different jdk versions -->
272	<	<fileset dir="${jtreg.src.dir}">
272	>	<fileset dir="${jtreg9.src.dir}">
273		<patternset id="jdk9.jtreg.tests">
274		<include name="**/*.java"/>
275		</patternset>
276		</fileset>
277
278	<	<fileset dir="${jtreg.src.dir}">
278	>	<fileset dir="${jtreg8.src.dir}">
279		<patternset id="jdk8.jtreg.tests">
280		<include name="**/*.java"/>
281	<	<exclude name="util/Spliterator/SpliteratorCharacteristics.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="${jtreg.src.dir}">
287	>	<fileset dir="${jtreg7.src.dir}">
288		<patternset id="jdk7.jtreg.tests">
289		<include name="**/*.java"/>
271	–	<exclude name="util/Collection/CollectionDefaults.java"/>
272	–	<exclude name="util/List/ListDefaults.java"/>
273	–	<exclude name="util/Spliterator/**/*.java"/>
274	–	<exclude name="util/concurrent/CompletableFuture/**/*.java"/>
275	–	<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
276	–	<exclude name="util/concurrent/locks/StampedLock/**/*.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 -->
282	<	<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		<patternset refid="jdk@{target}.jtreg.tests"/>
325	<	<arg value="-Xbootclasspath/p:@{classes}"/>
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 328 | 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 342 | 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"/>
#	Line 351 | Line 393
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 360 | 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 387 | 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 418 | Line 468
468		<exclude name="src/emulation/**"/>
469		<exclude name="**/SyntaxTest.java"/>
470		<exclude name="**/SuperfluousAbstract.java"/>
471	+	<manifest>
472	+	<attribute name="Built-By" value="${user.name}"/>
473	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
474	+	</manifest>
475		</jar>
476		</target>
477
#	Line 449 | Line 503
503		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
504		</target>
505
506	<	<target name="tck" depends="test-tck" description="alias for test-tck"/>
453	<	<target name="test-tck"
506	>	<target name="tck"
507		depends="jar"
508		description="Runs tck tests for main directly">
509
#	Line 460 | Line 513
513		classes="${product.jar}"/>
514		</target>
515
516	<	<target name="test-tck-parallelism-1"
517	<	description="Runs test-tck with given common pool parallelism">
518	<	<antcall target="test-tck">
516	>	<target name="tck-parallelism-1"
517	>	description="Runs tck with given common pool parallelism">
518	>	<antcall target="tck">
519		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
520		</antcall>
521		</target>
522
523	<	<target name="test-tck-parallelism-0"
524	<	description="Runs test-tck with given common pool parallelism">
525	<	<antcall target="test-tck">
523	>	<target name="tck-parallelism-0"
524	>	description="Runs tck with given common pool parallelism">
525	>	<antcall target="tck">
526		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
527		</antcall>
528		</target>
529
530	<	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
478	<	<target name="test-jtreg"
530	>	<target name="jtreg"
531		depends="jar"
532		description="Runs jtreg tests for main using the jtreg ant task">
533		<run-jtreg-tests
#	Line 485 | Line 537
537		</target>
538
539		<target name="test"
540	<	depends="test-tck, test-tck-parallelism-1, test-jtreg"
540	>	depends="tck, tck-parallelism-1, jtreg"
541		description="Runs tck and jtreg tests for main">
542		</target>
543
544	+	<target name="jtreg8" description="Runs jtreg tests with jdk8">
545	+
546	+	<antcall target="jtreg">
547	+	<param name="build.main.java.version" value="8"/>
548	+	<param name="build.main.javac" value="${javac8}"/>
549	+	</antcall>
550	+
551	+	</target>
552	+
553		<target name="test89"
554		description="Runs tck and jtreg tests for main for multiple java versions">
555
#	Line 496 | Line 557
557		<antcall target="test">
558		<param name="build.main.java.version" value="8"/>
559		<param name="build.main.javac" value="${javac8}"/>
499	–	<param name="jtreg.exclude.file" value="${jtreg.src.dir}/jdk9tests"/>
560		</antcall>
561
562		<antcall target="clean"/>
#	Line 510 | Line 570
570
571
572		<target name="configure-compiler">
573	+	<fail message="ant version too old">
574	+	<condition>
575	+	<not> <antversion atleast="1.9.1"/> </not>
576	+	</condition>
577	+	</fail>
578
579		<property name="unchecked.option" value="-Xlint:unchecked"/>
580
#	Line 541 | Line 606
606		debuglevel="${build.debuglevel}"
607		deprecation="${build.deprecation}"
608		source="${build.sourcelevel}"
609	+	target="${build.sourcelevel}"
610		fork="true">
611
612		<compilerarg line="${build.args}"/>
#	Line 573 | Line 639
639
640		<include name="*.java"/>
641		<compilerarg value="-XDignore.symbol.file=true"/>
642	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
642	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial"/>
643		<compilerarg value="-Xbootclasspath/p:${product.jar}"/>
644		<compilerarg line="${build.args}"/>
645
#	Line 596 | Line 662
662		debuglevel="${build.debuglevel}"
663		deprecation="${build.deprecation}"
664		source="6"
665	+	target="6"
666		classpath=""
667		bootclasspath="${bootclasspath6}"
668		includeAntRuntime="false"
#	Line 625 | Line 692
692		debuglevel="${build.debuglevel}"
693		deprecation="${build.deprecation}"
694		source="6"
695	+	target="6"
696		classpath=""
697	<	bootclasspath="${bootclasspath7}"
697	>	bootclasspath="${bootclasspath6}"
698		includeAntRuntime="false"
699		includeJavaRuntime="false"
700		executable="${javac8}"
#	Line 649 | Line 717
717
718		<jar destfile="${4jdk7product.jar}">
719		<fileset dir="${build.4jdk7.classes.dir}"/>
720	+	<manifest>
721	+	<attribute name="Built-By" value="${user.name}"/>
722	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
723	+	</manifest>
724		</jar>
725
726		</target>
727
728
729	<	<target name="4jdk7-test-tck"
729	>	<target name="4jdk7-tck"
730		depends="4jdk7jar"
731		description="Runs tck tests for jsr166-4jdk7 directly">
732
#	Line 666 | Line 738
738		<!-- JDK8+ test classes -->
739		<exclude name="*8Test.java"/>
740		<exclude name="*9Test.java"/>
741	+	<exclude name="*10Test.java"/>
742		<exclude name="DoubleAccumulatorTest.java"/>
743		<exclude name="DoubleAdderTest.java"/>
744		<exclude name="LongAccumulatorTest.java"/>
#	Line 673 | Line 746
746		<exclude name="CompletableFutureTest.java"/>
747		<exclude name="SplittableRandomTest.java"/>
748		<exclude name="StampedLockTest.java"/>
749	+	<exclude name="SubmissionPublisherTest.java"/>
750		</javac-elements>
751		</run-tck-tests>
752		</target>
753
754
755	<	<target name="4jdk7-test-tck-junit"
755	>	<target name="4jdk7-tck-junit"
756		depends="4jdk7compile"
757		description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
758
#	Line 706 | Line 780
780		</junit>
781		</target>
782
783	<	<target name="4jdk7-test-jtreg"
783	>	<target name="4jdk7-jtreg"
784		depends="4jdk7jar"
785		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
786		<run-jtreg-tests
#	Line 717 | Line 791
791
792
793		<target name="4jdk7-test"
794	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
794	>	depends="4jdk7-tck, 4jdk7-jtreg"
795		description="Runs tck and jtreg tests for jsr166-4jdk7">
796		</target>
797
#	Line 786 | Line 860
860		classpath=""
861		bootclasspath="${bootclasspath6}"
862		source="5"
863	+	target="5"
864		includeAntRuntime="false"
865		includeJavaRuntime="false"
866		executable="${javac7}"
#	Line 807 | Line 882
882
883		<jar destfile="${jsr166x.jar}">
884		<fileset dir="${build.jsr166x.classes.dir}"/>
885	+	<manifest>
886	+	<attribute name="Built-By" value="${user.name}"/>
887	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
888	+	</manifest>
889		</jar>
890
891		</target>
#	Line 871 | Line 950
950		debuglevel="${build.debuglevel}"
951		deprecation="${build.deprecation}"
952		source="6"
953	+	target="6"
954		classpath=""
955		bootclasspath="${bootclasspath6}"
956		includeAntRuntime="false"
#	Line 894 | Line 974
974
975		<jar destfile="${jsr166y.jar}" index="true">
976		<fileset dir="${build.jsr166y.classes.dir}"/>
977	+	<manifest>
978	+	<attribute name="Built-By" value="${user.name}"/>
979	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
980	+	</manifest>
981		</jar>
982
983		</target>
#	Line 961 | Line 1045
1045		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1046		classpath=""
1047		source="6"
1048	+	target="6"
1049		includeAntRuntime="false"
1050		includeJavaRuntime="false"
1051		executable="${javac7}"
#	Line 982 | Line 1067
1067
1068		<jar destfile="${extra166y.jar}" index="true">
1069		<fileset dir="${build.extra166y.classes.dir}"/>
1070	+	<manifest>
1071	+	<attribute name="Built-By" value="${user.name}"/>
1072	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1073	+	</manifest>
1074		</jar>
1075
1076		</target>
#	Line 1048 | Line 1137
1137		debuglevel="${build.debuglevel}"
1138		deprecation="${build.deprecation}"
1139		source="${build.jsr166e.java.version}"
1140	+	target="${build.jsr166e.java.version}"
1141		classpath=""
1142		includeAntRuntime="false"
1143		includeJavaRuntime="false"
#	Line 1074 | Line 1164
1164		debuglevel="${build.debuglevel}"
1165		deprecation="${build.deprecation}"
1166		source="${build.jsr166e.java.version}"
1167	+	target="${build.jsr166e.java.version}"
1168		classpath=""
1169	<	bootclasspath="${bootclasspath7}"
1169	>	bootclasspath="${bootclasspath6}"
1170		includeAntRuntime="false"
1171		includeJavaRuntime="false"
1172		executable="${javac8}"
#	Line 1097 | Line 1188
1188
1189		<jar destfile="${jsr166e.jar}" index="true">
1190		<fileset dir="${build.jsr166e.classes.dir}"/>
1191	+	<manifest>
1192	+	<attribute name="Built-By" value="${user.name}"/>
1193	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1194	+	</manifest>
1195		</jar>
1196
1197		</target>
#	Line 1122 | Line 1217
1217		</target>
1218
1219
1220	<	<target name="jsr166e-test-tck-one-java-version"
1220	>	<target name="jsr166e-tck-one-java-version"
1221		depends="jsr166ejar">
1222
1223		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
#	Line 1134 | Line 1229
1229		classes="${jsr166e.jar}"/>
1230		</target>
1231
1232	<	<target name="jsr166e-test-tck"
1232	>	<target name="jsr166e-tck"
1233		description="Runs tck tests for jsr166e for multiple java versions">
1234
1235		<!--     <antcall target="clean"/> -->
1236	<	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1236	>	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1237		<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1238		<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1239		<!--     </antcall> -->
1240
1241		<antcall target="clean"/>
1242	<	<antcall target="jsr166e-test-tck-one-java-version">
1242	>	<antcall target="jsr166e-tck-one-java-version">
1243		<param name="build.jsr166e.java.version" value="7"/>
1244		<param name="build.jsr166e.javac" value="${javac7}"/>
1245		</antcall>
1246
1247		<antcall target="clean"/>
1248	<	<antcall target="jsr166e-test-tck-one-java-version">
1248	>	<antcall target="jsr166e-tck-one-java-version">
1249		<param name="build.jsr166e.java.version" value="6"/>
1250		<param name="build.jsr166e.javac" value="${javac6}"/>
1251		</antcall>
#	Line 1158 | Line 1253
1253
1254
1255		<target name="jsr166e-test"
1256	<	depends="jsr166e-test-tck"
1256	>	depends="jsr166e-tck"
1257		description="Runs all tests for jsr166e">
1258		</target>
1259

Diff Legend

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