77 |
|
|
78 |
|
<mkdir dir="${build.classes.dir}"/> |
79 |
|
|
80 |
+ |
<!-- |
81 |
+ |
<echo>javac ${gjc.args}</echo> |
82 |
+ |
<echo>bootclasspath=${compile.bootclasspath}</echo> |
83 |
+ |
--> |
84 |
+ |
|
85 |
|
<javac srcdir="${prepare.src.dir}" |
86 |
|
destdir="${build.classes.dir}" |
87 |
|
debug="${build.debug}" |
90 |
|
source="${build.sourcelevel}" |
91 |
|
fork="true"> |
92 |
|
|
93 |
< |
<bootclasspath refid="javac.bootclasspath"/> |
94 |
< |
<compilerarg line="${build.javac.args}"/> |
93 |
> |
<compilerarg line="${gjc.args}"/> |
94 |
> |
<bootclasspath refid="compile.bootclasspath"/> |
95 |
|
|
96 |
|
</javac> |
97 |
|
|
182 |
|
source="${build.sourcelevel}" |
183 |
|
fork="true"> |
184 |
|
|
185 |
< |
<bootclasspath refid="javac.bootclasspath"/> |
186 |
< |
<compilerarg line="${build.javac.args} -s"/> |
185 |
> |
<compilerarg line="${gjc.args} -s"/> |
186 |
> |
<bootclasspath refid="compile.bootclasspath"/> |
187 |
|
|
188 |
|
</javac> |
189 |
|
|
277 |
|
source="${build.sourcelevel}" |
278 |
|
fork="true"> |
279 |
|
|
280 |
< |
<bootclasspath refid="javac.bootclasspath"/> |
281 |
< |
<compilerarg line="${build.javac.args}"/> |
280 |
> |
<compilerarg line="${gjc.args}"/> |
281 |
> |
<bootclasspath refid="compile.bootclasspath"/> |
282 |
|
|
283 |
|
</javac> |
284 |
|
|
416 |
|
|
417 |
|
<mkdir dir="${build.testcases.dir}"/> |
418 |
|
|
419 |
+ |
<!-- |
420 |
+ |
<echo>javac ${gjc.args}</echo> |
421 |
+ |
<echo>bootclasspath=${test.compile.bootclasspath}</echo> |
422 |
+ |
<echo>classpath="${test.classpath}"</echo> |
423 |
+ |
--> |
424 |
+ |
|
425 |
|
<javac srcdir="${test.src.dir}" |
426 |
|
destdir="${build.testcases.dir}" |
427 |
|
debug="${build.debug}" |
430 |
|
source="${build.sourcelevel}" |
431 |
|
fork="true"> |
432 |
|
|
433 |
< |
<classpath refid="test.classpath"/> |
434 |
< |
<bootclasspath refid="javac.bootclasspath"/> |
435 |
< |
<compilerarg line="${build.javac.args}"/> |
433 |
> |
<compilerarg line="${gjc.args}"/> |
434 |
> |
<bootclasspath refid="test.compile.bootclasspath"/> |
435 |
> |
<classpath refid="test.classpath"/> |
436 |
|
|
437 |
|
</javac> |
438 |
|
|
454 |
|
dir="${build.reports.dir}" |
455 |
|
fork="true"> |
456 |
|
|
457 |
< |
<jvmarg value="${test.bootclasspath.arg}"/> |
457 |
> |
<jvmarg value="-Xbootclasspath/p:${test.run.bootclasspath}"/> |
458 |
|
|
459 |
|
<formatter type="xml"/> |
460 |
|
|
500 |
|
<property name="gjc.version" |
501 |
|
value="2.0"/> |
502 |
|
|
503 |
< |
<condition property="build.novariance" value="-novariance"> |
503 |
> |
<condition property="novariance.arg" value="-novariance"> |
504 |
|
<and> |
505 |
|
<equals arg1="${gjc.version}" arg2="2.0"/> |
506 |
|
<or> |
510 |
|
</and> |
511 |
|
</condition> |
512 |
|
|
513 |
< |
<property name="build.novariance" |
513 |
> |
<property name="novariance.arg" |
514 |
|
value=""/> |
515 |
|
|
516 |
|
<property name="gjc.dir" |
520 |
|
location="${gjc.dir}/${gjc.version}/javac.jar"/> |
521 |
|
|
522 |
|
<property name="collect.jar" |
523 |
< |
location="${gjc.dir}/${gjc.version}/collect${build.novariance}.jar"/> |
523 |
> |
location="${gjc.dir}/${gjc.version}/collect${novariance.arg}.jar"/> |
524 |
|
|
525 |
|
|
526 |
< |
<condition property="build.warnunchecked" value="-warnunchecked"> |
526 |
> |
<condition property="warnunchecked.arg" value="-warnunchecked"> |
527 |
|
<istrue value="${gjc.warnunchecked}"/> |
528 |
|
</condition> |
529 |
|
|
530 |
< |
<property name="build.warnunchecked" value=""/> |
530 |
> |
<property name="warnunchecked.arg" value=""/> |
531 |
|
|
532 |
|
<condition property="prepare.src.dir" value="${build.dir}/prepare-src"> |
533 |
|
<istrue value="${build.nothreads}"/> |
538 |
|
! Bootclasspath munging for source compilation. |
539 |
|
--> |
540 |
|
|
541 |
< |
<path id="javac.bootclasspath.prefix"> |
541 |
> |
<path id="pre.bootclasspath"> |
542 |
|
<!-- <pathelement location="${src.dir}"/> --> |
543 |
|
<pathelement location="${javac.jar}"/> |
544 |
|
</path> |
545 |
|
|
546 |
< |
<path id="javac.bootclasspath"> |
546 |
> |
<path id="compile.bootclasspath"> |
547 |
|
<!-- <pathelement location="${src.dir}"/> --> |
548 |
|
<pathelement location="${collect.jar}"/> |
549 |
|
<pathelement location="${rt.jar}"/> |
550 |
|
</path> |
551 |
|
|
552 |
< |
<!-- Flatten bootclasspath prefix into a platform-appropriate string --> |
553 |
< |
<property name="javac.bootclasspath.prefix" |
554 |
< |
refid="javac.bootclasspath.prefix"/> |
544 |
< |
|
545 |
< |
<!-- Turn the flattened bootclasspath prefix into a javac argument --> |
546 |
< |
<property name="build.bootclasspath.arg" |
547 |
< |
value='-J-Xbootclasspath/p:${javac.bootclasspath.prefix}'/> |
548 |
< |
|
549 |
< |
<!-- Flatten bootclasspath for trace message --> |
550 |
< |
<property name="javac.bootclasspath" |
551 |
< |
refid="javac.bootclasspath"/> |
552 |
> |
<!-- Flatten paths into platform-appropriate strings --> |
553 |
> |
<property name="pre.bootclasspath" refid="pre.bootclasspath"/> |
554 |
> |
<property name="compile.bootclasspath" refid="compile.bootclasspath"/> |
555 |
|
|
553 |
– |
<!-- Common options in javac invocations --> |
554 |
– |
<property name="build.javac.args" |
555 |
– |
value="${build.bootclasspath.arg} ${build.warnunchecked} ${build.novariance}"/> |
556 |
|
|
557 |
< |
<echo>javac ${build.javac.args}</echo> |
558 |
< |
<echo>bootclasspath=${javac.bootclasspath}</echo> |
557 |
> |
<!-- Common options in javac invocations --> |
558 |
> |
<property name="gjc.args" |
559 |
> |
value="-J-Xbootclasspath/p:${pre.bootclasspath} ${warnunchecked.arg} ${novariance.arg}" |
560 |
> |
/> |
561 |
|
|
562 |
|
</target> |
563 |
|
|
593 |
|
</target> |
594 |
|
|
595 |
|
|
596 |
< |
<target name="configure-tests"> |
596 |
> |
<target name="configure-tests" |
597 |
> |
depends="configure-compiler"> |
598 |
|
|
599 |
|
<!-- junit.framework.Protectable is in JUnit 3.8.1 but not in 3.7 --> |
600 |
|
<available property="junit.available" |
615 |
|
<pathelement location="${junit.jar}"/> |
616 |
|
</path> |
617 |
|
|
618 |
< |
<!-- Flatten test classpath into a platform-appropriate string --> |
619 |
< |
<property name="test.classpath" refid="test.classpath"/> |
618 |
> |
<path id="test.compile.bootclasspath"> |
619 |
> |
<pathelement location="${javac.jar}"/> |
620 |
> |
<pathelement location="${collect.jar}"/> |
621 |
> |
<pathelement location="${rt.jar}"/> |
622 |
> |
</path> |
623 |
> |
|
624 |
> |
<path id="test.run.bootclasspath"> |
625 |
> |
<pathelement location="${javac.jar}"/> |
626 |
> |
<path refid="test.classpath"/> |
627 |
> |
</path> |
628 |
|
|
629 |
< |
<!-- Turn the flattened test classpath into a javac argument --> |
630 |
< |
<property name="test.bootclasspath.arg" |
631 |
< |
value='-Xbootclasspath/p:${test.classpath}'/> |
629 |
> |
<!-- Flatten test classpaths into platform-appropriate strings --> |
630 |
> |
<property name="test.classpath" refid="test.classpath"/> |
631 |
> |
<property name="test.compile.bootclasspath" refid="test.compile.bootclasspath"/> |
632 |
> |
<property name="test.run.bootclasspath" refid="test.run.bootclasspath"/> |
633 |
|
|
634 |
|
</target> |
635 |
|
|