Bug 1436662: Fix Thunderbird support for building windows packages; r=mshal
authorTom Prince <mozilla@hocat.ca>
Wed, 18 Apr 2018 20:52:07 -0600
changeset 468253 bc8bc00108b74a90e03db5e68033ff55fb218009
parent 468252 ecd4ccf11c070978542a43aab32fbe558f703f51
child 468254 e998b6b3f9b0fda500d7df3595aeeb955fc3301c
push id9165
push userasasaki@mozilla.com
push dateThu, 26 Apr 2018 21:04:54 +0000
treeherdermozilla-beta@064c3804de2e [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal
bugs1436662
milestone61.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 1436662: Fix Thunderbird support for building windows packages; r=mshal Differential Revision: https://phabricator.services.mozilla.com/D991
toolkit/mozapps/installer/windows/nsis/makensis.mk
--- a/toolkit/mozapps/installer/windows/nsis/makensis.mk
+++ b/toolkit/mozapps/installer/windows/nsis/makensis.mk
@@ -54,19 +54,19 @@ ifdef MOZ_EXTERNAL_SIGNING_FORMAT
 endif
 
 ifdef ZIP_IN
 installer:: $(CONFIG_DIR)/setup.exe $(ZIP_IN)
 	@echo 'Packaging $(WIN32_INSTALLER_OUT).'
 	$(NSINSTALL) -D '$(ABS_DIST)/$(PKG_INST_PATH)'
 	$(MOZILLA_DIR)/mach repackage installer \
 	  -o '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe' \
-	  --package-name firefox \
+	  --package-name '$(MOZ_PKG_DIR)' \
 	  --package '$(ZIP_IN)' \
-	  --tag $(topsrcdir)/browser/installer/windows/app.tag \
+	  --tag $(topsrcdir)/$(MOZ_BUILD_APP)/installer/windows/app.tag \
 	  --setupexe $(CONFIG_DIR)/setup.exe \
 	  --sfx-stub $(SFX_MODULE)
 ifdef MOZ_EXTERNAL_SIGNING_FORMAT
 	$(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f)) "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe"
 endif
 ifdef MOZ_STUB_INSTALLER
 	$(MOZILLA_DIR)/mach repackage installer \
 	  -o '$(ABS_DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe' \