From 940ecb23efec3610758f8583af53cced33262bf0 Mon Sep 17 00:00:00 2001 From: Sebastian Hengst Date: Tue, 31 Jan 2017 11:25:18 +0100 Subject: [PATCH] Bug 1334883 - Remove code NSIS pre-3.0a2 code from installer. r=mhowell MozReview-Commit-ID: 7mhVME2tUcv --- browser/installer/windows/nsis/installer.nsi | 18 +++--------------- .../nsis/maintenanceservice_installer.nsi | 18 +++--------------- browser/installer/windows/nsis/stub.nsi | 18 +++--------------- browser/installer/windows/nsis/uninstaller.nsi | 18 +++--------------- .../maintenanceservice_installer.nsi | 18 +++--------------- 5 files changed, 15 insertions(+), 75 deletions(-) diff --git a/browser/installer/windows/nsis/installer.nsi b/browser/installer/windows/nsis/installer.nsi index 64a1e5e1f218..95bfc867da62 100755 --- a/browser/installer/windows/nsis/installer.nsi +++ b/browser/installer/windows/nsis/installer.nsi @@ -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" diff --git a/browser/installer/windows/nsis/maintenanceservice_installer.nsi b/browser/installer/windows/nsis/maintenanceservice_installer.nsi index 20360cc61e68..dd7c7ea2aa4b 100644 --- a/browser/installer/windows/nsis/maintenanceservice_installer.nsi +++ b/browser/installer/windows/nsis/maintenanceservice_installer.nsi @@ -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 diff --git a/browser/installer/windows/nsis/stub.nsi b/browser/installer/windows/nsis/stub.nsi index befcaa1c5bf3..992d252d708c 100644 --- a/browser/installer/windows/nsis/stub.nsi +++ b/browser/installer/windows/nsis/stub.nsi @@ -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 diff --git a/browser/installer/windows/nsis/uninstaller.nsi b/browser/installer/windows/nsis/uninstaller.nsi index d8387d768b01..3639a9bbd785 100755 --- a/browser/installer/windows/nsis/uninstaller.nsi +++ b/browser/installer/windows/nsis/uninstaller.nsi @@ -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 diff --git a/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi b/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi index d4d21e3777a7..fa52234be7e3 100644 --- a/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi +++ b/toolkit/components/maintenanceservice/bootstrapinstaller/maintenanceservice_installer.nsi @@ -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