Bug 974830 - Expose MOZ_APP_DISPLAYNAME in application.ini if it differs from MOZ_APP_BASENAME. r=bsmedberg, a=sledru
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 20 Feb 2014 18:42:28 +0900
changeset 182975 faf9cc2047ef712159ddeee954a9d6d55bab5595
parent 182974 927e4ae612b6899234212bdcb5e261ec5ec387c0
child 182976 351b38e8c46f1a16f75e5fe2b705dc920704c0ab
push id3343
push userffxbld
push dateMon, 17 Mar 2014 21:55:32 +0000
treeherdermozilla-beta@2f7d3415f79f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg, sledru
bugs974830
milestone29.0a2
Bug 974830 - Expose MOZ_APP_DISPLAYNAME in application.ini if it differs from MOZ_APP_BASENAME. r=bsmedberg, a=sledru
build/application.ini
build/moz.build
--- a/build/application.ini
+++ b/build/application.ini
@@ -13,16 +13,19 @@
 ; This Source Code Form is subject to the terms of the Mozilla Public
 ; License, v. 2.0. If a copy of the MPL was not distributed with this
 ; file, You can obtain one at http://mozilla.org/MPL/2.0/.
 #endif
 #filter substitution
 [App]
 Vendor=@MOZ_APP_VENDOR@
 Name=@MOZ_APP_BASENAME@
+#ifdef MOZ_APP_DISPLAYNAME
+CodeName=@MOZ_APP_DISPLAYNAME@
+#endif
 Version=@MOZ_APP_VERSION@
 #ifdef MOZ_APP_PROFILE
 Profile=@MOZ_APP_PROFILE@
 #endif
 BuildID=@APP_BUILDID@
 #ifdef MOZ_SOURCE_REPO
 SourceRepository=@MOZ_SOURCE_REPO@
 #endif
--- a/build/moz.build
+++ b/build/moz.build
@@ -25,16 +25,19 @@ if CONFIG['MOZ_WIDGET_TOOLKIT'] == 'andr
         'mobile/robocop',
     ]
 
 for var in ('GRE_MILESTONE', 'MOZ_APP_VERSION', 'MOZ_APP_BASENAME',
             'MOZ_APP_VENDOR', 'MOZ_APP_ID', 'MAR_CHANNEL_ID',
             'ACCEPTED_MAR_CHANNEL_IDS'):
     DEFINES[var] = CONFIG[var]
 
+if CONFIG['MOZ_APP_DISPLAYNAME'] != CONFIG['MOZ_APP_BASENAME']:
+    DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']
+
 if CONFIG['MOZ_BUILD_APP'] == 'browser':
     DEFINES['MOZ_BUILD_APP_IS_BROWSER'] = True
 
 if CONFIG['MOZ_APP_PROFILE']:
     DEFINES['MOZ_APP_PROFILE'] = CONFIG['MOZ_APP_PROFILE']
 
 for var in ('MOZ_CRASHREPORTER', 'MOZ_PROFILE_MIGRATOR',
             'MOZ_EXTENSION_MANAGER', 'MOZ_APP_STATIC_INI'):