openjdk/jdk8u
1
0
Fork 0
mirror of https://github.com/openjdk/jdk8u.git synced 2025-12-10 10:44:16 -06:00
Code Issues Packages Projects Releases Wiki Activity

8025139: javac patch for using bootstrap compiler for debugging is not working properly

Browse Source 
Reviewed-by: jjg
This commit is contained in:
Vicente Romero 2013-09-26 19:06:09 +01:00
parent 26b536e23d
commit f5a3e39f94
2 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
langtools/make/netbeans/langtools/build.xml
View File

@ -55,18 +55,17 @@
description="Build one or all langtools tools"
/>
<condition property="bootstrap" value="bootstrap-" else="">
<condition property="use_bootstrap" value="bootstrap-" else="">
<isset property="langtools.tool.bootstrap"/>
</condition>
<condition property="bcp" value="${build.bootstrap.dir}/classes" else="${build.classes.dir}">
<condition property="with_bootclasspath" value="${build.bootstrap.dir}/classes" else="${build.classes.dir}">
<isset property="langtools.tool.bootstrap"/>
</condition>
<target name="-build-tool" if="langtools.tool.name">
<echo level="info" message="Building ${bootstrap}${langtools.tool.name}"/>
<echo level="info" message="Building ${use_bootstrap}${langtools.tool.name}"/>
<echo level="verbose" message="(Unset langtools.tool.name to build all tools)"/>
<antcall target="build-${bootstrap}${langtools.tool.name}"/>
<antcall target="build-${use_bootstrap}${langtools.tool.name}"/>
</target>
<target name="-build-all" unless="langtools.tool.name">
@ -97,9 +96,9 @@
<target name="run" depends="-check-target.java.home,build,-def-run,-get-tool-and-args"
description="run tool">
<echo level="info" message="${bcp}"/>
<echo level="info" message="Run ${bootstrap}${langtools.tool.name} with args ${langtools.tool.args}"/>
<run bcp="${bcp}" mainclass="com.sun.tools.${langtools.tool.name}.Main" args="${langtools.tool.args}"/>
<echo level="info" message="${with_bootclasspath}"/>
<echo level="info" message="Run ${use_bootstrap}${langtools.tool.name} with args ${langtools.tool.args}"/>
<run bcp="${with_bootclasspath}" mainclass="com.sun.tools.${langtools.tool.name}.Main" args="${langtools.tool.args}"/>
</target>
<!-- Run a selected class. (action: run.single; shift-F6) -->
@ -145,9 +144,9 @@
<!-- Debug tool in NetBeans. -->
<target name="debug" depends="-check-target.java.home,-def-run,-def-start-debugger,-get-tool-and-args,build" if="netbeans.home">
<echo level="info" message="Debug ${boostrap}${langtools.tool.name} with args ${langtools.tool.args}"/>
<echo level="info" message="Debug ${use_bootstrap}${langtools.tool.name} with args ${langtools.tool.args}"/>
<start-debugger/>
<run bcp="${bcp}" mainclass="com.sun.tools.${langtools.tool.name}.Main" args="${langtools.tool.args}" jpda.jvmargs="${jpda.jvmargs}"/>
<run bcp="${with_bootclasspath}" mainclass="com.sun.tools.${langtools.tool.name}.Main" args="${langtools.tool.args}" jpda.jvmargs="${jpda.jvmargs}"/>
</target>
<!-- Debug a selected class . -->
@ -237,12 +236,12 @@
<macrodef name="run">
<attribute name="mainclass"/>
<attribute name="args" default=""/>
<attribute name="bcp" default="${build.classes.dir}"/>
<attribute name="bcp" default="${with_bootclasspath}"/>
<attribute name="jpda.jvmargs" default=""/>
<sequential>
<java fork="true" jvm="${target.java}" classname="@{mainclass}">
<jvmarg line="-Xbootclasspath/p:${bcp}"/>
<jvmarg line="-Xbootclasspath/p:@{bcp}"/>
<jvmarg line="@{jpda.jvmargs}"/>
<arg line="@{args}"/>
</java>

3
langtools/make/tools/anttasks/SelectToolTask.java
View File

@ -87,8 +87,9 @@ public class SelectToolTask extends Task {
this(toolName, false);
}
ToolChoices(String toolName, boolean boostrap) {
ToolChoices(String toolName, boolean bootstrap) {
this.toolName = toolName;
this.bootstrap = bootstrap;
}
@Override