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 298543 931a13f5c867447f62b178e3d3a8dc70d9969f68
parent 298542 6ede2ff230fb3612ab735dc6f34bc6d47604cbc4
child 298544 0038529143f2f3be8f05eb2d18a6b59961bad8d9
push id962
push userjlund@mozilla.com
push dateFri, 04 Dec 2015 23:28:54 +0000
treeherdermozilla-release@23a2d286e80f [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal, lizzard
bugs1225918
milestone43.0
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']