Skip to content

Commit 704112c

Browse files
committed
Fix crash on Windows due to incompatible VC++ runtime
- Copy the required VC++ runtime DLLs to the .zip - Update the installer script to install the latest VC++ runtime
1 parent 8b8f787 commit 704112c

2 files changed

Lines changed: 10 additions & 2 deletions

File tree

.github/workflows/windows.yml

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,9 @@ jobs:
4343
cp -r ../Resources/DLLs/FrontPanelUSB-DriverOnly-4.5.5.exe open-ephys
4444
cp -r ../Resources/DLLs/FTD3XXDriver_WHQLCertified_1.3.0.8_Installer.exe open-ephys
4545
cp ../LICENSE open-ephys
46+
cp C:/Windows/System32/msvcp140.dll open-ephys
47+
cp C:/Windows/System32/vcruntime140.dll open-ephys
48+
cp C:/Windows/System32/vcruntime140_1.dll open-ephys
4649
gui_ver=$(git describe --tags $(git rev-list --tags --max-count=1))
4750
zipfile=open-ephys-v1.0.0-dev-windows.zip
4851
powershell Compress-Archive -Path "open-ephys" -DestinationPath ${zipfile}
@@ -59,13 +62,18 @@ jobs:
5962
cp -r ../Resources/DLLs/FrontPanelUSB-DriverOnly-4.5.5.exe open-ephys
6063
cp -r ../Resources/DLLs/FTD3XXDriver_WHQLCertified_1.3.0.8_Installer.exe open-ephys
6164
cp ../LICENSE open-ephys
65+
cp C:/Windows/System32/msvcp140.dll open-ephys
66+
cp C:/Windows/System32/vcruntime140.dll open-ephys
67+
cp C:/Windows/System32/vcruntime140_1.dll open-ephys
6268
gui_ver=$(git describe --tags $(git rev-list --tags --max-count=1))
6369
zipfile=open-ephys-v1.0.0-alpha.1-windows.zip
6470
powershell Compress-Archive -Path "open-ephys" -DestinationPath ${zipfile}
6571
user_info="X-JFrog-Art-Api:$artifactoryApiKey"
6672
curl -H $user_info -T $zipfile "https://openephysgui.jfrog.io/artifactory/1.0.0-alpha/windows/$zipfile"
6773
68-
cd ../Resources/Installers/Windows
74+
cd open-ephys
75+
rm -f msvcp140.dll vcruntime140.dll vcruntime140_1.dll
76+
cd ../../Resources/Installers/Windows
6977
iscc "windows_installer_script.iss"
7078
installer=Install-Open-Ephys-GUI-v1.0.0-alpha.1.exe
7179
mv Open-Ephys_Installer.exe $installer

Resources/Installers/Windows/windows_installer_script.iss

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -212,7 +212,7 @@ function InitializeSetup: Boolean;
212212
begin
213213
214214
// https://docs.microsoft.com/en-us/cpp/windows/latest-supported-vc-redist
215-
if not IsMsiProductInstalled('{36F68A90-239C-34DF-B58C-64B30153CE35}', PackVersionComponents(14, 30, 30704, 0)) then begin
215+
if not IsMsiProductInstalled('{36F68A90-239C-34DF-B58C-64B30153CE35}', PackVersionComponents(14, 40, 33810, 0)) then begin
216216
Dependency_Add('vcredist2022_x64.exe',
217217
'/passive /norestart',
218218
'Visual C++ 2015-2022 Redistributable (x64)',

0 commit comments

Comments
 (0)