PR cp-tools/39177 * tools/gnu/classpath/tools/jar/Creator.java
2009-10-22 Richard Guenther <rguenther@suse.de> PR cp-tools/39177 * tools/gnu/classpath/tools/jar/Creator.java (writeCommandLineEntries): Do not use uninitialized manifest. * tools/classes/gnu/classpath/tools/jar/Creator.class: Re-generated. From-SVN: r153461
This commit is contained in:
parent
2c9281556f
commit
78e3343044
|
@ -1,3 +1,10 @@
|
||||||
|
2009-10-22 Richard Guenther <rguenther@suse.de>
|
||||||
|
|
||||||
|
PR cp-tools/39177
|
||||||
|
* tools/gnu/classpath/tools/jar/Creator.java (writeCommandLineEntries):
|
||||||
|
Do not use uninitialized manifest.
|
||||||
|
* tools/classes/gnu/classpath/tools/jar/Creator.class: Re-generated.
|
||||||
|
|
||||||
2009-08-26 Dave Korn <dave.korn.cygwin@gmail.com>
|
2009-08-26 Dave Korn <dave.korn.cygwin@gmail.com>
|
||||||
|
|
||||||
* ltmain.sh (removedotparts): Don't use comma as 's' separator.
|
* ltmain.sh (removedotparts): Don't use comma as 's' separator.
|
||||||
|
|
Binary file not shown.
|
@ -216,11 +216,14 @@ public class Creator
|
||||||
manifest = createManifest(parameters);
|
manifest = createManifest(parameters);
|
||||||
/* If no version is specified, provide the same manifest version default
|
/* If no version is specified, provide the same manifest version default
|
||||||
* as Sun's jar tool */
|
* as Sun's jar tool */
|
||||||
Attributes attr = manifest.getMainAttributes();
|
if (parameters.wantManifest)
|
||||||
if (attr.getValue(Attributes.Name.MANIFEST_VERSION) == null)
|
{
|
||||||
attr.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1.0");
|
Attributes attr = manifest.getMainAttributes();
|
||||||
attr.putValue("Created-By", System.getProperty("java.version") +
|
if (attr.getValue(Attributes.Name.MANIFEST_VERSION) == null)
|
||||||
|
attr.putValue(Attributes.Name.MANIFEST_VERSION.toString(), "1.0");
|
||||||
|
attr.putValue("Created-By", System.getProperty("java.version") +
|
||||||
" (" + System.getProperty("java.vendor") + ")");
|
" (" + System.getProperty("java.vendor") + ")");
|
||||||
|
}
|
||||||
outputStream = new JarOutputStream(os, manifest);
|
outputStream = new JarOutputStream(os, manifest);
|
||||||
// FIXME: this sets the method too late for the manifest file.
|
// FIXME: this sets the method too late for the manifest file.
|
||||||
outputStream.setMethod(parameters.storageMode);
|
outputStream.setMethod(parameters.storageMode);
|
||||||
|
|
Loading…
Reference in New Issue