diff options
| author | Moonchild <moonchild@palemoon.org> | 2023-03-17 18:26:07 +0100 |
|---|---|---|
| committer | Moonchild <moonchild@palemoon.org> | 2023-03-17 22:10:59 +0100 |
| commit | df5696425eaa070588b141752ce2461cb746d5f2 (patch) | |
| tree | dba654c8b6eb5e56572acc456b18a5b8d37519a7 /toolkit | |
| parent | 947768348186fb8613cc2dce1cfd85aa26a52d11 (diff) | |
| download | uxp-df5696425eaa070588b141752ce2461cb746d5f2.tar.gz | |
Issue #2117 - Follow-up: Run precomplete cmd during package staging
We rely on this for all OSes except Mac where precomplete should not
be in the root (it uses Mozilla's fallback packaging that places it in
$RESPATH)
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/mozapps/installer/packager-uxp.mk | 1 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/packager.mk | 4 |
2 files changed, 4 insertions, 1 deletions
diff --git a/toolkit/mozapps/installer/packager-uxp.mk b/toolkit/mozapps/installer/packager-uxp.mk index 856ca434c3..8d7cb4e62d 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 10c37dca93..2dc6db26ff 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -55,6 +55,10 @@ 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) +ifneq (Darwin, $(OS_ARCH)) + # We don't want to do this on Mac as it will end up in the package root which is not how Mac packages things + cd $(DIST)/$(MOZ_PKG_DIR) && $(CREATE_PRECOMPLETE_CMD) +endif ifdef MOZ_PACKAGE_JSSHELL # Package JavaScript Shell @echo 'Packaging JavaScript Shell...' |