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.168 by jsr166, Wed Sep 2 02:14:59 2015 UTC vs.
Revision 1.194 by jsr166, Wed Dec 16 02:29:06 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 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="-Xoverride:${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="-Xoverride:${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		</syspropertyset>
260
242	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
261		<classpath>
262		<pathelement location="${junit.jar}"/>
263		<pathelement location="@{workdir}/tck-classes"/>
#	Line 252 | Line 268
268		</macrodef>
269
270		<!-- Define jtreg test sets for different jdk versions -->
271	<	<fileset dir="${jtreg.src.dir}">
271	>	<fileset dir="${jtreg9.src.dir}">
272		<patternset id="jdk9.jtreg.tests">
273		<include name="**/*.java"/>
274		</patternset>
275		</fileset>
276
277	<	<fileset dir="${jtreg.src.dir}">
277	>	<fileset dir="${jtreg8.src.dir}">
278		<patternset id="jdk8.jtreg.tests">
279		<include name="**/*.java"/>
280	<	<exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
280	>	<exclude name="**/SpliteratorCharacteristics.java"/>
281		<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
282	<	<exclude name="util/WeakHashMap/GCDuringIteration.java"/>
282	>	<exclude name="**/GCDuringIteration.java"/>
283		</patternset>
284		</fileset>
285
286	<	<fileset dir="${jtreg.src.dir}">
286	>	<fileset dir="${jtreg7.src.dir}">
287		<patternset id="jdk7.jtreg.tests">
288		<include name="**/*.java"/>
273	–	<exclude name="util/Collection/CollectionDefaults.java"/>
274	–	<exclude name="util/List/ListDefaults.java"/>
275	–	<exclude name="util/Spliterator/**/*.java"/>
276	–	<exclude name="util/concurrent/CompletableFuture/**/*.java"/>
277	–	<exclude name="util/concurrent/forkjoin/SubmissionTest.java"/>
278	–	<exclude name="util/concurrent/locks/StampedLock/**/*.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 -->
284	<	<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}"
313	>	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
314	>	<mkdir dir="@{workdir}/JTreport/html"/>
315	>	<mkdir dir="@{workdir}/JTreport/text"/>
316	>	<jtreg dir="${jtreg@{target}.src.dir}"
317		jdk="${jdk@{target}.home}"
318		workDir="@{workdir}/JTwork"
319		reportDir="@{workdir}/JTreport">
320		<patternset refid="jdk@{target}.jtreg.tests"/>
321	<	<arg value="-Xbootclasspath/p:@{classes}"/>
321	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
322	>	<arg value="-Xoverride:${build.classes.dir}" if:set="modules"/>
323		<arg value="-agentvm"/>
324	<	<arg value="-v:nopass,fail"/>
324	>	<arg value="-verbose:${jtreg.verbose}"/>
325		<arg value="-vmoptions:-esa -ea"/>
326		<arg value="-automatic"/>
327		<arg value="-k:!ignore"/>
#	Line 330 | Line 352
352		depends="configure-compiler"
353		description="Compiles src/main sources to build dir">
354
355	<	<mkdir dir="${build.classes.dir}"/>
355	>	<local name="modules"/>
356	>	<condition property="modules">
357	>	<and>
358	>	<available file="${jdk9.home}/jmods" type="dir"/>
359	>	<equals arg1="9" arg2="${build.main.java.version}"/>
360	>	</and>
361	>	</condition>
362	>
363	>	<local name="destdir"/>
364	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
365	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
366	>
367	>	<mkdir dir="${destdir}"/>
368
369		<javac srcdir="${src.dir}"
370	<	destdir="${build.classes.dir}"
370	>	destdir="${destdir}"
371		debug="${build.debug}"
372		debuglevel="${build.debuglevel}"
373		deprecation="${build.deprecation}"
#	Line 344 | Line 378
378		fork="true">
379
380		<include name="**/*.java"/>
381	+	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
382		<compilerarg value="-Xprefer:source"/>
383		<compilerarg value="-XDignore.symbol.file=true"/>
384		<compilerarg value="-Xlint:all"/>
#	Line 353 | Line 388
388		<compilerarg line="${build.args}"/>
389
390		</javac>
391	+
392	+	<!-- We need jdk9's Contended annotation, but at compile time only -->
393	+	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
394		</target>
395
396
#	Line 362 | Line 400
400
401		<jar destfile="${product.jar}">
402		<fileset dir="${build.classes.dir}"/>
403	+	<manifest>
404	+	<attribute name="Built-By" value="${user.name}"/>
405	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
406	+	</manifest>
407		</jar>
408		</target>
409
#	Line 389 | Line 431
431		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
432		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
433		<arg value="-XDignore.symbol.file=true"/>
434	+	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
435		<arg value="-tag"/>
436		<arg value="${javadoc.jls.option}"/>
437		<arg value="-tag"/>
#	Line 420 | Line 463
463		<exclude name="src/emulation/**"/>
464		<exclude name="**/SyntaxTest.java"/>
465		<exclude name="**/SuperfluousAbstract.java"/>
466	+	<manifest>
467	+	<attribute name="Built-By" value="${user.name}"/>
468	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
469	+	</manifest>
470		</jar>
471		</target>
472
#	Line 451 | Line 498
498		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
499		</target>
500
501	<	<target name="tck" depends="test-tck" description="alias for test-tck"/>
455	<	<target name="test-tck"
501	>	<target name="tck"
502		depends="jar"
503		description="Runs tck tests for main directly">
504
#	Line 462 | Line 508
508		classes="${product.jar}"/>
509		</target>
510
511	<	<target name="test-tck-parallelism-1"
512	<	description="Runs test-tck with given common pool parallelism">
513	<	<antcall target="test-tck">
511	>	<target name="tck-parallelism-1"
512	>	description="Runs tck with given common pool parallelism">
513	>	<antcall target="tck">
514		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
515		</antcall>
516		</target>
517
518	<	<target name="test-tck-parallelism-0"
519	<	description="Runs test-tck with given common pool parallelism">
520	<	<antcall target="test-tck">
518	>	<target name="tck-parallelism-0"
519	>	description="Runs tck with given common pool parallelism">
520	>	<antcall target="tck">
521		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
522		</antcall>
523		</target>
524
525	<	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
480	<	<target name="test-jtreg"
525	>	<target name="jtreg"
526		depends="jar"
527		description="Runs jtreg tests for main using the jtreg ant task">
528		<run-jtreg-tests
#	Line 487 | Line 532
532		</target>
533
534		<target name="test"
535	<	depends="test-tck, test-tck-parallelism-1, test-jtreg"
535	>	depends="tck, tck-parallelism-1, jtreg"
536		description="Runs tck and jtreg tests for main">
537		</target>
538
#	Line 520 | Line 565
565
566
567		<target name="configure-compiler">
568	+	<fail message="ant version too old">
569	+	<condition>
570	+	<not> <antversion atleast="1.9.1"/> </not>
571	+	</condition>
572	+	</fail>
573
574		<property name="unchecked.option" value="-Xlint:unchecked"/>
575
#	Line 551 | Line 601
601		debuglevel="${build.debuglevel}"
602		deprecation="${build.deprecation}"
603		source="${build.sourcelevel}"
604	+	target="${build.sourcelevel}"
605		fork="true">
606
607		<compilerarg line="${build.args}"/>
#	Line 606 | Line 657
657		debuglevel="${build.debuglevel}"
658		deprecation="${build.deprecation}"
659		source="6"
660	+	target="6"
661		classpath=""
662		bootclasspath="${bootclasspath6}"
663		includeAntRuntime="false"
#	Line 635 | Line 687
687		debuglevel="${build.debuglevel}"
688		deprecation="${build.deprecation}"
689		source="6"
690	+	target="6"
691		classpath=""
692	<	bootclasspath="${bootclasspath7}"
692	>	bootclasspath="${bootclasspath6}"
693		includeAntRuntime="false"
694		includeJavaRuntime="false"
695		executable="${javac8}"
#	Line 659 | Line 712
712
713		<jar destfile="${4jdk7product.jar}">
714		<fileset dir="${build.4jdk7.classes.dir}"/>
715	+	<manifest>
716	+	<attribute name="Built-By" value="${user.name}"/>
717	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
718	+	</manifest>
719		</jar>
720
721		</target>
722
723
724	<	<target name="4jdk7-test-tck"
724	>	<target name="4jdk7-tck"
725		depends="4jdk7jar"
726		description="Runs tck tests for jsr166-4jdk7 directly">
727
#	Line 676 | Line 733
733		<!-- JDK8+ test classes -->
734		<exclude name="*8Test.java"/>
735		<exclude name="*9Test.java"/>
736	+	<exclude name="*10Test.java"/>
737		<exclude name="DoubleAccumulatorTest.java"/>
738		<exclude name="DoubleAdderTest.java"/>
739		<exclude name="LongAccumulatorTest.java"/>
#	Line 683 | Line 741
741		<exclude name="CompletableFutureTest.java"/>
742		<exclude name="SplittableRandomTest.java"/>
743		<exclude name="StampedLockTest.java"/>
744	+	<exclude name="SubmissionPublisherTest.java"/>
745		</javac-elements>
746		</run-tck-tests>
747		</target>
748
749
750	<	<target name="4jdk7-test-tck-junit"
750	>	<target name="4jdk7-tck-junit"
751		depends="4jdk7compile"
752		description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
753
#	Line 716 | Line 775
775		</junit>
776		</target>
777
778	<	<target name="4jdk7-test-jtreg"
778	>	<target name="4jdk7-jtreg"
779		depends="4jdk7jar"
780		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
781		<run-jtreg-tests
#	Line 727 | Line 786
786
787
788		<target name="4jdk7-test"
789	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
789	>	depends="4jdk7-tck, 4jdk7-jtreg"
790		description="Runs tck and jtreg tests for jsr166-4jdk7">
791		</target>
792
#	Line 796 | Line 855
855		classpath=""
856		bootclasspath="${bootclasspath6}"
857		source="5"
858	+	target="5"
859		includeAntRuntime="false"
860		includeJavaRuntime="false"
861		executable="${javac7}"
#	Line 817 | Line 877
877
878		<jar destfile="${jsr166x.jar}">
879		<fileset dir="${build.jsr166x.classes.dir}"/>
880	+	<manifest>
881	+	<attribute name="Built-By" value="${user.name}"/>
882	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
883	+	</manifest>
884		</jar>
885
886		</target>
#	Line 881 | Line 945
945		debuglevel="${build.debuglevel}"
946		deprecation="${build.deprecation}"
947		source="6"
948	+	target="6"
949		classpath=""
950		bootclasspath="${bootclasspath6}"
951		includeAntRuntime="false"
#	Line 904 | Line 969
969
970		<jar destfile="${jsr166y.jar}" index="true">
971		<fileset dir="${build.jsr166y.classes.dir}"/>
972	+	<manifest>
973	+	<attribute name="Built-By" value="${user.name}"/>
974	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
975	+	</manifest>
976		</jar>
977
978		</target>
#	Line 971 | Line 1040
1040		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1041		classpath=""
1042		source="6"
1043	+	target="6"
1044		includeAntRuntime="false"
1045		includeJavaRuntime="false"
1046		executable="${javac7}"
#	Line 992 | Line 1062
1062
1063		<jar destfile="${extra166y.jar}" index="true">
1064		<fileset dir="${build.extra166y.classes.dir}"/>
1065	+	<manifest>
1066	+	<attribute name="Built-By" value="${user.name}"/>
1067	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1068	+	</manifest>
1069		</jar>
1070
1071		</target>
#	Line 1058 | Line 1132
1132		debuglevel="${build.debuglevel}"
1133		deprecation="${build.deprecation}"
1134		source="${build.jsr166e.java.version}"
1135	+	target="${build.jsr166e.java.version}"
1136		classpath=""
1137		includeAntRuntime="false"
1138		includeJavaRuntime="false"
#	Line 1084 | Line 1159
1159		debuglevel="${build.debuglevel}"
1160		deprecation="${build.deprecation}"
1161		source="${build.jsr166e.java.version}"
1162	+	target="${build.jsr166e.java.version}"
1163		classpath=""
1164	<	bootclasspath="${bootclasspath7}"
1164	>	bootclasspath="${bootclasspath6}"
1165		includeAntRuntime="false"
1166		includeJavaRuntime="false"
1167		executable="${javac8}"
#	Line 1107 | Line 1183
1183
1184		<jar destfile="${jsr166e.jar}" index="true">
1185		<fileset dir="${build.jsr166e.classes.dir}"/>
1186	+	<manifest>
1187	+	<attribute name="Built-By" value="${user.name}"/>
1188	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1189	+	</manifest>
1190		</jar>
1191
1192		</target>
#	Line 1132 | Line 1212
1212		</target>
1213
1214
1215	<	<target name="jsr166e-test-tck-one-java-version"
1215	>	<target name="jsr166e-tck-one-java-version"
1216		depends="jsr166ejar">
1217
1218		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
#	Line 1144 | Line 1224
1224		classes="${jsr166e.jar}"/>
1225		</target>
1226
1227	<	<target name="jsr166e-test-tck"
1227	>	<target name="jsr166e-tck"
1228		description="Runs tck tests for jsr166e for multiple java versions">
1229
1230		<!--     <antcall target="clean"/> -->
1231	<	<!--     <antcall target="jsr166e-test-tck-one-java-version"> -->
1231	>	<!--     <antcall target="jsr166e-tck-one-java-version"> -->
1232		<!--       <param name="build.jsr166e.java.version" value="8"/> -->
1233		<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
1234		<!--     </antcall> -->
1235
1236		<antcall target="clean"/>
1237	<	<antcall target="jsr166e-test-tck-one-java-version">
1237	>	<antcall target="jsr166e-tck-one-java-version">
1238		<param name="build.jsr166e.java.version" value="7"/>
1239		<param name="build.jsr166e.javac" value="${javac7}"/>
1240		</antcall>
1241
1242		<antcall target="clean"/>
1243	<	<antcall target="jsr166e-test-tck-one-java-version">
1243	>	<antcall target="jsr166e-tck-one-java-version">
1244		<param name="build.jsr166e.java.version" value="6"/>
1245		<param name="build.jsr166e.javac" value="${javac6}"/>
1246		</antcall>
#	Line 1168 | Line 1248
1248
1249
1250		<target name="jsr166e-test"
1251	<	depends="jsr166e-test-tck"
1251	>	depends="jsr166e-tck"
1252		description="Runs all tests for jsr166e">
1253		</target>
1254

Diff Legend

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