equal
deleted
inserted
replaced
388 <attribute name="excludes" default="**/package-info.java"/> |
388 <attribute name="excludes" default="**/package-info.java"/> |
389 <attribute name="bin.dir" default="${dist.bin.dir}"/> |
389 <attribute name="bin.dir" default="${dist.bin.dir}"/> |
390 <attribute name="classes.dir" default="${build.classes.dir}"/> |
390 <attribute name="classes.dir" default="${build.classes.dir}"/> |
391 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> |
391 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> |
392 <attribute name="lib.dir" default="${dist.lib.dir}"/> |
392 <attribute name="lib.dir" default="${dist.lib.dir}"/> |
393 <attribute name="java" default="java"/> |
|
394 <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> |
393 <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> |
|
394 <attribute name="javac.java.home" default="${boot.java.home}"/> |
395 <attribute name="javac.target" default="${javac.target}"/> |
395 <attribute name="javac.target" default="${javac.target}"/> |
396 <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/> |
396 <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/> |
397 <attribute name="jarclasspath" default=""/> |
397 <attribute name="jarclasspath" default=""/> |
398 <attribute name="release" default="${release}"/> |
398 <attribute name="release" default="${release}"/> |
399 <attribute name="full.version" default="${full.version}"/> |
399 <attribute name="full.version" default="${full.version}"/> |
431 <attribute name="excludes" default="**/package-info.java"/> |
431 <attribute name="excludes" default="**/package-info.java"/> |
432 <attribute name="classes.dir" default="${build.classes.dir}"/> |
432 <attribute name="classes.dir" default="${build.classes.dir}"/> |
433 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> |
433 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> |
434 <attribute name="lib.dir" default="${dist.lib.dir}"/> |
434 <attribute name="lib.dir" default="${dist.lib.dir}"/> |
435 <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> |
435 <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> |
|
436 <attribute name="javac.java.home" default="${boot.java.home}"/> |
436 <attribute name="javac.target" default="${javac.target}"/> |
437 <attribute name="javac.target" default="${javac.target}"/> |
437 <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/> |
438 <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/> |
438 <attribute name="jarclasspath" default=""/> |
439 <attribute name="jarclasspath" default=""/> |
439 <attribute name="release" default="${release}"/> |
440 <attribute name="release" default="${release}"/> |
440 <attribute name="full.version" default="${full.version}"/> |
441 <attribute name="full.version" default="${full.version}"/> |
469 <attribute name="includes"/> |
470 <attribute name="includes"/> |
470 <attribute name="excludes" default="**/package-info.java"/> |
471 <attribute name="excludes" default="**/package-info.java"/> |
471 <attribute name="classes.dir" default="${build.classes.dir}"/> |
472 <attribute name="classes.dir" default="${build.classes.dir}"/> |
472 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> |
473 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> |
473 <attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/> |
474 <attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/> |
|
475 <attribute name="javac.java.home" default="${boot.java.home}"/> |
474 <attribute name="javac.target" default="${javac.target}"/> |
476 <attribute name="javac.target" default="${javac.target}"/> |
475 <attribute name="release" default="${release}"/> |
477 <attribute name="release" default="${release}"/> |
476 <attribute name="full.version" default="${full.version}"/> |
478 <attribute name="full.version" default="${full.version}"/> |
477 <sequential> |
479 <sequential> |
478 <mkdir dir="@{gensrc.dir}"/> |
480 <mkdir dir="@{gensrc.dir}"/> |
491 </copy> |
493 </copy> |
492 <pcompile srcdir="@{gensrc.dir}" |
494 <pcompile srcdir="@{gensrc.dir}" |
493 destdir="@{gensrc.dir}" |
495 destdir="@{gensrc.dir}" |
494 includes="**/*.properties"/> |
496 includes="**/*.properties"/> |
495 <javac fork="true" |
497 <javac fork="true" |
|
498 executable="@{javac.java.home}/bin/javac" |
496 srcdir="@{gensrc.dir}" |
499 srcdir="@{gensrc.dir}" |
497 destdir="@{classes.dir}" |
500 destdir="@{classes.dir}" |
498 includes="@{includes}" |
501 includes="@{includes}" |
499 sourcepath="" |
502 sourcepath="" |
500 includeAntRuntime="no" |
503 includeAntRuntime="no" |
502 <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> |
505 <compilerarg value="-J-Xbootclasspath/p:@{javac.bootclasspath}"/> |
503 <compilerarg line="${javac.version.opt}"/> |
506 <compilerarg line="${javac.version.opt}"/> |
504 <compilerarg line="-Xlint"/> |
507 <compilerarg line="-Xlint"/> |
505 </javac> |
508 </javac> |
506 <javac fork="true" |
509 <javac fork="true" |
|
510 executable="@{javac.java.home}/bin/javac" |
507 srcdir="${src.classes.dir}" |
511 srcdir="${src.classes.dir}" |
508 destdir="@{classes.dir}" |
512 destdir="@{classes.dir}" |
509 includes="@{includes}" |
513 includes="@{includes}" |
510 excludes="@{excludes}" |
514 excludes="@{excludes}" |
511 sourcepath="" |
515 sourcepath="" |
538 javac.target="${boot.javac.target}" |
542 javac.target="${boot.javac.target}" |
539 gensrc.dir="${build.bootstrap.dir}/gensrc" |
543 gensrc.dir="${build.bootstrap.dir}/gensrc" |
540 classes.dir="${build.bootstrap.dir}/classes" |
544 classes.dir="${build.bootstrap.dir}/classes" |
541 bin.dir="${build.bootstrap.dir}/bin" |
545 bin.dir="${build.bootstrap.dir}/bin" |
542 lib.dir="${build.bootstrap.dir}/lib" |
546 lib.dir="${build.bootstrap.dir}/lib" |
543 java="${boot.java}" |
|
544 javac.bootclasspath="" |
547 javac.bootclasspath="" |
545 release="${bootstrap.release}" |
548 release="${bootstrap.release}" |
546 full.version="${bootstrap.full.version}"/> |
549 full.version="${bootstrap.full.version}"/> |
547 </presetdef> |
550 </presetdef> |
548 </target> |
551 </target> |
560 </presetdef> |
563 </presetdef> |
561 </target> |
564 </target> |
562 |
565 |
563 <target name="-def-pcompile"> |
566 <target name="-def-pcompile"> |
564 <mkdir dir="${build.toolclasses.dir}"/> |
567 <mkdir dir="${build.toolclasses.dir}"/> |
565 <javac srcdir="${make.tools.dir}/CompileProperties" |
568 <javac fork="true" |
|
569 executable="${boot.java.home}/bin/javac" |
|
570 srcdir="${make.tools.dir}/CompileProperties" |
566 destdir="${build.toolclasses.dir}/" |
571 destdir="${build.toolclasses.dir}/" |
567 classpath="${ant.home}/lib/ant.jar"/> |
572 classpath="${ant.home}/lib/ant.jar"/> |
568 <taskdef name="pcompile" |
573 <taskdef name="pcompile" |
569 classname="CompilePropertiesTask" |
574 classname="CompilePropertiesTask" |
570 classpath="${build.toolclasses.dir}/"/> |
575 classpath="${build.toolclasses.dir}/"/> |