Bug 1436662 - Fix Thunderbird support for building windows packages. r=mshal, a=jcristau
authorTom Prince <mozilla@hocat.ca>
Wed, 18 Apr 2018 20:52:07 -0600
changeset 463629 300908ac5dc7
parent 463628 4f7281fb6542
child 463630 79bfebd1166d
push id1717
push userryanvm@gmail.com
push date2018-05-15 21:44 +0000
treeherdermozilla-release@79bfebd1166d [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersmshal, jcristau
bugs1436662
milestone60.0.1
Bug 1436662 - Fix Thunderbird support for building windows packages. r=mshal, a=jcristau 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' \