525 <build-module-classes module.name="java.base" |
525 <build-module-classes module.name="java.base" |
526 compilation.kind="@{compilation.kind}" /> |
526 compilation.kind="@{compilation.kind}" /> |
527 <build-module-classes module.name="java.compiler" |
527 <build-module-classes module.name="java.compiler" |
528 compilation.kind="@{compilation.kind}" /> |
528 compilation.kind="@{compilation.kind}" /> |
529 <build-module-classes module.name="jdk.compiler" |
529 <build-module-classes module.name="jdk.compiler" |
530 compilation.kind="@{compilation.kind}" /> |
530 compilation.kind="@{compilation.kind}" |
|
531 resource.includes="${javac.resource.includes}" /> |
531 <build-module-classes module.name="jdk.javadoc" |
532 <build-module-classes module.name="jdk.javadoc" |
532 compilation.kind="@{compilation.kind}" /> |
533 compilation.kind="@{compilation.kind}" /> |
533 <build-module-classes module.name="jdk.dev" |
534 <build-module-classes module.name="jdk.dev" |
534 compilation.kind="@{compilation.kind}" /> |
535 compilation.kind="@{compilation.kind}" /> |
535 </sequential> |
536 </sequential> |
536 </macrodef> |
537 </macrodef> |
537 </target> |
538 </target> |
538 |
539 |
539 <target name="-def-build-module-classes" depends="-def-pcompile"> |
540 <target name="-def-build-module-classes" depends="-def-pcompile,-def-pparse"> |
540 <macrodef name="build-module-classes"> |
541 <macrodef name="build-module-classes"> |
541 <attribute name="module.name"/> |
542 <attribute name="module.name"/> |
542 <attribute name="compilation.kind" default=""/> |
543 <attribute name="compilation.kind" default=""/> |
|
544 <attribute name="resource.includes" default="nonExistent" /> |
543 <attribute name="dependencies" default="${@{module.name}.dependencies}"/> |
545 <attribute name="dependencies" default="${@{module.name}.dependencies}"/> |
544 <attribute name="includes" default="${@{compilation.kind}javac.includes}"/> |
546 <attribute name="includes" default="${@{compilation.kind}javac.includes}"/> |
545 <attribute name="javac.lint.opts" default="${@{compilation.kind}javac.lint.opts}"/> |
547 <attribute name="javac.lint.opts" default="${@{compilation.kind}javac.lint.opts}"/> |
546 <attribute name="javac.extra.opts" default="${@{compilation.kind}javac.extra.opts}"/> |
548 <attribute name="javac.extra.opts" default="${@{compilation.kind}javac.extra.opts}"/> |
547 <attribute name="build.dir" default="${@{compilation.kind}build.dir}"/> |
549 <attribute name="build.dir" default="${@{compilation.kind}build.dir}"/> |
581 includes="@{includes}"> |
583 includes="@{includes}"> |
582 <src> |
584 <src> |
583 <path location="${src.dir}"/> |
585 <path location="${src.dir}"/> |
584 </src> |
586 </src> |
585 </pcompile> |
587 </pcompile> |
|
588 <pparse destdir="@{gensrc.dir}" |
|
589 includes="@{resource.includes}"> |
|
590 <src> |
|
591 <path location="${src.dir}"/> |
|
592 </src> |
|
593 </pparse> |
586 <copy todir="@{gensrc.dir}"> |
594 <copy todir="@{gensrc.dir}"> |
587 <fileset dir="${src.dir}" includes="@{includes}" /> |
595 <fileset dir="${src.dir}" includes="@{includes}" /> |
588 <globmapper from="*.properties-template" to="*.properties"/> |
596 <globmapper from="*.properties-template" to="*.properties"/> |
589 <filterset begintoken="$(" endtoken=")"> |
597 <filterset begintoken="$(" endtoken=")"> |
590 <filter token="JDK_VERSION" value="${jdk.version}"/> |
598 <filter token="JDK_VERSION" value="${jdk.version}"/> |
642 </copy> |
650 </copy> |
643 </sequential> |
651 </sequential> |
644 </macrodef> |
652 </macrodef> |
645 </target> |
653 </target> |
646 |
654 |
|
655 <target name="-def-pparse"> |
|
656 <mkdir dir="${build.toolclasses.dir}"/> |
|
657 <copy todir="${build.toolclasses.dir}/propertiesparser" > |
|
658 <fileset dir="make/tools/propertiesparser" includes="**/resources/**"/> |
|
659 </copy> |
|
660 <javac fork="true" |
|
661 source="${boot.javac.source}" |
|
662 target="${boot.javac.target}" |
|
663 executable="${boot.java.home}/bin/javac" |
|
664 srcdir="${make.tools.dir}" |
|
665 includes="propertiesparser/* anttasks/PropertiesParser* anttasks/PathFileSet*" |
|
666 destdir="${build.toolclasses.dir}/" |
|
667 classpath="${ant.core.lib}" |
|
668 bootclasspath="${boot.java.home}/jre/lib/rt.jar" |
|
669 includeantruntime="false"> |
|
670 <compilerarg line="${javac.lint.opts}"/> |
|
671 </javac> |
|
672 <taskdef name="pparse" |
|
673 classname="anttasks.PropertiesParserTask" |
|
674 classpath="${build.toolclasses.dir}/"/> |
|
675 </target> |
|
676 |
647 <target name="-do-depend" if="do.depend"> |
677 <target name="-do-depend" if="do.depend"> |
648 <depend srcdir="${src.dir}:${gensrc.dir}" destdir="${classes.dir}" classpath="${classpath}" |
678 <depend srcdir="${src.dir}:${gensrc.dir}" destdir="${classes.dir}" classpath="${classpath}" |
649 cache="${depcache.dir}"/> |
679 cache="${depcache.dir}"/> |
650 </target> |
680 </target> |
651 |
681 |