diff options
| author | Mike Kaganski <mike.kaganski@collabora.com> | 2020-01-13 13:08:02 +0300 |
|---|---|---|
| committer | Andras Timar <andras.timar@collabora.com> | 2020-05-13 17:41:53 +0200 |
| commit | d4a72f99c96622ac372eafe9494246df2e8cbb89 (patch) | |
| tree | 126bf9a6f38a29693cfa633575c76004c6676836 /scp2 | |
| parent | 9084bb7b961872e8108448298fb3e740e638789c (diff) | |
Merge both x64 and x86 CRT merge modules into x64 MSI
... because it contains x86 binaries in addition to x64: e.g., twain32shim,
spsupp_x86.
The opposite (inclusion of x64 MSM into x86 MSI) is not possible ( see
https://stackoverflow.com/questions/58181986 ), so do it just for x64 MSI.
Change-Id: I3935fce751b1b6d04291fede6b82be25fe541582
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86667
Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com>
Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
(cherry picked from commit a4681e8b74a59439110af42ff18cce021512056d)
Reviewed-on: https://gerrit.libreoffice.org/c/core/+/86680
Tested-by: Jenkins CollaboraOffice <jenkinscollaboraoffice@gmail.com>
Diffstat (limited to 'scp2')
| -rw-r--r-- | scp2/source/ooo/vc_redist.scp | 55 |
1 files changed, 16 insertions, 39 deletions
diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp index 727c13b27615..234427536fa5 100644 --- a/scp2/source/ooo/vc_redist.scp +++ b/scp2/source/ooo/vc_redist.scp @@ -18,57 +18,34 @@ #include "macros.inc" -#if defined(WITH_VC140_REDIST) - -#if defined WINDOWS_X64 -MergeModule gid_MergeModule_Microsoft_VC140_CRT_x64 -#else -MergeModule gid_MergeModule_Microsoft_VC140_CRT_x86 -#endif - Feature = gm_Root; -#if defined WINDOWS_X64 - Name = "Microsoft_VC140_CRT_x64.msm"; -#else - Name = "Microsoft_VC140_CRT_x86.msm"; -#endif - RootDir = "TARGETDIR"; - ComponentCondition = "VC_REDIST=1"; -End - +#if defined(WITH_VC141_REDIST) + #define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC141_CRT_x64 + #define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC141_CRT_x64.msm" + #define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC141_CRT_x86 + #define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC141_CRT_x86.msm" +#elif defined(WITH_VC150_REDIST) + #define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC150_CRT_x64 + #define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC150_CRT_x64.msm" + #define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC150_CRT_x86 + #define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC150_CRT_x86.msm" #endif -#if defined(WITH_VC150_REDIST) +#if defined(WINDOWS_X86_MERGEMODULE) -#if defined WINDOWS_X64 -MergeModule gid_MergeModule_Microsoft_VC150_CRT_x64 -#else -MergeModule gid_MergeModule_Microsoft_VC150_CRT_x86 -#endif +MergeModule WINDOWS_X86_MERGEMODULE Feature = gm_Root; -#if defined WINDOWS_X64 - Name = "Microsoft_VC150_CRT_x64.msm"; -#else - Name = "Microsoft_VC150_CRT_x86.msm"; -#endif + Name = WINDOWS_X86_MERGEMODULE_FILE; RootDir = "TARGETDIR"; ComponentCondition = "VC_REDIST=1"; End #endif -#if defined(WITH_VC141_REDIST) +#if defined(WINDOWS_X64) && defined(WINDOWS_X64_MERGEMODULE) -#if defined WINDOWS_X64 -MergeModule gid_MergeModule_Microsoft_VC141_CRT_x64 -#else -MergeModule gid_MergeModule_Microsoft_VC141_CRT_x86 -#endif +MergeModule WINDOWS_X64_MERGEMODULE Feature = gm_Root; -#if defined WINDOWS_X64 - Name = "Microsoft_VC141_CRT_x64.msm"; -#else - Name = "Microsoft_VC141_CRT_x86.msm"; -#endif + Name = WINDOWS_X64_MERGEMODULE_FILE; RootDir = "TARGETDIR"; ComponentCondition = "VC_REDIST=1"; End |