Bug 461758 - [Mac] Branding iron should set CFBundleDisplayName
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
index 183653d..b4c060b 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/BrandingIron.java
@@ -504,8 +504,10 @@
}
//Deal with error case
+ String capitalizedName = name.substring(0, 1).toUpperCase() + name.substring(1);
infoPListEditor.setKey(InfoPListEditor.MARKER_KEY, name);
- infoPListEditor.setKey(InfoPListEditor.BUNDLE_KEY, name);
+ infoPListEditor.setKey(InfoPListEditor.BUNDLE_KEY, capitalizedName);
+ infoPListEditor.setKey(InfoPListEditor.BUNDLE_DISPLAYNAME_KEY, capitalizedName);
infoPListEditor.setKey(InfoPListEditor.BUNDLE_ID_KEY, id == null ? name : id);
if (description != null)
infoPListEditor.setKey(InfoPListEditor.BUNDLE_INFO_KEY, description);
diff --git a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/InfoPListEditor.java b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/InfoPListEditor.java
index 72c8885..9599eb2 100644
--- a/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/InfoPListEditor.java
+++ b/bundles/org.eclipse.equinox.p2.publisher.eclipse/src/org/eclipse/equinox/internal/p2/publisher/eclipse/InfoPListEditor.java
@@ -26,6 +26,7 @@
public static final String MARKER_KEY = "CFBundleExecutable"; //$NON-NLS-1$
public static final String BUNDLE_KEY = "CFBundleName"; //$NON-NLS-1$
public static final String BUNDLE_ID_KEY = "CFBundleIdentifier"; //$NON-NLS-1$
+ public static final String BUNDLE_DISPLAYNAME_KEY = "CFBundleDisplayName"; //$NON-NLS-1$
public static final String BUNDLE_INFO_KEY = "CFBundleGetInfoString"; //$NON-NLS-1$
public static final String BUNDLE_VERSION_KEY = "CFBundleVersion"; //$NON-NLS-1$
public static final String BUNDLE_SHORT_VERSION_KEY = "CFBundleShortVersionString"; //$NON-NLS-1$
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java
index 37101f8..158f66e 100644
--- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java
+++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/publisher/actions/EquinoxExecutableActionTest.java
@@ -215,10 +215,10 @@
assertTrue(found);
try {
String contents = readContentsAndClose(zip.getInputStream(candidate));
- System.out.println("INFO.PLIST.CONTENT IS----> " + contents);
assertEquals(id, getPlistStringValue(contents, "CFBundleIdentifier"));
assertEquals(EXECUTABLE_NAME, getPlistStringValue(contents, "CFBundleExecutable"));
assertEquals(EXECUTABLE_NAME, getPlistStringValue(contents, "CFBundleName"));
+ assertEquals(EXECUTABLE_NAME, getPlistStringValue(contents, "CFBundleDisplayName"));
assertEquals(version.toString(), getPlistStringValue(contents, "CFBundleVersion"));
} catch (IOException e) {
fail();
