[Libreoffice-commits] core.git: instsetoo_native/inc_openoffice instsetoo_native/util solenv/bin

[Andras Timar]

 instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf |    4 ++--
 instsetoo_native/inc_openoffice/windows/msi_templates/CustomAc.idt |    2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallE.idt |    2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/InstallU.idt |    2 +-
 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |    2 ++
 instsetoo_native/util/openoffice.lst.in                            |    1 +
 solenv/bin/modules/installer/windows/property.pm                   |   10 ++++++++++
 7 files changed, 18 insertions(+), 5 deletions(-)

New commits:
commit d96d76480257cc9cfd5c6dfa8eba6847d5fdafc4
Author: Andras Timar <andras.timar at collabora.com>
Date:   Thu Apr 9 19:17:52 2015 +0200

    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 at collabora.com>
    Tested-by: Andras Timar <andras.timar at collabora.com>

diff --git a/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf b/instsetoo_native/inc_openoffice/windows/msi_languages/CustomAc.ulf
index 51f8788..f6b751e 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 9372705..602c683 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 6dd5ede..680961b 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 c19c5b2..24642ec 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 9923857..b771f8b 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 77f566d..fc2e98b 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@
         }
     }
 }
diff --git a/solenv/bin/modules/installer/windows/property.pm b/solenv/bin/modules/installer/windows/property.pm
index d09d315..d96678b 100644
--- a/solenv/bin/modules/installer/windows/property.pm
+++ b/solenv/bin/modules/installer/windows/property.pm
@@ -418,6 +418,14 @@ 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 Vista";
+    my $windowsminversionnumber = "600";
+
+    if ( $allvariables->{'WINDOWSSDKVERSION'} eq '70' )
+    {
+       $windowsminversiontext = "Windows XP";
+       $windowsminversionnumber = "501";
+    }
 
     # Updating the values
 
@@ -431,6 +439,8 @@ sub update_property_table
         ${$propertyfile}[$i] =~ s/\bPRODUCTNAMETEMPLATE\b/$productname/;
         ${$propertyfile}[$i] =~ s/\bPRODUCTVERSIONTEMPLATE\b/$productversion/;
         ${$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; }
     }