forked from amazingfate/loongoffice
61b1d63133
... in InstallUISequense. Use --with-vcredist-dir to point to a directory with vc_redist.x64.exe and/or vc_redist.x86.exe. Use --without-vcredist-dir (or --with-vcredist-dir=no) if you don't want to ship it as part of installer and want to silence the configure warning. VCRedist 2015 version 14.0.24215.1 is available at https://www.microsoft.com/en-us/download/details.aspx?id=53840 Since VisualStudio 2015, VC redist merge module that we used before started to work differently: it installs the UCRT only on WinXP, but not on later OSes (Vista to 8.1) which may lack the UCRT (Win10 has it out of the box). The merge module only installs VCRuntime on those systems, which still leaves us with "api-ms-*.dll is missing" problem. (https://blogs.msdn.microsoft.com/vcblog/2015/03/03/introducing-the-universal-crt/ gives more information on VCRedist refactoring background.) Since commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a, we use a workaround described at the page mentioned above as "App-local deployment of the Universal CRT". We just copy all UCRT DLLs to LibreOffice/program. This has a drawback though, that our UCRT is not updated by Windows Update, so users would rely on LibreOffice updates in case of some vulnerabilities in UCRT (and they could even not realize they have that problem). MS recommends to install UCRT using EXEs they provide from their site. The EXEs install both VCRuntimes and UCRTs, along with required patches, for all Windows versions (Windows XP through Windows 10, where they only install VCRuntimes); the installed libraries are managed by system's update mechanism. But those EXEs cannot be used in MSI custom actions inside InstallExecuteSequence, because they use MSI themselves. So this patch integrates the vc_redist.xXX.exe into MSI binary table, and uses custom action to run the EXE after ExecuteAction in InstallUISequence. This will show the user a VCRedist install window after the main LibreOffice installation finishes; no user interaction is required (except for one additional UAC request), and errors are ignored. Since this installation takes care of both VCRuntime and UCRT, we can ultimately drop both the app-local workaround, and vcredist merge module (so VCRuntime would also be updated by system). The former is done here: this reverts commit 71d9a61302e65fe091cf70c13fa72b3df09b7e3a. This approach has its drawback: if one wants to use unattended installation (without UI; one example is deployment using ActiveDirectory GPO), then InstallUISequence is not run, and so VCRedist isn't installed. In this case, one should install VCRedist separately. Supposedly this should not be huge problem, because this is the case for many existing applications that need separate VCRedist deployment in these scenarios, and unattended installation is advanced stuff that requires prepared user. A notice would be required in release notes and FAQ, though. Change-Id: Ia6a16be60af8a08f41ea7c3dbd457d8f89006006 Reviewed-on: https://gerrit.libreoffice.org/46356 Reviewed-by: Mike Kaganski <mike.kaganski@collabora.com> Tested-by: Mike Kaganski <mike.kaganski@collabora.com>
52 lines
1.5 KiB
Makefile
52 lines
1.5 KiB
Makefile
# -*- Mode: makefile-gmake; tab-width: 4; indent-tabs-mode: t -*-
|
|
#
|
|
# 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/.
|
|
#
|
|
|
|
$(eval $(call gb_InstallModule_InstallModule,scp2/windows))
|
|
|
|
$(eval $(call gb_InstallModule_define_if_set,scp2/windows,\
|
|
BUILD_X64 \
|
|
))
|
|
|
|
$(eval $(call gb_InstallModule_add_defs,scp2/windows,\
|
|
$(if $(WINDOWS_SDK_HOME),\
|
|
-DHAVE_WINDOWS_SDK \
|
|
) \
|
|
$(if $(MSM_PATH),\
|
|
-DMSM_PATH \
|
|
) \
|
|
$(if $(VCREDIST_DIR),\
|
|
-DVCREDIST_EXE_NAME="$(VCREDIST_EXE)" \
|
|
) \
|
|
))
|
|
|
|
$(eval $(call gb_InstallModule_add_scpfiles,scp2/windows,\
|
|
scp2/source/ooo/folder_ooo \
|
|
scp2/source/ooo/vc_redist \
|
|
scp2/source/ooo/windowscustomaction_ooo \
|
|
))
|
|
|
|
$(eval $(call gb_InstallModule_add_localized_scpfiles,scp2/windows,\
|
|
scp2/source/base/folderitem_base \
|
|
scp2/source/base/registryitem_base \
|
|
scp2/source/calc/folderitem_calc \
|
|
scp2/source/calc/registryitem_calc \
|
|
scp2/source/draw/folderitem_draw \
|
|
scp2/source/draw/registryitem_draw \
|
|
scp2/source/impress/folderitem_impress \
|
|
scp2/source/impress/registryitem_impress \
|
|
scp2/source/math/folderitem_math \
|
|
scp2/source/math/registryitem_math \
|
|
scp2/source/ooo/folderitem_ooo \
|
|
scp2/source/ooo/registryitem_ooo \
|
|
scp2/source/writer/folderitem_writer \
|
|
scp2/source/writer/registryitem_writer \
|
|
))
|
|
|
|
# vim: set shiftwidth=4 tabstop=4 noexpandtab:
|