diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-06 23:39:47 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-12-06 23:39:47 +0100 |
| commit | 642032029f65e9dc0d38fbb6d35ef656c73a292c (patch) | |
| tree | 78a22bd12d679ab532db490d631ee69fa085aec1 /toolkit/mozapps/installer | |
| parent | 50ef259a2df60d020ccb02d76dc5aa4835ee319e (diff) | |
| parent | 2529b2edece0a0ed86553d1e73eef13c3848bf64 (diff) | |
| download | UXP-642032029f65e9dc0d38fbb6d35ef656c73a292c.tar UXP-642032029f65e9dc0d38fbb6d35ef656c73a292c.tar.gz UXP-642032029f65e9dc0d38fbb6d35ef656c73a292c.tar.lz UXP-642032029f65e9dc0d38fbb6d35ef656c73a292c.tar.xz UXP-642032029f65e9dc0d38fbb6d35ef656c73a292c.zip | |
Merge branch 'master' into release
Diffstat (limited to 'toolkit/mozapps/installer')
| -rw-r--r-- | toolkit/mozapps/installer/packager-uxp.mk | 23 | ||||
| -rwxr-xr-x | toolkit/mozapps/installer/windows/nsis/common.nsh | 15 |
2 files changed, 23 insertions, 15 deletions
diff --git a/toolkit/mozapps/installer/packager-uxp.mk b/toolkit/mozapps/installer/packager-uxp.mk new file mode 100644 index 000000000..8d7cb4e62 --- /dev/null +++ b/toolkit/mozapps/installer/packager-uxp.mk @@ -0,0 +1,23 @@ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. + +# We need to include the mozilla packaging routines because we are +# very much still dependent on them +include $(MOZILLA_DIR)/toolkit/mozapps/installer/packager.mk + +# This is currently only used on Windows, Linux, and Solaris +# on other platforms such as Mac will fall back to the orginal +# mozilla packaging +make-archive: +ifeq (,$(filter SunOS Linux WINNT,$(OS_ARCH))) + $(MAKE) make-package +else + $(MAKE) stage-package make-buildinfo-file + @echo 'Compressing...' +ifeq (WINNT,$(OS_ARCH)) + cd $(DIST); $(CYGWIN_WRAPPER) 7z a -t7z -m0=lzma2 -mx=9 -aoa -bb3 $(PKG_BASENAME).7z $(MOZ_PKG_DIR) +else + cd $(DIST); XZ_OPT=-9e $(TAR) cfJv $(PKG_BASENAME).tar.xz $(MOZ_PKG_DIR) +endif +endif diff --git a/toolkit/mozapps/installer/windows/nsis/common.nsh b/toolkit/mozapps/installer/windows/nsis/common.nsh index 36e228797..57a25df9d 100755 --- a/toolkit/mozapps/installer/windows/nsis/common.nsh +++ b/toolkit/mozapps/installer/windows/nsis/common.nsh @@ -5577,21 +5577,6 @@ StrCpy $INSTDIR "$R9" !endif - ; If the user doesn't have write access to the installation directory set - ; the installation directory to a subdirectory of the All Users application - ; directory and if the user can't write to that location set the installation - ; directory to a subdirectory of the users local application directory - ; (e.g. non-roaming). - ${CanWriteToInstallDir} $R9 - StrCmp "$R9" "false" +1 finish_check_install_dir - - SetShellVarContext all ; Set SHCTX to All Users - StrCpy $INSTDIR "$APPDATA\${BrandFullName}\" - ${CanWriteToInstallDir} $R9 - StrCmp "$R9" "false" +2 +1 - StrCpy $INSTDIR "$LOCALAPPDATA\${BrandFullName}\" - - finish_check_install_dir: IfFileExists "$INSTDIR" +3 +1 Pop $R9 Return |