archive/jdk
1
0
Fork 0
mirror of https://github.com/openjdk/jdk.git synced 2025-09-20 19:14:38 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

6795030: Files in langtools build can be compiled ignoring java.home settings

Browse source 
Reviewed-by: mcimadamore
This commit is contained in:
Jonathan Gibbons 2009-01-21 08:21:41 -08:00
parent 15099c9ffe
commit f495424a45
1 changed files with 8 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

11
langtools/make/build.xml
View file

@ -390,8 +390,8 @@
<attribute name="classes.dir" default="${build.classes.dir}"/> <attribute name="classes.dir" default="${build.classes.dir}"/>
<attribute name="gensrc.dir" default="${build.gensrc.dir}"/> <attribute name="gensrc.dir" default="${build.gensrc.dir}"/>
<attribute name="lib.dir" default="${dist.lib.dir}"/> <attribute name="lib.dir" default="${dist.lib.dir}"/>
<attribute name="java" default="java"/>
<attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/>
<attribute name="javac.java.home" default="${boot.java.home}"/>
<attribute name="javac.target" default="${javac.target}"/> <attribute name="javac.target" default="${javac.target}"/>
<attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/> <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/>
<attribute name="jarclasspath" default=""/> <attribute name="jarclasspath" default=""/>
@ -433,6 +433,7 @@
<attribute name="gensrc.dir" default="${build.gensrc.dir}"/> <attribute name="gensrc.dir" default="${build.gensrc.dir}"/>
<attribute name="lib.dir" default="${dist.lib.dir}"/> <attribute name="lib.dir" default="${dist.lib.dir}"/>
<attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/> <attribute name="javac.bootclasspath" default="-J-Xbootclasspath/p:${build.bootstrap.dir}/classes"/>
<attribute name="javac.java.home" default="${boot.java.home}"/>
<attribute name="javac.target" default="${javac.target}"/> <attribute name="javac.target" default="${javac.target}"/>
<attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/> <attribute name="jarmainclass" default="com.sun.tools.@{name}.Main"/>
<attribute name="jarclasspath" default=""/> <attribute name="jarclasspath" default=""/>
@ -471,6 +472,7 @@
<attribute name="classes.dir" default="${build.classes.dir}"/> <attribute name="classes.dir" default="${build.classes.dir}"/>
<attribute name="gensrc.dir" default="${build.gensrc.dir}"/> <attribute name="gensrc.dir" default="${build.gensrc.dir}"/>
<attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/> <attribute name="javac.bootclasspath" default="${build.bootstrap.dir}/classes"/>
<attribute name="javac.java.home" default="${boot.java.home}"/>
<attribute name="javac.target" default="${javac.target}"/> <attribute name="javac.target" default="${javac.target}"/>
<attribute name="release" default="${release}"/> <attribute name="release" default="${release}"/>
<attribute name="full.version" default="${full.version}"/> <attribute name="full.version" default="${full.version}"/>
@ -493,6 +495,7 @@
destdir="@{gensrc.dir}" destdir="@{gensrc.dir}"
includes="**/*.properties"/> includes="**/*.properties"/>
<javac fork="true" <javac fork="true"
executable="@{javac.java.home}/bin/javac"
srcdir="@{gensrc.dir}" srcdir="@{gensrc.dir}"
destdir="@{classes.dir}" destdir="@{classes.dir}"
includes="@{includes}" includes="@{includes}"
@ -504,6 +507,7 @@
<compilerarg line="-Xlint"/> <compilerarg line="-Xlint"/>
</javac> </javac>
<javac fork="true" <javac fork="true"
executable="@{javac.java.home}/bin/javac"
srcdir="${src.classes.dir}" srcdir="${src.classes.dir}"
destdir="@{classes.dir}" destdir="@{classes.dir}"
includes="@{includes}" includes="@{includes}"
@ -540,7 +544,6 @@
classes.dir="${build.bootstrap.dir}/classes" classes.dir="${build.bootstrap.dir}/classes"
bin.dir="${build.bootstrap.dir}/bin" bin.dir="${build.bootstrap.dir}/bin"
lib.dir="${build.bootstrap.dir}/lib" lib.dir="${build.bootstrap.dir}/lib"
java="${boot.java}"
javac.bootclasspath="" javac.bootclasspath=""
release="${bootstrap.release}" release="${bootstrap.release}"
full.version="${bootstrap.full.version}"/> full.version="${bootstrap.full.version}"/>
@ -562,7 +565,9 @@
<target name="-def-pcompile"> <target name="-def-pcompile">
<mkdir dir="${build.toolclasses.dir}"/> <mkdir dir="${build.toolclasses.dir}"/>
<javac srcdir="${make.tools.dir}/CompileProperties" <javac fork="true"
executable="${boot.java.home}/bin/javac"
srcdir="${make.tools.dir}/CompileProperties"
destdir="${build.toolclasses.dir}/" destdir="${build.toolclasses.dir}/"
classpath="${ant.home}/lib/ant.jar"/> classpath="${ant.home}/lib/ant.jar"/>
<taskdef name="pcompile" <taskdef name="pcompile"