diff options
| author | Matt A. Tobin <email@mattatobin.com> | 2020-04-07 22:13:11 -0400 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2020-04-14 13:25:58 +0200 |
| commit | 6daff43b6176657a6b893ae044967d18c6d9cb67 (patch) | |
| tree | f81a6e0fc105ee536728aac66c15b0a94370a7e9 | |
| parent | eedf9f5ebfbf58994a179119cd886504e2e1a2fa (diff) | |
| download | UXP-6daff43b6176657a6b893ae044967d18c6d9cb67.tar UXP-6daff43b6176657a6b893ae044967d18c6d9cb67.tar.gz UXP-6daff43b6176657a6b893ae044967d18c6d9cb67.tar.lz UXP-6daff43b6176657a6b893ae044967d18c6d9cb67.tar.xz UXP-6daff43b6176657a6b893ae044967d18c6d9cb67.zip | |
Follow up to d0eee8f01 - Run precomplete cmd during package staging
| -rw-r--r-- | toolkit/mozapps/installer/packager-uxp.mk | 1 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/packager.mk | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/toolkit/mozapps/installer/packager-uxp.mk b/toolkit/mozapps/installer/packager-uxp.mk index 856ca434c..8d7cb4e62 100644 --- a/toolkit/mozapps/installer/packager-uxp.mk +++ b/toolkit/mozapps/installer/packager-uxp.mk @@ -15,7 +15,6 @@ 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 dc9324597..e700b5162 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -55,6 +55,7 @@ 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...' |