diff options
| author | Andras Timar <andras.timar@collabora.com> | 2015-04-09 19:17:52 +0200 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2015-04-10 07:10:06 +0000 |
| commit | d96d76480257cc9cfd5c6dfa8eba6847d5fdafc4 (patch) | |
| tree | 0eb49f613c9718c8c17477787c1021151b6ab7d6 /instsetoo_native | |
| parent | c18cdfb1c16f4c334f31dfb9a09ef9ef20fcf752 (diff) | |
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/15218
Reviewed-by: Andras Timar <andras.timar@collabora.com>
Tested-by: Andras Timar <andras.timar@collabora.com>
Diffstat (limited to 'instsetoo_native')
6 files changed, 8 insertions, 5 deletions
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf index 51f87881110d..f6b751e93b21 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf +++ b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf @@ -25,5 +25,5 @@ en-US = "The same version of this product is already installed." [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." -[OOO_CUSTOMACTION_4] -en-US = "[ProductName] cannot be installed on this Windows version. Windows XP or newer is required." +[OOO_CUSTOMACTION_5] +en-US = "[ProductName] cannot be installed on this Windows version. [WindowsMinVersionText] or newer is required." diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt index 937270577002..602c683b85d6 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt @@ -8,7 +8,7 @@ SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION] SetARPNoRemove 51 ARPNOREMOVE 1 NewProductFound 19 OOO_CUSTOMACTION_1 SameProductFound 19 OOO_CUSTOMACTION_2 -WrongWindowsVersion 19 OOO_CUSTOMACTION_4 +WrongWindowsVersion 19 OOO_CUSTOMACTION_5 SetLanguageSelected 51 LANG_SELECTED 1 ResetLanguageSelected 51 LANG_SELECTED 0 SetApplicationSelected 51 APP_SELECTED 1 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt index 6dd5ede6d88c..680961b4f744 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt @@ -71,4 +71,4 @@ ValidateProductID 300 WriteEnvironmentStrings 2500 WriteIniValues 2450 WriteRegistryValues 2400 -WrongWindowsVersion VersionNT < 501 10 +WrongWindowsVersion VersionNT < WindowsMinVersionNumber 10 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt index c19c5b22f910..24642ecaeb74 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 < 501 10 +WrongWindowsVersion VersionNT < WindowsMinVersionNumber 10 diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt index 99238570760e..b771f8bc706e 100644 --- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt +++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt @@ -60,3 +60,5 @@ STR_MS_POWERPOINT_SHOW OOO_STR_MS_POWERPOINT_SHOW STR_INSTALLATION_WIZARD OOO_STR_INSTALLATION_WIZARD UpgradeCode UPGRADECODETEMPLATE VC_REDIST 1 +WindowsMinVersionText WINDOWSMINVERSIONTEXTTEMPLATE +WindowsMinVersionNumber WINDOWSMINVERSIONNUMBERTEMPLATE diff --git a/instsetoo_native/util/openoffice.lst.in b/instsetoo_native/util/openoffice.lst.in index 77f566da55b9..fc2e98becdf9 100644 --- a/instsetoo_native/util/openoffice.lst.in +++ b/instsetoo_native/util/openoffice.lst.in @@ -34,6 +34,7 @@ Globals OOODOWNLOADNAME 1 STARTCENTER_HIDE_EXTERNAL_LINKS 0 64BITPRODUCT @WINDOWS_X64@ + WINDOWSSDKVERSION @WINDOWS_SDK_VERSION@ } } } |