pengjunjie/desktop-apps
1
0
Fork 1
mirror of https://github.com/ONLYOFFICE/desktop-apps.git synced 2026-04-07 14:09:22 +08:00
Code Issues Packages Projects Releases Wiki Activity

Update vcredist to 2019 (#416)

Browse Source 
* Add check vcredist2019

* Update files section

* Update vcredist 2015 to 2015-2022

* Change version vcredist

* Update makefile

* Update arch

Co-authored-by: papacarlo <builder@onlyoffice.com>
This commit is contained in:
Egor Bespalov
2022-02-22 14:57:02 +03:00
committed by GitHub
parent 5acfa19b8a
commit 5b15492555
3 changed files with 13 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
win-linux/package/windows/Makefile.mk
View File

@ -8,20 +8,20 @@ DESKTOP_EDITORS_MSI += $(BUILD_DIR)/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(WIN_ARC
DESKTOP_EDITORS_ZIP += $(BUILD_DIR)/$(PACKAGE_NAME)_$(PACKAGE_VERSION)_$(WIN_ARCH)$(WIN_ARCH_SUFFIX:%=_%).zip
VCREDIST13 := $(BUILD_DIR)/data/vcredist/vcredist_2013_$(WIN_ARCH).exe
VCREDIST15 := $(BUILD_DIR)/data/vcredist/vcredist_2015_$(WIN_ARCH).exe
VCREDIST22 := $(BUILD_DIR)/data/vcredist/vcredist_2022_$(WIN_ARCH).exe
ifeq ($(WIN_ARCH),x64)
VCREDIST13_URL := https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x64.exe
VCREDIST15_URL := http://download.microsoft.com/download/2/c/6/2c675af0-2155-4961-b32e-289d7addfcec/vc_redist.x64.exe
VCREDIST22_URL := https://aka.ms/vs/17/release/vc_redist.x64.exe
else ifeq ($(WIN_ARCH),x86)
VCREDIST13_URL := https://download.microsoft.com/download/2/E/6/2E61CFA4-993B-4DD4-91DA-3737CD5CD6E3/vcredist_x86.exe
VCREDIST15_URL := http://download.microsoft.com/download/d/e/c/dec58546-c2f5-40a7-b38e-4df8d60b9764/vc_redist.x86.exe
VCREDIST22_URL := https://aka.ms/vs/17/release/vc_redist.x86.exe
endif
ifneq ($(COMPANY_NAME), ONLYOFFICE)
VCREDIST += $(VCREDIST13)
endif
VCREDIST += $(VCREDIST15)
VCREDIST += $(VCREDIST22)
EXE_UPDATE += $(BUILD_DIR)/update/editors_update_$(WIN_ARCH)$(WIN_ARCH_SUFFIX:%=_%).exe
APPCAST := $(BUILD_DIR)/update/appcast.xml
@ -94,9 +94,9 @@ $(VCREDIST13):
mkdir -p $(dir $(VCREDIST13))
$(CURL) $(VCREDIST13) $(VCREDIST13_URL)
$(VCREDIST15):
mkdir -p $(dir $(VCREDIST15))
$(CURL) $(VCREDIST15) $(VCREDIST15_URL)
$(VCREDIST22):
mkdir -p $(dir $(VCREDIST22))
$(CURL) $(VCREDIST22) $(VCREDIST22_URL)
$(DEST_DIR): install

6
win-linux/package/windows/common.iss
View File

@ -892,9 +892,9 @@ Name: {commonappdata}\{#APP_PATH}\webdata\cloud; Flags: uninsalwaysuninstall;
[Files]
Source: data\vcredist\vcredist_2015_{#sWinArch}.exe; DestDir: {app}; Flags: deleteafterinstall; \
AfterInstall: installVCRedist(ExpandConstant('{app}\vcredist_2015_{#sWinArch}.exe'), ExpandConstant('{cm:InstallAdditionalComponents}')); \
Check: not checkVCRedist2015;
Source: data\vcredist\vcredist_2022_{#sWinArch}.exe; DestDir: {app}; Flags: deleteafterinstall; \
AfterInstall: installVCRedist(ExpandConstant('{app}\vcredist_2022_{#sWinArch}.exe'), ExpandConstant('{cm:InstallAdditionalComponents}')); \
Check: not checkVCRedist2022;
Source: {#sBrandingFolder}\win-linux\package\windows\data\VisualElementsManifest.xml; DestDir: {app}; DestName: {#VISEFFECTS_MANIFEST_NAME}; MinVersion: 6.3;
Source: {#sBrandingFolder}\win-linux\package\windows\data\visual_elements_icon_150x150.png; DestDir: {app}\browser; MinVersion: 6.3;

6
win-linux/package/windows/utils.iss
View File

@ -92,15 +92,15 @@ begin
Result := msiproductupgrade(upgradecode, '12');
end;
function checkVCRedist2015(): Boolean;
function checkVCRedist2022(): Boolean;
var
upgradecode: String;
begin
if Is64BitInstallMode then
upgradecode := '{36F68A90-239C-34DF-B58C-64B30153CE35}' //x64
upgradecode := '{A181A302-3F6D-4BAD-97A8-A426A6499D78}' //x64
else
upgradecode := '{65E5BD06-6392-3027-8C26-853107D3CF1A}'; //x86
upgradecode := '{5720EC03-F26F-40B7-980C-50B5D420B5DE}'; //x86
Result := msiproductupgrade(upgradecode, '14');
end;