Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-10-08 02:14:43 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1334883 - Remove code NSIS pre-3.0a2 code from installer. r=mhowell

Browse Source 
MozReview-Commit-ID: 7mhVME2tUcv
This commit is contained in:
Sebastian Hengst 2017-01-31 11:25:18 +01:00
parent ab2e1d213f
commit 940ecb23ef
5 changed files with 15 additions and 75 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
browser/installer/windows/nsis/installer.nsi
View File

@ -21,13 +21,9 @@ CRCCheck on
RequestExecutionLevel user
; The commands inside this ifdef require NSIS 3.0a2 or greater so the ifdef can
; be removed after we require NSIS 3.0a2 or greater.
!ifdef NSIS_PACKEDVERSION
Unicode true
ManifestSupportedOS all
ManifestDPIAware true
!endif
Unicode true
ManifestSupportedOS all
ManifestDPIAware true
!addplugindir ./
@ -1157,14 +1153,6 @@ Function .onInit
${InstallOnInitCommon} "$(WARN_MIN_SUPPORTED_OSVER_CPU_MSG)"
; The commands inside this ifndef are needed prior to NSIS 3.0a2 and can be
; removed after we require NSIS 3.0a2 or greater.
!ifndef NSIS_PACKEDVERSION
${If} ${AtLeastWinVista}
System::Call 'user32::SetProcessDPIAware()'
${EndIf}
!endif
!insertmacro InitInstallOptionsFile "options.ini"
!insertmacro InitInstallOptionsFile "shortcuts.ini"
!insertmacro InitInstallOptionsFile "components.ini"

18
browser/installer/windows/nsis/maintenanceservice_installer.nsi
View File

@ -13,13 +13,9 @@ CRCCheck on
RequestExecutionLevel admin
; The commands inside this ifdef require NSIS 3.0a2 or greater so the ifdef can
; be removed after we require NSIS 3.0a2 or greater.
!ifdef NSIS_PACKEDVERSION
Unicode true
ManifestSupportedOS all
ManifestDPIAware true
!endif
Unicode true
ManifestSupportedOS all
ManifestDPIAware true
!addplugindir ./
@ -130,14 +126,6 @@ Function un.onInit
; This only effects LoadLibrary calls and not implicitly loaded DLLs.
System::Call 'kernel32::SetDllDirectoryW(w "")'
; The commands inside this ifndef are needed prior to NSIS 3.0a2 and can be
; removed after we require NSIS 3.0a2 or greater.
!ifndef NSIS_PACKEDVERSION
${If} ${AtLeastWinVista}
System::Call 'user32::SetProcessDPIAware()'
${EndIf}
!endif
StrCpy $BrandFullNameDA "${MaintFullName}"
StrCpy $BrandFullName "${MaintFullName}"
FunctionEnd

18
browser/installer/windows/nsis/stub.nsi
View File

@ -18,13 +18,9 @@ CRCCheck on
RequestExecutionLevel user
; The commands inside this ifdef require NSIS 3.0a2 or greater so the ifdef can
; be removed after we require NSIS 3.0a2 or greater.
!ifdef NSIS_PACKEDVERSION
Unicode true
ManifestSupportedOS all
ManifestDPIAware true
!endif
Unicode true
ManifestSupportedOS all
ManifestDPIAware true
!addplugindir ./
@ -352,14 +348,6 @@ Function .onInit
; Require elevation if the user can elevate
${ElevateUAC}
; The commands inside this ifndef are needed prior to NSIS 3.0a2 and can be
; removed after we require NSIS 3.0a2 or greater.
!ifndef NSIS_PACKEDVERSION
${If} ${AtLeastWinVista}
System::Call 'user32::SetProcessDPIAware()'
${EndIf}
!endif
; If we have any existing installation, use its location as the default
; path for this install, even if it's not the same architecture.
SetRegView 32

18
browser/installer/windows/nsis/uninstaller.nsi
View File

@ -19,13 +19,9 @@ CRCCheck on
RequestExecutionLevel user
; The commands inside this ifdef require NSIS 3.0a2 or greater so the ifdef can
; be removed after we require NSIS 3.0a2 or greater.
!ifdef NSIS_PACKEDVERSION
Unicode true
ManifestSupportedOS all
ManifestDPIAware true
!endif
Unicode true
ManifestSupportedOS all
ManifestDPIAware true
!addplugindir ./
@ -607,14 +603,6 @@ Function un.onInit
${un.UninstallUnOnInitCommon}
; The commands inside this ifndef are needed prior to NSIS 3.0a2 and can be
; removed after we require NSIS 3.0a2 or greater.
!ifndef NSIS_PACKEDVERSION
${If} ${AtLeastWinVista}
System::Call 'user32::SetProcessDPIAware()'
${EndIf}
!endif
!insertmacro InitInstallOptionsFile "unconfirm.ini"
FunctionEnd

18
toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi
View File

@ -13,13 +13,9 @@ CRCCheck on
RequestExecutionLevel admin
; The commands inside this ifdef require NSIS 3.0a2 or greater so the ifdef can
; be removed after we require NSIS 3.0a2 or greater.
!ifdef NSIS_PACKEDVERSION
Unicode true
ManifestSupportedOS all
ManifestDPIAware true
!endif
Unicode true
ManifestSupportedOS all
ManifestDPIAware true
!addplugindir ./
@ -127,14 +123,6 @@ Function un.onInit
; This only effects LoadLibrary calls and not implicitly loaded DLLs.
System::Call 'kernel32::SetDllDirectoryW(w "")'
; The commands inside this ifndef are needed prior to NSIS 3.0a2 and can be
; removed after we require NSIS 3.0a2 or greater.
!ifndef NSIS_PACKEDVERSION
${If} ${AtLeastWinVista}
System::Call 'user32::SetProcessDPIAware()'
${EndIf}
!endif
StrCpy $BrandFullNameDA "${MaintFullName}"
StrCpy $BrandFullName "${MaintFullName}"
FunctionEnd