325 |
325 |
326 <target name="diags-examples" depends="build-javac"> |
326 <target name="diags-examples" depends="build-javac"> |
327 <!-- can override the following on the command line if desired. --> |
327 <!-- can override the following on the command line if desired. --> |
328 <property name="diags.examples.out" location="${build.dir}/diag-examples/diags-examples.html"/> |
328 <property name="diags.examples.out" location="${build.dir}/diag-examples/diags-examples.html"/> |
329 <mkdir dir="${build.dir}/diag-examples/classes"/> |
329 <mkdir dir="${build.dir}/diag-examples/classes"/> |
|
330 <echo message="jj: diags-examples dist.bin.dir ${dist.bin.dir}/javac"/> |
330 <javac fork="true" |
331 <javac fork="true" |
331 executable="${dist.bin.dir}/javac" |
332 executable="${dist.bin.dir}/javac" |
332 srcdir="test/tools/javac/diags" |
333 srcdir="test/tools/javac/diags" |
333 destdir="${build.dir}/diag-examples/classes" |
334 destdir="${build.dir}/diag-examples/classes" |
334 includes="Example.java,FileManager.java,HTMLWriter.java,RunExamples.java" |
335 includes="Example.java,FileManager.java,HTMLWriter.java,RunExamples.java" |
739 </filterset> |
740 </filterset> |
740 </copy> |
741 </copy> |
741 <pcompile srcdir="@{gensrc.dir}" |
742 <pcompile srcdir="@{gensrc.dir}" |
742 destdir="@{gensrc.dir}" |
743 destdir="@{gensrc.dir}" |
743 includes="**/*.properties"/> |
744 includes="**/*.properties"/> |
|
745 <echo message="jj: -def-build-classes @java.home: @{java.home}/bin/javac"/> |
744 <javac fork="true" |
746 <javac fork="true" |
745 executable="@{java.home}/bin/javac" |
747 executable="@{java.home}/bin/javac" |
746 srcdir="${src.classes.dir}:@{gensrc.dir}" |
748 srcdir="${src.classes.dir}:@{gensrc.dir}" |
747 destdir="@{classes.dir}" |
749 destdir="@{classes.dir}" |
748 includes="@{includes}" |
750 includes="@{includes}" |
806 </presetdef> |
808 </presetdef> |
807 </target> |
809 </target> |
808 |
810 |
809 <target name="-def-pcompile"> |
811 <target name="-def-pcompile"> |
810 <mkdir dir="${build.toolclasses.dir}"/> |
812 <mkdir dir="${build.toolclasses.dir}"/> |
|
813 <echo message="jj: -def-pcompile boot.java.home ${boot.java.home}/bin/javac"/> |
|
814 |
811 <javac fork="true" |
815 <javac fork="true" |
812 source="${boot.javac.source}" |
816 source="${boot.javac.source}" |
813 target="${boot.javac.target}" |
817 target="${boot.javac.target}" |
814 executable="${boot.java.home}/bin/javac" |
818 executable="${boot.java.home}/bin/javac" |
815 srcdir="${make.tools.dir}/CompileProperties" |
819 srcdir="${make.tools.dir}/CompileProperties" |
821 classpath="${build.toolclasses.dir}/"/> |
825 classpath="${build.toolclasses.dir}/"/> |
822 </target> |
826 </target> |
823 |
827 |
824 <target name="-def-genstubs" depends="build-bootstrap-javac" if="require.import.jdk.stubs"> |
828 <target name="-def-genstubs" depends="build-bootstrap-javac" if="require.import.jdk.stubs"> |
825 <mkdir dir="${build.toolclasses.dir}"/> |
829 <mkdir dir="${build.toolclasses.dir}"/> |
|
830 <echo message="jj: -def-genstubs boot.java.home ${boot.java.home}/bin/javac"/> |
|
831 |
826 <javac fork="true" |
832 <javac fork="true" |
827 source="${boot.javac.source}" |
833 source="${boot.javac.source}" |
828 target="${boot.javac.target}" |
834 target="${boot.javac.target}" |
829 executable="${boot.java.home}/bin/javac" |
835 executable="${boot.java.home}/bin/javac" |
830 srcdir="${make.tools.dir}/GenStubs" |
836 srcdir="${make.tools.dir}/GenStubs" |