parent
55d52a83a8
commit
d44dc19842
@ -336,7 +336,9 @@
|
|||||||
classpath="${dist.lib.dir}/javac.jar"
|
classpath="${dist.lib.dir}/javac.jar"
|
||||||
includeAntRuntime="no"
|
includeAntRuntime="no"
|
||||||
debug="${javac.debug}"
|
debug="${javac.debug}"
|
||||||
debuglevel="${javac.debuglevel}"/>
|
debuglevel="${javac.debuglevel}">
|
||||||
|
<compilerarg line="${javac.lint.opts}"/>
|
||||||
|
</javac>
|
||||||
<java fork="true"
|
<java fork="true"
|
||||||
jvm="${target.java.home}/bin/java"
|
jvm="${target.java.home}/bin/java"
|
||||||
dir="test/tools/javac/diags"
|
dir="test/tools/javac/diags"
|
||||||
@ -857,7 +859,10 @@
|
|||||||
srcdir="${make.tools.dir}/CompileProperties"
|
srcdir="${make.tools.dir}/CompileProperties"
|
||||||
destdir="${build.toolclasses.dir}/"
|
destdir="${build.toolclasses.dir}/"
|
||||||
classpath="${ant.core.lib}"
|
classpath="${ant.core.lib}"
|
||||||
includeantruntime="false"/>
|
bootclasspath="${boot.java.home}/jre/lib/rt.jar"
|
||||||
|
includeantruntime="false">
|
||||||
|
<compilerarg line="${javac.lint.opts}"/>
|
||||||
|
</javac>
|
||||||
<taskdef name="pcompile"
|
<taskdef name="pcompile"
|
||||||
classname="CompilePropertiesTask"
|
classname="CompilePropertiesTask"
|
||||||
classpath="${build.toolclasses.dir}/"/>
|
classpath="${build.toolclasses.dir}/"/>
|
||||||
@ -874,6 +879,7 @@
|
|||||||
classpath="${ant.core.lib}"
|
classpath="${ant.core.lib}"
|
||||||
includeantruntime="false">
|
includeantruntime="false">
|
||||||
<compilerarg value="-Xbootclasspath/p:${build.bootstrap.dir}/classes"/>
|
<compilerarg value="-Xbootclasspath/p:${build.bootstrap.dir}/classes"/>
|
||||||
|
<compilerarg line="${javac.lint.opts}"/>
|
||||||
</javac>
|
</javac>
|
||||||
<taskdef name="genstubs"
|
<taskdef name="genstubs"
|
||||||
classname="GenStubs$$Ant"
|
classname="GenStubs$$Ant"
|
||||||
|
@ -222,13 +222,13 @@ public class CompileProperties {
|
|||||||
sortedKeys.add((String)key);
|
sortedKeys.add((String)key);
|
||||||
}
|
}
|
||||||
Collections.sort(sortedKeys);
|
Collections.sort(sortedKeys);
|
||||||
Iterator keys = sortedKeys.iterator();
|
Iterator<String> keys = sortedKeys.iterator();
|
||||||
|
|
||||||
StringBuffer data = new StringBuffer();
|
StringBuffer data = new StringBuffer();
|
||||||
|
|
||||||
while (keys.hasNext()) {
|
while (keys.hasNext()) {
|
||||||
Object key = keys.next();
|
String key = keys.next();
|
||||||
data.append(" { \"" + escape((String)key) + "\", \"" +
|
data.append(" { \"" + escape(key) + "\", \"" +
|
||||||
escape((String)p.get(key)) + "\" },\n");
|
escape((String)p.get(key)) + "\" },\n");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user