From 79383148bb31bee0c8fae941f6cc0fdd605fb2ea Mon Sep 17 00:00:00 2001 From: Mike Kaganski Date: Mon, 9 Apr 2018 09:33:20 +0100 Subject: tdf#108580 related: Check for SP level of the minimal supported OS Currently we support Win7 SP1 and later; so let installer fail on lower SP levels. Change-Id: I807e0a04870b9eeabbfae258d68da4a1156b0408 Reviewed-on: https://gerrit.libreoffice.org/52619 Tested-by: Jenkins Reviewed-by: Mike Kaganski --- instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt | 2 +- instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt | 2 +- instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt | 1 + 3 files changed, 3 insertions(+), 2 deletions(-) (limited to 'instsetoo_native/inc_openoffice/windows') diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 0a0d60f09832..722bb463629d 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -69,4 +69,4 @@ ValidateProductID 300 WriteEnvironmentStrings 2500 WriteIniValues 2450 WriteRegistryValues 2400 -WrongWindowsVersion VersionNT < WindowsMinVersionNumber 10 +WrongWindowsVersion (VersionNT < WindowsMinVersionNumber) OR ((VersionNT = WindowsMinVersionNumber) AND (ServicePackLevel < WindowsMinSPNumber)) 10 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt index 7a89cbcc756f..3bb2a5191d20 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt @@ -28,4 +28,4 @@ SetupProgress 800 SetupResume Installed And (RESUME Or Preselected) And Not PATCH 700 setUserProfile 510 ValidateProductID 350 -WrongWindowsVersion VersionNT < WindowsMinVersionNumber 10 +WrongWindowsVersion (VersionNT < WindowsMinVersionNumber) OR ((VersionNT = WindowsMinVersionNumber) AND (ServicePackLevel < WindowsMinSPNumber)) 10 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index b16732079076..f8eeaf25c105 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -64,3 +64,4 @@ UpgradeCode UPGRADECODETEMPLATE VC_REDIST 1 WindowsMinVersionText WINDOWSMINVERSIONTEXTTEMPLATE WindowsMinVersionNumber WINDOWSMINVERSIONNUMBERTEMPLATE +WindowsMinSPNumber WINDOWSMINSPNUMBERTEMPLATE -- cgit