Mercurial > jdk8-mips64-public > langtools / changeset

     1.1 --- a/make/build.xml	Wed Jun 22 23:26:00 2011 -0700
     1.2 +++ b/make/build.xml	Thu Jun 23 17:30:49 2011 -0700
     1.3 @@ -336,7 +336,9 @@
     1.4              classpath="${dist.lib.dir}/javac.jar"
     1.5              includeAntRuntime="no"
     1.6              debug="${javac.debug}"
     1.7 -            debuglevel="${javac.debuglevel}"/>
     1.8 +            debuglevel="${javac.debuglevel}">
     1.9 +            <compilerarg line="${javac.lint.opts}"/>
    1.10 +        </javac>
    1.11          <java fork="true"
    1.12              jvm="${target.java.home}/bin/java"
    1.13              dir="test/tools/javac/diags"
    1.14 @@ -857,7 +859,10 @@
    1.15                 srcdir="${make.tools.dir}/CompileProperties"
    1.16                 destdir="${build.toolclasses.dir}/"
    1.17                 classpath="${ant.core.lib}"
    1.18 -               includeantruntime="false"/>
    1.19 +               bootclasspath="${boot.java.home}/jre/lib/rt.jar"
    1.20 +               includeantruntime="false">
    1.21 +            <compilerarg line="${javac.lint.opts}"/>
    1.22 +        </javac>
    1.23          <taskdef name="pcompile"
    1.24                   classname="CompilePropertiesTask"
    1.25                   classpath="${build.toolclasses.dir}/"/>
    1.26 @@ -874,6 +879,7 @@
    1.27                 classpath="${ant.core.lib}"
    1.28                 includeantruntime="false">
    1.29              <compilerarg value="-Xbootclasspath/p:${build.bootstrap.dir}/classes"/>
    1.30 +            <compilerarg line="${javac.lint.opts}"/>
    1.31          </javac>
    1.32          <taskdef name="genstubs"
    1.33                   classname="GenStubs$$Ant"

     2.1 --- a/make/tools/CompileProperties/CompileProperties.java	Wed Jun 22 23:26:00 2011 -0700
     2.2 +++ b/make/tools/CompileProperties/CompileProperties.java	Thu Jun 23 17:30:49 2011 -0700
     2.3 @@ -222,13 +222,13 @@
     2.4                  sortedKeys.add((String)key);
     2.5              }
     2.6              Collections.sort(sortedKeys);
     2.7 -            Iterator keys = sortedKeys.iterator();
     2.8 +            Iterator<String> keys = sortedKeys.iterator();
     2.9  
    2.10              StringBuffer data = new StringBuffer();
    2.11  
    2.12              while (keys.hasNext()) {
    2.13 -                Object key = keys.next();
    2.14 -                data.append("            { \"" + escape((String)key) + "\", \"" +
    2.15 +                String key = keys.next();
    2.16 +                data.append("            { \"" + escape(key) + "\", \"" +
    2.17                          escape((String)p.get(key)) + "\" },\n");
    2.18              }
    2.19