File nvl544794.patch of Package cross-avr-gcc44

Overview Repositories Revisions Requests Users Attributes Meta

File nvl544794.patch of Package cross-avr-gcc44

Index: libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java
===================================================================
*** libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java	(revision 152176)
--- libjava/classpath/tools/gnu/classpath/tools/jar/Creator.java	(working copy)
*************** public class Creator
*** 216,226 ****
      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") +
  		  " (" + System.getProperty("java.vendor") + ")");
      outputStream = new JarOutputStream(os, manifest);
      // FIXME: this sets the method too late for the manifest file.
      outputStream.setMethod(parameters.storageMode);
--- 216,229 ----
      manifest = createManifest(parameters);
      /* If no version is specified, provide the same manifest version default
       * as Sun's jar tool */
!     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);

Places

File nvl544794.patch of Package cross-avr-gcc44

Places