Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/make/netbeans/langtools/build.xml	Thu Sep 26 20:07:43 2013 +0200
     1.2 +++ b/make/netbeans/langtools/build.xml	Thu Sep 26 19:06:09 2013 +0100
     1.3 @@ -55,18 +55,17 @@
     1.4          description="Build one or all langtools tools"
     1.5          />
     1.6  
     1.7 -    <condition property="bootstrap" value="bootstrap-" else="">
     1.8 +    <condition property="use_bootstrap" value="bootstrap-" else="">
     1.9          <isset property="langtools.tool.bootstrap"/>
    1.10      </condition>
    1.11 -
    1.12 -    <condition property="bcp" value="${build.bootstrap.dir}/classes" else="${build.classes.dir}">
    1.13 +    <condition property="with_bootclasspath" value="${build.bootstrap.dir}/classes" else="${build.classes.dir}">
    1.14          <isset property="langtools.tool.bootstrap"/>
    1.15      </condition>
    1.16  
    1.17      <target name="-build-tool" if="langtools.tool.name">
    1.18 -        <echo level="info" message="Building ${bootstrap}${langtools.tool.name}"/>
    1.19 +        <echo level="info" message="Building ${use_bootstrap}${langtools.tool.name}"/>
    1.20          <echo level="verbose" message="(Unset langtools.tool.name to build all tools)"/>
    1.21 -        <antcall target="build-${bootstrap}${langtools.tool.name}"/>
    1.22 +        <antcall target="build-${use_bootstrap}${langtools.tool.name}"/>
    1.23      </target>
    1.24  
    1.25      <target name="-build-all" unless="langtools.tool.name">
    1.26 @@ -97,9 +96,9 @@
    1.27  
    1.28      <target name="run" depends="-check-target.java.home,build,-def-run,-get-tool-and-args"
    1.29              description="run tool">
    1.30 -        <echo level="info" message="${bcp}"/>
    1.31 -        <echo level="info" message="Run ${bootstrap}${langtools.tool.name} with args ${langtools.tool.args}"/>
    1.32 -        <run bcp="${bcp}" mainclass="com.sun.tools.${langtools.tool.name}.Main" args="${langtools.tool.args}"/>
    1.33 +        <echo level="info" message="${with_bootclasspath}"/>
    1.34 +        <echo level="info" message="Run ${use_bootstrap}${langtools.tool.name} with args ${langtools.tool.args}"/>
    1.35 +        <run bcp="${with_bootclasspath}" mainclass="com.sun.tools.${langtools.tool.name}.Main" args="${langtools.tool.args}"/>
    1.36      </target>
    1.37  
    1.38      <!-- Run a selected class. (action: run.single;  shift-F6) -->
    1.39 @@ -145,9 +144,9 @@
    1.40      <!-- Debug tool in NetBeans. -->
    1.41  
    1.42      <target name="debug" depends="-check-target.java.home,-def-run,-def-start-debugger,-get-tool-and-args,build" if="netbeans.home">
    1.43 -        <echo level="info" message="Debug ${boostrap}${langtools.tool.name} with args ${langtools.tool.args}"/>
    1.44 +        <echo level="info" message="Debug ${use_bootstrap}${langtools.tool.name} with args ${langtools.tool.args}"/>
    1.45          <start-debugger/>
    1.46 -        <run bcp="${bcp}" mainclass="com.sun.tools.${langtools.tool.name}.Main" args="${langtools.tool.args}" jpda.jvmargs="${jpda.jvmargs}"/>
    1.47 +        <run bcp="${with_bootclasspath}" mainclass="com.sun.tools.${langtools.tool.name}.Main" args="${langtools.tool.args}" jpda.jvmargs="${jpda.jvmargs}"/>
    1.48      </target>
    1.49  
    1.50      <!-- Debug a selected class . -->
    1.51 @@ -237,12 +236,12 @@
    1.52          <macrodef name="run">
    1.53              <attribute name="mainclass"/>
    1.54              <attribute name="args" default=""/>
    1.55 -            <attribute name="bcp" default="${build.classes.dir}"/>
    1.56 +            <attribute name="bcp" default="${with_bootclasspath}"/>
    1.57              <attribute name="jpda.jvmargs" default=""/>
    1.58  
    1.59              <sequential>
    1.60                  <java fork="true" jvm="${target.java}" classname="@{mainclass}">
    1.61 -                    <jvmarg line="-Xbootclasspath/p:${bcp}"/>
    1.62 +                    <jvmarg line="-Xbootclasspath/p:@{bcp}"/>
    1.63                      <jvmarg line="@{jpda.jvmargs}"/>
    1.64                      <arg line="@{args}"/>
    1.65                  </java>

     2.1 --- a/make/tools/anttasks/SelectToolTask.java	Thu Sep 26 20:07:43 2013 +0200
     2.2 +++ b/make/tools/anttasks/SelectToolTask.java	Thu Sep 26 19:06:09 2013 +0100
     2.3 @@ -87,8 +87,9 @@
     2.4              this(toolName, false);
     2.5          }
     2.6  
     2.7 -        ToolChoices(String toolName, boolean boostrap) {
     2.8 +        ToolChoices(String toolName, boolean bootstrap) {
     2.9              this.toolName = toolName;
    2.10 +            this.bootstrap = bootstrap;
    2.11          }
    2.12  
    2.13          @Override