Bug 974830 - Expose MOZ_APP_DISPLAYNAME in application.ini if it differs from MOZ_APP_BASENAME. r=bsmedberg
authorMike Hommey <mh+mozilla@glandium.org>
Thu, 20 Feb 2014 18:42:28 +0900
changeset 188006 673a7e313372f3bf247e76199cbec5a0cf383fe0
parent 188005 6deadaf3af446ef63e47be9711a86ad0cdd6f3f4
child 188007 59a30471542b3ab88418b487972d78f093d34565
push id474
push userasasaki@mozilla.com
push dateMon, 02 Jun 2014 21:01:02 +0000
treeherdermozilla-release@967f4cf1b31c [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersbsmedberg
bugs974830
milestone30.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 974830 - Expose MOZ_APP_DISPLAYNAME in application.ini if it differs from MOZ_APP_BASENAME. r=bsmedberg
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'):