| 16 |
|
$HOME/jdk/jdk6 |
| 17 |
|
$HOME/jdk/jdk7 |
| 18 |
|
$HOME/jdk/jdk8 |
| 19 |
+ |
$HOME/jdk/jdk9 |
| 20 |
|
where each of the above is a JDK or a symlink to same, and |
| 21 |
|
$HOME/jdk/src/jdk6 |
| 22 |
|
$HOME/jdk/src/jdk7 |
| 23 |
|
$HOME/jdk/src/jdk8 |
| 24 |
+ |
$HOME/jdk/src/jdk9 |
| 25 |
|
where each of the above is a complete JDK source tree |
| 26 |
|
(e.g. mercurial forest) or a symlink to same. |
| 25 |
– |
As of 2013-02, the very latest lambda 8 jdk is needed for jdk8. |
| 27 |
|
------------------------------------------------------------------------------ |
| 28 |
|
</description> |
| 29 |
|
|
| 30 |
< |
<target name="usage" description="Display main targets by running 'ant -projecthelp'"> |
| 30 |
> |
<!-- Display main targets by running 'ant -projecthelp' --> |
| 31 |
> |
<target name="usage"> |
| 32 |
|
<java classname="org.apache.tools.ant.Main"> |
| 33 |
|
<arg value="-projecthelp" /> |
| 34 |
|
</java> |
| 46 |
|
<property name="build.deprecation" value="false"/> |
| 47 |
|
<property name="build.javadoc.access" value="protected"/> |
| 48 |
|
|
| 49 |
+ |
<!-- Tck options; see JSR166TestCase.java --> |
| 50 |
+ |
<!-- ant -Djsr166.profileTests=true -Djsr166.runsPerTest=100 test-tck --> |
| 51 |
+ |
<property name="jsr166.profileTests" value="false"/> |
| 52 |
+ |
<property name="jsr166.profileThreshold" value="100"/> |
| 53 |
+ |
<property name="jsr166.runsPerTest" value="1"/> |
| 54 |
+ |
<!-- Allow running an individual tck test class --> |
| 55 |
+ |
<!-- ant -Djsr166.tckTestClass=CountedCompleterTest -Djsr166.runsPerTest=100 test-tck --> |
| 56 |
+ |
<property name="jsr166.tckTestClass" value="JSR166TestCase"/> |
| 57 |
+ |
|
| 58 |
|
<!-- Build locations --> |
| 59 |
|
<property name="build.dir" location="build"/> |
| 60 |
|
<property name="build.classes.dir" location="${build.dir}/classes"/> |
| 116 |
|
<defjdklocations v="6"/> |
| 117 |
|
<defjdklocations v="7"/> |
| 118 |
|
<defjdklocations v="8"/> |
| 119 |
+ |
<defjdklocations v="9"/> |
| 120 |
|
|
| 121 |
|
<!-- Source locations --> |
| 122 |
|
<property name="src.dir" location="${basedir}/src/main"/> |
| 163 |
|
<property name="jdkapi7docs.url" value="http://docs.oracle.com/javase/7/docs/api/"/> |
| 164 |
|
|
| 165 |
|
<property name="jdkapi8docs.url" value="http://download.java.net/jdk8/docs/api/"/> |
| 166 |
< |
<!-- The below does not yet exist as of 2013-01 --> |
| 166 |
> |
<!-- The expected canonical location does not yet exist as of 2014-02 --> |
| 167 |
|
<!-- <property name="jdkapi8docs.url" value="http://docs.oracle.com/javase/8/docs/api/"/> --> |
| 168 |
|
|
| 169 |
+ |
<property name="jdkapi9docs.url" value="${jdkapi8docs.url}"/> |
| 170 |
+ |
<!-- No published jdk9 docs exist as of 2014-02 --> |
| 171 |
+ |
<!-- <property name="jdkapi9docs.url" value="http://docs.oracle.com/javase/9/docs/api/"/> --> |
| 172 |
+ |
|
| 173 |
|
<!-- Default jdk api doc location (latest stable release seems best) --> |
| 174 |
|
<property name="jdkapidocs.url" value="${jdkapi7docs.url}"/> |
| 175 |
|
|
| 186 |
|
|
| 187 |
|
<macrodef name="run-tck-tests"> |
| 188 |
|
<attribute name="tck.src.dir" default="${tck.src.dir}"/> |
| 173 |
– |
<attribute name="source" default="6"/> |
| 189 |
|
<attribute name="target"/> |
| 190 |
+ |
<attribute name="compile-target" default="@{target}"/> |
| 191 |
|
<attribute name="workdir"/> |
| 192 |
|
<attribute name="classes"/> |
| 193 |
|
<attribute name="jvmflags" default=""/> |
| 201 |
|
debug="${build.debug}" |
| 202 |
|
debuglevel="${build.debuglevel}" |
| 203 |
|
deprecation="${build.deprecation}" |
| 204 |
< |
source="@{source}" |
| 204 |
> |
source="@{compile-target}" |
| 205 |
> |
target="@{compile-target}" |
| 206 |
|
classpath="${junit.jar}" |
| 207 |
< |
bootclasspath="@{classes}:${bootclasspath@{source}}" |
| 207 |
> |
bootclasspath="@{classes}:${bootclasspath@{compile-target}}" |
| 208 |
|
includeAntRuntime="false" |
| 209 |
|
includeJavaRuntime="false" |
| 210 |
< |
executable="${javac@{target}}" |
| 210 |
> |
executable="${javac@{compile-target}}" |
| 211 |
|
fork="true"> |
| 212 |
|
|
| 213 |
|
<include name="*.java"/> |
| 218 |
|
|
| 219 |
|
</javac> |
| 220 |
|
|
| 221 |
< |
<java classname="JSR166TestCase" |
| 221 |
> |
<java classname="${jsr166.tckTestClass}" |
| 222 |
|
failonerror="true" |
| 223 |
|
jvm="${java@{target}}" |
| 224 |
|
fork="true"> |
| 225 |
|
<jvmarg value="-Xbootclasspath/p:@{classes}"/> |
| 226 |
|
<jvmarg line="@{jvmflags}"/> |
| 227 |
+ |
<sysproperty key="jsr166.profileTests" value="${jsr166.profileTests}"/> |
| 228 |
+ |
<sysproperty key="jsr166.profileThreshold" value="${jsr166.profileThreshold}"/> |
| 229 |
+ |
<sysproperty key="jsr166.runsPerTest" value="${jsr166.runsPerTest}"/> |
| 230 |
|
<classpath> |
| 231 |
|
<pathelement location="${junit.jar}"/> |
| 232 |
|
<pathelement location="@{workdir}/tck-classes"/> |
| 236 |
|
</sequential> |
| 237 |
|
</macrodef> |
| 238 |
|
|
| 239 |
+ |
<macrodef name="run-jtreg-tests"> |
| 240 |
+ |
<attribute name="jtreg.src.dir" default="${jtreg.src.dir}"/> |
| 241 |
+ |
<attribute name="source" default="7"/> |
| 242 |
+ |
<attribute name="target"/> |
| 243 |
+ |
<attribute name="workdir"/> |
| 244 |
+ |
<attribute name="classes"/> |
| 245 |
+ |
<attribute name="jtregflags" default=""/> |
| 246 |
+ |
<sequential> |
| 247 |
+ |
<delete dir="@{workdir}/JTwork" quiet="true"/> |
| 248 |
+ |
<delete dir="@{workdir}/JTreport" quiet="true"/> |
| 249 |
+ |
<mkdir dir="@{workdir}/JTwork/scratch"/> |
| 250 |
+ |
<mkdir dir="@{workdir}/JTreport"/> |
| 251 |
+ |
<jtreg dir="@{jtreg.src.dir}" |
| 252 |
+ |
jdk="${jdk@{target}.home}" |
| 253 |
+ |
workDir="@{workdir}/JTwork" |
| 254 |
+ |
reportDir="@{workdir}/JTreport"> |
| 255 |
+ |
|
| 256 |
+ |
<arg value="-Xbootclasspath/p:@{classes}"/> |
| 257 |
+ |
<arg value="-agentvm"/> |
| 258 |
+ |
<arg value="-v:nopass,fail"/> |
| 259 |
+ |
<arg value="-vmoptions:-esa -ea"/> |
| 260 |
+ |
<arg value="-automatic"/> |
| 261 |
+ |
<arg value="-k:!ignore"/> |
| 262 |
+ |
<arg line="@{jtregflags}"/> |
| 263 |
+ |
</jtreg> |
| 264 |
+ |
</sequential> |
| 265 |
+ |
</macrodef> |
| 266 |
+ |
|
| 267 |
|
<!-- ALoops classpath --> |
| 268 |
|
<path id="loops.classpath"> |
| 269 |
|
<pathelement location="${build.loops.dir}"/> |
| 275 |
|
|
| 276 |
|
<!-- Main targets --> |
| 277 |
|
|
| 278 |
+ |
<property name="build.main.java.version" value="9"/> |
| 279 |
+ |
<property name="build.main.javac" value="${javac9}"/> |
| 280 |
+ |
|
| 281 |
|
<target name="dists" |
| 282 |
|
depends="dist, 4jdk7dist, jsr166edist, jsr166ydist, extra166ydist, jsr166xdist" |
| 283 |
|
description="Builds all public jars and docs"/> |
| 296 |
|
classpath="" |
| 297 |
|
includeAntRuntime="false" |
| 298 |
|
includeJavaRuntime="false" |
| 299 |
< |
executable="${javac8}" |
| 299 |
> |
executable="${build.main.javac}" |
| 300 |
|
fork="true"> |
| 301 |
|
|
| 302 |
|
<include name="**/*.java"/> |
| 303 |
+ |
<compilerarg value="-Xprefer:source"/> |
| 304 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 305 |
|
<compilerarg value="-Xlint:all"/> |
| 306 |
+ |
<compilerarg value="-Xdoclint:all/protected"/> |
| 307 |
+ |
<compilerarg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
| 308 |
|
<compilerarg line="${build.args}"/> |
| 309 |
|
|
| 310 |
|
</javac> |
| 321 |
|
</target> |
| 322 |
|
|
| 323 |
|
|
| 270 |
– |
<target name="test" |
| 271 |
– |
depends="configure-tests, report-tests" |
| 272 |
– |
description="Runs all tests (requires JUnit 3.8.1 in ${ant.home}/lib)" /> |
| 273 |
– |
|
| 274 |
– |
|
| 324 |
|
<target name="docs" |
| 325 |
|
description="Builds javadocs for src/main to dist dir"> |
| 326 |
|
|
| 332 |
|
|
| 333 |
|
<javadoc destdir="${docs.dir}" |
| 334 |
|
packagenames="none" |
| 335 |
< |
link="${jdkapi8docs.url}" |
| 335 |
> |
link="${jdkapi9docs.url}" |
| 336 |
|
overview="${src.dir}/intro.html" |
| 337 |
|
access="${build.javadoc.access}" |
| 338 |
< |
sourcepath="${src.dir}:${jdk8src.dir}" |
| 338 |
> |
sourcepath="${src.dir}:${jdk9src.dir}" |
| 339 |
|
classpath="" |
| 340 |
< |
executable="${javadoc8}"> |
| 340 |
> |
executable="${javadoc9}"> |
| 341 |
|
<fileset dir="${src.dir}" defaultexcludes="yes"> |
| 342 |
|
<include name="**/*.java"/> |
| 343 |
|
</fileset> |
| 344 |
+ |
<arg line="-Xmaxerrs 1000 -Xmaxwarns 1000"/> |
| 345 |
|
<arg value="-XDignore.symbol.file=true"/> |
| 346 |
|
<arg value="-tag"/> |
| 347 |
|
<arg value="${javadoc.jls.option}"/> |
| 348 |
+ |
<arg value="-tag"/> |
| 349 |
+ |
<arg value="apiNote:a:<em>API Note:</em>"/> |
| 350 |
+ |
<arg value="-tag"/> |
| 351 |
+ |
<arg value="implSpec:a:<em>Implementation Requirements:</em>"/> |
| 352 |
+ |
<arg value="-tag"/> |
| 353 |
+ |
<arg value="implNote:a:<em>Implementation Note:</em>"/> |
| 354 |
|
</javadoc> |
| 355 |
|
</target> |
| 356 |
|
|
| 389 |
|
<target name="dist-clean" |
| 390 |
|
description="Removes all build and distribution products"> |
| 391 |
|
|
| 392 |
+ |
<delete dir="${build.dir}"/> |
| 393 |
|
<delete dir="${dist.dir}"/> |
| 394 |
|
|
| 395 |
|
</target> |
| 396 |
|
|
| 397 |
|
|
| 341 |
– |
<!-- Internal targets --> |
| 342 |
– |
|
| 343 |
– |
|
| 398 |
|
<target name="dist-jar" |
| 399 |
|
depends="clean, jar"> |
| 400 |
|
<copy file="${product.jar}" todir="${dist.dir}"/> |
| 406 |
|
</target> |
| 407 |
|
|
| 408 |
|
|
| 355 |
– |
<target name="compile-tests" |
| 356 |
– |
depends="jar"> |
| 357 |
– |
|
| 358 |
– |
<mkdir dir="${build.testcases.dir}"/> |
| 359 |
– |
|
| 360 |
– |
<javac srcdir="${tck.src.dir}" |
| 361 |
– |
destdir="${build.testcases.dir}" |
| 362 |
– |
debug="${build.debug}" |
| 363 |
– |
debuglevel="${build.debuglevel}" |
| 364 |
– |
deprecation="${build.deprecation}" |
| 365 |
– |
source="6" |
| 366 |
– |
classpath="${junit.jar}" |
| 367 |
– |
bootclasspath="@{product.jar}:${bootclasspath6}" |
| 368 |
– |
includeAntRuntime="false" |
| 369 |
– |
includeJavaRuntime="false" |
| 370 |
– |
executable="${javac8}" |
| 371 |
– |
fork="true"> |
| 372 |
– |
|
| 373 |
– |
<include name="**/*.java"/> |
| 374 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
| 375 |
– |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
| 376 |
– |
<compilerarg line="${build.args}"/> |
| 377 |
– |
|
| 378 |
– |
</javac> |
| 379 |
– |
|
| 380 |
– |
<javac srcdir="${test.src.dir}" |
| 381 |
– |
destdir="${build.testcases.dir}" |
| 382 |
– |
debug="${build.debug}" |
| 383 |
– |
debuglevel="${build.debuglevel}" |
| 384 |
– |
deprecation="${build.deprecation}" |
| 385 |
– |
source="6" |
| 386 |
– |
classpath="" |
| 387 |
– |
bootclasspath="@{product.jar}:${bootclasspath6}" |
| 388 |
– |
includeAntRuntime="false" |
| 389 |
– |
includeJavaRuntime="false" |
| 390 |
– |
executable="${javac8}" |
| 391 |
– |
fork="true"> |
| 392 |
– |
|
| 393 |
– |
<include name="jsr166/test/**/*.java"/> |
| 394 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
| 395 |
– |
<compilerarg value="-Xlint:all,-unchecked,-rawtypes,-serial,-deprecation"/> |
| 396 |
– |
<compilerarg line="${build.args}"/> |
| 397 |
– |
|
| 398 |
– |
</javac> |
| 399 |
– |
|
| 400 |
– |
<!-- |
| 401 |
– |
<javac srcdir="${jtreg.src.dir}" |
| 402 |
– |
destdir="${build.testcases.dir}" |
| 403 |
– |
debug="${build.debug}" |
| 404 |
– |
debuglevel="${build.debuglevel}" |
| 405 |
– |
deprecation="${build.deprecation}" |
| 406 |
– |
source="${build.sourcelevel}" |
| 407 |
– |
fork="true"> |
| 408 |
– |
|
| 409 |
– |
<compilerarg value="-Xbootclasspath/p:${product.jar}"/> |
| 410 |
– |
<compilerarg value="-XDignore.symbol.file=true"/> |
| 411 |
– |
<compilerarg line="${build.args}"/> |
| 412 |
– |
|
| 413 |
– |
</javac> |
| 414 |
– |
--> |
| 415 |
– |
|
| 416 |
– |
</target> |
| 417 |
– |
|
| 409 |
|
<target name="test-tck" |
| 410 |
|
depends="jar" |
| 411 |
|
description="Runs tck tests for main directly"> |
| 412 |
|
|
| 413 |
|
<run-tck-tests |
| 414 |
< |
target="8" |
| 414 |
> |
target="${build.main.java.version}" |
| 415 |
|
workdir="${build.dir}" |
| 416 |
|
classes="${product.jar}"/> |
| 417 |
|
</target> |
| 418 |
|
|
| 419 |
< |
<target name="run-tests" |
| 420 |
< |
depends="compile-tests"> |
| 421 |
< |
|
| 422 |
< |
<!-- May be overridden by user.properties --> |
| 423 |
< |
<property name="testcase" value="*"/> |
| 424 |
< |
|
| 425 |
< |
<mkdir dir="${build.reports.dir}"/> |
| 435 |
< |
|
| 436 |
< |
<junit printsummary="true" |
| 437 |
< |
showoutput="true" |
| 438 |
< |
errorProperty="junit.failed" |
| 439 |
< |
failureProperty="junit.failed" |
| 440 |
< |
dir="${build.reports.dir}" |
| 441 |
< |
jvm="${java8}" |
| 442 |
< |
fork="true"> |
| 443 |
< |
|
| 444 |
< |
<jvmarg value="-Xbootclasspath/p:${product.jar}"/> |
| 445 |
< |
<jvmarg value="-server"/> |
| 446 |
< |
<jvmarg value="-showversion"/> |
| 447 |
< |
|
| 448 |
< |
<classpath refid="test.classpath"/> |
| 449 |
< |
|
| 450 |
< |
<formatter type="xml"/> |
| 451 |
< |
|
| 452 |
< |
<batchtest todir="${build.reports.dir}" unless="no.test.tck"> |
| 453 |
< |
<fileset dir="${tck.src.dir}"> |
| 454 |
< |
<include name="**/${testcase}Test.java"/> |
| 455 |
< |
</fileset> |
| 456 |
< |
</batchtest> |
| 457 |
< |
|
| 458 |
< |
<batchtest todir="${build.reports.dir}" if="do.test.old"> |
| 459 |
< |
<fileset dir="${test.src.dir}"> |
| 460 |
< |
<include name="jsr166/test/**/${testcase}Test.java"/> |
| 461 |
< |
</fileset> |
| 462 |
< |
</batchtest> |
| 463 |
< |
|
| 464 |
< |
<!-- |
| 465 |
< |
<batchtest todir="${build.reports.dir}" if="do.test.jtreg"> |
| 466 |
< |
<fileset dir="${jtreg.src.dir}"> |
| 467 |
< |
<include name="**/${testcase}Test.java"/> |
| 468 |
< |
</fileset> |
| 469 |
< |
</batchtest> |
| 470 |
< |
--> |
| 471 |
< |
|
| 472 |
< |
</junit> |
| 473 |
< |
|
| 419 |
> |
<target name="test-jtreg" |
| 420 |
> |
depends="jar" |
| 421 |
> |
description="Runs jtreg tests for main using the jtreg ant task"> |
| 422 |
> |
<run-jtreg-tests |
| 423 |
> |
target="${build.main.java.version}" |
| 424 |
> |
workdir="${build.dir}" |
| 425 |
> |
classes="${product.jar}"/> |
| 426 |
|
</target> |
| 427 |
|
|
| 428 |
+ |
<target name="test" |
| 429 |
+ |
depends="test-tck, test-jtreg" |
| 430 |
+ |
description="Runs tck and jtreg tests for main"> |
| 431 |
+ |
</target> |
| 432 |
|
|
| 433 |
< |
<target name="report-tests" |
| 434 |
< |
depends="run-tests"> |
| 479 |
< |
|
| 480 |
< |
<!-- Sets junit.report.format to frames if redirection is present, |
| 481 |
< |
otherwise sets it to noframes. --> |
| 482 |
< |
<available property="junit.report.format" |
| 483 |
< |
value="frames" |
| 484 |
< |
classname="org.apache.xalan.lib.Redirect" |
| 485 |
< |
/> |
| 486 |
< |
<property name="junit.report.format" value="noframes"/> |
| 487 |
< |
|
| 488 |
< |
<junitreport todir="${build.reports.dir}"> |
| 489 |
< |
<fileset dir="${build.reports.dir}"> |
| 490 |
< |
<include name="TEST-*.xml"/> |
| 491 |
< |
</fileset> |
| 492 |
< |
<report format="${junit.report.format}" todir="${build.reports.dir}" |
| 493 |
< |
/> |
| 494 |
< |
</junitreport> |
| 433 |
> |
<target name="test89" |
| 434 |
> |
description="Runs tck and jtreg tests for main for multiple java versions"> |
| 435 |
|
|
| 436 |
< |
<fail message="Test Cases Failed" if="junit.failed"/> |
| 436 |
> |
<antcall target="clean"/> |
| 437 |
> |
<antcall target="test"> |
| 438 |
> |
<param name="build.main.java.version" value="8"/> |
| 439 |
> |
<param name="build.main.javac" value="${javac8}"/> |
| 440 |
> |
</antcall> |
| 441 |
> |
|
| 442 |
> |
<antcall target="clean"/> |
| 443 |
> |
<antcall target="test"> |
| 444 |
> |
<param name="build.main.java.version" value="9"/> |
| 445 |
> |
<param name="build.main.javac" value="${javac9}"/> |
| 446 |
> |
</antcall> |
| 447 |
|
|
| 448 |
|
</target> |
| 449 |
|
|
| 450 |
|
|
| 451 |
+ |
|
| 452 |
|
<target name="configure-compiler"> |
| 453 |
|
|
| 454 |
|
<property name="unchecked.option" value="-Xlint:unchecked"/> |
| 466 |
|
</target> |
| 467 |
|
|
| 468 |
|
|
| 518 |
– |
<target name="configure-tests" |
| 519 |
– |
depends="configure-compiler"> |
| 520 |
– |
|
| 521 |
– |
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
| 522 |
– |
<available property="junit.available" |
| 523 |
– |
classname="junit.framework.Protectable"/> |
| 524 |
– |
|
| 525 |
– |
<!-- Xalan --> |
| 526 |
– |
<available property="xalan.available" |
| 527 |
– |
classname="org.apache.xalan.Version"/> |
| 528 |
– |
|
| 529 |
– |
|
| 530 |
– |
<!-- Ant 1.6beta and later don't need or want this check --> |
| 531 |
– |
<!-- |
| 532 |
– |
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
| 533 |
– |
unless="junit.available"/> |
| 534 |
– |
|
| 535 |
– |
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
| 536 |
– |
unless="xalan.available"/> |
| 537 |
– |
--> |
| 538 |
– |
|
| 539 |
– |
</target> |
| 540 |
– |
|
| 469 |
|
|
| 470 |
|
<!-- Various demos and test programs --> |
| 471 |
|
|
| 518 |
|
fork="true"> |
| 519 |
|
|
| 520 |
|
<include name="**/*.java"/> |
| 521 |
+ |
<compilerarg value="-Xprefer:source"/> |
| 522 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
| 523 |
+ |
<compilerarg value="-Xlint:all"/> |
| 524 |
+ |
<compilerarg line="${build.args}"/> |
| 525 |
+ |
|
| 526 |
+ |
</javac> |
| 527 |
+ |
</target> |
| 528 |
+ |
|
| 529 |
+ |
<target name="4jdk7doclint" |
| 530 |
+ |
depends="configure-compiler" |
| 531 |
+ |
description="Finds doclint warnings"> |
| 532 |
+ |
|
| 533 |
+ |
<mkdir dir="${build.4jdk7.classes.dir}"/> |
| 534 |
+ |
|
| 535 |
+ |
<javac srcdir="${4jdk7src.dir}" |
| 536 |
+ |
destdir="${build.4jdk7.classes.dir}" |
| 537 |
+ |
debug="${build.debug}" |
| 538 |
+ |
debuglevel="${build.debuglevel}" |
| 539 |
+ |
deprecation="${build.deprecation}" |
| 540 |
+ |
source="6" |
| 541 |
+ |
classpath="" |
| 542 |
+ |
bootclasspath="${bootclasspath7}" |
| 543 |
+ |
includeAntRuntime="false" |
| 544 |
+ |
includeJavaRuntime="false" |
| 545 |
+ |
executable="${javac8}" |
| 546 |
+ |
fork="true"> |
| 547 |
+ |
|
| 548 |
+ |
<include name="**/*.java"/> |
| 549 |
+ |
<compilerarg value="-Xprefer:source"/> |
| 550 |
|
<compilerarg value="-XDignore.symbol.file=true"/> |
| 551 |
|
<compilerarg value="-Xlint:all"/> |
| 552 |
+ |
<compilerarg value="-Xdoclint:all/protected"/> |
| 553 |
|
<compilerarg line="${build.args}"/> |
| 554 |
|
|
| 555 |
|
</javac> |
| 576 |
|
workdir="${build.4jdk7.dir}" |
| 577 |
|
classes="${4jdk7product.jar}"> |
| 578 |
|
<javac-elements> |
| 579 |
+ |
<!-- JDK8+ test classes --> |
| 580 |
+ |
<exclude name="*8Test.java"/> |
| 581 |
+ |
<exclude name="*9Test.java"/> |
| 582 |
+ |
<exclude name="DoubleAccumulatorTest.java"/> |
| 583 |
+ |
<exclude name="DoubleAdderTest.java"/> |
| 584 |
+ |
<exclude name="LongAccumulatorTest.java"/> |
| 585 |
+ |
<exclude name="LongAdderTest.java"/> |
| 586 |
+ |
<exclude name="CompletableFutureTest.java"/> |
| 587 |
+ |
<exclude name="SplittableRandomTest.java"/> |
| 588 |
|
<exclude name="StampedLockTest.java"/> |
| 589 |
|
</javac-elements> |
| 590 |
|
</run-tck-tests> |
| 613 |
|
|
| 614 |
|
<formatter type="brief"/> |
| 615 |
|
|
| 616 |
< |
<test name="JSR166TestCase" haltonfailure="no"> |
| 616 |
> |
<test name="${jsr166.tckTestClass}" haltonfailure="no"> |
| 617 |
|
</test> |
| 618 |
|
|
| 619 |
|
</junit> |
| 620 |
|
</target> |
| 621 |
|
|
| 622 |
|
<target name="4jdk7-test-jtreg" |
| 623 |
< |
depends="4jdk7compile" |
| 623 |
> |
depends="4jdk7jar" |
| 624 |
|
description="Runs jtreg tests for jsr166-4jdk7 using the jtreg ant task"> |
| 625 |
< |
<delete dir="${build.4jdk7.dir}/JTwork" quiet="true"/> |
| 626 |
< |
<delete dir="${build.4jdk7.dir}/JTreport" quiet="true"/> |
| 627 |
< |
<mkdir dir="${build.4jdk7.dir}/JTwork/scratch"/> |
| 628 |
< |
<mkdir dir="${build.4jdk7.dir}/JTreport"/> |
| 629 |
< |
<jtreg dir="${jtreg.src.dir}" |
| 663 |
< |
jdk="${jdk7.home}" |
| 664 |
< |
workDir="${build.4jdk7.dir}/JTwork" |
| 665 |
< |
reportDir="${build.4jdk7.dir}/JTreport"> |
| 666 |
< |
|
| 667 |
< |
<arg value="-Xbootclasspath/p:${4jdk7product.jar}"/> |
| 668 |
< |
<arg value="-agentvm"/> |
| 669 |
< |
<arg value="-v:nopass,fail"/> |
| 670 |
< |
<arg value="-vmoptions:-esa -ea"/> |
| 671 |
< |
<arg value="-automatic"/> |
| 672 |
< |
<arg value="-k:!ignore"/> |
| 673 |
< |
</jtreg> |
| 625 |
> |
<run-jtreg-tests |
| 626 |
> |
target="7" |
| 627 |
> |
workdir="${build.4jdk7.dir}" |
| 628 |
> |
classes="${4jdk7product.jar}" |
| 629 |
> |
jtregflags="-exclude:${jtreg.src.dir}/jdk8tests"/> |
| 630 |
|
</target> |
| 631 |
|
|
| 632 |
|
|
| 671 |
|
</target> |
| 672 |
|
|
| 673 |
|
|
| 718 |
– |
<target name="4jdk7dist-clean" |
| 719 |
– |
description="Removes all build and distribution products"> |
| 720 |
– |
|
| 721 |
– |
</target> |
| 722 |
– |
|
| 674 |
|
<target name="4jdk7dist-jar" |
| 675 |
|
depends="4jdk7clean, 4jdk7jar"> |
| 676 |
|
<copy file="${4jdk7product.jar}" todir="${dist.dir}"/> |
| 757 |
|
</target> |
| 758 |
|
|
| 759 |
|
|
| 809 |
– |
<target name="jsr166xdist-clean" |
| 810 |
– |
description="Removes all build and distribution products"> |
| 811 |
– |
|
| 812 |
– |
</target> |
| 813 |
– |
|
| 814 |
– |
|
| 760 |
|
<target name="jsr166xdist-jar" |
| 761 |
|
depends="jsr166xclean, jsr166xjar"> |
| 762 |
|
<copy file="${jsr166x.jar}" todir="${dist.dir}"/> |
| 842 |
|
</target> |
| 843 |
|
|
| 844 |
|
|
| 900 |
– |
<target name="jsr166ydist-clean" |
| 901 |
– |
description="Removes all build and distribution products"> |
| 902 |
– |
|
| 903 |
– |
</target> |
| 904 |
– |
|
| 845 |
|
<target name="jsr166ydist-jar" |
| 846 |
|
depends="jsr166yclean, jsr166yjar"> |
| 847 |
|
<copy file="${jsr166y.jar}" todir="${dist.dir}"/> |
| 928 |
|
</target> |
| 929 |
|
|
| 930 |
|
|
| 991 |
– |
<target name="extra166ydist-clean" |
| 992 |
– |
description="Removes all build and distribution products"> |
| 993 |
– |
|
| 994 |
– |
</target> |
| 995 |
– |
|
| 931 |
|
<target name="extra166ydist-jar" |
| 932 |
|
depends="extra166yclean, extra166yjar"> |
| 933 |
|
<copy file="${extra166y.jar}" todir="${dist.dir}"/> |
| 940 |
|
|
| 941 |
|
<!-- jsr166e --> |
| 942 |
|
|
| 943 |
+ |
<property name="build.jsr166e.java.version" value="6"/> |
| 944 |
+ |
<property name="build.jsr166e.javac" value="${javac6}"/> |
| 945 |
+ |
|
| 946 |
|
<target name="jsr166ecompile" |
| 947 |
|
depends="configure-compiler" |
| 948 |
|
description="Compiles jsr166e sources"> |
| 954 |
|
debug="${build.debug}" |
| 955 |
|
debuglevel="${build.debuglevel}" |
| 956 |
|
deprecation="${build.deprecation}" |
| 957 |
< |
source="7" |
| 957 |
> |
source="${build.jsr166e.java.version}" |
| 958 |
|
classpath="" |
| 959 |
|
includeAntRuntime="false" |
| 960 |
|
includeJavaRuntime="false" |
| 961 |
< |
executable="${javac7}" |
| 961 |
> |
executable="${build.jsr166e.javac}" |
| 962 |
|
fork="true"> |
| 963 |
|
|
| 964 |
|
<include name="jsr166e/**/*.java"/> |
| 969 |
|
</javac> |
| 970 |
|
</target> |
| 971 |
|
|
| 972 |
+ |
<!-- jsr166e: find doclint errors --> |
| 973 |
+ |
<target name="jsr166edoclint"> |
| 974 |
+ |
|
| 975 |
+ |
<mkdir dir="${build.jsr166e.classes.dir}"/> |
| 976 |
+ |
|
| 977 |
+ |
<javac srcdir="${topsrc.dir}" |
| 978 |
+ |
destdir="${build.jsr166e.classes.dir}" |
| 979 |
+ |
debug="${build.debug}" |
| 980 |
+ |
debuglevel="${build.debuglevel}" |
| 981 |
+ |
deprecation="${build.deprecation}" |
| 982 |
+ |
source="${build.jsr166e.java.version}" |
| 983 |
+ |
classpath="" |
| 984 |
+ |
bootclasspath="${bootclasspath7}" |
| 985 |
+ |
includeAntRuntime="false" |
| 986 |
+ |
includeJavaRuntime="false" |
| 987 |
+ |
executable="${javac8}" |
| 988 |
+ |
fork="true"> |
| 989 |
+ |
|
| 990 |
+ |
<include name="jsr166e/**/*.java"/> |
| 991 |
+ |
<compilerarg value="-XDignore.symbol.file=true"/> |
| 992 |
+ |
<compilerarg value="-Xlint:all"/> |
| 993 |
+ |
<compilerarg value="-Xdoclint:all/protected"/> |
| 994 |
+ |
|
| 995 |
+ |
</javac> |
| 996 |
+ |
</target> |
| 997 |
+ |
|
| 998 |
|
|
| 999 |
|
<target name="jsr166ejar" |
| 1000 |
|
depends="jsr166ecompile" |
| 1017 |
|
packagenames="jsr166e.*" |
| 1018 |
|
link="${jdkapidocs.url}" |
| 1019 |
|
access="${build.javadoc.access}" |
| 1020 |
< |
sourcepath="${topsrc.dir}:${jdk7src.dir}" |
| 1021 |
< |
source="7" |
| 1020 |
> |
sourcepath="${topsrc.dir}:${jdk6src.dir}" |
| 1021 |
> |
source="${build.jsr166e.java.version}" |
| 1022 |
|
executable="${javadoc7}"> |
| 1023 |
|
<arg value="-XDignore.symbol.file=true"/> |
| 1024 |
|
|
| 1026 |
|
</target> |
| 1027 |
|
|
| 1028 |
|
|
| 1029 |
< |
<target name="jsr166e-test-tck" |
| 1030 |
< |
depends="jsr166ejar" |
| 1031 |
< |
description="Runs tck tests for jsr166e"> |
| 1029 |
> |
<target name="jsr166e-test-tck-one-java-version" |
| 1030 |
> |
depends="jsr166ejar"> |
| 1031 |
> |
|
| 1032 |
> |
<echo message="Testing with jdk${build.jsr166e.java.version} ..."/> |
| 1033 |
|
|
| 1034 |
|
<run-tck-tests |
| 1035 |
|
tck.src.dir="${test.src.dir}/tck-jsr166e" |
| 1036 |
< |
source="7" |
| 1072 |
< |
target="8" |
| 1036 |
> |
target="${build.jsr166e.java.version}" |
| 1037 |
|
workdir="${build.jsr166e.dir}" |
| 1038 |
|
classes="${jsr166e.jar}"/> |
| 1039 |
|
</target> |
| 1040 |
|
|
| 1041 |
+ |
<target name="jsr166e-test-tck" |
| 1042 |
+ |
description="Runs tck tests for jsr166e for multiple java versions"> |
| 1043 |
+ |
|
| 1044 |
+ |
<!-- <antcall target="clean"/> --> |
| 1045 |
+ |
<!-- <antcall target="jsr166e-test-tck-one-java-version"> --> |
| 1046 |
+ |
<!-- <param name="build.jsr166e.java.version" value="8"/> --> |
| 1047 |
+ |
<!-- <param name="build.jsr166e.javac" value="${javac8}"/> --> |
| 1048 |
+ |
<!-- </antcall> --> |
| 1049 |
+ |
|
| 1050 |
+ |
<antcall target="clean"/> |
| 1051 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
| 1052 |
+ |
<param name="build.jsr166e.java.version" value="7"/> |
| 1053 |
+ |
<param name="build.jsr166e.javac" value="${javac7}"/> |
| 1054 |
+ |
</antcall> |
| 1055 |
+ |
|
| 1056 |
+ |
<antcall target="clean"/> |
| 1057 |
+ |
<antcall target="jsr166e-test-tck-one-java-version"> |
| 1058 |
+ |
<param name="build.jsr166e.java.version" value="6"/> |
| 1059 |
+ |
<param name="build.jsr166e.javac" value="${javac6}"/> |
| 1060 |
+ |
</antcall> |
| 1061 |
+ |
</target> |
| 1062 |
+ |
|
| 1063 |
+ |
|
| 1064 |
+ |
<target name="jsr166e-test" |
| 1065 |
+ |
depends="jsr166e-test-tck" |
| 1066 |
+ |
description="Runs all tests for jsr166e"> |
| 1067 |
+ |
</target> |
| 1068 |
|
|
| 1069 |
|
<target name="jsr166edist" |
| 1070 |
|
depends="jsr166edist-jar, jsr166edist-docs" |
| 1077 |
|
</target> |
| 1078 |
|
|
| 1079 |
|
|
| 1089 |
– |
<target name="jsr166edist-clean" |
| 1090 |
– |
description="Removes all build and distribution products"> |
| 1091 |
– |
|
| 1092 |
– |
</target> |
| 1093 |
– |
|
| 1080 |
|
<target name="jsr166edist-jar" |
| 1081 |
|
depends="jsr166eclean, jsr166ejar"> |
| 1082 |
|
<copy file="${jsr166e.jar}" todir="${dist.dir}"/> |
