Fix up the Mac installer’s Info.plist, build with branding info

BUG= Review-Url: https://codereview.chromium.org/2359953003 Cr-Commit-Position: refs/heads/master@{#420450}
Denger-Network · Sep 22, 2016 · a00c1a9 · a00c1a9
1 parent 624769f
commit a00c1a9
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 10 deletions.
diff --git a/build/util/branding.gni b/build/util/branding.gni
@@ -14,10 +14,13 @@
 
 import("//build/config/chrome_build.gni")
 
-_branding_dictionary_template = "full_name = \"@PRODUCT_FULLNAME@\" " +
-                                "short_name = \"@PRODUCT_SHORTNAME@\" " +
-                                "bundle_id = \"@MAC_BUNDLE_ID@\" " +
-                                "creator_code = \"@MAC_CREATOR_CODE@\" "
+_branding_dictionary_template =
+    "full_name = \"@PRODUCT_FULLNAME@\" " +
+    "short_name = \"@PRODUCT_SHORTNAME@\" " +
+    "bundle_id = \"@MAC_BUNDLE_ID@\" " +
+    "creator_code = \"@MAC_CREATOR_CODE@\" " +
+    "installer_full_name = \"@PRODUCT_INSTALLER_FULLNAME@\" " +
+    "installer_short_name = \"@PRODUCT_INSTALLER_SHORTNAME@\" "
 
 _branding_file = "//chrome/app/theme/$branding_path_component/BRANDING"
 _result = exec_script("version.py",
@@ -32,6 +35,8 @@ _result = exec_script("version.py",
 
 chrome_product_full_name = _result.full_name
 chrome_product_short_name = _result.short_name
+chrome_product_installer_full_name = _result.installer_full_name
+chrome_product_installer_short_name = _result.installer_short_name
 
 if (is_mac) {
   chrome_mac_bundle_id = _result.bundle_id

diff --git a/chrome/installer/mac/app/BUILD.gn b/chrome/installer/mac/app/BUILD.gn
@@ -2,8 +2,9 @@
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
-import("//testing/test.gni")
 import("//build/config/mac/rules.gni")
+import("//build/util/branding.gni")
+import("//testing/test.gni")
 
 source_set("mac_installer_base") {
   visibility = [ ":*" ]
@@ -29,8 +30,13 @@ source_set("mac_installer_base") {
 }
 
 mac_app_bundle("mac_installer_app") {
+  output_name = "$chrome_product_installer_full_name"
   info_plist = "Info.plist"
-  extra_substitutions = [ "MACOSX_DEPLOYMENT_TARGET=10.9" ]
+  extra_substitutions = [
+    "MACOSX_DEPLOYMENT_TARGET=10.9",
+    "PRODUCT_INSTALLER_FULLNAME=$chrome_product_installer_full_name",
+    "CHROMIUM_BUNDLE_ID=$chrome_mac_bundle_id",
+  ]
   sources = [
     "AppDelegate.h",
     "AppDelegate.mm",

diff --git a/chrome/installer/mac/app/Info.plist b/chrome/installer/mac/app/Info.plist
@@ -5,15 +5,15 @@
   <key>CFBundleDevelopmentRegion</key>
   <string>en</string>
   <key>CFBundleExecutable</key>
-  <string>$(EXECUTABLE_NAME)</string>
+  <string>${EXECUTABLE_NAME}</string>
   <key>CFBundleIconFile</key>
   <string></string>
   <key>CFBundleIdentifier</key>
-  <string>$(PRODUCT_BUNDLE_IDENTIFIER)</string>
+  <string>${CHROMIUM_BUNDLE_ID}.installer</string>
   <key>CFBundleInfoDictionaryVersion</key>
   <string>6.0</string>
   <key>CFBundleName</key>
-  <string>$(PRODUCT_NAME)</string>
+  <string>${PRODUCT_INSTALLER_FULLNAME}</string>
   <key>CFBundlePackageType</key>
   <string>APPL</string>
   <key>CFBundleShortVersionString</key>
@@ -23,7 +23,7 @@
   <key>CFBundleVersion</key>
   <string>1</string>
   <key>LSMinimumSystemVersion</key>
-  <string>$(MACOSX_DEPLOYMENT_TARGET)</string>
+  <string>${MACOSX_DEPLOYMENT_TARGET}</string>
   <key>NSHumanReadableCopyright</key>
   <string>Copyright © 2016 Google. All rights reserved.</string>
   <key>NSMainNibFile</key>