Kaydet (Commit) 79383148 authored tarafından Mike Kaganski's avatar Mike Kaganski

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/52619Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 61411db9
...@@ -69,4 +69,4 @@ ValidateProductID 300 ...@@ -69,4 +69,4 @@ ValidateProductID 300
WriteEnvironmentStrings 2500 WriteEnvironmentStrings 2500
WriteIniValues 2450 WriteIniValues 2450
WriteRegistryValues 2400 WriteRegistryValues 2400
WrongWindowsVersion VersionNT < WindowsMinVersionNumber 10 WrongWindowsVersion (VersionNT < WindowsMinVersionNumber) OR ((VersionNT = WindowsMinVersionNumber) AND (ServicePackLevel < WindowsMinSPNumber)) 10
...@@ -28,4 +28,4 @@ SetupProgress 800 ...@@ -28,4 +28,4 @@ SetupProgress 800
SetupResume Installed And (RESUME Or Preselected) And Not PATCH 700 SetupResume Installed And (RESUME Or Preselected) And Not PATCH 700
setUserProfile 510 setUserProfile 510
ValidateProductID 350 ValidateProductID 350
WrongWindowsVersion VersionNT < WindowsMinVersionNumber 10 WrongWindowsVersion (VersionNT < WindowsMinVersionNumber) OR ((VersionNT = WindowsMinVersionNumber) AND (ServicePackLevel < WindowsMinSPNumber)) 10
...@@ -64,3 +64,4 @@ UpgradeCode UPGRADECODETEMPLATE ...@@ -64,3 +64,4 @@ UpgradeCode UPGRADECODETEMPLATE
VC_REDIST 1 VC_REDIST 1
WindowsMinVersionText WINDOWSMINVERSIONTEXTTEMPLATE WindowsMinVersionText WINDOWSMINVERSIONTEXTTEMPLATE
WindowsMinVersionNumber WINDOWSMINVERSIONNUMBERTEMPLATE WindowsMinVersionNumber WINDOWSMINVERSIONNUMBERTEMPLATE
WindowsMinSPNumber WINDOWSMINSPNUMBERTEMPLATE
...@@ -413,8 +413,9 @@ sub update_property_table ...@@ -413,8 +413,9 @@ sub update_property_table
my $productname = get_productname_for_property_table($language, $allvariables); my $productname = get_productname_for_property_table($language, $allvariables);
my $productversion = get_productversion_for_property_table(); my $productversion = get_productversion_for_property_table();
my $quickstarterlinkname = get_quickstarterlinkname_for_property_table($language, $allvariables); my $quickstarterlinkname = get_quickstarterlinkname_for_property_table($language, $allvariables);
my $windowsminversiontext = "Windows 7"; my $windowsminversiontext = "Windows 7 SP1";
my $windowsminversionnumber = "601"; my $windowsminversionnumber = "601";
my $windowsminspnumber = "1";
# Updating the values # Updating the values
...@@ -430,6 +431,7 @@ sub update_property_table ...@@ -430,6 +431,7 @@ sub update_property_table
${$propertyfile}[$i] =~ s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/; ${$propertyfile}[$i] =~ s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/;
${$propertyfile}[$i] =~ s/\bWINDOWSMINVERSIONTEXTTEMPLATE\b/$windowsminversiontext/; ${$propertyfile}[$i] =~ s/\bWINDOWSMINVERSIONTEXTTEMPLATE\b/$windowsminversiontext/;
${$propertyfile}[$i] =~ s/\bWINDOWSMINVERSIONNUMBERTEMPLATE\b/$windowsminversionnumber/; ${$propertyfile}[$i] =~ s/\bWINDOWSMINVERSIONNUMBERTEMPLATE\b/$windowsminversionnumber/;
${$propertyfile}[$i] =~ s/\bWINDOWSMINSPNUMBERTEMPLATE\b/$windowsminspnumber/;
if ( ${$propertyfile}[$i] =~ m/\bARPNOMODIFY\b/ ) { $hasarpnomodify = 1; } if ( ${$propertyfile}[$i] =~ m/\bARPNOMODIFY\b/ ) { $hasarpnomodify = 1; }
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment