diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-08-18 16:25:15 +0200 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-08-18 16:26:16 +0200 |
| commit | 202296d02aa99afa90581333ab059c050b9c3ade (patch) | |
| tree | 6ed8a1289bed1bb06d2703ea77cba5fccd3bdffa /toolkit/mozapps | |
| parent | 1530f48c27fb13d7cbd2708c9f0fcf2dabc6ed6a (diff) | |
| parent | ab6242a93b849b0a3c7525b16bc01dd3172fc167 (diff) | |
| download | UXP-202296d02aa99afa90581333ab059c050b9c3ade.tar UXP-202296d02aa99afa90581333ab059c050b9c3ade.tar.gz UXP-202296d02aa99afa90581333ab059c050b9c3ade.tar.lz UXP-202296d02aa99afa90581333ab059c050b9c3ade.tar.xz UXP-202296d02aa99afa90581333ab059c050b9c3ade.zip | |
Pull Basilisk-release forward.
Diffstat (limited to 'toolkit/mozapps')
| -rw-r--r-- | toolkit/mozapps/extensions/content/extensions.js | 2 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/packager.mk | 2 | ||||
| -rw-r--r-- | toolkit/mozapps/installer/upload-files.mk | 8 | ||||
| -rwxr-xr-x | toolkit/mozapps/installer/windows/nsis/common.nsh | 15 |
4 files changed, 6 insertions, 21 deletions
diff --git a/toolkit/mozapps/extensions/content/extensions.js b/toolkit/mozapps/extensions/content/extensions.js index 1e185f879..9576e9a3b 100644 --- a/toolkit/mozapps/extensions/content/extensions.js +++ b/toolkit/mozapps/extensions/content/extensions.js @@ -2153,7 +2153,7 @@ var gDiscoverView = { Ci.nsIWebProgressListener.STATE_IS_REQUEST | Ci.nsIWebProgressListener.STATE_TRANSFERRING; // Once transferring begins show the content - if (aStateFlags & transferStart) + if ((aStateFlags & transferStart) === transferStart) this.node.selectedPanel = this._browser; // Only care about the network events diff --git a/toolkit/mozapps/installer/packager.mk b/toolkit/mozapps/installer/packager.mk index 71a956aa4..dc9324597 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 25103ff37..40af34a59 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 diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh index 846718dab..36e228797 100755 --- a/toolkit/mozapps/installer/windows/nsis/common.nsh +++ b/toolkit/mozapps/installer/windows/nsis/common.nsh @@ -5218,21 +5218,6 @@ StrCpy $AddStartMenuSC "1" ${EndIf} - ReadINIStr $R8 $R7 "Install" "TaskbarShortcut" - ${If} $R8 == "false" - StrCpy $AddTaskbarSC "0" - ${Else} - StrCpy $AddTaskbarSC "1" - ${EndIf} - - ReadINIStr $R8 $R7 "Install" "MaintenanceService" - ${If} $R8 == "false" - StrCpy $InstallMaintenanceService "0" - ${Else} - ; Installing the service always requires elevation. - ${ElevateUAC} - ${EndIf} - !ifndef NO_STARTMENU_DIR ReadINIStr $R8 $R7 "Install" "StartMenuDirectoryName" ${If} $R8 != "" |