diff options
author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-09 09:33:20 +0100 |
---|---|---|
committer | Andras Timar <andras.timar@collabora.com> | 2018-04-17 13:18:43 +0200 |
commit | 0823a615b86c5629ff5a7354c75603e23966f0bb (patch) | |
tree | c5f84521cfbe5c8f151f8d4df668a260bc4b2994 /instsetoo_native | |
parent | 0578bbb22b7def7cb52e497751d3b1822020bdc1 (diff) |
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 <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit 79383148bb31bee0c8fae941f6cc0fdd605fb2ea)
Reviewed-on: https://gerrit.libreoffice.org/52632
Reviewed-by: Caolán McNamara <caolanm@redhat.com>
Tested-by: Caolán McNamara <caolanm@redhat.com>
(cherry picked from commit 158f6e5489d8167299deb53fde433e835019d10a)
Diffstat (limited to 'instsetoo_native')
3 files changed, 3 insertions, 2 deletions
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 609ab7b668c7..fa9f54284c2a 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 |