Kaydet (Commit) d96d7648 authored tarafından Andras Timar's avatar Andras Timar

Don't try to install LibreOffice on XP, if it was built with SDK 8.x or higher

Change-Id: I79a357a51a3d98774745001d5f99b045ef964255
Reviewed-on: https://gerrit.libreoffice.org/15218Reviewed-by: 's avatarAndras Timar <andras.timar@collabora.com>
Tested-by: 's avatarAndras Timar <andras.timar@collabora.com>
üst c18cdfb1
...@@ -25,5 +25,5 @@ en-US = "The same version of this product is already installed." ...@@ -25,5 +25,5 @@ en-US = "The same version of this product is already installed."
[OOO_CUSTOMACTION_3] [OOO_CUSTOMACTION_3]
en-US = "An older version of [ProductName] was found. To install a newer version, the older version needs to be removed first." en-US = "An older version of [ProductName] was found. To install a newer version, the older version needs to be removed first."
[OOO_CUSTOMACTION_4] [OOO_CUSTOMACTION_5]
en-US = "[ProductName] cannot be installed on this Windows version. Windows XP or newer is required." en-US = "[ProductName] cannot be installed on this Windows version. [WindowsMinVersionText] or newer is required."
...@@ -8,7 +8,7 @@ SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION] ...@@ -8,7 +8,7 @@ SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
SetARPNoRemove 51 ARPNOREMOVE 1 SetARPNoRemove 51 ARPNOREMOVE 1
NewProductFound 19 OOO_CUSTOMACTION_1 NewProductFound 19 OOO_CUSTOMACTION_1
SameProductFound 19 OOO_CUSTOMACTION_2 SameProductFound 19 OOO_CUSTOMACTION_2
WrongWindowsVersion 19 OOO_CUSTOMACTION_4 WrongWindowsVersion 19 OOO_CUSTOMACTION_5
SetLanguageSelected 51 LANG_SELECTED 1 SetLanguageSelected 51 LANG_SELECTED 1
ResetLanguageSelected 51 LANG_SELECTED 0 ResetLanguageSelected 51 LANG_SELECTED 0
SetApplicationSelected 51 APP_SELECTED 1 SetApplicationSelected 51 APP_SELECTED 1
......
...@@ -71,4 +71,4 @@ ValidateProductID 300 ...@@ -71,4 +71,4 @@ ValidateProductID 300
WriteEnvironmentStrings 2500 WriteEnvironmentStrings 2500
WriteIniValues 2450 WriteIniValues 2450
WriteRegistryValues 2400 WriteRegistryValues 2400
WrongWindowsVersion VersionNT < 501 10 WrongWindowsVersion VersionNT < WindowsMinVersionNumber 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 < 501 10 WrongWindowsVersion VersionNT < WindowsMinVersionNumber 10
...@@ -60,3 +60,5 @@ STR_MS_POWERPOINT_SHOW OOO_STR_MS_POWERPOINT_SHOW ...@@ -60,3 +60,5 @@ STR_MS_POWERPOINT_SHOW OOO_STR_MS_POWERPOINT_SHOW
STR_INSTALLATION_WIZARD OOO_STR_INSTALLATION_WIZARD STR_INSTALLATION_WIZARD OOO_STR_INSTALLATION_WIZARD
UpgradeCode UPGRADECODETEMPLATE UpgradeCode UPGRADECODETEMPLATE
VC_REDIST 1 VC_REDIST 1
WindowsMinVersionText WINDOWSMINVERSIONTEXTTEMPLATE
WindowsMinVersionNumber WINDOWSMINVERSIONNUMBERTEMPLATE
...@@ -34,6 +34,7 @@ Globals ...@@ -34,6 +34,7 @@ Globals
OOODOWNLOADNAME 1 OOODOWNLOADNAME 1
STARTCENTER_HIDE_EXTERNAL_LINKS 0 STARTCENTER_HIDE_EXTERNAL_LINKS 0
64BITPRODUCT @WINDOWS_X64@ 64BITPRODUCT @WINDOWS_X64@
WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@
} }
} }
} }
......
...@@ -418,6 +418,14 @@ sub update_property_table ...@@ -418,6 +418,14 @@ 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 Vista";
my $windowsminversionnumber = "600";
if ( $allvariables->{'WINDOWSSDKVERSION'} eq '70' )
{
$windowsminversiontext = "Windows XP";
$windowsminversionnumber = "501";
}
# Updating the values # Updating the values
...@@ -431,6 +439,8 @@ sub update_property_table ...@@ -431,6 +439,8 @@ sub update_property_table
${$propertyfile}[$i] =~ s/\bPRODUCTNAMETEMPLATE\b/$productname/; ${$propertyfile}[$i] =~ s/\bPRODUCTNAMETEMPLATE\b/$productname/;
${$propertyfile}[$i] =~ s/\bPRODUCTVERSIONTEMPLATE\b/$productversion/; ${$propertyfile}[$i] =~ s/\bPRODUCTVERSIONTEMPLATE\b/$productversion/;
${$propertyfile}[$i] =~ s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/; ${$propertyfile}[$i] =~ s/\bQUICKSTARTERLINKNAMETEMPLATE\b/$quickstarterlinkname/;
${$propertyfile}[$i] =~ s/\bWINDOWSMINVERSIONTEXTTEMPLATE\b/$windowsminversiontext/;
${$propertyfile}[$i] =~ s/\bWINDOWSMINVERSIONNUMBERTEMPLATE\b/$windowsminversionnumber/;
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