diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2018-02-17 05:29:44 -0500 |
|---|---|---|
| committer | Matt A. Tobin <email@mattatobin.com> | 2018-02-17 05:29:44 -0500 |
| commit | 433b04771173d6ca6697213d0281bc4888742113 (patch) | |
| tree | d4de6238a603d1fb39292ce93765bd539de0dd52 /toolkit/mozapps | |
| parent | 1da0e8a095d82dd6b9ad0c0a45a7ee3b9d80ded7 (diff) | |
| download | UXP-433b04771173d6ca6697213d0281bc4888742113.tar UXP-433b04771173d6ca6697213d0281bc4888742113.tar.gz UXP-433b04771173d6ca6697213d0281bc4888742113.tar.lz UXP-433b04771173d6ca6697213d0281bc4888742113.tar.xz UXP-433b04771173d6ca6697213d0281bc4888742113.zip | |
Remove stub installer - Part 1: Toolkit
Diffstat (limited to 'toolkit/mozapps')
| -rw-r--r-- | toolkit/mozapps/installer/upload-files.mk | 4 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/windows/nsis/makensis.mk | 16 |
2 files changed, 0 insertions, 20 deletions
diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk index 516331782..1fc9db579 100644 --- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -490,10 +490,6 @@ ifdef MOZ_SIGN_CMD UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(PACKAGE).asc) endif -ifdef MOZ_STUB_INSTALLER - UPLOAD_FILES += $(call QUOTED_WILDCARD,$(DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe) -endif - ifndef MOZ_PKG_SRCDIR MOZ_PKG_SRCDIR = $(topsrcdir) endif diff --git a/toolkit/mozapps/installer/windows/nsis/makensis.mk b/toolkit/mozapps/installer/windows/nsis/makensis.mk index 97608e0ce..aff6d29e9 100644 --- a/toolkit/mozapps/installer/windows/nsis/makensis.mk +++ b/toolkit/mozapps/installer/windows/nsis/makensis.mk @@ -45,18 +45,6 @@ $(CONFIG_DIR)/setup.exe:: $(INSTALL) $(addprefix $(MOZILLA_DIR)/other-licenses/nsis/Plugins/,$(CUSTOM_NSIS_PLUGINS)) $(CONFIG_DIR) $(INSTALL) $(addprefix $(MOZILLA_DIR)/other-licenses/nsis/,$(CUSTOM_UI)) $(CONFIG_DIR) cd $(CONFIG_DIR) && $(MAKENSISU) installer.nsi -ifdef MOZ_STUB_INSTALLER - cd $(CONFIG_DIR) && $(MAKENSISU) stub.nsi -ifdef MOZ_EXTERNAL_SIGNING_FORMAT - $(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT),-f $(f)) $(CONFIG_DIR)/setup-stub.exe -endif - $(MAKE) $(CONFIG_DIR)/7zSD.sfx - cd $(CONFIG_DIR) && $(CYGWIN_WRAPPER) 7z a -t7z $(ABS_CONFIG_DIR)/stub.7z setup-stub.exe -mx -m0=BCJ2 -m1=LZMA:d21 -m2=LZMA:d17 -m3=LZMA:d17 -mb0:1 -mb0s1:2 -mb0s2:3 - cat $(CONFIG_DIR)/7zSD.sfx $(CONFIG_DIR)/stub.tag $(CONFIG_DIR)/stub.7z > "$(CONFIG_DIR)/stub.exe" -ifdef MOZ_EXTERNAL_SIGNING_FORMAT_STUB - $(MOZ_SIGN_CMD) $(foreach f,$(MOZ_EXTERNAL_SIGNING_FORMAT_STUB),-f $(f)) $(CONFIG_DIR)/stub.exe -endif -endif # Support for building the uninstaller when repackaging locales ifeq ($(CONFIG_DIR),l10ngen) cd $(CONFIG_DIR) && $(MAKENSISU) uninstaller.nsi @@ -75,10 +63,6 @@ installer:: $(NSINSTALL) -D $(DIST)/$(PKG_INST_PATH) cat $(CONFIG_DIR)/7zSD.sfx $(CONFIG_DIR)/app.tag $(CONFIG_DIR)/app.7z > "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" chmod 0755 "$(DIST)/$(PKG_INST_PATH)$(PKG_INST_BASENAME).exe" -ifdef MOZ_STUB_INSTALLER - cp $(CONFIG_DIR)/stub.exe "$(DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe" - chmod 0755 "$(DIST)/$(PKG_INST_PATH)$(PKG_STUB_BASENAME).exe" -endif 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 |