Bug 1439256: Move windows installer defines into moz.build; r=Fallen
authorTom Prince <mozilla@hocat.ca>
Wed, 22 Nov 2017 16:43:58 -0700
changeset 30296 5d2d7680dacb87c5a68a8450251909cd2696f748
parent 30295 213368cb1707b422ab35cb2a39fa0e1f706dd02e
child 30297 6f3a78ceb39bff767f01e16c4712469b90a6399b
push id2140
push userclokep@gmail.com
push dateMon, 12 Mar 2018 19:42:51 +0000
treeherdercomm-beta@2d485f0d3723 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersFallen
bugs1439256
Bug 1439256: Move windows installer defines into moz.build; r=Fallen Differential Revision: https://phabricator.services.mozilla.com/D601
mail/installer/windows/Makefile.in
mail/installer/windows/moz.build
--- a/mail/installer/windows/Makefile.in
+++ b/mail/installer/windows/Makefile.in
@@ -2,51 +2,36 @@
 # 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/.
 
 include $(moztopsrcdir)/toolkit/mozapps/installer/package-name.mk
 
 CONFIG_DIR = instgen
 SFX_MODULE = $(commtopsrcdir)/other-licenses/7zstub/thunderbird/7zSD.sfx
 
-DEFINES += -DMOZ_APP_VERSION=$(MOZ_APP_VERSION)
-PRE_RELEASE_SUFFIX := ""
-DEFINES += -DPRE_RELEASE_SUFFIX="$(PRE_RELEASE_SUFFIX)"
-
-ifdef MOZ_UPDATER
-DEFINES += -DMOZ_UPDATER=1
-endif
-
 INSTALLER_FILES = \
 	app.tag \
 	nsis/installer.nsi \
 	nsis/uninstaller.nsi \
 	nsis/shared.nsh \
 	$(NULL)
 
 ifdef MOZ_MAINTENANCE_SERVICE
 INSTALLER_FILES += \
 	nsis/maintenanceservice_installer.nsi \
 	$(NULL)
 endif
 
-
 BRANDING_FILES = \
 	branding.nsi \
 	wizHeader.bmp \
 	wizHeaderRTL.bmp \
 	wizWatermark.bmp \
 	$(NULL)
 
-DEFINES += \
-	-DMOZ_APP_NAME=$(MOZ_APP_NAME) \
-	-DMOZ_APP_DISPLAYNAME='${MOZ_APP_DISPLAYNAME}' \
-	-DMOZILLA_VERSION=${MOZILLA_VERSION} \
-	$(NULL)
-
 LOCALE_TOPDIR=$(commtopsrcdir)
 LOCALE_RELATIVEDIR=mail/installer/windows
 
 include $(moztopsrcdir)/config/config.mk
 
 ifdef IS_LANGUAGE_REPACK
 PPL_LOCALE_ARGS = \
   --l10n-dir=$(REAL_LOCALE_MERGEDIR)/mail/installer \
--- a/mail/installer/windows/moz.build
+++ b/mail/installer/windows/moz.build
@@ -1,4 +1,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['MOZ_APP_NAME'] = CONFIG['MOZ_APP_NAME']
+DEFINES['MOZ_APP_DISPLAYNAME'] = CONFIG['MOZ_APP_DISPLAYNAME']
+DEFINES['MOZILLA_VERSION'] = CONFIG['MOZILLA_VERSION']
+DEFINES['MOZ_APP_VERSION'] = CONFIG['MOZ_APP_VERSION']
+DEFINES['PRE_RELEASE_SUFFIX'] = ''