Bug 1225918 - avoid quoting MOZ_APP_DISPLAYNAME when used as a DEFINE; r=mshal, a=lizzard
authorNathan Froyd <froydnj@mozilla.com>
Wed, 18 Nov 2015 13:44:20 -0500
changeset 305689 a256d40aa813723030043f469ae57b3b9e1c8c29
parent 305688 444d8d6198d29c1463cf274e3fd1628525e38b4c
child 305690 cfcf9ab4f70505ab3b4058e957f16a92026b035b
push id1001
push userraliiev@mozilla.com
push dateMon, 18 Jan 2016 19:06:03 +0000
treeherdermozilla-release@8b89261f3ac4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal, lizzard
bugs1225918
milestone44.0a2
Bug 1225918 - avoid quoting MOZ_APP_DISPLAYNAME when used as a DEFINE; r=mshal, a=lizzard Moving DEFINES from Makefile.in to moz.build in browser/installer/windows/ kept the single quotes for MOZ_APP_DISPLAYNAME. Unfortunately, the patch author missed that those quotes were there for the shell's benefit, not as a part of the defined value. These extraneous quotes look rather unbecoming in the installer. Since mozbuild adds the appropriate quoting to a defined value, we can simply forego the quoting in the moz.build file.
browser/installer/windows/moz.build
--- a/browser/installer/windows/moz.build
+++ b/browser/installer/windows/moz.build
@@ -2,10 +2,10 @@
 # vim: set filetype=python:
 # 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/.
 
 DEFINES['APP_VERSION'] = CONFIG['FIREFOX_VERSION']
 
 DEFINES['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME']
-DEFINES['MOZ_APP_DISPLAYNAME'] = "'%s'" % CONFIG['MOZ_APP_DISPLAYNAME']
+DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']
 DEFINES['MOZILLA_VERSION'] = CONFIG['MOZILLA_VERSION']