open.source/espanso
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #342 from federico-terzi/redistcheck

Browse Source 
Add check to verify correct VC redist version is included on Windows. Fix #336
This commit is contained in:
Federico Terzi 2020-06-24 21:25:48 +02:00 committed by GitHub
commit 9cfd73622b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
packager.py
View File

@ -82,11 +82,24 @@ def build_windows(package_info):
msvc_dirs = glob.glob("C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\*\\VC\\Redist\\MSVC\\*") msvc_dirs = glob.glob("C:\\Program Files (x86)\\Microsoft Visual Studio\\2019\\*\\VC\\Redist\\MSVC\\*")
print("Found Redists: ", msvc_dirs) print("Found Redists: ", msvc_dirs)
print("Determining best redist...")
if len(msvc_dirs) == 0: if len(msvc_dirs) == 0:
raise Exception("Cannot find redistributable dlls") raise Exception("Cannot find redistributable dlls")
msvc_dir = msvc_dirs[-1] # Take the most recent version of the toolchain msvc_dir = None
print("Using: ",msvc_dir)
for curr_dir in msvc_dirs:
dll_files = glob.glob(curr_dir + "\\x64\\*CRT\\*.dll")
print("Found dlls", dll_files, "in", curr_dir)
if any("vcruntime140_1.dll" in x.lower() for x in dll_files):
msvc_dir = curr_dir
break
if msvc_dir is None:
raise Exception("Cannot find redist with VCRUNTIME140_1.dll")
print("Using: ", msvc_dir)
dll_files = glob.glob(msvc_dir + "\\x64\\*CRT\\*.dll") dll_files = glob.glob(msvc_dir + "\\x64\\*CRT\\*.dll")