diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-09 09:33:20 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-09 14:40:18 +0200 |
| commit | 79383148bb31bee0c8fae941f6cc0fdd605fb2ea (patch) | |
| tree | b67ba5f32d7368ec26bda99b3df07eb9075283e7 | |
| parent | 61411db9f719d793f0665a4d278e0748e8fcd75f (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>
4 files changed, 6 insertions, 3 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 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 diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm index baf8421ced97..a385e59a8c27 100644 --- a/solenv/bin/modules/installer/windows/property.pm +++ b/solenv/bin/modules/installer/windows/property.pm @@ -413,8 +413,9 @@ sub update_property_table my $productname = get_productname_for_property_table($language, $allvariables); my $productversion = get_productversion_for_property_table(); my $quickstarterlinkname = get_quickstarterlinkname_for_property_table($language, $allvariables); - my $windowsminversiontext = "Windows 7"; + my $windowsminversiontext = "Windows 7 SP1"; my $windowsminversionnumber = "601"; + my $windowsminspnumber = "1"; # Updating the values @@ -430,6 +431,7 @@ sub update_property_table ${$propertyfile}[$i] =~ s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/; ${$propertyfile}[$i] =~ s/\bWINDOWSMINVERSIONTEXTTEMPLATE\b/$windowsminversiontext/; ${$propertyfile}[$i] =~ s/\bWINDOWSMINVERSIONNUMBERTEMPLATE\b/$windowsminversionnumber/; + ${$propertyfile}[$i] =~ s/\bWINDOWSMINSPNUMBERTEMPLATE\b/$windowsminspnumber/; if ( ${$propertyfile}[$i] =~ m/\bARPNOMODIFY\b/ ) { $hasarpnomodify = 1; } } |