summaryrefslogtreecommitdiff
path: root/toolkit
diff options
context:
space:
mode:
authorBrian Smith <brian@dbsoft.org>2023-02-20 10:15:11 -0600
committerBrian Smith <brian@dbsoft.org>2023-02-20 10:17:49 -0600
commitc2ed566b06570e52ea854fa049ada7c6057d8eae (patch)
treececee86f4fb990cdcee1b3c79eabfbec998e7d73 /toolkit
parent2f5798b5dbf311956685d4effd519b280e617904 (diff)
downloaduxp-c2ed566b06570e52ea854fa049ada7c6057d8eae.tar.gz
Issue #2117 - Part 2 - Revert "Follow up to d0eee8f01 - Run precomplete cmd during package staging"
This reverts commit c622e988fed60f2e868cd0419f5cf517323b5c2a.
Diffstat (limited to 'toolkit')
-rw-r--r--toolkit/mozapps/installer/packager-uxp.mk1
-rw-r--r--toolkit/mozapps/installer/packager.mk1
2 files changed, 1 insertions, 1 deletions
diff --git a/toolkit/mozapps/installer/packager-uxp.mk b/toolkit/mozapps/installer/packager-uxp.mk
index 8d7cb4e62d..856ca434c3 100644
--- a/toolkit/mozapps/installer/packager-uxp.mk
+++ b/toolkit/mozapps/installer/packager-uxp.mk
@@ -15,6 +15,7 @@ ifeq (,$(filter SunOS Linux WINNT,$(OS_ARCH)))
else
$(MAKE) stage-package make-buildinfo-file
@echo 'Compressing...'
+ cd $(DIST)/$(MOZ_PKG_DIR); $(CREATE_PRECOMPLETE_CMD)
ifeq (WINNT,$(OS_ARCH))
cd $(DIST); $(CYGWIN_WRAPPER) 7z a -t7z -m0=lzma2 -mx=9 -aoa -bb3 $(PKG_BASENAME).7z $(MOZ_PKG_DIR)
else
diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk
index 99bb0de911..10c37dca93 100644
--- a/toolkit/mozapps/installer/packager.mk
+++ b/toolkit/mozapps/installer/packager.mk
@@ -55,7 +55,6 @@ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_MANIFEST_DEPS)
$(MOZ_PKG_MANIFEST) '$(DIST)' '$(DIST)'/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \
$(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES)))
$(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/find-dupes.py $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)
- @(cd $(DIST)/$(MOZ_PKG_DIR) && $(CREATE_PRECOMPLETE_CMD))
ifdef MOZ_PACKAGE_JSSHELL
# Package JavaScript Shell
@echo 'Packaging JavaScript Shell...'