Kaydet (Commit) 914f6385 authored tarafından Mike Kaganski's avatar Mike Kaganski

32-bit installer must search both for 32- and 64-bit redist

Change-Id: I343b731878c5ebbe61dc8b01fecf3be36b9a35c3
Reviewed-on: https://gerrit.libreoffice.org/52933Tested-by: 's avatarJenkins <ci@libreoffice.org>
Reviewed-by: 's avatarMike Kaganski <mike.kaganski@collabora.com>
üst 104b26b2
......@@ -46,16 +46,15 @@ sub create_upgrade_table
push(@upgradetable, $newline);
# Detecting if VC Runtime is installed on system
$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 =~ s/VCRUNTIME_UPGRADE_CODE/{36F68A90-239C-34DF-B58C-64B30153CE35}/;
}
else
$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 =~ s/VCRUNTIME_UPGRADE_CODE/{65E5BD06-6392-3027-8C26-853107D3CF1A}/;
$newline = "{65E5BD06-6392-3027-8C26-853107D3CF1A}" . "\t" . "14.0.24215" . "\t" . "15.0.0" . "\t" . "" . "\t" . "258" . "\t" . "" . "\t" . "VCRUNTIME_DETECTED";
push(@upgradetable, $newline);
}
push(@upgradetable, $newline);
# Saving the file
......
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