equal
deleted
inserted
replaced
313 </target> |
313 </target> |
314 |
314 |
315 <target name="build-javap" depends="build-javac"> |
315 <target name="build-javap" depends="build-javac"> |
316 <build-tool name="javap" |
316 <build-tool name="javap" |
317 includes="${javap.includes}" |
317 includes="${javap.includes}" |
318 jarmainclass="sun.tools.javap.Main" |
318 jarmainclass="com.sun.tools.javap.Main" |
319 jarclasspath="javac.jar"/> |
319 jarclasspath="javac.jar"/> |
320 </target> |
320 </target> |
321 |
321 |
322 <!-- (no javadoc for javap) --> |
322 <!-- (no javadoc for javap) --> |
323 |
323 |
398 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> |
398 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> |
399 <attribute name="lib.dir" default="${dist.lib.dir}"/> |
399 <attribute name="lib.dir" default="${dist.lib.dir}"/> |
400 <attribute name="java" default="java"/> |
400 <attribute name="java" default="java"/> |
401 <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> |
401 <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> |
402 <attribute name="javac.java.home" default="${boot.java.home}"/> |
402 <attribute name="javac.java.home" default="${boot.java.home}"/> |
|
403 <attribute name="javac.source" default="${javac.source}"/> |
403 <attribute name="javac.target" default="${javac.target}"/> |
404 <attribute name="javac.target" default="${javac.target}"/> |
404 <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/> |
405 <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/> |
405 <attribute name="jarclasspath" default=""/> |
406 <attribute name="jarclasspath" default=""/> |
406 <attribute name="release" default="${release}"/> |
407 <attribute name="release" default="${release}"/> |
407 <attribute name="full.version" default="${full.version}"/> |
408 <attribute name="full.version" default="${full.version}"/> |
416 jarmainclass="@{jarmainclass}" |
417 jarmainclass="@{jarmainclass}" |
417 jarclasspath="@{jarclasspath}" |
418 jarclasspath="@{jarclasspath}" |
418 release="@{release}" |
419 release="@{release}" |
419 full.version="@{full.version}" |
420 full.version="@{full.version}" |
420 javac.bootclasspath="@{javac.bootclasspath}" |
421 javac.bootclasspath="@{javac.bootclasspath}" |
|
422 javac.source="@{javac.source}" |
421 javac.target="@{javac.target}" |
423 javac.target="@{javac.target}" |
422 /> |
424 /> |
423 <mkdir dir="@{bin.dir}"/> |
425 <mkdir dir="@{bin.dir}"/> |
424 <copy file="${src.bin.dir}/launcher.sh-template" tofile="@{bin.dir}/@{name}"> |
426 <copy file="${src.bin.dir}/launcher.sh-template" tofile="@{bin.dir}/@{name}"> |
425 <filterset begintoken="#" endtoken="#"> |
427 <filterset begintoken="#" endtoken="#"> |
440 <attribute name="classes.dir" default="${build.classes.dir}"/> |
442 <attribute name="classes.dir" default="${build.classes.dir}"/> |
441 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> |
443 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> |
442 <attribute name="lib.dir" default="${dist.lib.dir}"/> |
444 <attribute name="lib.dir" default="${dist.lib.dir}"/> |
443 <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> |
445 <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> |
444 <attribute name="javac.java.home" default="${boot.java.home}"/> |
446 <attribute name="javac.java.home" default="${boot.java.home}"/> |
|
447 <attribute name="javac.source" default="${javac.source}"/> |
445 <attribute name="javac.target" default="${javac.target}"/> |
448 <attribute name="javac.target" default="${javac.target}"/> |
446 <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/> |
449 <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/> |
447 <attribute name="jarclasspath" default=""/> |
450 <attribute name="jarclasspath" default=""/> |
448 <attribute name="release" default="${release}"/> |
451 <attribute name="release" default="${release}"/> |
449 <attribute name="full.version" default="${full.version}"/> |
452 <attribute name="full.version" default="${full.version}"/> |
455 includes="@{includes}" |
458 includes="@{includes}" |
456 excludes="@{excludes}" |
459 excludes="@{excludes}" |
457 release="@{release}" |
460 release="@{release}" |
458 full.version="@{full.version}" |
461 full.version="@{full.version}" |
459 javac.bootclasspath="@{javac.bootclasspath}" |
462 javac.bootclasspath="@{javac.bootclasspath}" |
|
463 javac.source="@{javac.source}" |
460 javac.target="@{javac.target}" |
464 javac.target="@{javac.target}" |
461 /> |
465 /> |
462 <mkdir dir="@{lib.dir}"/> |
466 <mkdir dir="@{lib.dir}"/> |
463 <jar destfile="@{lib.dir}/@{name}.jar" |
467 <jar destfile="@{lib.dir}/@{name}.jar" |
464 basedir="@{classes.dir}" |
468 basedir="@{classes.dir}" |
479 <attribute name="excludes" default="**/package-info.java"/> |
483 <attribute name="excludes" default="**/package-info.java"/> |
480 <attribute name="classes.dir" default="${build.classes.dir}"/> |
484 <attribute name="classes.dir" default="${build.classes.dir}"/> |
481 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> |
485 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> |
482 <attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/> |
486 <attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/> |
483 <attribute name="javac.java.home" default="${boot.java.home}"/> |
487 <attribute name="javac.java.home" default="${boot.java.home}"/> |
|
488 <attribute name="javac.source" default="${javac.source}"/> |
484 <attribute name="javac.target" default="${javac.target}"/> |
489 <attribute name="javac.target" default="${javac.target}"/> |
485 <attribute name="release" default="${release}"/> |
490 <attribute name="release" default="${release}"/> |
486 <attribute name="full.version" default="${full.version}"/> |
491 <attribute name="full.version" default="${full.version}"/> |
487 <sequential> |
492 <sequential> |
488 <mkdir dir="@{gensrc.dir}"/> |
493 <mkdir dir="@{gensrc.dir}"/> |
507 srcdir="@{gensrc.dir}" |
512 srcdir="@{gensrc.dir}" |
508 destdir="@{classes.dir}" |
513 destdir="@{classes.dir}" |
509 includes="@{includes}" |
514 includes="@{includes}" |
510 sourcepath="" |
515 sourcepath="" |
511 includeAntRuntime="no" |
516 includeAntRuntime="no" |
|
517 source="@{javac.source}" |
512 target="@{javac.target}"> |
518 target="@{javac.target}"> |
513 <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> |
519 <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> |
514 <compilerarg line="${javac.version.opt}"/> |
520 <compilerarg line="${javac.version.opt}"/> |
515 <compilerarg line="-Xlint"/> |
521 <compilerarg line="-Xlint"/> |
516 </javac> |
522 </javac> |
520 destdir="@{classes.dir}" |
526 destdir="@{classes.dir}" |
521 includes="@{includes}" |
527 includes="@{includes}" |
522 excludes="@{excludes}" |
528 excludes="@{excludes}" |
523 sourcepath="" |
529 sourcepath="" |
524 includeAntRuntime="no" |
530 includeAntRuntime="no" |
|
531 source="@{javac.source}" |
525 target="@{javac.target}" |
532 target="@{javac.target}" |
526 debug="${javac.debug}" |
533 debug="${javac.debug}" |
527 debuglevel="${javac.debuglevel}"> |
534 debuglevel="${javac.debuglevel}"> |
528 <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> |
535 <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> |
529 <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/> |
536 <compilerarg value="-Xbootclasspath/p:@{classes.dir}"/> |
545 </target> |
552 </target> |
546 |
553 |
547 <target name="-def-build-bootstrap-tool" depends="-check-boot.java.home,-def-build-tool"> |
554 <target name="-def-build-bootstrap-tool" depends="-check-boot.java.home,-def-build-tool"> |
548 <presetdef name="build-bootstrap-tool"> |
555 <presetdef name="build-bootstrap-tool"> |
549 <build-tool |
556 <build-tool |
|
557 javac.source="${boot.javac.source}" |
550 javac.target="${boot.javac.target}" |
558 javac.target="${boot.javac.target}" |
551 gensrc.dir="${build.bootstrap.dir}/gensrc" |
559 gensrc.dir="${build.bootstrap.dir}/gensrc" |
552 classes.dir="${build.bootstrap.dir}/classes" |
560 classes.dir="${build.bootstrap.dir}/classes" |
553 bin.dir="${build.bootstrap.dir}/bin" |
561 bin.dir="${build.bootstrap.dir}/bin" |
554 lib.dir="${build.bootstrap.dir}/lib" |
562 lib.dir="${build.bootstrap.dir}/lib" |
560 </target> |
568 </target> |
561 |
569 |
562 <target name="-def-build-bootstrap-jar" depends="-def-build-jar"> |
570 <target name="-def-build-bootstrap-jar" depends="-def-build-jar"> |
563 <presetdef name="build-bootstrap-jar"> |
571 <presetdef name="build-bootstrap-jar"> |
564 <build-jar |
572 <build-jar |
|
573 javac.source="${boot.javac.source}" |
565 javac.target="${boot.javac.target}" |
574 javac.target="${boot.javac.target}" |
566 gensrc.dir="${build.bootstrap.dir}/gensrc" |
575 gensrc.dir="${build.bootstrap.dir}/gensrc" |
567 classes.dir="${build.bootstrap.dir}/classes" |
576 classes.dir="${build.bootstrap.dir}/classes" |
568 lib.dir="${build.bootstrap.dir}/lib" |
577 lib.dir="${build.bootstrap.dir}/lib" |
569 javac.bootclasspath="" |
578 javac.bootclasspath="" |