Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 05:11:16 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1799202 - Wrap use of $AddPrivateBrowsingSC with !ifdef in shared installer code. r=bhearsum

Browse Source 
Private browsing doesn't make sense for Thunderbird. Wrap the use of
$AddPrivateBrowsingSC to avoid breaking the installer build.

Differential Revision: https://phabricator.services.mozilla.com/D161340
This commit is contained in:
Rob Lemley 2022-11-04 20:37:34 +00:00
parent 723690ae93
commit 153a4d3d76
2 changed files with 14 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
browser/installer/windows/nsis/defines.nsi.in
View File

@ -127,6 +127,9 @@
!define MOZ_OPTIONAL_EXTENSIONS
!endif
# To add Private Browsing shortcut argument to setup.exe
!define MOZ_PRIVATE_BROWSING
# File details shared by both the installer and uninstaller
VIProductVersion "1.0.0.0"
VIAddVersionKey "ProductName" "${BrandShortName}"

18
toolkit/mozapps/installer/windows/nsis/common.nsh
View File

@ -5622,12 +5622,14 @@
StrCpy $AddStartMenuSC "1"
${EndIf}
ReadINIStr $R8 $R7 "Install" "PrivateBrowsingShortcut"
${If} $R8 == "false"
StrCpy $AddPrivateBrowsingSC "0"
${ElseIfNot} ${Errors}
StrCpy $AddPrivateBrowsingSC "1"
${EndIf}
!ifdef MOZ_PRIVATE_BROWSING
ReadINIStr $R8 $R7 "Install" "PrivateBrowsingShortcut"
${If} $R8 == "false"
StrCpy $AddPrivateBrowsingSC "0"
${ElseIfNot} ${Errors}
StrCpy $AddPrivateBrowsingSC "1"
${EndIf}
!endif
ReadINIStr $R8 $R7 "Install" "TaskbarShortcut"
${If} $R8 == "false"
@ -5693,7 +5695,9 @@
; We still accept the plural version for backwards compatibility,
; but the singular version takes priority.
${InstallGetOption} $R8 "StartMenuShortcut" $AddStartMenuSC
${InstallGetOption} $R8 "PrivateBrowsingShortcut" $AddPrivateBrowsingSC
!ifdef MOZ_PRIVATE_BROWSING
${InstallGetOption} $R8 "PrivateBrowsingShortcut" $AddPrivateBrowsingSC
!endif
${InstallGetOption} $R8 "TaskbarShortcut" $AddTaskbarSC
${InstallGetOption} $R8 "MaintenanceService" $InstallMaintenanceService
${InstallGetOption} $R8 "RegisterDefaultAgent" $RegisterDefaultAgent