diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-16 07:23:29 +0100 |
|---|---|---|
| committer | Mike Kaganski <mike.kaganski@collabora.com> | 2018-04-16 10:36:50 +0200 |
| commit | 914f6385d98f8c898102c971a4d5b0eb9f075ef0 (patch) | |
| tree | 4d2912f3b62397ad947f5644377023152e2ec0ac | |
| parent | 104b26b246c94c8c66864b20d00e419d96b15961 (diff) | |
32-bit installer must search both for 32- and 64-bit redist
Change-Id: I343b731878c5ebbe61dc8b01fecf3be36b9a35c3
Reviewed-on: https://gerrit.libreoffice.org/52933
Tested-by: Jenkins <ci@libreoffice.org>
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
| -rw-r--r-- | solenv/bin/modules/installer/windows/upgrade.pm | 15 |
1 files changed, 7 insertions, 8 deletions
diff --git a/solenv/bin/modules/installer/windows/upgrade.pm b/solenv/bin/modules/installer/windows/upgrade.pm index 9e0d7ea79fb7..cb54a794cbc5 100644 --- a/solenv/bin/modules/installer/windows/upgrade.pm +++ b/solenv/bin/modules/installer/windows/upgrade.pm @@ -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 |