instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf | 3 +++
instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt | 6
+++---
instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt | 1 +
instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt | 6
+++---
4 files changed, 10 insertions(+), 6 deletions(-)
New commits:
commit 37ca06662fc2a0b5353381b70e62ad9586046069
Author: Andras Timar <ati...@suse.com>
Date: Thu Aug 22 11:33:31 2013 +0200
fdo#65129 Windows Installer checks OS version before proceeding
Change-Id: I827ecafe1a22c5ef860dea590799693525cec849
diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
index 52b5463..51f8788 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
+++ b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
@@ -24,3 +24,6 @@ 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."
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
index 8df102c..d582840 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt
@@ -2,12 +2,12 @@ Action Type Source Target
s72 i2 S64 S255
CustomAction Action
ISInitAllUsers 307 ALLUSERS 1
-setAllUsersProfile2K 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
-SetAllUsersProfileNT 51 ALLUSERSPROFILE [%SystemRoot]\Profiles\All Users
-setUserProfileNT 51 USERPROFILE [%USERPROFILE]
+setAllUsersProfile 51 ALLUSERSPROFILE [%ALLUSERSPROFILE]
+setUserProfile 51 USERPROFILE [%USERPROFILE]
SetARPInstallLocation 51 ARPINSTALLLOCATION [INSTALLLOCATION]
NewProductFound 19 OOO_CUSTOMACTION_1
SameProductFound 19 OOO_CUSTOMACTION_2
+WrongWindowsVersion 19 OOO_CUSTOMACTION_4
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 3da59dc..62cb174 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt
@@ -70,3 +70,4 @@ ValidateProductID 300
WriteEnvironmentStrings 2500
WriteIniValues 2450
WriteRegistryValues 2400
+WrongWindowsVersion VersionNT < 501 10
diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
index 135987f..c19c5b2 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt
@@ -19,13 +19,13 @@ PatchWelcome Installed And PATCH And Not
IS_MAJOR_UPGRADE 625
ResolveSource Not Installed And Not PATCH 525
RMCCPSearch Not CCP_SUCCESS And CCP_TEST 300
SameProductFound SAMEPRODUCTS 170
-setAllUsersProfile2K VersionNT >= 500 512
-SetAllUsersProfileNT VersionNT = 400 511
+setAllUsersProfile 512
SetupCompleteError -3
SetupCompleteSuccess -1
SetupInitialization 100
SetupInterrupted -2
SetupProgress 800
SetupResume Installed And (RESUME Or Preselected) And Not PATCH 700
-setUserProfileNT VersionNT 510
+setUserProfile 510
ValidateProductID 350
+WrongWindowsVersion VersionNT < 501 10
_______________________________________________
Libreoffice-commits mailing list
libreoffice-comm...@lists.freedesktop.org
http://lists.freedesktop.org/mailman/listinfo/libreoffice-commits
