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

[Mike Kaganski]

 instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt |    2 -
 scp2/source/ooo/vc_redist.scp                                      |    2 -
 solenv/bin/modules/installer/windows/upgrade.pm                    |   15 +++++-----
 3 files changed, 10 insertions(+), 9 deletions(-)

New commits:
commit 606852089e32a2065ee5fc3224f7b2940e6b1323
Author: Mike Kaganski <mike.kaganski at collabora.com>
Date:   Wed Apr 18 07:05:04 2018 +0100

    Revert two last changes to Upgrade table
    
    This reverts commits 914f6385d98f8c898102c971a4d5b0eb9f075ef0 and
    a6045159237419ce8fa49202c672e3895f0ab30a. A investigation required why
    is the problem with them; meanwhile, they break builds.
    
    Change-Id: I713b27dd64e8ac7beb2757c362765b60ce191f8d
    Reviewed-on: https://gerrit.libreoffice.org/53078
    Reviewed-by: Mike Kaganski <mike.kaganski at collabora.com>
    Tested-by: Mike Kaganski <mike.kaganski at collabora.com>

diff --git a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
index 326b70fcddc7..12ba10f300c9 100644
--- a/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
+++ b/instsetoo_native/inc_openoffice/windows/msi_templates/Property.idt
@@ -43,7 +43,7 @@ ProgressType3	installs
 Quickstarterlinkname	QUICKSTARTERLINKNAMETEMPLATE
 RebootYesNo	Yes
 ReinstallModeText	omus
-SecureCustomProperties	NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED;VCRUNTIME_DETECTED_32
+SecureCustomProperties	NEWPRODUCTS;OLDPRODUCTS;VCRUNTIME_DETECTED
 SetupType	Typical
 SELECT_WORD	0
 SELECT_EXCEL	0
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp
index c4750ff5ad69..921a9433e820 100644
--- a/scp2/source/ooo/vc_redist.scp
+++ b/scp2/source/ooo/vc_redist.scp
@@ -93,7 +93,7 @@ WindowsCustomAction gid_Customaction_InstallVCRedist
     Source = VCREDIST_EXE_NAME;
     Target = "/repair /norestart /passive";
     Inbinarytable = 1;
-    Assignment1 = ("InstallUISequence", "Not Installed And Not ( (VCRUNTIME_DETECTED Or VCRUNTIME_DETECTED_32) And UCRT_DETECTED ) And VC_REDIST = 1", "behind_ExecuteAction");
+    Assignment1 = ("InstallUISequence", "Not Installed And Not ( VCRUNTIME_DETECTED And UCRT_DETECTED ) And VC_REDIST = 1", "behind_ExecuteAction");
 End
 
 #endif
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm
index b008d010fb15..9e0d7ea79fb7 100644
--- a/solenv/bin/modules/installer/windows/upgrade.pm
+++ b/solenv/bin/modules/installer/windows/upgrade.pm
@@ -46,15 +46,16 @@ sub create_upgrade_table
     push(@upgradetable, $newline);
 
     # Detecting if VC Runtime is installed on system
-    $newline = "{36F68A90-239C-34DF-B58C-64B30153CE35}" . "\t" . "14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . "VCRUNTIME_DETECTED";
-    push(@upgradetable, $newline);
-
-    # 32-bit installer must also detect if 32-bit Runtime is installed
-    if ( $installer::globals::cpuname ne 'X86_64' )
+    $newline = "VCRUNTIME_UPGRADE_CODE" . "\t" . "14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . "VCRUNTIME_DETECTED";
+    if ( $installer::globals::cpuname eq 'X86_64' )
     {
-        $newline = "{65E5BD06-6392-3027-8C26-853107D3CF1A}" . "\t" . "14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . "VCRUNTIME_DETECTED_32";
-        push(@upgradetable, $newline);
+        $newline =~ s/VCRUNTIME_UPGRADE_CODE/{36F68A90-239C-34DF-B58C-64B30153CE35}/;
     }
+    else
+    {
+        $newline =~ s/VCRUNTIME_UPGRADE_CODE/{65E5BD06-6392-3027-8C26-853107D3CF1A}/;
+    }
+    push(@upgradetable, $newline);
 
     # Saving the file