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 |
> |
<target name="usage" description="Display main targets by running 'ant -projecthelp'"> |
30 |
> |
<java classname="org.apache.tools.ant.Main"> |
31 |
> |
<arg value="-projecthelp" /> |
32 |
> |
</java> |
33 |
|
</target> |
34 |
|
|
35 |
|
|
42 |
|
<property name="build.debug" value="true"/> |
43 |
|
<property name="build.debuglevel" value="source,lines,vars"/> |
44 |
|
<property name="build.deprecation" value="false"/> |
45 |
+ |
<property name="build.javadoc.access" value="protected"/> |
46 |
+ |
|
47 |
+ |
<!-- Tck options; see JSR166TestCase.java --> |
48 |
+ |
<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck --> |
49 |
+ |
<property name="jsr166.profileTests" value="false"/> |
50 |
+ |
<property name="jsr166.profileThreshold" value="100"/> |
51 |
+ |
<property name="jsr166.runsPerTest" value="1"/> |
52 |
+ |
<!-- Allow running an individual tck test class --> |
53 |
+ |
<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck --> |
54 |
+ |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
55 |
|
|
56 |
|
<!-- Build locations --> |
57 |
|
<property name="build.dir" location="build"/> |
131 |
|
<property name="extra166ysrc.dir" location="${topsrc.dir}/extra166y"/> |
132 |
|
|
133 |
|
<!-- Javadoc locations --> |
134 |
< |
<property name="javadocs.dir" location="${build.dir}/javadocs"/> |
135 |
< |
<property name="4jdk7javadocs.dir" location="${build.4jdk7.dir}/javadocs"/> |
136 |
< |
<property name="jsr166xjavadocs.dir" location="${build.jsr166x.dir}/javadocs"/> |
137 |
< |
<property name="jsr166yjavadocs.dir" location="${build.jsr166y.dir}/javadocs"/> |
138 |
< |
<property name="jsr166ejavadocs.dir" location="${build.jsr166e.dir}/javadocs"/> |
139 |
< |
<property name="extra166yjavadocs.dir" location="${build.extra166y.dir}/javadocs"/> |
140 |
< |
|
141 |
< |
<property name="dist.javadocs.dir" location="${dist.dir}/docs"/> |
142 |
< |
<property name="dist.4jdk7javadocs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
143 |
< |
<property name="dist.jsr166xjavadocs.dir" location="${dist.dir}/jsr166xdocs"/> |
144 |
< |
<property name="dist.jsr166yjavadocs.dir" location="${dist.dir}/jsr166ydocs"/> |
145 |
< |
<property name="dist.jsr166ejavadocs.dir" location="${dist.dir}/jsr166edocs"/> |
146 |
< |
<property name="dist.extra166yjavadocs.dir" location="${dist.dir}/extra166ydocs"/> |
134 |
> |
<property name="docs.dir" location="${build.dir}/docs"/> |
135 |
> |
<property name="4jdk7docs.dir" location="${build.4jdk7.dir}/docs"/> |
136 |
> |
<property name="jsr166xdocs.dir" location="${build.jsr166x.dir}/docs"/> |
137 |
> |
<property name="jsr166ydocs.dir" location="${build.jsr166y.dir}/docs"/> |
138 |
> |
<property name="jsr166edocs.dir" location="${build.jsr166e.dir}/docs"/> |
139 |
> |
<property name="extra166ydocs.dir" location="${build.extra166y.dir}/docs"/> |
140 |
> |
|
141 |
> |
<property name="dist.docs.dir" location="${dist.dir}/docs"/> |
142 |
> |
<property name="dist.4jdk7docs.dir" location="${dist.dir}/jsr166-4jdk7docs"/> |
143 |
> |
<property name="dist.jsr166xdocs.dir" location="${dist.dir}/jsr166xdocs"/> |
144 |
> |
<property name="dist.jsr166ydocs.dir" location="${dist.dir}/jsr166ydocs"/> |
145 |
> |
<property name="dist.jsr166edocs.dir" location="${dist.dir}/jsr166edocs"/> |
146 |
> |
<property name="dist.extra166ydocs.dir" location="${dist.dir}/extra166ydocs"/> |
147 |
|
|
148 |
|
<!-- Jar locations --> |
149 |
|
<property name="product.jar" location="${build.dir}/jsr166.jar"/> |
179 |
|
|
180 |
|
<macrodef name="run-tck-tests"> |
181 |
|
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
169 |
– |
<attribute name="source" default="6"/> |
182 |
|
<attribute name="target"/> |
183 |
+ |
<attribute name="compile-target" default="@{target}"/> |
184 |
|
<attribute name="workdir"/> |
185 |
|
<attribute name="classes"/> |
186 |
|
<attribute name="jvmflags" default=""/> |
187 |
+ |
<element name="javac-elements" optional="true"/> |
188 |
|
<sequential> |
189 |
|
|
190 |
|
<mkdir dir="@{workdir}/tck-classes"/> |
194 |
|
debug="${build.debug}" |
195 |
|
debuglevel="${build.debuglevel}" |
196 |
|
deprecation="${build.deprecation}" |
197 |
< |
source="@{source}" |
197 |
> |
source="@{compile-target}" |
198 |
> |
target="@{compile-target}" |
199 |
|
classpath="${junit.jar}" |
200 |
< |
bootclasspath="@{classes}:${bootclasspath@{source}}" |
200 |
> |
bootclasspath="@{classes}:${bootclasspath@{compile-target}}" |
201 |
|
includeAntRuntime="false" |
202 |
|
includeJavaRuntime="false" |
203 |
< |
executable="${javac@{target}}" |
203 |
> |
executable="${javac@{compile-target}}" |
204 |
|
fork="true"> |
205 |
|
|
206 |
|
<include name="*.java"/> |
207 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
208 |
|
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
209 |
|
<compilerarg line="${build.args}"/> |
210 |
+ |
<javac-elements/> |
211 |
|
|
212 |
|
</javac> |
213 |
|
|
214 |
< |
<java classname="JSR166TestCase" |
214 |
> |
<java classname="${jsr166.tckTestClass}" |
215 |
|
failonerror="true" |
216 |
|
jvm="${java@{target}}" |
217 |
|
fork="true"> |
218 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
219 |
|
<jvmarg line="@{jvmflags}"/> |
220 |
+ |
<sysproperty key="jsr166.profileTests" value="${jsr166.profileTests}"/> |
221 |
+ |
<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/> |
222 |
+ |
<sysproperty key="jsr166.runsPerTest" value="${jsr166.runsPerTest}"/> |
223 |
|
<classpath> |
224 |
|
<pathelement location="${junit.jar}"/> |
225 |
|
<pathelement location="@{workdir}/tck-classes"/> |
229 |
|
</sequential> |
230 |
|
</macrodef> |
231 |
|
|
232 |
+ |
<macrodef name="run-jtreg-tests"> |
233 |
+ |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
234 |
+ |
<attribute name="source" default="7"/> |
235 |
+ |
<attribute name="target"/> |
236 |
+ |
<attribute name="workdir"/> |
237 |
+ |
<attribute name="classes"/> |
238 |
+ |
<attribute name="jtregflags" default=""/> |
239 |
+ |
<sequential> |
240 |
+ |
<delete dir="@{workdir}/JTwork" quiet="true"/> |
241 |
+ |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
242 |
+ |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
243 |
+ |
<mkdir dir="@{workdir}/JTreport"/> |
244 |
+ |
<jtreg dir="@{jtreg.src.dir}" |
245 |
+ |
jdk="${jdk@{target}.home}" |
246 |
+ |
workDir="@{workdir}/JTwork" |
247 |
+ |
reportDir="@{workdir}/JTreport"> |
248 |
+ |
|
249 |
+ |
<arg value="-Xbootclasspath/p:@{classes}"/> |
250 |
+ |
<arg value="-agentvm"/> |
251 |
+ |
<arg value="-v:nopass,fail"/> |
252 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
253 |
+ |
<arg value="-automatic"/> |
254 |
+ |
<arg value="-k:!ignore"/> |
255 |
+ |
<arg line="@{jtregflags}"/> |
256 |
+ |
</jtreg> |
257 |
+ |
</sequential> |
258 |
+ |
</macrodef> |
259 |
+ |
|
260 |
|
<!-- ALoops classpath --> |
261 |
|
<path id="loops.classpath"> |
262 |
|
<pathelement location="${build.loops.dir}"/> |
290 |
|
fork="true"> |
291 |
|
|
292 |
|
<include name="**/*.java"/> |
293 |
+ |
<compilerarg value="-Xprefer:source"/> |
294 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
295 |
|
<compilerarg value="-Xlint:all"/> |
296 |
|
<compilerarg line="${build.args}"/> |
309 |
|
</target> |
310 |
|
|
311 |
|
|
264 |
– |
<target name="test" |
265 |
– |
depends="configure-tests, report-tests" |
266 |
– |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
267 |
– |
|
268 |
– |
|
312 |
|
<target name="docs" |
313 |
|
description="Builds javadocs for src/main to dist dir"> |
314 |
|
|
315 |
< |
<delete dir="${javadocs.dir}"/> |
316 |
< |
<mkdir dir="${javadocs.dir}"/> |
315 |
> |
<delete dir="${docs.dir}"/> |
316 |
> |
<mkdir dir="${docs.dir}"/> |
317 |
|
|
318 |
|
<!-- the packagenames="none" hack below prevents scanning the --> |
319 |
|
<!-- sourcepath for packages --> |
320 |
|
|
321 |
< |
<javadoc destdir="${javadocs.dir}" |
321 |
> |
<javadoc destdir="${docs.dir}" |
322 |
|
packagenames="none" |
323 |
|
link="${jdkapi8docs.url}" |
324 |
|
overview="${src.dir}/intro.html" |
325 |
+ |
access="${build.javadoc.access}" |
326 |
|
sourcepath="${src.dir}:${jdk8src.dir}" |
327 |
|
classpath="" |
328 |
|
executable="${javadoc8}"> |
332 |
|
<arg value="-XDignore.symbol.file=true"/> |
333 |
|
<arg value="-tag"/> |
334 |
|
<arg value="${javadoc.jls.option}"/> |
335 |
+ |
<arg value="-tag"/> |
336 |
+ |
<arg value="apiNote:a:<em>API Note:</em>"/> |
337 |
+ |
<arg value="-tag"/> |
338 |
+ |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
339 |
+ |
<arg value="-tag"/> |
340 |
+ |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
341 |
|
</javadoc> |
342 |
|
</target> |
343 |
|
|
381 |
|
</target> |
382 |
|
|
383 |
|
|
334 |
– |
<!-- Internal targets --> |
335 |
– |
|
336 |
– |
|
384 |
|
<target name="dist-jar" |
385 |
|
depends="clean, jar"> |
386 |
|
<copy file="${product.jar}" todir="${dist.dir}"/> |
388 |
|
|
389 |
|
<target name="dist-docs" |
390 |
|
depends="clean, docs"> |
391 |
< |
<mirror-dir src="${javadocs.dir}" dst="${dist.javadocs.dir}"/> |
391 |
> |
<mirror-dir src="${docs.dir}" dst="${dist.docs.dir}"/> |
392 |
|
</target> |
393 |
|
|
394 |
|
|
395 |
< |
<target name="compile-tests" |
396 |
< |
depends="jar"> |
397 |
< |
|
351 |
< |
<mkdir dir="${build.testcases.dir}"/> |
352 |
< |
|
353 |
< |
<javac srcdir="${tck.src.dir}" |
354 |
< |
destdir="${build.testcases.dir}" |
355 |
< |
debug="${build.debug}" |
356 |
< |
debuglevel="${build.debuglevel}" |
357 |
< |
deprecation="${build.deprecation}" |
358 |
< |
source="6" |
359 |
< |
classpath="${junit.jar}" |
360 |
< |
bootclasspath="@{product.jar}:${bootclasspath6}" |
361 |
< |
includeAntRuntime="false" |
362 |
< |
includeJavaRuntime="false" |
363 |
< |
executable="${javac8}" |
364 |
< |
fork="true"> |
365 |
< |
|
366 |
< |
<include name="**/*.java"/> |
367 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
368 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
369 |
< |
<compilerarg line="${build.args}"/> |
370 |
< |
|
371 |
< |
</javac> |
372 |
< |
|
373 |
< |
<javac srcdir="${test.src.dir}" |
374 |
< |
destdir="${build.testcases.dir}" |
375 |
< |
debug="${build.debug}" |
376 |
< |
debuglevel="${build.debuglevel}" |
377 |
< |
deprecation="${build.deprecation}" |
378 |
< |
source="6" |
379 |
< |
classpath="" |
380 |
< |
bootclasspath="@{product.jar}:${bootclasspath6}" |
381 |
< |
includeAntRuntime="false" |
382 |
< |
includeJavaRuntime="false" |
383 |
< |
executable="${javac8}" |
384 |
< |
fork="true"> |
385 |
< |
|
386 |
< |
<include name="jsr166/test/**/*.java"/> |
387 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
388 |
< |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
389 |
< |
<compilerarg line="${build.args}"/> |
390 |
< |
|
391 |
< |
</javac> |
392 |
< |
|
393 |
< |
<!-- |
394 |
< |
<javac srcdir="${jtreg.src.dir}" |
395 |
< |
destdir="${build.testcases.dir}" |
396 |
< |
debug="${build.debug}" |
397 |
< |
debuglevel="${build.debuglevel}" |
398 |
< |
deprecation="${build.deprecation}" |
399 |
< |
source="${build.sourcelevel}" |
400 |
< |
fork="true"> |
401 |
< |
|
402 |
< |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
403 |
< |
<compilerarg value="-XDignore.symbol.file=true"/> |
404 |
< |
<compilerarg line="${build.args}"/> |
405 |
< |
|
406 |
< |
</javac> |
407 |
< |
--> |
395 |
> |
<target name="test-tck" |
396 |
> |
depends="jar" |
397 |
> |
description="Runs tck tests for main directly"> |
398 |
|
|
399 |
+ |
<run-tck-tests |
400 |
+ |
target="8" |
401 |
+ |
workdir="${build.dir}" |
402 |
+ |
classes="${product.jar}"/> |
403 |
|
</target> |
404 |
|
|
405 |
< |
|
406 |
< |
<target name="run-tests" |
407 |
< |
depends="compile-tests"> |
408 |
< |
|
409 |
< |
<!-- May be overridden by user.properties --> |
410 |
< |
<property name="testcase" value="*"/> |
411 |
< |
|
418 |
< |
<mkdir dir="${build.reports.dir}"/> |
419 |
< |
|
420 |
< |
<junit printsummary="true" |
421 |
< |
showoutput="true" |
422 |
< |
errorProperty="junit.failed" |
423 |
< |
failureProperty="junit.failed" |
424 |
< |
dir="${build.reports.dir}" |
425 |
< |
jvm="${java8}" |
426 |
< |
fork="true"> |
427 |
< |
|
428 |
< |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
429 |
< |
<jvmarg value="-server"/> |
430 |
< |
<jvmarg value="-showversion"/> |
431 |
< |
|
432 |
< |
<classpath refid="test.classpath"/> |
433 |
< |
|
434 |
< |
<formatter type="xml"/> |
435 |
< |
|
436 |
< |
<batchtest todir="${build.reports.dir}" unless="no.test.tck"> |
437 |
< |
<fileset dir="${tck.src.dir}"> |
438 |
< |
<include name="**/${testcase}Test.java"/> |
439 |
< |
</fileset> |
440 |
< |
</batchtest> |
441 |
< |
|
442 |
< |
<batchtest todir="${build.reports.dir}" if="do.test.old"> |
443 |
< |
<fileset dir="${test.src.dir}"> |
444 |
< |
<include name="jsr166/test/**/${testcase}Test.java"/> |
445 |
< |
</fileset> |
446 |
< |
</batchtest> |
447 |
< |
|
448 |
< |
<!-- |
449 |
< |
<batchtest todir="${build.reports.dir}" if="do.test.jtreg"> |
450 |
< |
<fileset dir="${jtreg.src.dir}"> |
451 |
< |
<include name="**/${testcase}Test.java"/> |
452 |
< |
</fileset> |
453 |
< |
</batchtest> |
454 |
< |
--> |
455 |
< |
|
456 |
< |
</junit> |
457 |
< |
|
405 |
> |
<target name="test-jtreg" |
406 |
> |
depends="jar" |
407 |
> |
description="Runs jtreg tests for main using the jtreg ant task"> |
408 |
> |
<run-jtreg-tests |
409 |
> |
target="8" |
410 |
> |
workdir="${build.dir}" |
411 |
> |
classes="${product.jar}"/> |
412 |
|
</target> |
413 |
|
|
414 |
< |
|
415 |
< |
<target name="report-tests" |
416 |
< |
depends="run-tests"> |
463 |
< |
|
464 |
< |
<!-- Sets junit.report.format to frames if redirection is present, |
465 |
< |
otherwise sets it to noframes. --> |
466 |
< |
<available property="junit.report.format" |
467 |
< |
value="frames" |
468 |
< |
classname="org.apache.xalan.lib.Redirect" |
469 |
< |
/> |
470 |
< |
<property name="junit.report.format" value="noframes"/> |
471 |
< |
|
472 |
< |
<junitreport todir="${build.reports.dir}"> |
473 |
< |
<fileset dir="${build.reports.dir}"> |
474 |
< |
<include name="TEST-*.xml"/> |
475 |
< |
</fileset> |
476 |
< |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
477 |
< |
/> |
478 |
< |
</junitreport> |
479 |
< |
|
480 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
481 |
< |
|
414 |
> |
<target name="test" |
415 |
> |
depends="test-tck, test-jtreg" |
416 |
> |
description="Runs tck and jtreg tests for main"> |
417 |
|
</target> |
418 |
|
|
419 |
|
|
420 |
+ |
|
421 |
|
<target name="configure-compiler"> |
422 |
|
|
423 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
435 |
|
</target> |
436 |
|
|
437 |
|
|
502 |
– |
<target name="configure-tests" |
503 |
– |
depends="configure-compiler"> |
504 |
– |
|
505 |
– |
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
506 |
– |
<available property="junit.available" |
507 |
– |
classname="junit.framework.Protectable"/> |
508 |
– |
|
509 |
– |
<!-- Xalan --> |
510 |
– |
<available property="xalan.available" |
511 |
– |
classname="org.apache.xalan.Version"/> |
512 |
– |
|
513 |
– |
|
514 |
– |
<!-- Ant 1.6beta and later don't need or want this check --> |
515 |
– |
<!-- |
516 |
– |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
517 |
– |
unless="junit.available"/> |
518 |
– |
|
519 |
– |
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
520 |
– |
unless="xalan.available"/> |
521 |
– |
--> |
522 |
– |
|
523 |
– |
</target> |
524 |
– |
|
438 |
|
|
439 |
|
<!-- Various demos and test programs --> |
440 |
|
|
487 |
|
fork="true"> |
488 |
|
|
489 |
|
<include name="**/*.java"/> |
490 |
+ |
<compilerarg value="-Xprefer:source"/> |
491 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
492 |
|
<compilerarg value="-Xlint:all"/> |
493 |
|
<compilerarg line="${build.args}"/> |
496 |
|
</target> |
497 |
|
|
498 |
|
|
499 |
< |
<target name="4jdk7-jar" |
499 |
> |
<target name="4jdk7jar" |
500 |
|
depends="4jdk7compile" |
501 |
|
description="Builds library jar from compiled sources"> |
502 |
|
|
508 |
|
|
509 |
|
|
510 |
|
<target name="4jdk7-test-tck" |
511 |
< |
depends="4jdk7-jar" |
511 |
> |
depends="4jdk7jar" |
512 |
|
description="Runs tck tests for jsr166-4jdk7 directly"> |
513 |
|
|
514 |
|
<run-tck-tests |
515 |
|
target="7" |
516 |
|
workdir="${build.4jdk7.dir}" |
517 |
< |
classes="${4jdk7product.jar}"/> |
517 |
> |
classes="${4jdk7product.jar}"> |
518 |
> |
<javac-elements> |
519 |
> |
<!-- JDK8+ test classes --> |
520 |
> |
<exclude name="*8Test.java"/> |
521 |
> |
<exclude name="DoubleAccumulatorTest.java"/> |
522 |
> |
<exclude name="DoubleAdderTest.java"/> |
523 |
> |
<exclude name="LongAccumulatorTest.java"/> |
524 |
> |
<exclude name="LongAdderTest.java"/> |
525 |
> |
<exclude name="CompletableFutureTest.java"/> |
526 |
> |
<exclude name="StampedLockTest.java"/> |
527 |
> |
</javac-elements> |
528 |
> |
</run-tck-tests> |
529 |
|
</target> |
530 |
|
|
531 |
|
|
551 |
|
|
552 |
|
<formatter type="brief"/> |
553 |
|
|
554 |
< |
<test name="JSR166TestCase" haltonfailure="no"> |
554 |
> |
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
555 |
|
</test> |
556 |
|
|
557 |
|
</junit> |
558 |
|
</target> |
559 |
|
|
560 |
|
<target name="4jdk7-test-jtreg" |
561 |
< |
depends="4jdk7compile" |
561 |
> |
depends="4jdk7jar" |
562 |
|
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
563 |
< |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
564 |
< |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
565 |
< |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
566 |
< |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
567 |
< |
<jtreg dir="${jtreg.src.dir}" |
643 |
< |
jdk="${jdk7.home}" |
644 |
< |
workDir="${build.4jdk7.dir}/JTwork" |
645 |
< |
reportDir="${build.4jdk7.dir}/JTreport"> |
646 |
< |
|
647 |
< |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
648 |
< |
<arg value="-agentvm"/> |
649 |
< |
<arg value="-v:nopass,fail"/> |
650 |
< |
<arg value="-vmoptions:-esa -ea"/> |
651 |
< |
<arg value="-automatic"/> |
652 |
< |
<arg value="-k:!ignore"/> |
653 |
< |
</jtreg> |
563 |
> |
<run-jtreg-tests |
564 |
> |
target="7" |
565 |
> |
workdir="${build.4jdk7.dir}" |
566 |
> |
classes="${4jdk7product.jar}" |
567 |
> |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
568 |
|
</target> |
569 |
|
|
570 |
|
|
577 |
|
<target name="4jdk7docs" |
578 |
|
description="Builds javadocs for src/jdk7 to dist dir"> |
579 |
|
|
580 |
< |
<delete dir="${4jdk7javadocs.dir}"/> |
581 |
< |
<mkdir dir="${4jdk7javadocs.dir}"/> |
580 |
> |
<delete dir="${4jdk7docs.dir}"/> |
581 |
> |
<mkdir dir="${4jdk7docs.dir}"/> |
582 |
|
|
583 |
< |
<javadoc destdir="${4jdk7javadocs.dir}" |
583 |
> |
<javadoc destdir="${4jdk7docs.dir}" |
584 |
|
packagenames="none" |
585 |
|
link="${jdkapi7docs.url}" |
586 |
|
overview="${4jdk7src.dir}/intro.html" |
587 |
+ |
access="${build.javadoc.access}" |
588 |
|
sourcepath="${4jdk7src.dir}:${jdk7src.dir}" |
589 |
|
classpath="" |
590 |
|
executable="${javadoc7}"> |
615 |
|
</target> |
616 |
|
|
617 |
|
<target name="4jdk7dist-jar" |
618 |
< |
depends="4jdk7clean, 4jdk7-jar"> |
618 |
> |
depends="4jdk7clean, 4jdk7jar"> |
619 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
620 |
|
</target> |
621 |
|
|
622 |
|
|
623 |
|
<target name="4jdk7dist-docs" |
624 |
|
depends="4jdk7clean, 4jdk7docs"> |
625 |
< |
<mirror-dir src="${4jdk7javadocs.dir}" dst="${dist.4jdk7javadocs.dir}"/> |
625 |
> |
<mirror-dir src="${4jdk7docs.dir}" dst="${dist.4jdk7docs.dir}"/> |
626 |
|
</target> |
627 |
|
|
628 |
|
|
656 |
|
</target> |
657 |
|
|
658 |
|
|
659 |
< |
<target name="jsr166x-jar" |
659 |
> |
<target name="jsr166xjar" |
660 |
|
depends="jsr166xcompile" |
661 |
|
description="Builds library jar from compiled sources"> |
662 |
|
|
670 |
|
<target name="jsr166xdocs" |
671 |
|
description="Builds javadocs to dist dir"> |
672 |
|
|
673 |
< |
<delete dir="${jsr166xjavadocs.dir}"/> |
674 |
< |
<mkdir dir="${jsr166xjavadocs.dir}"/> |
673 |
> |
<delete dir="${jsr166xdocs.dir}"/> |
674 |
> |
<mkdir dir="${jsr166xdocs.dir}"/> |
675 |
|
|
676 |
< |
<javadoc destdir="${jsr166xjavadocs.dir}" |
676 |
> |
<javadoc destdir="${jsr166xdocs.dir}" |
677 |
|
packagenames="jsr166x.*" |
678 |
|
link="${jdkapidocs.url}" |
679 |
+ |
access="${build.javadoc.access}" |
680 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
681 |
|
bootclasspath="${bootclasspath6}" |
682 |
|
source="5" |
707 |
|
|
708 |
|
|
709 |
|
<target name="jsr166xdist-jar" |
710 |
< |
depends="jsr166xclean, jsr166x-jar"> |
710 |
> |
depends="jsr166xclean, jsr166xjar"> |
711 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
712 |
|
</target> |
713 |
|
|
714 |
|
<target name="jsr166xdist-docs" |
715 |
|
depends="jsr166xclean, jsr166xdocs"> |
716 |
< |
<mirror-dir src="${jsr166xjavadocs.dir}" dst="${dist.jsr166xjavadocs.dir}"/> |
716 |
> |
<mirror-dir src="${jsr166xdocs.dir}" dst="${dist.jsr166xdocs.dir}"/> |
717 |
|
</target> |
718 |
|
|
719 |
|
<!-- jsr166y --> |
747 |
|
</target> |
748 |
|
|
749 |
|
|
750 |
< |
<target name="jsr166y-jar" |
750 |
> |
<target name="jsr166yjar" |
751 |
|
depends="jsr166ycompile" |
752 |
|
description="Builds library jar from compiled sources"> |
753 |
|
|
761 |
|
<target name="jsr166ydocs" |
762 |
|
description="Builds javadocs to dist dir"> |
763 |
|
|
764 |
< |
<delete dir="${jsr166yjavadocs.dir}"/> |
765 |
< |
<mkdir dir="${jsr166yjavadocs.dir}"/> |
764 |
> |
<delete dir="${jsr166ydocs.dir}"/> |
765 |
> |
<mkdir dir="${jsr166ydocs.dir}"/> |
766 |
|
|
767 |
< |
<javadoc destdir="${jsr166yjavadocs.dir}" |
767 |
> |
<javadoc destdir="${jsr166ydocs.dir}" |
768 |
|
packagenames="jsr166y.*" |
769 |
|
link="${jdkapidocs.url}" |
770 |
+ |
access="${build.javadoc.access}" |
771 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
772 |
|
bootclasspath="${bootclasspath6}" |
773 |
|
source="6" |
797 |
|
</target> |
798 |
|
|
799 |
|
<target name="jsr166ydist-jar" |
800 |
< |
depends="jsr166yclean, jsr166y-jar"> |
800 |
> |
depends="jsr166yclean, jsr166yjar"> |
801 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
802 |
|
</target> |
803 |
|
|
804 |
|
<target name="jsr166ydist-docs" |
805 |
|
depends="jsr166yclean, jsr166ydocs"> |
806 |
< |
<mirror-dir src="${jsr166yjavadocs.dir}" dst="${dist.jsr166yjavadocs.dir}"/> |
806 |
> |
<mirror-dir src="${jsr166ydocs.dir}" dst="${dist.jsr166ydocs.dir}"/> |
807 |
|
</target> |
808 |
|
|
809 |
|
|
811 |
|
|
812 |
|
|
813 |
|
<target name="extra166ycompile" |
814 |
< |
depends="configure-compiler, jsr166y-jar" |
814 |
> |
depends="configure-compiler, jsr166yjar" |
815 |
|
description="Compiles extra166y sources"> |
816 |
|
|
817 |
|
<mkdir dir="${build.extra166y.classes.dir}"/> |
838 |
|
</target> |
839 |
|
|
840 |
|
|
841 |
< |
<target name="extra166y-jar" |
841 |
> |
<target name="extra166yjar" |
842 |
|
depends="extra166ycompile" |
843 |
|
description="Builds library jar from compiled sources"> |
844 |
|
|
852 |
|
<target name="extra166ydocs" |
853 |
|
description="Builds javadocs to build dir"> |
854 |
|
|
855 |
< |
<delete dir="${extra166yjavadocs.dir}"/> |
856 |
< |
<mkdir dir="${extra166yjavadocs.dir}"/> |
855 |
> |
<delete dir="${extra166ydocs.dir}"/> |
856 |
> |
<mkdir dir="${extra166ydocs.dir}"/> |
857 |
|
|
858 |
< |
<javadoc destdir="${extra166yjavadocs.dir}" |
858 |
> |
<javadoc destdir="${extra166ydocs.dir}" |
859 |
|
packagenames="extra166y.*" |
860 |
|
link="${jdkapidocs.url}" |
861 |
+ |
access="${build.javadoc.access}" |
862 |
|
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
863 |
|
bootclasspath="${bootclasspath6}" |
864 |
|
source="6" |
888 |
|
</target> |
889 |
|
|
890 |
|
<target name="extra166ydist-jar" |
891 |
< |
depends="extra166yclean, extra166y-jar"> |
891 |
> |
depends="extra166yclean, extra166yjar"> |
892 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
893 |
|
</target> |
894 |
|
|
895 |
|
<target name="extra166ydist-docs" |
896 |
|
depends="extra166yclean, extra166ydocs"> |
897 |
< |
<mirror-dir src="${extra166yjavadocs.dir}" dst="${dist.extra166yjavadocs.dir}"/> |
897 |
> |
<mirror-dir src="${extra166ydocs.dir}" dst="${dist.extra166ydocs.dir}"/> |
898 |
|
</target> |
899 |
|
|
900 |
|
<!-- jsr166e --> |
901 |
|
|
902 |
+ |
<property name="build.jsr166e.java.version" value="6"/> |
903 |
+ |
<property name="build.jsr166e.javac" value="${javac6}"/> |
904 |
+ |
|
905 |
|
<target name="jsr166ecompile" |
906 |
|
depends="configure-compiler" |
907 |
|
description="Compiles jsr166e sources"> |
913 |
|
debug="${build.debug}" |
914 |
|
debuglevel="${build.debuglevel}" |
915 |
|
deprecation="${build.deprecation}" |
916 |
< |
source="7" |
916 |
> |
source="${build.jsr166e.java.version}" |
917 |
|
classpath="" |
918 |
|
includeAntRuntime="false" |
919 |
|
includeJavaRuntime="false" |
920 |
< |
executable="${javac7}" |
920 |
> |
executable="${build.jsr166e.javac}" |
921 |
|
fork="true"> |
922 |
|
|
923 |
|
<include name="jsr166e/**/*.java"/> |
929 |
|
</target> |
930 |
|
|
931 |
|
|
932 |
< |
<target name="jsr166e-jar" |
932 |
> |
<target name="jsr166ejar" |
933 |
|
depends="jsr166ecompile" |
934 |
|
description="Builds library jar from compiled sources"> |
935 |
|
|
943 |
|
<target name="jsr166edocs" |
944 |
|
description="Builds javadocs to build dir"> |
945 |
|
|
946 |
< |
<delete dir="${jsr166ejavadocs.dir}"/> |
947 |
< |
<mkdir dir="${jsr166ejavadocs.dir}"/> |
946 |
> |
<delete dir="${jsr166edocs.dir}"/> |
947 |
> |
<mkdir dir="${jsr166edocs.dir}"/> |
948 |
|
|
949 |
< |
<javadoc destdir="${jsr166ejavadocs.dir}" |
949 |
> |
<javadoc destdir="${jsr166edocs.dir}" |
950 |
|
packagenames="jsr166e.*" |
951 |
|
link="${jdkapidocs.url}" |
952 |
< |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
953 |
< |
source="7" |
952 |
> |
access="${build.javadoc.access}" |
953 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
954 |
> |
source="${build.jsr166e.java.version}" |
955 |
|
executable="${javadoc7}"> |
956 |
|
<arg value="-XDignore.symbol.file=true"/> |
957 |
|
|
959 |
|
</target> |
960 |
|
|
961 |
|
|
962 |
< |
<target name="jsr166e-test-tck" |
963 |
< |
depends="jsr166e-jar" |
962 |
> |
<target name="jsr166e-test-tck-one-java-version" |
963 |
> |
depends="jsr166ejar" |
964 |
|
description="Runs tck tests for jsr166e"> |
965 |
|
|
966 |
+ |
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
967 |
+ |
|
968 |
|
<run-tck-tests |
969 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
970 |
< |
source="7" |
1047 |
< |
target="8" |
970 |
> |
target="${build.jsr166e.java.version}" |
971 |
|
workdir="${build.jsr166e.dir}" |
972 |
|
classes="${jsr166e.jar}"/> |
973 |
|
</target> |
974 |
|
|
975 |
+ |
<target name="jsr166e-test-tck" |
976 |
+ |
description="Runs tck tests for jsr166e for multiple java versions"> |
977 |
+ |
|
978 |
+ |
<!-- <antcall target="clean"/> --> |
979 |
+ |
<!-- <antcall target="jsr166e-test-tck-one-java-version"> --> |
980 |
+ |
<!-- <param name="build.jsr166e.java.version" value="8"/> --> |
981 |
+ |
<!-- <param name="build.jsr166e.javac" value="${javac8}"/> --> |
982 |
+ |
<!-- </antcall> --> |
983 |
+ |
|
984 |
+ |
<antcall target="clean"/> |
985 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
986 |
+ |
<param name="build.jsr166e.java.version" value="7"/> |
987 |
+ |
<param name="build.jsr166e.javac" value="${javac7}"/> |
988 |
+ |
</antcall> |
989 |
+ |
|
990 |
+ |
<antcall target="clean"/> |
991 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
992 |
+ |
<param name="build.jsr166e.java.version" value="6"/> |
993 |
+ |
<param name="build.jsr166e.javac" value="${javac6}"/> |
994 |
+ |
</antcall> |
995 |
+ |
</target> |
996 |
+ |
|
997 |
|
|
998 |
|
<target name="jsr166edist" |
999 |
|
depends="jsr166edist-jar, jsr166edist-docs" |
1012 |
|
</target> |
1013 |
|
|
1014 |
|
<target name="jsr166edist-jar" |
1015 |
< |
depends="jsr166eclean, jsr166e-jar"> |
1015 |
> |
depends="jsr166eclean, jsr166ejar"> |
1016 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
1017 |
|
</target> |
1018 |
|
|
1019 |
|
<target name="jsr166edist-docs" |
1020 |
|
depends="jsr166eclean, jsr166edocs"> |
1021 |
< |
<mirror-dir src="${jsr166ejavadocs.dir}" dst="${dist.jsr166ejavadocs.dir}"/> |
1021 |
> |
<mirror-dir src="${jsr166edocs.dir}" dst="${dist.jsr166edocs.dir}"/> |
1022 |
|
</target> |
1023 |
|
|
1024 |
+ |
|
1025 |
+ |
<!-- Find buglets that can be detected by static build tools --> |
1026 |
+ |
|
1027 |
+ |
<target name="lint"> |
1028 |
+ |
<antcall target="dists"> |
1029 |
+ |
<param name="build.javadoc.access" value="private"/> |
1030 |
+ |
</antcall> |
1031 |
+ |
</target> |
1032 |
+ |
|
1033 |
+ |
|
1034 |
|
</project> |