Bug 1345422 - Specify the right sfx package and installer path for TB/IB/SM. r=jorgk,clokep,IanN a=jorgk
authorEdmund Wong <ewong@pw-wspx.org>
Thu, 16 Mar 2017 03:03:00 +0100
changeset 21326 20d90b5d3da4b80622a7f180c8b6e1dabac286d4
parent 21325 18e67aaff1534c6a3b6133156c1fca112d8dc79d
child 21327 04d93e773a776bb86827873ba9d7a7d1246c7458
push id12967
push usermozilla@jorgk.com
push dateWed, 22 Mar 2017 13:40:59 +0000
treeherdercomm-central@20d90b5d3da4 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersjorgk, clokep, IanN, jorgk
bugs1345422
Bug 1345422 - Specify the right sfx package and installer path for TB/IB/SM. r=jorgk,clokep,IanN a=jorgk
im/locales/Makefile.in
mail/locales/Makefile.in
suite/locales/Makefile.in
--- a/im/locales/Makefile.in
+++ b/im/locales/Makefile.in
@@ -37,16 +37,19 @@ PP_TARGETS += L10N_PREF_JS_EXPORTS
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png
 MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink "/Applications:/ "
 endif
 
+MOZ_SFX_PACKAGE=other-licenses/7zstub/instantbird/7zSD.sfx
+MOZ_INSTALLER_PATH=im/installer/windows
+
 ifeq (WINNT,$(OS_ARCH))
 UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
     $(NSINSTALL) -D $(STAGEDIST)/uninstall; \
     cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
     $(RM) $(ABS_DIST)/l10n-stage/setup.exe; \
     cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \
     $(NULL)
 endif
--- a/mail/locales/Makefile.in
+++ b/mail/locales/Makefile.in
@@ -33,16 +33,19 @@ PP_TARGETS += L10N_PREF_JS_EXPORTS
 
 ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT))
 MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png
 MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
 endif
 
+MOZ_SFX_PACKAGE=other-licenses/7zstub/thunderbird/7zSD.sfx
+MOZ_INSTALLER_PATH=mail/installer/windows
+
 ifeq (WINNT,$(OS_ARCH))
 UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
     $(NSINSTALL) -D $(STAGEDIST)/uninstall; \
     cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
     $(RM) $(ABS_DIST)/l10n-stage/setup.exe; \
     cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \
     $(NULL)
 endif
--- a/suite/locales/Makefile.in
+++ b/suite/locales/Makefile.in
@@ -35,16 +35,19 @@ PP_TARGETS += L10N_PREF_JS_EXPORTS
 
 ifeq ($(MOZ_WIDGET_TOOLKIT),cocoa)
 MOZ_PKG_MAC_DSSTORE=$(ABS_DIST)/branding/dsstore
 MOZ_PKG_MAC_BACKGROUND=$(ABS_DIST)/branding/background.png
 MOZ_PKG_MAC_ICON=$(ABS_DIST)/branding/disk.icns
 MOZ_PKG_MAC_EXTRA=--symlink '/Applications:/ '
 endif
 
+MOZ_SFX_PACKAGE=other-licenses/7zstub/seamonkey/7zSD.sfx
+MOZ_INSTALLER_PATH=suite/installer/windows
+
 ifeq (WINNT,$(OS_ARCH))
 UNINSTALLER_PACKAGE_HOOK = $(RM) -r $(STAGEDIST)/uninstall; \
 	$(NSINSTALL) -D $(STAGEDIST)/uninstall; \
 	cp ../installer/windows/l10ngen/helper.exe $(STAGEDIST)/uninstall; \
 	$(RM) $(ABS_DIST)/l10n-stage/setup.exe; \
 	cp ../installer/windows/l10ngen/setup.exe $(ABS_DIST)/l10n-stage; \
 	$(NULL)
 endif