diff options
| author | Richard Guenther <rguenther@suse.de> | 2009-10-22 15:41:32 +0000 |
|---|---|---|
| committer | Richard Guenther <rguenther@suse.de> | 2009-10-22 15:41:32 +0000 |
| commit | 76afb10066189f3e1e739b37e9624d2648135d69 (patch) | |
| tree | 1a4ea3f3a9c761c67316f3ac3b9417142b9d69b3 | |
| parent | 1e8fbfd0876c5bac8430158f8d026059c3a0d435 (diff) | |
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.
git-svn-id: https://gcc.gnu.org/svn/gcc/trunk@153461 138bc75d-0d04-0410-961f-82ee72b054a4
| -rw-r--r-- | libjava/classpath/ChangeLog | 7 | ||||
| -rw-r--r-- | libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class | bin | 7259 -> 6001 bytes | |||
| -rw-r--r-- | libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java | 11 |
3 files changed, 14 insertions, 4 deletions
diff --git a/libjava/classpath/ChangeLog b/libjava/classpath/ChangeLog index 475e6bdc1b3..a2df28c46cf 100644 --- a/libjava/classpath/ChangeLog +++ b/libjava/classpath/ChangeLog @@ -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> * ltmain.sh (removedotparts): Don't use comma as 's' separator. diff --git a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class Binary files differindex 517fe0c7a33..ad4cc74f732 100644 --- a/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class +++ b/libjava/classpath/tools/classes/gnu/classpath/tools/jar/Creator.class diff --git a/libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java b/libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java index a6b6112caa1..6ffce18ac05 100644 --- a/libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java +++ b/libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java @@ -216,11 +216,14 @@ public class Creator manifest = createManifest(parameters); /* If no version is specified, provide the same manifest version default * as Sun's jar tool */ - Attributes attr = manifest.getMainAttributes(); - 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") + + if (parameters.wantManifest) + { + Attributes attr = manifest.getMainAttributes(); + 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") + ")"); + } outputStream = new JarOutputStream(os, manifest); // FIXME: this sets the method too late for the manifest file. outputStream.setMethod(parameters.storageMode); |