| 102 |
|
source="${build.sourcelevel}" |
| 103 |
|
fork="true"> |
| 104 |
|
|
| 105 |
– |
<!-- |
| 105 |
|
<compilerarg line="${gjc.args}"/> |
| 106 |
+ |
<!-- |
| 107 |
|
<bootclasspath refid="compile.bootclasspath"/> |
| 108 |
|
--> |
| 109 |
|
|
| 238 |
|
source="${build.sourcelevel}" |
| 239 |
|
fork="true"> |
| 240 |
|
|
| 241 |
– |
<!-- |
| 241 |
|
<compilerarg line="${gjc.args} -s"/> |
| 242 |
+ |
<!-- |
| 243 |
|
<bootclasspath refid="compile.bootclasspath"/> |
| 244 |
< |
--> |
| 244 |
> |
--> |
| 245 |
|
|
| 246 |
|
</javac> |
| 247 |
|
|
| 318 |
|
<!-- Version is kept in a separate file --> |
| 319 |
|
<loadfile property="version" srcFile="version.properties"/> |
| 320 |
|
<echo>Building JSR-166 version ${version}</echo> |
| 321 |
+ |
<echo>java.home is ${java.home}</echo> |
| 322 |
|
|
| 323 |
|
</target> |
| 324 |
|
|
| 356 |
|
fork="true"> |
| 357 |
|
|
| 358 |
|
<compilerarg line="${gjc.args}"/> |
| 359 |
+ |
<!-- |
| 360 |
|
<bootclasspath refid="compile.bootclasspath"/> |
| 361 |
+ |
--> |
| 362 |
|
|
| 363 |
|
</javac> |
| 364 |
|
|
| 527 |
|
source="${build.sourcelevel}" |
| 528 |
|
fork="true"> |
| 529 |
|
|
| 527 |
– |
<!-- |
| 530 |
|
<compilerarg line="${gjc.args}"/> |
| 531 |
< |
--> |
| 531 |
> |
<!-- |
| 532 |
|
<bootclasspath refid="test.compile.bootclasspath"/> |
| 533 |
+ |
--> |
| 534 |
|
<classpath refid="test.classpath"/> |
| 535 |
+ |
|
| 536 |
+ |
<include name="java/**"/> |
| 537 |
+ |
<include name="jsr166/**"/> |
| 538 |
|
|
| 539 |
|
</javac> |
| 540 |
|
|
| 556 |
|
dir="${build.reports.dir}" |
| 557 |
|
fork="true"> |
| 558 |
|
|
| 559 |
< |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
| 559 |
> |
<jvmarg value="-Xbootclasspath:${test.run.bootclasspath}"/> |
| 560 |
|
|
| 561 |
|
<formatter type="xml"/> |
| 562 |
|
|
| 563 |
|
<batchtest todir="${build.reports.dir}"> |
| 564 |
|
<fileset dir="${test.src.dir}"> |
| 565 |
< |
<include name="**/${testcase}Test.java"/> |
| 565 |
> |
<include name="java/**/${testcase}Test.java"/> |
| 566 |
> |
<include name="jsr166/**/${testcase}Test.java"/> |
| 567 |
|
</fileset> |
| 568 |
|
</batchtest> |
| 569 |
|
|
| 575 |
|
<target name="report-tests" |
| 576 |
|
depends="run-tests"> |
| 577 |
|
|
| 578 |
< |
<!-- Sets junit.report.format to frames if Xalan is present, |
| 578 |
> |
<!-- Sets junit.report.format to frames if redirection is present, |
| 579 |
|
otherwise sets it to noframes. --> |
| 580 |
|
<available property="junit.report.format" |
| 581 |
|
value="frames" |
| 599 |
|
|
| 600 |
|
|
| 601 |
|
<target name="configure-compiler"> |
| 602 |
< |
<!-- |
| 602 |
> |
|
| 603 |
|
<property name="gjc.version" |
| 604 |
|
value="2.2"/> |
| 605 |
|
|
| 625 |
|
<property name="collect.jar" |
| 626 |
|
location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/> |
| 627 |
|
|
| 628 |
+ |
<!-- |
| 629 |
+ |
<property name="unchecked.option" value="-warnunchecked"/> |
| 630 |
|
--> |
| 631 |
< |
<condition property="warnunchecked.arg" value="-warnunchecked"> |
| 631 |
> |
|
| 632 |
> |
<property name="unchecked.option" value="-Xlint:unchecked"/> |
| 633 |
> |
|
| 634 |
> |
<condition property="warnunchecked.arg" value="${unchecked.option}"> |
| 635 |
|
<istrue value="${gjc.warnunchecked}"/> |
| 636 |
|
</condition> |
| 637 |
|
|
| 638 |
|
<property name="warnunchecked.arg" value=""/> |
| 639 |
< |
|
| 639 |
> |
|
| 640 |
|
<condition property="prepare.src.dir" value="${build.dir}/prepare-src"> |
| 641 |
|
<istrue value="${build.nothreads}"/> |
| 642 |
|
</condition> |
| 647 |
|
--> |
| 648 |
|
|
| 649 |
|
<path id="pre.bootclasspath"> |
| 650 |
+ |
<!-- |
| 651 |
|
<pathelement location="${javac.jar}"/> |
| 652 |
+ |
--> |
| 653 |
|
</path> |
| 654 |
|
|
| 655 |
|
<path id="compile.bootclasspath"> |
| 656 |
|
<pathelement location="${build.classes.dir}"/> |
| 657 |
+ |
<!-- |
| 658 |
|
<pathelement location="${collect.jar}"/> |
| 659 |
+ |
--> |
| 660 |
|
<pathelement location="${rt.jar}"/> |
| 661 |
|
</path> |
| 662 |
|
|
| 671 |
|
value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}" |
| 672 |
|
/> |
| 673 |
|
--> |
| 674 |
+ |
<property name="gjc.args" value="${warnunchecked.arg} ${novariance.arg}"/> |
| 675 |
|
|
| 676 |
|
</target> |
| 677 |
|
|
| 693 |
|
<target name="configure-emulation"> |
| 694 |
|
|
| 695 |
|
<condition property="build.emulation.true"> |
| 696 |
< |
<or> |
| 680 |
< |
<and> |
| 681 |
< |
<os family="windows"/> |
| 682 |
< |
<not> |
| 683 |
< |
<isset property="build.emulation"/> |
| 684 |
< |
</not> |
| 685 |
< |
</and> |
| 686 |
< |
<istrue value="${build.emulation}"/> |
| 687 |
< |
</or> |
| 696 |
> |
<istrue value="${build.emulation}"/> |
| 697 |
|
</condition> |
| 698 |
|
|
| 699 |
|
</target> |
| 709 |
|
<fail message="Need JUnit 3.8.1 in ${ant.home}${file.separator}lib to run tests" |
| 710 |
|
unless="junit.available"/> |
| 711 |
|
|
| 712 |
+ |
<!-- Xalan --> |
| 713 |
+ |
<available property="xalan.available" |
| 714 |
+ |
classname="org.apache.xalan.Version"/> |
| 715 |
+ |
|
| 716 |
+ |
<fail message="Need Xalan 2.5.1 jar in ${ant.home}${file.separator}lib to run tests" |
| 717 |
+ |
unless="xalan.available"/> |
| 718 |
+ |
|
| 719 |
|
|
| 720 |
|
<!-- |
| 721 |
|
! Bootclasspath munging for testing, so JUnit can test our local |
| 724 |
|
|
| 725 |
|
<path id="test.classpath"> |
| 726 |
|
<pathelement location="${product.jar}"/> |
| 727 |
+ |
<pathelement location="${rt.jar}"/> |
| 728 |
|
<pathelement location="${build.testcases.dir}"/> |
| 729 |
|
<pathelement location="${junit.jar}"/> |
| 730 |
|
</path> |
| 736 |
|
</path> |
| 737 |
|
|
| 738 |
|
<path id="test.run.bootclasspath"> |
| 739 |
< |
<pathelement location="${javac.jar}"/> |
| 739 |
> |
<!-- |
| 740 |
> |
<pathelement location="${javac.jar}"/> |
| 741 |
> |
--> |
| 742 |
|
<path refid="test.classpath"/> |
| 743 |
|
</path> |
| 744 |
|
|
| 753 |
|
|
| 754 |
|
<!-- Anthill targets --> |
| 755 |
|
|
| 756 |
< |
<target name="anthill-build" |
| 756 |
> |
<target name="anthill-build"> |
| 757 |
> |
|
| 758 |
> |
<!-- Override this in user.properties --> |
| 759 |
> |
<property name="tiger.home" location="e:/j2sdk1.5.0"/> |
| 760 |
> |
|
| 761 |
> |
<exec resultproperty="result.property" dir="${basedir}" executable="${tiger.home}/bin/java"> |
| 762 |
> |
<arg value="-Xmx256000000"/> |
| 763 |
> |
<!-- classpath of new JVM --> |
| 764 |
> |
<arg value="-classpath"/> <arg path="${java.class.path}"/> |
| 765 |
> |
<!-- location of Ant home directory --> |
| 766 |
> |
<arg value="-Dant.home=${ant.home}"/> |
| 767 |
> |
<!-- the Ant main class --> |
| 768 |
> |
<arg value="org.apache.tools.ant.Main"/> |
| 769 |
> |
<!-- The build file --> |
| 770 |
> |
<arg value="-buildfile"/> <arg value="build.xml"/> |
| 771 |
> |
<!-- the target to build on the new Ant instance --> |
| 772 |
> |
<arg value="-DJAVA_HOME=${tiger.home}"/> |
| 773 |
> |
<arg value="do-anthill-build"/> |
| 774 |
> |
</exec> |
| 775 |
> |
</target> |
| 776 |
> |
|
| 777 |
> |
<target name="do-anthill-build" |
| 778 |
|
depends="jar, test, docs, dist-docs"/> |
| 779 |
|
|
| 780 |
|
<target name="anthill-publish"> |
