From 267c6f2ac71f92999e969232431ba04678e7437e Mon Sep 17 00:00:00 2001 From: Daniel Baumann Date: Mon, 15 Apr 2024 07:54:39 +0200 Subject: Adding upstream version 4:24.2.0. Signed-off-by: Daniel Baumann --- scp2/source/ooo/vc_redist.scp | 68 +++++++++++++++++++++++++++++++++++++++++++ 1 file changed, 68 insertions(+) create mode 100644 scp2/source/ooo/vc_redist.scp (limited to 'scp2/source/ooo/vc_redist.scp') diff --git a/scp2/source/ooo/vc_redist.scp b/scp2/source/ooo/vc_redist.scp new file mode 100644 index 0000000000..3fe7af2b97 --- /dev/null +++ b/scp2/source/ooo/vc_redist.scp @@ -0,0 +1,68 @@ +/* + * This file is part of the LibreOffice project. + * + * This Source Code Form is subject to the terms of the Mozilla Public + * License, v. 2.0. If a copy of the MPL was not distributed with this + * file, You can obtain one at http://mozilla.org/MPL/2.0/. + * + * This file incorporates work covered by the following license notice: + * + * Licensed to the Apache Software Foundation (ASF) under one or more + * contributor license agreements. See the NOTICE file distributed + * with this work for additional information regarding copyright + * ownership. The ASF licenses this file to you under the Apache + * License, Version 2.0 (the "License"); you may not use this file + * except in compliance with the License. You may obtain a copy of + * the License at http://www.apache.org/licenses/LICENSE-2.0 . + */ + +#include "macros.inc" + +#if defined(WITH_VC_REDIST) +#if WITH_VC_REDIST == 143 + #define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC143_CRT_x64 + #define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC143_CRT_x64.msm" + #define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC143_CRT_x86 + #define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC143_CRT_x86.msm" +#elif WITH_VC_REDIST == 142 + #define WINDOWS_X64_MERGEMODULE gid_MergeModule_Microsoft_VC142_CRT_x64 + #define WINDOWS_X64_MERGEMODULE_FILE "Microsoft_VC142_CRT_x64.msm" + #define WINDOWS_X86_MERGEMODULE gid_MergeModule_Microsoft_VC142_CRT_x86 + #define WINDOWS_X86_MERGEMODULE_FILE "Microsoft_VC142_CRT_x86.msm" +#elif WITH_VC_REDIST == 141 + #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" +#else + // The next string will result in "malformed par file" error, terminating build as expected. + // Possibly a new version of CRT was enabled in configure.ac, but not handled here yet? + error: unknown VC redist version WITH_VC_REDIST. Check configure.ac +#endif +#endif + +#if defined(WINDOWS_X86_MERGEMODULE) + +/* Attributes: msidbComponentAttributesPermanent = 0x10 */ +MergeModule WINDOWS_X86_MERGEMODULE + Feature = gm_Root; + Name = WINDOWS_X86_MERGEMODULE_FILE; + RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; + Attributes_Add = "0x10"; +End + +#endif + +#if defined(WINDOWS_X64) && defined(WINDOWS_X64_MERGEMODULE) + +/* Attributes: msidbComponentAttributesPermanent = 0x10 */ +MergeModule WINDOWS_X64_MERGEMODULE + Feature = gm_Root; + Name = WINDOWS_X64_MERGEMODULE_FILE; + RootDir = "TARGETDIR"; + ComponentCondition = "VC_REDIST=1"; + Attributes_Add = "0x10"; +End + +#endif -- cgit v1.2.3