Wed, 21 Jan 2009 08:21:41 -0800
6795030: Files in langtools build can be compiled ignoring java.home settings
Reviewed-by: mcimadamore
make/build.xml | file | annotate | diff | comparison | revisions |
1.1 --- a/make/build.xml Tue Jan 20 18:23:13 2009 -0800 1.2 +++ b/make/build.xml Wed Jan 21 08:21:41 2009 -0800 1.3 @@ -390,8 +390,8 @@ 1.4 <attribute name="classes.dir" default="${build.classes.dir}"/> 1.5 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> 1.6 <attribute name="lib.dir" default="${dist.lib.dir}"/> 1.7 - <attribute name="java" default="java"/> 1.8 <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> 1.9 + <attribute name="javac.java.home" default="${boot.java.home}"/> 1.10 <attribute name="javac.target" default="${javac.target}"/> 1.11 <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/> 1.12 <attribute name="jarclasspath" default=""/> 1.13 @@ -433,6 +433,7 @@ 1.14 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> 1.15 <attribute name="lib.dir" default="${dist.lib.dir}"/> 1.16 <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> 1.17 + <attribute name="javac.java.home" default="${boot.java.home}"/> 1.18 <attribute name="javac.target" default="${javac.target}"/> 1.19 <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/> 1.20 <attribute name="jarclasspath" default=""/> 1.21 @@ -471,6 +472,7 @@ 1.22 <attribute name="classes.dir" default="${build.classes.dir}"/> 1.23 <attribute name="gensrc.dir" default="${build.gensrc.dir}"/> 1.24 <attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/> 1.25 + <attribute name="javac.java.home" default="${boot.java.home}"/> 1.26 <attribute name="javac.target" default="${javac.target}"/> 1.27 <attribute name="release" default="${release}"/> 1.28 <attribute name="full.version" default="${full.version}"/> 1.29 @@ -493,6 +495,7 @@ 1.30 destdir="@{gensrc.dir}" 1.31 includes="**/*.properties"/> 1.32 <javac fork="true" 1.33 + executable="@{javac.java.home}/bin/javac" 1.34 srcdir="@{gensrc.dir}" 1.35 destdir="@{classes.dir}" 1.36 includes="@{includes}" 1.37 @@ -504,6 +507,7 @@ 1.38 <compilerarg line="-Xlint"/> 1.39 </javac> 1.40 <javac fork="true" 1.41 + executable="@{javac.java.home}/bin/javac" 1.42 srcdir="${src.classes.dir}" 1.43 destdir="@{classes.dir}" 1.44 includes="@{includes}" 1.45 @@ -540,7 +544,6 @@ 1.46 classes.dir="${build.bootstrap.dir}/classes" 1.47 bin.dir="${build.bootstrap.dir}/bin" 1.48 lib.dir="${build.bootstrap.dir}/lib" 1.49 - java="${boot.java}" 1.50 javac.bootclasspath="" 1.51 release="${bootstrap.release}" 1.52 full.version="${bootstrap.full.version}"/> 1.53 @@ -562,7 +565,9 @@ 1.54 1.55 <target name="-def-pcompile"> 1.56 <mkdir dir="${build.toolclasses.dir}"/> 1.57 - <javac srcdir="${make.tools.dir}/CompileProperties" 1.58 + <javac fork="true" 1.59 + executable="${boot.java.home}/bin/javac" 1.60 + srcdir="${make.tools.dir}/CompileProperties" 1.61 destdir="${build.toolclasses.dir}/" 1.62 classpath="${ant.home}/lib/ant.jar"/> 1.63 <taskdef name="pcompile"