22 |
|
$HOME/jdk/src/jdk8 |
23 |
|
where each of the above is a complete JDK source tree |
24 |
|
(e.g. mercurial forest) or a symlink to same. |
25 |
+ |
As of 2013-02, the very latest lambda 8 jdk is needed for jdk8. |
26 |
|
------------------------------------------------------------------------------ |
27 |
|
</description> |
28 |
|
|
29 |
< |
<target name="usage" description="Advises user to run with -projecthelp"> |
30 |
< |
<echo>Run "ant -projecthelp" for full usage information.</echo> |
29 |
> |
<!-- Display main targets by running 'ant -projecthelp' --> |
30 |
> |
<target name="usage"> |
31 |
> |
<java classname="org.apache.tools.ant.Main"> |
32 |
> |
<arg value="-projecthelp" /> |
33 |
> |
</java> |
34 |
|
</target> |
35 |
|
|
36 |
|
|
43 |
|
<property name="build.debug" value="true"/> |
44 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
45 |
|
<property name="build.deprecation" value="false"/> |
46 |
+ |
<property name="build.javadoc.access" value="protected"/> |
47 |
+ |
|
48 |
+ |
<!-- Tck options; see JSR166TestCase.java --> |
49 |
+ |
<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck --> |
50 |
+ |
<property name="jsr166.profileTests" value="false"/> |
51 |
+ |
<property name="jsr166.profileThreshold" value="100"/> |
52 |
+ |
<property name="jsr166.runsPerTest" value="1"/> |
53 |
+ |
<!-- Allow running an individual tck test class --> |
54 |
+ |
<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck --> |
55 |
+ |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
56 |
|
|
57 |
|
<!-- Build locations --> |
58 |
|
<property name="build.dir" location="build"/> |
71 |
|
<property name="build.jsr166e.dir" location="${build.dir}/jsr166e"/> |
72 |
|
<property name="build.extra166y.dir" location="${build.dir}/extra166y"/> |
73 |
|
|
74 |
< |
<property name="build.jsr166x.classes.dir" location="${build.jsr166x.dir}/classes"/> |
75 |
< |
<property name="build.jsr166y.classes.dir" location="${build.jsr166y.dir}/classes"/> |
76 |
< |
<property name="build.jsr166e.classes.dir" location="${build.jsr166e.dir}/classes"/> |
77 |
< |
<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/> |
74 |
> |
<property name="build.jsr166x.classes.dir" location="${build.jsr166x.dir}/classes"/> |
75 |
> |
<property name="build.jsr166y.classes.dir" location="${build.jsr166y.dir}/classes"/> |
76 |
> |
<property name="build.jsr166e.classes.dir" location="${build.jsr166e.dir}/classes"/> |
77 |
> |
<property name="build.extra166y.classes.dir" location="${build.extra166y.dir}/classes"/> |
78 |
|
|
79 |
|
<!-- JDK locations --> |
80 |
|
<property name="jdks.home" location="${user.home}/jdk"/> |
100 |
|
</sequential> |
101 |
|
</macrodef> |
102 |
|
|
103 |
+ |
<macrodef name="mirror-dir"> |
104 |
+ |
<attribute name="src"/> |
105 |
+ |
<attribute name="dst"/> |
106 |
+ |
<sequential> |
107 |
+ |
<delete dir="@{dst}"/> |
108 |
+ |
<mkdir dir="@{dst}"/> |
109 |
+ |
<copy todir="@{dst}" preservelastmodified="true"> |
110 |
+ |
<fileset dir="@{src}"/> |
111 |
+ |
</copy> |
112 |
+ |
</sequential> |
113 |
+ |
</macrodef> |
114 |
+ |
|
115 |
|
<defjdklocations v="6"/> |
116 |
|
<defjdklocations v="7"/> |
117 |
|
<defjdklocations v="8"/> |
131 |
|
<property name="jsr166esrc.dir" location="${topsrc.dir}/jsr166e"/> |
132 |
|
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
133 |
|
|
134 |
< |
<!-- Distribution locations --> |
135 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/jsr166.docs"/> |
136 |
< |
<property name="dist.4jdk7.docs.dir" location="${dist.dir}/jsr166-4jdk7.docs"/> |
137 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166x.docs"/> |
138 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166y.docs"/> |
139 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166e.docs"/> |
140 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166y.docs"/> |
134 |
> |
<!-- Javadoc locations --> |
135 |
> |
<property name="docs.dir" location="${build.dir}/docs"/> |
136 |
> |
<property name="4jdk7docs.dir" location="${build.4jdk7.dir}/docs"/> |
137 |
> |
<property name="jsr166xdocs.dir" location="${build.jsr166x.dir}/docs"/> |
138 |
> |
<property name="jsr166ydocs.dir" location="${build.jsr166y.dir}/docs"/> |
139 |
> |
<property name="jsr166edocs.dir" location="${build.jsr166e.dir}/docs"/> |
140 |
> |
<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/> |
141 |
> |
|
142 |
> |
<property name="dist.docs.dir" location="${dist.dir}/docs"/> |
143 |
> |
<property name="dist.4jdk7docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
144 |
> |
<property name="dist.jsr166xdocs.dir" location="${dist.dir}/jsr166xdocs"/> |
145 |
> |
<property name="dist.jsr166ydocs.dir" location="${dist.dir}/jsr166ydocs"/> |
146 |
> |
<property name="dist.jsr166edocs.dir" location="${dist.dir}/jsr166edocs"/> |
147 |
> |
<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/> |
148 |
|
|
149 |
|
<!-- Jar locations --> |
150 |
|
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
180 |
|
|
181 |
|
<macrodef name="run-tck-tests"> |
182 |
|
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
150 |
– |
<attribute name="source" default="6"/> |
183 |
|
<attribute name="target"/> |
184 |
+ |
<attribute name="compile-target" default="@{target}"/> |
185 |
|
<attribute name="workdir"/> |
186 |
|
<attribute name="classes"/> |
187 |
|
<attribute name="jvmflags" default=""/> |
188 |
+ |
<element name="javac-elements" optional="true"/> |
189 |
|
<sequential> |
190 |
|
|
191 |
|
<mkdir dir="@{workdir}/tck-classes"/> |
195 |
|
debug="${build.debug}" |
196 |
|
debuglevel="${build.debuglevel}" |
197 |
|
deprecation="${build.deprecation}" |
198 |
< |
source="@{source}" |
198 |
> |
source="@{compile-target}" |
199 |
> |
target="@{compile-target}" |
200 |
|
classpath="${junit.jar}" |
201 |
< |
bootclasspath="@{classes}:${bootclasspath@{source}}" |
201 |
> |
bootclasspath="@{classes}:${bootclasspath@{compile-target}}" |
202 |
|
includeAntRuntime="false" |
203 |
|
includeJavaRuntime="false" |
204 |
< |
executable="${javac@{target}}" |
204 |
> |
executable="${javac@{compile-target}}" |
205 |
|
fork="true"> |
206 |
|
|
207 |
|
<include name="*.java"/> |
208 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
209 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
210 |
|
<compilerarg line="${build.args}"/> |
211 |
+ |
<javac-elements/> |
212 |
|
|
213 |
|
</javac> |
214 |
|
|
215 |
< |
<java classname="JSR166TestCase" |
215 |
> |
<java classname="${jsr166.tckTestClass}" |
216 |
|
failonerror="true" |
217 |
|
jvm="${java@{target}}" |
218 |
|
fork="true"> |
219 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
220 |
|
<jvmarg line="@{jvmflags}"/> |
221 |
+ |
<sysproperty key="jsr166.profileTests" value="${jsr166.profileTests}"/> |
222 |
+ |
<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/> |
223 |
+ |
<sysproperty key="jsr166.runsPerTest" value="${jsr166.runsPerTest}"/> |
224 |
|
<classpath> |
225 |
|
<pathelement location="${junit.jar}"/> |
226 |
|
<pathelement location="@{workdir}/tck-classes"/> |
230 |
|
</sequential> |
231 |
|
</macrodef> |
232 |
|
|
233 |
+ |
<macrodef name="run-jtreg-tests"> |
234 |
+ |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
235 |
+ |
<attribute name="source" default="7"/> |
236 |
+ |
<attribute name="target"/> |
237 |
+ |
<attribute name="workdir"/> |
238 |
+ |
<attribute name="classes"/> |
239 |
+ |
<attribute name="jtregflags" default=""/> |
240 |
+ |
<sequential> |
241 |
+ |
<delete dir="@{workdir}/JTwork" quiet="true"/> |
242 |
+ |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
243 |
+ |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
244 |
+ |
<mkdir dir="@{workdir}/JTreport"/> |
245 |
+ |
<jtreg dir="@{jtreg.src.dir}" |
246 |
+ |
jdk="${jdk@{target}.home}" |
247 |
+ |
workDir="@{workdir}/JTwork" |
248 |
+ |
reportDir="@{workdir}/JTreport"> |
249 |
+ |
|
250 |
+ |
<arg value="-Xbootclasspath/p:@{classes}"/> |
251 |
+ |
<arg value="-agentvm"/> |
252 |
+ |
<arg value="-v:nopass,fail"/> |
253 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
254 |
+ |
<arg value="-automatic"/> |
255 |
+ |
<arg value="-k:!ignore"/> |
256 |
+ |
<arg line="@{jtregflags}"/> |
257 |
+ |
</jtreg> |
258 |
+ |
</sequential> |
259 |
+ |
</macrodef> |
260 |
+ |
|
261 |
|
<!-- ALoops classpath --> |
262 |
|
<path id="loops.classpath"> |
263 |
|
<pathelement location="${build.loops.dir}"/> |
291 |
|
fork="true"> |
292 |
|
|
293 |
|
<include name="**/*.java"/> |
294 |
+ |
<compilerarg value="-Xprefer:source"/> |
295 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
296 |
|
<compilerarg value="-Xlint:all"/> |
297 |
+ |
<compilerarg value="-Xdoclint:all/protected"/> |
298 |
+ |
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
299 |
|
<compilerarg line="${build.args}"/> |
300 |
|
|
301 |
|
</javac> |
312 |
|
</target> |
313 |
|
|
314 |
|
|
245 |
– |
<target name="test" |
246 |
– |
depends="configure-tests, report-tests" |
247 |
– |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
248 |
– |
|
249 |
– |
|
315 |
|
<target name="docs" |
316 |
|
description="Builds javadocs for src/main to dist dir"> |
317 |
|
|
318 |
< |
<delete dir="${dist.javadocs.dir}"/> |
319 |
< |
<mkdir dir="${dist.javadocs.dir}"/> |
318 |
> |
<delete dir="${docs.dir}"/> |
319 |
> |
<mkdir dir="${docs.dir}"/> |
320 |
|
|
321 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
322 |
|
<!-- sourcepath for packages --> |
323 |
|
|
324 |
< |
<javadoc destdir="${dist.javadocs.dir}" |
324 |
> |
<javadoc destdir="${docs.dir}" |
325 |
|
packagenames="none" |
326 |
|
link="${jdkapi8docs.url}" |
327 |
|
overview="${src.dir}/intro.html" |
328 |
+ |
access="${build.javadoc.access}" |
329 |
|
sourcepath="${src.dir}:${jdk8src.dir}" |
330 |
|
classpath="" |
331 |
|
executable="${javadoc8}"> |
332 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
333 |
|
<include name="**/*.java"/> |
334 |
|
</fileset> |
335 |
+ |
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
336 |
|
<arg value="-XDignore.symbol.file=true"/> |
337 |
|
<arg value="-tag"/> |
338 |
|
<arg value="${javadoc.jls.option}"/> |
339 |
+ |
<arg value="-tag"/> |
340 |
+ |
<arg value="apiNote:a:<em>API Note:</em>"/> |
341 |
+ |
<arg value="-tag"/> |
342 |
+ |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
343 |
+ |
<arg value="-tag"/> |
344 |
+ |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
345 |
|
</javadoc> |
346 |
|
</target> |
347 |
|
|
348 |
|
|
349 |
|
<target name="dist" |
350 |
< |
depends="dist-clean, dist-jar, docs" |
350 |
> |
depends="dist-clean, dist-jar, dist-docs" |
351 |
|
description="Puts all distributable products in single hierarchy"/> |
352 |
|
|
353 |
|
|
380 |
|
<target name="dist-clean" |
381 |
|
description="Removes all build and distribution products"> |
382 |
|
|
383 |
+ |
<delete dir="${build.dir}"/> |
384 |
|
<delete dir="${dist.dir}"/> |
385 |
|
|
386 |
|
</target> |
387 |
|
|
388 |
|
|
315 |
– |
<!-- Internal targets --> |
316 |
– |
|
317 |
– |
|
389 |
|
<target name="dist-jar" |
390 |
|
depends="clean, jar"> |
320 |
– |
|
391 |
|
<copy file="${product.jar}" todir="${dist.dir}"/> |
322 |
– |
|
392 |
|
</target> |
393 |
|
|
394 |
< |
|
395 |
< |
<target name="compile-tests" |
396 |
< |
depends="jar"> |
328 |
< |
|
329 |
< |
<mkdir dir="${build.testcases.dir}"/> |
330 |
< |
|
331 |
< |
<javac srcdir="${tck.src.dir}" |
332 |
< |
destdir="${build.testcases.dir}" |
333 |
< |
debug="${build.debug}" |
334 |
< |
debuglevel="${build.debuglevel}" |
335 |
< |
deprecation="${build.deprecation}" |
336 |
< |
source="6" |
337 |
< |
classpath="${junit.jar}" |
338 |
< |
bootclasspath="@{product.jar}:${bootclasspath6}" |
339 |
< |
includeAntRuntime="false" |
340 |
< |
includeJavaRuntime="false" |
341 |
< |
executable="${javac8}" |
342 |
< |
fork="true"> |
343 |
< |
|
344 |
< |
<include name="**/*.java"/> |
345 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
346 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
347 |
< |
<compilerarg line="${build.args}"/> |
348 |
< |
|
349 |
< |
</javac> |
350 |
< |
|
351 |
< |
<javac srcdir="${test.src.dir}" |
352 |
< |
destdir="${build.testcases.dir}" |
353 |
< |
debug="${build.debug}" |
354 |
< |
debuglevel="${build.debuglevel}" |
355 |
< |
deprecation="${build.deprecation}" |
356 |
< |
source="6" |
357 |
< |
classpath="" |
358 |
< |
bootclasspath="@{product.jar}:${bootclasspath6}" |
359 |
< |
includeAntRuntime="false" |
360 |
< |
includeJavaRuntime="false" |
361 |
< |
executable="${javac8}" |
362 |
< |
fork="true"> |
363 |
< |
|
364 |
< |
<include name="jsr166/test/**/*.java"/> |
365 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
366 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
367 |
< |
<compilerarg line="${build.args}"/> |
368 |
< |
|
369 |
< |
</javac> |
370 |
< |
|
371 |
< |
<!-- |
372 |
< |
<javac srcdir="${jtreg.src.dir}" |
373 |
< |
destdir="${build.testcases.dir}" |
374 |
< |
debug="${build.debug}" |
375 |
< |
debuglevel="${build.debuglevel}" |
376 |
< |
deprecation="${build.deprecation}" |
377 |
< |
source="${build.sourcelevel}" |
378 |
< |
fork="true"> |
379 |
< |
|
380 |
< |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
381 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
382 |
< |
<compilerarg line="${build.args}"/> |
383 |
< |
|
384 |
< |
</javac> |
385 |
< |
--> |
386 |
< |
|
394 |
> |
<target name="dist-docs" |
395 |
> |
depends="clean, docs"> |
396 |
> |
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
397 |
|
</target> |
398 |
|
|
399 |
|
|
400 |
< |
<target name="run-tests" |
401 |
< |
depends="compile-tests"> |
402 |
< |
|
393 |
< |
<!-- May be overridden by user.properties --> |
394 |
< |
<property name="testcase" value="*"/> |
395 |
< |
|
396 |
< |
<mkdir dir="${build.reports.dir}"/> |
397 |
< |
|
398 |
< |
<junit printsummary="true" |
399 |
< |
showoutput="true" |
400 |
< |
errorProperty="junit.failed" |
401 |
< |
failureProperty="junit.failed" |
402 |
< |
dir="${build.reports.dir}" |
403 |
< |
jvm="${java8}" |
404 |
< |
fork="true"> |
405 |
< |
|
406 |
< |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
407 |
< |
<jvmarg value="-server"/> |
408 |
< |
<jvmarg value="-showversion"/> |
409 |
< |
|
410 |
< |
<classpath refid="test.classpath"/> |
411 |
< |
|
412 |
< |
<formatter type="xml"/> |
413 |
< |
|
414 |
< |
<batchtest todir="${build.reports.dir}" unless="no.test.tck"> |
415 |
< |
<fileset dir="${tck.src.dir}"> |
416 |
< |
<include name="**/${testcase}Test.java"/> |
417 |
< |
</fileset> |
418 |
< |
</batchtest> |
419 |
< |
|
420 |
< |
<batchtest todir="${build.reports.dir}" if="do.test.old"> |
421 |
< |
<fileset dir="${test.src.dir}"> |
422 |
< |
<include name="jsr166/test/**/${testcase}Test.java"/> |
423 |
< |
</fileset> |
424 |
< |
</batchtest> |
425 |
< |
|
426 |
< |
<!-- |
427 |
< |
<batchtest todir="${build.reports.dir}" if="do.test.jtreg"> |
428 |
< |
<fileset dir="${jtreg.src.dir}"> |
429 |
< |
<include name="**/${testcase}Test.java"/> |
430 |
< |
</fileset> |
431 |
< |
</batchtest> |
432 |
< |
--> |
433 |
< |
|
434 |
< |
</junit> |
400 |
> |
<target name="test-tck" |
401 |
> |
depends="jar" |
402 |
> |
description="Runs tck tests for main directly"> |
403 |
|
|
404 |
+ |
<run-tck-tests |
405 |
+ |
target="8" |
406 |
+ |
workdir="${build.dir}" |
407 |
+ |
classes="${product.jar}"/> |
408 |
|
</target> |
409 |
|
|
410 |
+ |
<target name="test-jtreg" |
411 |
+ |
depends="jar" |
412 |
+ |
description="Runs jtreg tests for main using the jtreg ant task"> |
413 |
+ |
<run-jtreg-tests |
414 |
+ |
target="8" |
415 |
+ |
workdir="${build.dir}" |
416 |
+ |
classes="${product.jar}"/> |
417 |
+ |
</target> |
418 |
|
|
419 |
< |
<target name="report-tests" |
420 |
< |
depends="run-tests"> |
421 |
< |
|
442 |
< |
<!-- Sets junit.report.format to frames if redirection is present, |
443 |
< |
otherwise sets it to noframes. --> |
444 |
< |
<available property="junit.report.format" |
445 |
< |
value="frames" |
446 |
< |
classname="org.apache.xalan.lib.Redirect" |
447 |
< |
/> |
448 |
< |
<property name="junit.report.format" value="noframes"/> |
449 |
< |
|
450 |
< |
<junitreport todir="${build.reports.dir}"> |
451 |
< |
<fileset dir="${build.reports.dir}"> |
452 |
< |
<include name="TEST-*.xml"/> |
453 |
< |
</fileset> |
454 |
< |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
455 |
< |
/> |
456 |
< |
</junitreport> |
457 |
< |
|
458 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
459 |
< |
|
419 |
> |
<target name="test" |
420 |
> |
depends="test-tck, test-jtreg" |
421 |
> |
description="Runs tck and jtreg tests for main"> |
422 |
|
</target> |
423 |
|
|
424 |
|
|
425 |
+ |
|
426 |
|
<target name="configure-compiler"> |
427 |
|
|
428 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
440 |
|
</target> |
441 |
|
|
442 |
|
|
480 |
– |
<target name="configure-tests" |
481 |
– |
depends="configure-compiler"> |
482 |
– |
|
483 |
– |
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
484 |
– |
<available property="junit.available" |
485 |
– |
classname="junit.framework.Protectable"/> |
486 |
– |
|
487 |
– |
<!-- Xalan --> |
488 |
– |
<available property="xalan.available" |
489 |
– |
classname="org.apache.xalan.Version"/> |
490 |
– |
|
491 |
– |
|
492 |
– |
<!-- Ant 1.6beta and later don't need or want this check --> |
493 |
– |
<!-- |
494 |
– |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
495 |
– |
unless="junit.available"/> |
496 |
– |
|
497 |
– |
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
498 |
– |
unless="xalan.available"/> |
499 |
– |
--> |
500 |
– |
|
501 |
– |
</target> |
502 |
– |
|
443 |
|
|
444 |
|
<!-- Various demos and test programs --> |
445 |
|
|
492 |
|
fork="true"> |
493 |
|
|
494 |
|
<include name="**/*.java"/> |
495 |
+ |
<compilerarg value="-Xprefer:source"/> |
496 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
497 |
|
<compilerarg value="-Xlint:all"/> |
498 |
|
<compilerarg line="${build.args}"/> |
501 |
|
</target> |
502 |
|
|
503 |
|
|
504 |
< |
<target name="4jdk7-jar" |
504 |
> |
<target name="4jdk7jar" |
505 |
|
depends="4jdk7compile" |
506 |
|
description="Builds library jar from compiled sources"> |
507 |
|
|
513 |
|
|
514 |
|
|
515 |
|
<target name="4jdk7-test-tck" |
516 |
< |
depends="4jdk7-jar" |
516 |
> |
depends="4jdk7jar" |
517 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
518 |
|
|
519 |
|
<run-tck-tests |
520 |
|
target="7" |
521 |
|
workdir="${build.4jdk7.dir}" |
522 |
< |
classes="${4jdk7product.jar}"/> |
522 |
> |
classes="${4jdk7product.jar}"> |
523 |
> |
<javac-elements> |
524 |
> |
<!-- JDK8+ test classes --> |
525 |
> |
<exclude name="*8Test.java"/> |
526 |
> |
<exclude name="DoubleAccumulatorTest.java"/> |
527 |
> |
<exclude name="DoubleAdderTest.java"/> |
528 |
> |
<exclude name="LongAccumulatorTest.java"/> |
529 |
> |
<exclude name="LongAdderTest.java"/> |
530 |
> |
<exclude name="CompletableFutureTest.java"/> |
531 |
> |
<exclude name="SplittableRandomTest.java"/> |
532 |
> |
<exclude name="StampedLockTest.java"/> |
533 |
> |
</javac-elements> |
534 |
> |
</run-tck-tests> |
535 |
|
</target> |
536 |
|
|
537 |
|
|
557 |
|
|
558 |
|
<formatter type="brief"/> |
559 |
|
|
560 |
< |
<test name="JSR166TestCase" haltonfailure="no"> |
560 |
> |
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
561 |
|
</test> |
562 |
|
|
563 |
|
</junit> |
564 |
|
</target> |
565 |
|
|
566 |
|
<target name="4jdk7-test-jtreg" |
567 |
< |
depends="4jdk7compile" |
567 |
> |
depends="4jdk7jar" |
568 |
|
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
569 |
< |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
570 |
< |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
571 |
< |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
572 |
< |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
573 |
< |
<jtreg dir="${jtreg.src.dir}" |
621 |
< |
jdk="${jdk7.home}" |
622 |
< |
workDir="${build.4jdk7.dir}/JTwork" |
623 |
< |
reportDir="${build.4jdk7.dir}/JTreport"> |
624 |
< |
|
625 |
< |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
626 |
< |
<arg value="-agentvm"/> |
627 |
< |
<arg value="-v:nopass,fail"/> |
628 |
< |
<arg value="-vmoptions:-esa -ea"/> |
629 |
< |
<arg value="-automatic"/> |
630 |
< |
<arg value="-k:!ignore"/> |
631 |
< |
</jtreg> |
569 |
> |
<run-jtreg-tests |
570 |
> |
target="7" |
571 |
> |
workdir="${build.4jdk7.dir}" |
572 |
> |
classes="${4jdk7product.jar}" |
573 |
> |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
574 |
|
</target> |
575 |
|
|
576 |
|
|
583 |
|
<target name="4jdk7docs" |
584 |
|
description="Builds javadocs for src/jdk7 to dist dir"> |
585 |
|
|
586 |
< |
<delete dir="${dist.4jdk7.docs.dir}"/> |
587 |
< |
<mkdir dir="${dist.4jdk7.docs.dir}"/> |
586 |
> |
<delete dir="${4jdk7docs.dir}"/> |
587 |
> |
<mkdir dir="${4jdk7docs.dir}"/> |
588 |
|
|
589 |
< |
<javadoc destdir="${dist.4jdk7.docs.dir}" |
589 |
> |
<javadoc destdir="${4jdk7docs.dir}" |
590 |
|
packagenames="none" |
591 |
|
link="${jdkapi7docs.url}" |
592 |
|
overview="${4jdk7src.dir}/intro.html" |
593 |
+ |
access="${build.javadoc.access}" |
594 |
|
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
595 |
|
classpath="" |
596 |
|
executable="${javadoc7}"> |
603 |
|
|
604 |
|
|
605 |
|
<target name="4jdk7dist" |
606 |
< |
depends="4jdk7dist-clean, 4jdk7dist-jar, 4jdk7docs" |
606 |
> |
depends="4jdk7dist-jar, 4jdk7dist-docs" |
607 |
|
description="Puts all distributable products in single hierarchy"/> |
608 |
|
|
609 |
|
|
615 |
|
</target> |
616 |
|
|
617 |
|
|
675 |
– |
<target name="4jdk7dist-clean" |
676 |
– |
description="Removes all build and distribution products"> |
677 |
– |
|
678 |
– |
</target> |
679 |
– |
|
618 |
|
<target name="4jdk7dist-jar" |
619 |
< |
depends="4jdk7clean, 4jdk7-jar"> |
682 |
< |
|
619 |
> |
depends="4jdk7clean, 4jdk7jar"> |
620 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
621 |
+ |
</target> |
622 |
|
|
623 |
+ |
|
624 |
+ |
<target name="4jdk7dist-docs" |
625 |
+ |
depends="4jdk7clean, 4jdk7docs"> |
626 |
+ |
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
627 |
|
</target> |
628 |
|
|
629 |
|
|
657 |
|
</target> |
658 |
|
|
659 |
|
|
660 |
< |
<target name="jsr166x-jar" |
660 |
> |
<target name="jsr166xjar" |
661 |
|
depends="jsr166xcompile" |
662 |
|
description="Builds library jar from compiled sources"> |
663 |
|
|
671 |
|
<target name="jsr166xdocs" |
672 |
|
description="Builds javadocs to dist dir"> |
673 |
|
|
674 |
< |
<delete dir="${dist.jsr166xjavadocs.dir}"/> |
675 |
< |
<mkdir dir="${dist.jsr166xjavadocs.dir}"/> |
674 |
> |
<delete dir="${jsr166xdocs.dir}"/> |
675 |
> |
<mkdir dir="${jsr166xdocs.dir}"/> |
676 |
|
|
677 |
< |
<javadoc destdir="${dist.jsr166xjavadocs.dir}" |
677 |
> |
<javadoc destdir="${jsr166xdocs.dir}" |
678 |
|
packagenames="jsr166x.*" |
679 |
|
link="${jdkapidocs.url}" |
680 |
+ |
access="${build.javadoc.access}" |
681 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
682 |
|
bootclasspath="${bootclasspath6}" |
683 |
|
source="5" |
689 |
|
|
690 |
|
|
691 |
|
<target name="jsr166xdist" |
692 |
< |
depends="jsr166xdist-clean, jsr166xdist-jar, jsr166xdocs" |
692 |
> |
depends="jsr166xdist-jar, jsr166xdist-docs" |
693 |
|
description="Puts all distributable products in single hierarchy"/> |
694 |
|
|
695 |
|
|
701 |
|
</target> |
702 |
|
|
703 |
|
|
761 |
– |
<target name="jsr166xdist-clean" |
762 |
– |
description="Removes all build and distribution products"> |
763 |
– |
|
764 |
– |
</target> |
765 |
– |
|
766 |
– |
|
704 |
|
<target name="jsr166xdist-jar" |
705 |
< |
depends="jsr166xclean, jsr166x-jar"> |
769 |
< |
|
705 |
> |
depends="jsr166xclean, jsr166xjar"> |
706 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
707 |
+ |
</target> |
708 |
|
|
709 |
+ |
<target name="jsr166xdist-docs" |
710 |
+ |
depends="jsr166xclean, jsr166xdocs"> |
711 |
+ |
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
712 |
|
</target> |
713 |
|
|
714 |
|
<!-- jsr166y --> |
742 |
|
</target> |
743 |
|
|
744 |
|
|
745 |
< |
<target name="jsr166y-jar" |
745 |
> |
<target name="jsr166yjar" |
746 |
|
depends="jsr166ycompile" |
747 |
|
description="Builds library jar from compiled sources"> |
748 |
|
|
756 |
|
<target name="jsr166ydocs" |
757 |
|
description="Builds javadocs to dist dir"> |
758 |
|
|
759 |
< |
<delete dir="${dist.jsr166yjavadocs.dir}"/> |
760 |
< |
<mkdir dir="${dist.jsr166yjavadocs.dir}"/> |
759 |
> |
<delete dir="${jsr166ydocs.dir}"/> |
760 |
> |
<mkdir dir="${jsr166ydocs.dir}"/> |
761 |
|
|
762 |
< |
<javadoc destdir="${dist.jsr166yjavadocs.dir}" |
762 |
> |
<javadoc destdir="${jsr166ydocs.dir}" |
763 |
|
packagenames="jsr166y.*" |
764 |
|
link="${jdkapidocs.url}" |
765 |
+ |
access="${build.javadoc.access}" |
766 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
767 |
|
bootclasspath="${bootclasspath6}" |
768 |
|
source="6" |
774 |
|
|
775 |
|
|
776 |
|
<target name="jsr166ydist" |
777 |
< |
depends="jsr166ydist-clean, jsr166ydist-jar, jsr166ydocs" |
777 |
> |
depends="jsr166ydist-jar, jsr166ydist-docs" |
778 |
|
description="Puts all distributable products in single hierarchy"/> |
779 |
|
|
780 |
|
|
786 |
|
</target> |
787 |
|
|
788 |
|
|
848 |
– |
<target name="jsr166ydist-clean" |
849 |
– |
description="Removes all build and distribution products"> |
850 |
– |
|
851 |
– |
</target> |
852 |
– |
|
789 |
|
<target name="jsr166ydist-jar" |
790 |
< |
depends="jsr166yclean, jsr166y-jar"> |
855 |
< |
|
790 |
> |
depends="jsr166yclean, jsr166yjar"> |
791 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
792 |
+ |
</target> |
793 |
|
|
794 |
+ |
<target name="jsr166ydist-docs" |
795 |
+ |
depends="jsr166yclean, jsr166ydocs"> |
796 |
+ |
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
797 |
|
</target> |
798 |
|
|
799 |
|
|
801 |
|
|
802 |
|
|
803 |
|
<target name="extra166ycompile" |
804 |
< |
depends="configure-compiler, jsr166y-jar" |
804 |
> |
depends="configure-compiler, jsr166yjar" |
805 |
|
description="Compiles extra166y sources"> |
806 |
|
|
807 |
|
<mkdir dir="${build.extra166y.classes.dir}"/> |
828 |
|
</target> |
829 |
|
|
830 |
|
|
831 |
< |
<target name="extra166y-jar" |
831 |
> |
<target name="extra166yjar" |
832 |
|
depends="extra166ycompile" |
833 |
|
description="Builds library jar from compiled sources"> |
834 |
|
|
842 |
|
<target name="extra166ydocs" |
843 |
|
description="Builds javadocs to build dir"> |
844 |
|
|
845 |
< |
<delete dir="${dist.extra166yjavadocs.dir}"/> |
846 |
< |
<mkdir dir="${dist.extra166yjavadocs.dir}"/> |
845 |
> |
<delete dir="${extra166ydocs.dir}"/> |
846 |
> |
<mkdir dir="${extra166ydocs.dir}"/> |
847 |
|
|
848 |
< |
<javadoc destdir="${dist.extra166yjavadocs.dir}" |
848 |
> |
<javadoc destdir="${extra166ydocs.dir}" |
849 |
|
packagenames="extra166y.*" |
850 |
|
link="${jdkapidocs.url}" |
851 |
+ |
access="${build.javadoc.access}" |
852 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
853 |
|
bootclasspath="${bootclasspath6}" |
854 |
|
source="6" |
860 |
|
|
861 |
|
|
862 |
|
<target name="extra166ydist" |
863 |
< |
depends="extra166ydist-clean, extra166ydist-jar, extra166ydocs" |
863 |
> |
depends="extra166ydist-jar, extra166ydist-docs" |
864 |
|
description="Puts all distributable products in single hierarchy"/> |
865 |
|
|
866 |
|
|
872 |
|
</target> |
873 |
|
|
874 |
|
|
935 |
– |
<target name="extra166ydist-clean" |
936 |
– |
description="Removes all build and distribution products"> |
937 |
– |
|
938 |
– |
</target> |
939 |
– |
|
875 |
|
<target name="extra166ydist-jar" |
876 |
< |
depends="extra166yclean, extra166y-jar"> |
942 |
< |
|
876 |
> |
depends="extra166yclean, extra166yjar"> |
877 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
878 |
+ |
</target> |
879 |
|
|
880 |
+ |
<target name="extra166ydist-docs" |
881 |
+ |
depends="extra166yclean, extra166ydocs"> |
882 |
+ |
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
883 |
|
</target> |
884 |
|
|
885 |
|
<!-- jsr166e --> |
886 |
|
|
887 |
+ |
<property name="build.jsr166e.java.version" value="6"/> |
888 |
+ |
<property name="build.jsr166e.javac" value="${javac6}"/> |
889 |
+ |
|
890 |
|
<target name="jsr166ecompile" |
891 |
|
depends="configure-compiler" |
892 |
|
description="Compiles jsr166e sources"> |
898 |
|
debug="${build.debug}" |
899 |
|
debuglevel="${build.debuglevel}" |
900 |
|
deprecation="${build.deprecation}" |
901 |
< |
source="7" |
901 |
> |
source="${build.jsr166e.java.version}" |
902 |
|
classpath="" |
903 |
|
includeAntRuntime="false" |
904 |
|
includeJavaRuntime="false" |
905 |
< |
executable="${javac7}" |
905 |
> |
executable="${build.jsr166e.javac}" |
906 |
|
fork="true"> |
907 |
|
|
908 |
|
<include name="jsr166e/**/*.java"/> |
914 |
|
</target> |
915 |
|
|
916 |
|
|
917 |
< |
<target name="jsr166e-jar" |
917 |
> |
<target name="jsr166ejar" |
918 |
|
depends="jsr166ecompile" |
919 |
|
description="Builds library jar from compiled sources"> |
920 |
|
|
928 |
|
<target name="jsr166edocs" |
929 |
|
description="Builds javadocs to build dir"> |
930 |
|
|
931 |
< |
<delete dir="${dist.jsr166ejavadocs.dir}"/> |
932 |
< |
<mkdir dir="${dist.jsr166ejavadocs.dir}"/> |
931 |
> |
<delete dir="${jsr166edocs.dir}"/> |
932 |
> |
<mkdir dir="${jsr166edocs.dir}"/> |
933 |
|
|
934 |
< |
<javadoc destdir="${dist.jsr166ejavadocs.dir}" |
934 |
> |
<javadoc destdir="${jsr166edocs.dir}" |
935 |
|
packagenames="jsr166e.*" |
936 |
|
link="${jdkapidocs.url}" |
937 |
< |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
938 |
< |
source="7" |
937 |
> |
access="${build.javadoc.access}" |
938 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
939 |
> |
source="${build.jsr166e.java.version}" |
940 |
|
executable="${javadoc7}"> |
941 |
|
<arg value="-XDignore.symbol.file=true"/> |
942 |
|
|
944 |
|
</target> |
945 |
|
|
946 |
|
|
947 |
< |
<target name="jsr166e-test-tck" |
948 |
< |
depends="jsr166e-jar" |
949 |
< |
description="Runs tck tests for jsr166e"> |
947 |
> |
<target name="jsr166e-test-tck-one-java-version" |
948 |
> |
depends="jsr166ejar"> |
949 |
> |
|
950 |
> |
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
951 |
|
|
952 |
|
<run-tck-tests |
953 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
954 |
< |
source="7" |
1012 |
< |
target="8" |
954 |
> |
target="${build.jsr166e.java.version}" |
955 |
|
workdir="${build.jsr166e.dir}" |
956 |
|
classes="${jsr166e.jar}"/> |
957 |
|
</target> |
958 |
|
|
959 |
+ |
<target name="jsr166e-test-tck" |
960 |
+ |
description="Runs tck tests for jsr166e for multiple java versions"> |
961 |
+ |
|
962 |
+ |
<!-- <antcall target="clean"/> --> |
963 |
+ |
<!-- <antcall target="jsr166e-test-tck-one-java-version"> --> |
964 |
+ |
<!-- <param name="build.jsr166e.java.version" value="8"/> --> |
965 |
+ |
<!-- <param name="build.jsr166e.javac" value="${javac8}"/> --> |
966 |
+ |
<!-- </antcall> --> |
967 |
+ |
|
968 |
+ |
<antcall target="clean"/> |
969 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
970 |
+ |
<param name="build.jsr166e.java.version" value="7"/> |
971 |
+ |
<param name="build.jsr166e.javac" value="${javac7}"/> |
972 |
+ |
</antcall> |
973 |
+ |
|
974 |
+ |
<antcall target="clean"/> |
975 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
976 |
+ |
<param name="build.jsr166e.java.version" value="6"/> |
977 |
+ |
<param name="build.jsr166e.javac" value="${javac6}"/> |
978 |
+ |
</antcall> |
979 |
+ |
</target> |
980 |
+ |
|
981 |
+ |
|
982 |
+ |
<target name="jsr166e-test" |
983 |
+ |
depends="jsr166e-test-tck" |
984 |
+ |
description="Runs all tests for jsr166e"> |
985 |
+ |
</target> |
986 |
|
|
987 |
|
<target name="jsr166edist" |
988 |
< |
depends="jsr166edist-clean, jsr166edist-jar, jsr166edocs" |
988 |
> |
depends="jsr166edist-jar, jsr166edist-docs" |
989 |
|
description="Puts all distributable products in single hierarchy"/> |
990 |
|
|
991 |
|
|
992 |
|
<target name="jsr166eclean" |
993 |
|
description="Removes all jsr166e build products"> |
1025 |
– |
|
994 |
|
<delete dir="${build.jsr166e.dir}"/> |
1027 |
– |
|
995 |
|
</target> |
996 |
|
|
997 |
|
|
998 |
< |
<target name="jsr166edist-clean" |
999 |
< |
description="Removes all build and distribution products"> |
998 |
> |
<target name="jsr166edist-jar" |
999 |
> |
depends="jsr166eclean, jsr166ejar"> |
1000 |
> |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1001 |
> |
</target> |
1002 |
|
|
1003 |
+ |
<target name="jsr166edist-docs" |
1004 |
+ |
depends="jsr166eclean, jsr166edocs"> |
1005 |
+ |
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1006 |
|
</target> |
1007 |
|
|
1036 |
– |
<target name="jsr166edist-jar" |
1037 |
– |
depends="jsr166eclean, jsr166e-jar"> |
1008 |
|
|
1009 |
< |
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1009 |
> |
<!-- Find buglets that can be detected by static build tools --> |
1010 |
|
|
1011 |
+ |
<target name="lint"> |
1012 |
+ |
<antcall target="dists"> |
1013 |
+ |
<param name="build.javadoc.access" value="private"/> |
1014 |
+ |
</antcall> |
1015 |
|
</target> |
1016 |
|
|
1017 |
+ |
|
1018 |
|
</project> |