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.199 by jsr166, Fri Mar 25 03:36:15 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 26 | Line 27
27		(e.g. mercurial forest) or a symlink to same.
28
29		Alternatively, define ant variables thus:
30	<	ant -Djdk$N.home=...
30	>	ant -Djdk$N.home=... -Djdk$N.src.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.home="$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 89 | Line 85
85		<macrodef name="defjdklocations">
86		<attribute name="v"/>
87		<sequential>
88	<	<property name="jdk@{v}.home"   location="${jdks.home}/jdk@{v}"/>
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"/>
88	>	<property name="jdk@{v}.home"     location="${jdks.home}/jdk@{v}"/>
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.home" location="${jdks.home}/src/jdk@{v}"/>
93	>	<local name="have.java.base"/>
94	>	<available property="have.java.base"
95	>	file="${jdk@{v}.src.home}/jdk/src/java.base/share/classes" type="dir"/>
96	>	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/java.base/share/classes"
97	>	if:set="have.java.base"/>
98	>	<property name="jdk@{v}.src.dir" location="${jdk@{v}.src.home}/jdk/src/share/classes"
99	>	unless:set="have.java.base"/>
100	>	<local name="modules"/>
101	>	<available property="modules" file="${jdk@{v}.home}/jmods" type="dir"/>
102		<local name="boot.jar.dir"/>
103	<	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib"/>
104	<	<path id="bootclasspath@{v}">
103	>	<property name="boot.jar.dir"   location="${jdk@{v}.home}/jre/lib" unless:set="modules"/>
104	>	<path id="bootclasspath@{v}" unless:set="modules">
105		<pathelement path="${boot.jar.dir}/resources.jar"/>
106		<pathelement path="${boot.jar.dir}/rt.jar"/>
107		<pathelement path="${boot.jar.dir}/jsse.jar"/>
108		<pathelement path="${boot.jar.dir}/jce.jar"/>
109		<pathelement path="${boot.jar.dir}/charsets.jar"/>
110		</path>
111	<	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}"/>
111	>	<property name="bootclasspath@{v}" value="${toString:bootclasspath@{v}}" unless:set="modules"/>
112		</sequential>
113		</macrodef>
114
#	Line 129 | Line 134
134		<property name="test.src.dir"         location="${basedir}/src/test"/>
135		<property name="loops.src.dir"        location="${basedir}/src/loops"/>
136		<property name="tck.src.dir"          location="${test.src.dir}/tck"/>
137	<	<property name="jtreg.src.dir"        location="${test.src.dir}/jtreg"/>
137	>	<property name="jtreg7.src.dir"       location="${test.src.dir}/jtreg-jdk7"/>
138	>	<property name="jtreg8.src.dir"       location="${test.src.dir}/jtreg"/>
139	>	<property name="jtreg9.src.dir"       location="${test.src.dir}/jtreg"/>
140	>	<property name="jtreg.src.dir"        location="${jtreg9.src.dir}"/>
141		<property name="lib.dir"              location="${basedir}/lib"/>
142		<property name="dist.dir"             location="${basedir}/dist"/>
143		<property name="topsrc.dir"           location="${basedir}/src"/>
#	Line 168 | Line 176
176		<property name="java6.docroot.url"      value="http://docs.oracle.com/javase/6/docs"/>
177		<property name="java7.docroot.url"      value="http://docs.oracle.com/javase/7/docs"/>
178		<property name="java8.docroot.url"      value="http://docs.oracle.com/javase/8/docs"/>
179	<	<!-- The expected canonical location does not yet exist as of 2014-07 -->
179	>	<!-- The expected canonical location does not yet exist as of 2015-11 -->
180		<!-- <property name="java9.docroot.url" value="http://docs.oracle.com/javase/9/docs"/> -->
181		<property name="java9.docroot.url"      value="http://download.java.net/jdk9/docs"/>
182		<!-- Default jdk doc location (latest stable release seems best) -->
#	Line 187 | Line 195
195		<taskdef name="jtreg" classname="com.sun.javatest.regtest.Main$$Ant"
196		classpath="${lib.dir}/jtreg.jar" />
197
198	<	<!-- Test classpath -->
199	<	<path id="test.classpath">
200	<	<pathelement location="${build.testcases.dir}"/>
201	<	<pathelement location="${junit.jar}"/>
202	<	</path>
203	<
198	>	<!-- Tck options; see JSR166TestCase.java
199	>	To profile a single tck test class:
200	>	ant -Djsr166.profileTests=true -Djsr166.profileThreshold=10 -Djsr166.tckTestClass=CompletableFutureTest tck
201	>	To stress test a single tck test class:
202	>	ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 tck
203	>	To stress test a single tck test method:
204	>	ant -Djsr166.tckTestClass=RecursiveTaskTest -Djsr166.runsPerTest=1000 -Djsr166.methodFilter=testAbnormalInvokeAll3 tck
205	>	-->
206	>	<property name="jsr166.tckTestClass"     value="JSR166TestCase"/>
207		<macrodef name="run-tck-tests">
208		<attribute name="tck.src.dir" default="${tck.src.dir}"/>
209		<attribute name="target"/>
#	Line 201 | Line 212
212		<attribute name="classes"/>
213		<attribute name="jvmflags" default="-ea -esa -Djsr166.testImplementationDetails=true"/>
214		<element name="javac-elements" optional="true"/>
215	+
216		<sequential>
217
218	+	<local name="modules"/>
219	+	<condition property="modules">
220	+	<available file="${jdk@{compile-target}.home}/jmods" type="dir"/>
221	+	</condition>
222	+
223		<mkdir dir="@{workdir}/tck-classes"/>
224
225		<javac srcdir="@{tck.src.dir}"
#	Line 220 | Line 237
237
238		<include name="*.java"/>
239		<compilerarg value="-XDignore.symbol.file=true"/>
240	<	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/>
241	<	<compilerarg value="-Xbootclasspath/p:@{classes}"/>
240	>	<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation,-try"/>
241	>	<compilerarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
242	>	<compilerarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
243		<compilerarg line="${build.args}"/>
244		<javac-elements/>
245
#	Line 231 | Line 249
249		failonerror="true"
250		jvm="${java@{target}}"
251		fork="true">
252	<	<jvmarg value="-Xbootclasspath/p:@{classes}"/>
252	>	<jvmarg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
253	>	<jvmarg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
254		<jvmarg line="@{jvmflags}"/>
255
256	<	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 test-tck -->
257	<	<syspropertyset id="java.util.concurrent.ForkJoinPool-properties">
256	>	<!-- ant -Djava.util.concurrent.ForkJoinPool.common.parallelism=1 tck -->
257	>	<syspropertyset id="system-properties-used-by-tck">
258		<propertyref prefix="java.util.concurrent.ForkJoinPool"/>
259	+	<propertyref prefix="jsr166."/>
260	+	<propertyref name="test.timeout.factor"/>
261		</syspropertyset>
262
242	–	<sysproperty key="jsr166.profileTests"     value="${jsr166.profileTests}"/>
243	–	<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/>
244	–	<sysproperty key="jsr166.runsPerTest"      value="${jsr166.runsPerTest}"/>
263		<classpath>
264		<pathelement location="${junit.jar}"/>
265		<pathelement location="@{workdir}/tck-classes"/>
#	Line 252 | Line 270
270		</macrodef>
271
272		<!-- Define jtreg test sets for different jdk versions -->
273	<	<fileset dir="${jtreg.src.dir}">
273	>	<fileset dir="${jtreg9.src.dir}">
274		<patternset id="jdk9.jtreg.tests">
275		<include name="**/*.java"/>
276		</patternset>
277		</fileset>
278
279	<	<fileset dir="${jtreg.src.dir}">
279	>	<fileset dir="${jtreg8.src.dir}">
280		<patternset id="jdk8.jtreg.tests">
281		<include name="**/*.java"/>
282	<	<exclude name="util/Spliterator/SpliteratorCharacteristics.java"/>
282	>	<exclude name="**/SpliteratorCharacteristics.java"/>
283		<!-- https://bugs.openjdk.java.net/browse/JDK-6842353 -->
284	<	<exclude name="util/WeakHashMap/GCDuringIteration.java"/>
284	>	<exclude name="**/GCDuringIteration.java"/>
285		</patternset>
286		</fileset>
287
288	<	<fileset dir="${jtreg.src.dir}">
288	>	<fileset dir="${jtreg7.src.dir}">
289		<patternset id="jdk7.jtreg.tests">
290		<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"/>
291		</patternset>
292		</fileset>
293
294	+	<!-- ant -Djtreg.flags=-timeoutFactor:4 -->
295	+	<property name="jtreg.flags" value=""/>
296	+
297		<macrodef name="run-jtreg-tests">
298	<	<!-- ant -Djtreg.src.dir=src/test/jtreg/util/concurrent/CompletableFuture test-jtreg -->
284	<	<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/>
298	>	<!-- ant -Djtreg9.src.dir=src/test/jtreg/util/concurrent/CompletableFuture jtreg -->
299		<attribute name="source" default="7"/>
300		<attribute name="target"/>
301		<attribute name="workdir"/>
302		<attribute name="classes"/>
303		<attribute name="jtregflags" default=""/>
304	+
305		<sequential>
306	+
307	+	<!-- ant -Djtreg.verbose=time,fail,error jtreg -->
308	+	<property name="jtreg.verbose" value="nopass,fail,error"/>
309	+
310	+	<local name="modules"/>
311	+	<condition property="modules">
312	+	<available file="${jdk@{target}.home}/jmods" type="dir"/>
313	+	</condition>
314	+
315		<delete dir="@{workdir}/JTwork"   quiet="true"/>
316		<delete dir="@{workdir}/JTreport" quiet="true"/>
317		<mkdir dir="@{workdir}/JTwork/scratch"/>
318	<	<mkdir dir="@{workdir}/JTreport"/>
319	<	<jtreg dir="@{jtreg.src.dir}"
318	>	<!-- workaround for https://bugs.openjdk.java.net/browse/CODETOOLS-7901571 -->
319	>	<mkdir dir="@{workdir}/JTreport/html"/>
320	>	<mkdir dir="@{workdir}/JTreport/text"/>
321	>	<jtreg dir="${jtreg@{target}.src.dir}"
322		jdk="${jdk@{target}.home}"
323		workDir="@{workdir}/JTwork"
324		reportDir="@{workdir}/JTreport">
325		<patternset refid="jdk@{target}.jtreg.tests"/>
326	<	<arg value="-Xbootclasspath/p:@{classes}"/>
326	>	<arg value="-Xbootclasspath/p:@{classes}" unless:set="modules"/>
327	>	<arg value="-Xpatch:${build.classes.dir}" if:set="modules"/>
328		<arg value="-agentvm"/>
329	<	<arg value="-v:nopass,fail"/>
329	>	<arg value="-verbose:${jtreg.verbose}"/>
330		<arg value="-vmoptions:-esa -ea"/>
331		<arg value="-automatic"/>
332		<arg value="-k:!ignore"/>
333		<arg line="@{jtregflags}"/>
334	+	<arg line="${jtreg.flags}"/>
335		</jtreg>
336		</sequential>
337		</macrodef>
#	Line 330 | Line 358
358		depends="configure-compiler"
359		description="Compiles src/main sources to build dir">
360
361	<	<mkdir dir="${build.classes.dir}"/>
361	>	<local name="modules"/>
362	>	<condition property="modules">
363	>	<and>
364	>	<available file="${jdk9.home}/jmods" type="dir"/>
365	>	<equals arg1="9" arg2="${build.main.java.version}"/>
366	>	</and>
367	>	</condition>
368	>
369	>	<local name="destdir"/>
370	>	<property name="destdir" value="${build.classes.dir}/java.base" if:set="modules"/>
371	>	<property name="destdir" value="${build.classes.dir}" unless:set="modules"/>
372	>
373	>	<mkdir dir="${destdir}"/>
374
375		<javac srcdir="${src.dir}"
376	<	destdir="${build.classes.dir}"
376	>	destdir="${destdir}"
377		debug="${build.debug}"
378		debuglevel="${build.debuglevel}"
379		deprecation="${build.deprecation}"
#	Line 344 | Line 384
384		fork="true">
385
386		<include name="**/*.java"/>
387	+	<compilerarg value="-Xmodule:java.base" if:set="modules"/>
388		<compilerarg value="-Xprefer:source"/>
389		<compilerarg value="-XDignore.symbol.file=true"/>
390		<compilerarg value="-Xlint:all"/>
#	Line 353 | Line 394
394		<compilerarg line="${build.args}"/>
395
396		</javac>
397	+
398	+	<!-- We need jdk9's Contended annotation, but at compile time only -->
399	+	<delete file="${destdir}/jdk/internal/vm/annotation/Contended.class"/>
400		</target>
401
402
#	Line 362 | Line 406
406
407		<jar destfile="${product.jar}">
408		<fileset dir="${build.classes.dir}"/>
409	+	<manifest>
410	+	<attribute name="Built-By" value="${user.name}"/>
411	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
412	+	</manifest>
413		</jar>
414		</target>
415
#	Line 380 | Line 428
428		link="${java9.api.url}"
429		overview="${src.dir}/intro.html"
430		access="${build.javadoc.access}"
431	<	sourcepath="${src.dir}:${jdk9src.dir}"
431	>	sourcepath="${src.dir}:${jdk9.src.dir}"
432		classpath=""
433		executable="${javadoc9}">
434		<fileset dir="${src.dir}" defaultexcludes="yes">
#	Line 389 | Line 437
437		<arg line="-Xdocrootparent ${java9.docroot.url}"/>
438		<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/>
439		<arg value="-XDignore.symbol.file=true"/>
440	+	<!--  TODO     <arg value="-Xmodule:java.base"/> -->
441		<arg value="-tag"/>
442		<arg value="${javadoc.jls.option}"/>
443		<arg value="-tag"/>
#	Line 397 | Line 446
446		<arg value="implSpec:a:&lt;em&gt;Implementation Requirements:&lt;/em&gt;"/>
447		<arg value="-tag"/>
448		<arg value="implNote:a:&lt;em&gt;Implementation Note:&lt;/em&gt;"/>
449	+	<!-- tags added in jdk9 -->
450	+	<arg value="-tag"/>
451	+	<arg value="revised:X"/>
452	+	<arg value="-tag"/>
453	+	<arg value="spec:X"/>
454		</javadoc>
455		</target>
456
#	Line 420 | Line 474
474		<exclude name="src/emulation/**"/>
475		<exclude name="**/SyntaxTest.java"/>
476		<exclude name="**/SuperfluousAbstract.java"/>
477	+	<manifest>
478	+	<attribute name="Built-By" value="${user.name}"/>
479	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
480	+	</manifest>
481		</jar>
482		</target>
483
#	Line 451 | Line 509
509		<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/>
510		</target>
511
512	<	<target name="tck" depends="test-tck" description="alias for test-tck"/>
455	<	<target name="test-tck"
512	>	<target name="tck"
513		depends="jar"
514		description="Runs tck tests for main directly">
515
#	Line 462 | Line 519
519		classes="${product.jar}"/>
520		</target>
521
522	<	<target name="test-tck-parallelism-1"
523	<	description="Runs test-tck with given common pool parallelism">
524	<	<antcall target="test-tck">
522	>	<target name="tck-parallelism-1"
523	>	description="Runs tck with given common pool parallelism">
524	>	<antcall target="tck">
525		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="1"/>
526		</antcall>
527		</target>
528
529	<	<target name="test-tck-parallelism-0"
530	<	description="Runs test-tck with given common pool parallelism">
531	<	<antcall target="test-tck">
529	>	<target name="tck-parallelism-0"
530	>	description="Runs tck with given common pool parallelism">
531	>	<antcall target="tck">
532		<param name="java.util.concurrent.ForkJoinPool.common.parallelism" value="0"/>
533		</antcall>
534		</target>
535
536	<	<target name="jtreg" depends="test-jtreg" description="alias for test-jtreg"/>
480	<	<target name="test-jtreg"
536	>	<target name="jtreg"
537		depends="jar"
538		description="Runs jtreg tests for main using the jtreg ant task">
539		<run-jtreg-tests
#	Line 487 | Line 543
543		</target>
544
545		<target name="test"
546	<	depends="test-tck, test-tck-parallelism-1, test-jtreg"
546	>	depends="tck, tck-parallelism-1, jtreg"
547		description="Runs tck and jtreg tests for main">
548		</target>
549
#	Line 520 | Line 576
576
577
578		<target name="configure-compiler">
579	+	<fail message="ant version too old">
580	+	<condition>
581	+	<not> <antversion atleast="1.9.1"/> </not>
582	+	</condition>
583	+	</fail>
584
585		<property name="unchecked.option" value="-Xlint:unchecked"/>
586
#	Line 551 | Line 612
612		debuglevel="${build.debuglevel}"
613		deprecation="${build.deprecation}"
614		source="${build.sourcelevel}"
615	+	target="${build.sourcelevel}"
616		fork="true">
617
618		<compilerarg line="${build.args}"/>
#	Line 606 | Line 668
668		debuglevel="${build.debuglevel}"
669		deprecation="${build.deprecation}"
670		source="6"
671	+	target="6"
672		classpath=""
673		bootclasspath="${bootclasspath6}"
674		includeAntRuntime="false"
#	Line 635 | Line 698
698		debuglevel="${build.debuglevel}"
699		deprecation="${build.deprecation}"
700		source="6"
701	+	target="6"
702		classpath=""
703	<	bootclasspath="${bootclasspath7}"
703	>	bootclasspath="${bootclasspath6}"
704		includeAntRuntime="false"
705		includeJavaRuntime="false"
706		executable="${javac8}"
#	Line 659 | Line 723
723
724		<jar destfile="${4jdk7product.jar}">
725		<fileset dir="${build.4jdk7.classes.dir}"/>
726	+	<manifest>
727	+	<attribute name="Built-By" value="${user.name}"/>
728	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
729	+	</manifest>
730		</jar>
731
732		</target>
733
734
735	<	<target name="4jdk7-test-tck"
735	>	<target name="4jdk7-tck"
736		depends="4jdk7jar"
737		description="Runs tck tests for jsr166-4jdk7 directly">
738
#	Line 676 | Line 744
744		<!-- JDK8+ test classes -->
745		<exclude name="*8Test.java"/>
746		<exclude name="*9Test.java"/>
747	+	<exclude name="*10Test.java"/>
748		<exclude name="DoubleAccumulatorTest.java"/>
749		<exclude name="DoubleAdderTest.java"/>
750		<exclude name="LongAccumulatorTest.java"/>
#	Line 683 | Line 752
752		<exclude name="CompletableFutureTest.java"/>
753		<exclude name="SplittableRandomTest.java"/>
754		<exclude name="StampedLockTest.java"/>
755	+	<exclude name="SubmissionPublisherTest.java"/>
756		</javac-elements>
757		</run-tck-tests>
758		</target>
759
760
761	<	<target name="4jdk7-test-tck-junit"
761	>	<target name="4jdk7-tck-junit"
762		depends="4jdk7compile"
763		description="Runs tck tests for jsr166-4jdk7 via junit task (experimental)">
764
#	Line 716 | Line 786
786		</junit>
787		</target>
788
789	<	<target name="4jdk7-test-jtreg"
789	>	<target name="4jdk7-jtreg"
790		depends="4jdk7jar"
791		description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task">
792		<run-jtreg-tests
#	Line 727 | Line 797
797
798
799		<target name="4jdk7-test"
800	<	depends="4jdk7-test-tck, 4jdk7-test-jtreg"
800	>	depends="4jdk7-tck, 4jdk7-jtreg"
801		description="Runs tck and jtreg tests for jsr166-4jdk7">
802		</target>
803
#	Line 743 | Line 813
813		link="${java7.api.url}"
814		overview="${4jdk7src.dir}/intro.html"
815		access="${build.javadoc.access}"
816	<	sourcepath="${4jdk7src.dir}:${jdk7src.dir}"
816	>	sourcepath="${4jdk7src.dir}:${jdk7.src.dir}"
817		classpath=""
818		executable="${javadoc7}">
819		<fileset dir="${4jdk7src.dir}" defaultexcludes="yes">
#	Line 796 | Line 866
866		classpath=""
867		bootclasspath="${bootclasspath6}"
868		source="5"
869	+	target="5"
870		includeAntRuntime="false"
871		includeJavaRuntime="false"
872		executable="${javac7}"
#	Line 817 | Line 888
888
889		<jar destfile="${jsr166x.jar}">
890		<fileset dir="${build.jsr166x.classes.dir}"/>
891	+	<manifest>
892	+	<attribute name="Built-By" value="${user.name}"/>
893	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
894	+	</manifest>
895		</jar>
896
897		</target>
#	Line 832 | Line 907
907		packagenames="jsr166x.*"
908		link="${java.api.url}"
909		access="${build.javadoc.access}"
910	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
910	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
911		bootclasspath="${bootclasspath6}"
912		source="5"
913		executable="${javadoc7}">
#	Line 881 | Line 956
956		debuglevel="${build.debuglevel}"
957		deprecation="${build.deprecation}"
958		source="6"
959	+	target="6"
960		classpath=""
961		bootclasspath="${bootclasspath6}"
962		includeAntRuntime="false"
#	Line 904 | Line 980
980
981		<jar destfile="${jsr166y.jar}" index="true">
982		<fileset dir="${build.jsr166y.classes.dir}"/>
983	+	<manifest>
984	+	<attribute name="Built-By" value="${user.name}"/>
985	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
986	+	</manifest>
987		</jar>
988
989		</target>
#	Line 919 | Line 999
999		packagenames="jsr166y.*"
1000		link="${java.api.url}"
1001		access="${build.javadoc.access}"
1002	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1002	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1003		bootclasspath="${bootclasspath6}"
1004		source="6"
1005		executable="${javadoc7}">
#	Line 971 | Line 1051
1051		bootclasspath="@{jsr166y.jar}:${bootclasspath6}"
1052		classpath=""
1053		source="6"
1054	+	target="6"
1055		includeAntRuntime="false"
1056		includeJavaRuntime="false"
1057		executable="${javac7}"
#	Line 992 | Line 1073
1073
1074		<jar destfile="${extra166y.jar}" index="true">
1075		<fileset dir="${build.extra166y.classes.dir}"/>
1076	+	<manifest>
1077	+	<attribute name="Built-By" value="${user.name}"/>
1078	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1079	+	</manifest>
1080		</jar>
1081
1082		</target>
#	Line 1007 | Line 1092
1092		packagenames="extra166y.*"
1093		link="${java.api.url}"
1094		access="${build.javadoc.access}"
1095	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1095	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1096		bootclasspath="${bootclasspath6}"
1097		source="6"
1098		executable="${javadoc7}">
#	Line 1058 | Line 1143
1143		debuglevel="${build.debuglevel}"
1144		deprecation="${build.deprecation}"
1145		source="${build.jsr166e.java.version}"
1146	+	target="${build.jsr166e.java.version}"
1147		classpath=""
1148		includeAntRuntime="false"
1149		includeJavaRuntime="false"
#	Line 1084 | Line 1170
1170		debuglevel="${build.debuglevel}"
1171		deprecation="${build.deprecation}"
1172		source="${build.jsr166e.java.version}"
1173	+	target="${build.jsr166e.java.version}"
1174		classpath=""
1175	<	bootclasspath="${bootclasspath7}"
1175	>	bootclasspath="${bootclasspath6}"
1176		includeAntRuntime="false"
1177		includeJavaRuntime="false"
1178		executable="${javac8}"
#	Line 1107 | Line 1194
1194
1195		<jar destfile="${jsr166e.jar}" index="true">
1196		<fileset dir="${build.jsr166e.classes.dir}"/>
1197	+	<manifest>
1198	+	<attribute name="Built-By" value="${user.name}"/>
1199	+	<attribute name="Implementation-Vendor" value="JCP JSR-166 Expert Group."/>
1200	+	</manifest>
1201		</jar>
1202
1203		</target>
#	Line 1122 | Line 1213
1213		packagenames="jsr166e.*"
1214		link="${java.api.url}"
1215		access="${build.javadoc.access}"
1216	<	sourcepath="${topsrc.dir}:${jdk6src.dir}"
1216	>	sourcepath="${topsrc.dir}:${jdk6.src.dir}"
1217		source="${build.jsr166e.java.version}"
1218		executable="${javadoc7}">
1219		<arg line="-Xdocrootparent ${java.docroot.url}"/>
#	Line 1132 | Line 1223
1223		</target>
1224
1225
1226	<	<target name="jsr166e-test-tck-one-java-version"
1226	>	<target name="jsr166e-tck-one-java-version"
1227		depends="jsr166ejar">
1228
1229		<echo message="Testing with jdk${build.jsr166e.java.version} ..."/>
#	Line 1144 | Line 1235
1235		classes="${jsr166e.jar}"/>
1236		</target>
1237
1238	<	<target name="jsr166e-test-tck"
1238	>	<target name="jsr166e-tck"
1239		description="Runs tck tests for jsr166e for multiple java versions">
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="8"/> -->
1244		<!--       <param name="build.jsr166e.javac" value="${javac8}"/> -->
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="7"/>
1250		<param name="build.jsr166e.javac" value="${javac7}"/>
1251		</antcall>
1252
1253		<antcall target="clean"/>
1254	<	<antcall target="jsr166e-test-tck-one-java-version">
1254	>	<antcall target="jsr166e-tck-one-java-version">
1255		<param name="build.jsr166e.java.version" value="6"/>
1256		<param name="build.jsr166e.javac" value="${javac6}"/>
1257		</antcall>
#	Line 1168 | Line 1259
1259
1260
1261		<target name="jsr166e-test"
1262	<	depends="jsr166e-test-tck"
1262	>	depends="jsr166e-tck"
1263		description="Runs all tests for jsr166e">
1264		</target>
1265

Diff Legend

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