diff options
| author | Moonchild <moonchild@palemoon.org> | 2019-07-21 00:35:25 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-07-21 00:35:25 +0000 |
| commit | 44455d8b483d88b01fa7dac87325b6b2d04f5956 (patch) | |
| tree | 0e3fc1a435967ed45dc3ec6c9a9972e8c68b66eb /toolkit | |
| parent | 1dbed95e4c43fdbcc2d959ddb06ebe6331afb9d8 (diff) | |
| parent | 4e464892a2b547a6a0ed30d47d2de39d30a4d32a (diff) | |
| download | uxp-44455d8b483d88b01fa7dac87325b6b2d04f5956.tar.gz | |
Merge pull request #1190 from adeshkp/spaces-mac-appname
Issue #701 - Support spaces in Mac app name
Diffstat (limited to 'toolkit')
| -rw-r--r-- | toolkit/locales/l10n.mk | 8 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/packager.mk | 2 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/upload-files.mk | 8 |
3 files changed, 9 insertions, 9 deletions
diff --git a/toolkit/locales/l10n.mk b/toolkit/locales/l10n.mk index 05bda0b564..f1825438d3 100644 --- a/toolkit/locales/l10n.mk +++ b/toolkit/locales/l10n.mk @@ -112,13 +112,13 @@ repackage-zip: UNPACKAGE='$(ZIP_IN)' repackage-zip: libs-$(AB_CD) # call a hook for apps to put their uninstall helper.exe into the package $(UNINSTALLER_PACKAGE_HOOK) - $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/l10n-repack.py $(STAGEDIST) $(DIST)/xpi-stage/locale-$(AB_CD) \ + $(PYTHON) $(MOZILLA_DIR)/toolkit/mozapps/installer/l10n-repack.py '$(STAGEDIST)' $(DIST)/xpi-stage/locale-$(AB_CD) \ $(MOZ_PKG_EXTRAL10N) \ $(if $(filter omni,$(MOZ_PACKAGER_FORMAT)),$(if $(NON_OMNIJAR_FILES),--non-resource $(NON_OMNIJAR_FILES))) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) ifneq (en,$(LPROJ_ROOT)) - mv $(STAGEDIST)/en.lproj $(STAGEDIST)/$(LPROJ_ROOT).lproj + mv '$(STAGEDIST)'/en.lproj '$(STAGEDIST)'/$(LPROJ_ROOT).lproj endif endif @@ -133,7 +133,7 @@ endif # packaging done, undo l10n stuff ifneq (en,$(LPROJ_ROOT)) ifeq (cocoa,$(MOZ_WIDGET_TOOLKIT)) - mv $(STAGEDIST)/$(LPROJ_ROOT).lproj $(STAGEDIST)/en.lproj + mv '$(STAGEDIST)'/$(LPROJ_ROOT).lproj '$(STAGEDIST)'/en.lproj endif endif $(NSINSTALL) -D $(DIST)/$(PKG_PATH) @@ -197,7 +197,7 @@ endif generate-snippet-%: $(PYTHON) $(MOZILLA_DIR)/tools/update-packaging/generatesnippet.py \ --mar-path=$(ABS_DIST)/update \ - --application-ini-file=$(STAGEDIST)/application.ini \ + --application-ini-file='$(STAGEDIST)'/application.ini \ --locale=$* \ --product=$(MOZ_PKG_APPNAME) \ --platform=$(MOZ_PKG_PLATFORM) \ diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 71a956aa46..dc9324597c 100644 --- a/toolkit/mozapps/installer/packager.mk +++ b/toolkit/mozapps/installer/packager.mk @@ -52,7 +52,7 @@ stage-package: $(MOZ_PKG_MANIFEST) $(MOZ_PKG_MANIFEST_DEPS) $(if $(OPTIMIZEJARS),--optimizejars) \ $(if $(DISABLE_JAR_COMPRESSION),--disable-compression) \ $(addprefix --unify ,$(UNIFY_DIST)) \ - $(MOZ_PKG_MANIFEST) $(DIST) $(DIST)/$(STAGEPATH)$(MOZ_PKG_DIR)$(if $(MOZ_PKG_MANIFEST),,$(_BINPATH)) \ + $(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) ifdef MOZ_PACKAGE_JSSHELL diff --git a/toolkit/mozapps/installer/upload-files.mk b/toolkit/mozapps/installer/upload-files.mk index 25103ff37b..40af34a593 100644 --- a/toolkit/mozapps/installer/upload-files.mk +++ b/toolkit/mozapps/installer/upload-files.mk @@ -286,18 +286,18 @@ endif ifdef MOZ_SIGN_PREPARED_PACKAGE_CMD ifeq (Darwin, $(OS_ARCH)) MAKE_PACKAGE = $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)$(_BINPATH)/$(MOZ_CHILD_PROCESS_NAME).app/Contents/MacOS,$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)),true) \ - && (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) \ - && cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_MACBUNDLE_NAME) \ + && (cd '$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)' && $(CREATE_PRECOMPLETE_CMD)) \ + && cd ./$(PKG_DMG_SOURCE) && $(MOZ_SIGN_PREPARED_PACKAGE_CMD) '$(MOZ_MACBUNDLE_NAME)' \ && cd $(PACKAGE_BASE_DIR) && $(INNER_MAKE_PACKAGE) else MAKE_PACKAGE = $(MOZ_SIGN_PREPARED_PACKAGE_CMD) $(MOZ_PKG_DIR) \ && $(or $(call MAKE_SIGN_EME_VOUCHER,$(STAGEPATH)$(MOZ_PKG_DIR)),true) \ - && (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) \ + && (cd '$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)' && $(CREATE_PRECOMPLETE_CMD)) \ && $(INNER_MAKE_PACKAGE) endif #Darwin else - MAKE_PACKAGE = (cd $(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH) && $(CREATE_PRECOMPLETE_CMD)) && $(INNER_MAKE_PACKAGE) + MAKE_PACKAGE = (cd '$(STAGEPATH)$(MOZ_PKG_DIR)$(_RESPATH)' && $(CREATE_PRECOMPLETE_CMD)) && $(INNER_MAKE_PACKAGE) endif ifdef MOZ_SIGN_PACKAGE_CMD |