diff options
| author | vromero <none@none> | 2013-09-26 19:06:09 +0100 |
|---|---|---|
| committer | vromero <none@none> | 2013-09-26 19:06:09 +0100 |
| commit | 956c3131241b0e64bffece57ca0b1813922d113d (patch) | |
| tree | 0837d3e88d0d479322af99b46c6157d798b24610 /make/netbeans | |
| parent | 4a50949658080d393aa2f3af9759ee9f5189a58b (diff) | |
8025139: javac patch for using bootstrap compiler for debugging is not working properly
Reviewed-by: jjg
Diffstat (limited to 'make/netbeans')
| -rw-r--r-- | make/netbeans/langtools/build.xml | 23 |
1 files changed, 11 insertions, 12 deletions
diff --git a/make/netbeans/langtools/build.xml b/make/netbeans/langtools/build.xml index cbb00705..c0b6ae26 100644 --- a/make/netbeans/langtools/build.xml +++ b/make/netbeans/langtools/build.xml @@ -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> |