From 96312f29e33be978e7d9bdac2f2e3bbe619f5f37 Mon Sep 17 00:00:00 2001 From: Eugene Kozyrev <67453079+EugeneKozyrev@users.noreply.github.com> Date: Tue, 23 Aug 2022 12:42:03 +0300 Subject: [PATCH] Put away vcredist_2013 removing (#512) --- scripts/package_desktop.py | 12 ++---------- 1 file changed, 2 insertions(+), 10 deletions(-) diff --git a/scripts/package_desktop.py b/scripts/package_desktop.py index 950b816..2ea1754 100644 --- a/scripts/package_desktop.py +++ b/scripts/package_desktop.py @@ -221,24 +221,16 @@ def make_advinst(): aic_content += [ "SetPackageType x86", "SetAppdir -buildname DefaultBuild -path [ProgramFilesFolder][MANUFACTURER_INSTALL_FOLDER]\\[PRODUCT_INSTALL_FOLDER]", - 'DelPrerequisite "Microsoft Visual C++ 2015-2022 Redistributable (x64)"' - ] - if not onlyoffice: - aic_content += [ + 'DelPrerequisite "Microsoft Visual C++ 2015-2022 Redistributable (x64)"', 'DelPrerequisite "Microsoft Visual C++ 2013 Redistributable (x64)"' ] if machine == '64': aic_content += [ - 'DelPrerequisite "Microsoft Visual C++ 2015-2022 Redistributable (x86)"' - ] - if not onlyoffice: - aic_content += [ + 'DelPrerequisite "Microsoft Visual C++ 2015-2022 Redistributable (x86)"', 'DelPrerequisite "Microsoft Visual C++ 2013 Redistributable (x86)"' ] if onlyoffice: aic_content += [ - 'DelPrerequisite "Microsoft Visual C++ 2013 Redistributable (x86)"', - 'DelPrerequisite "Microsoft Visual C++ 2013 Redistributable (x64)"', "DelFolder CUSTOM_PATH" ] else: