Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Disable app-local deployment of the universal CRT

Browse Source 
It does not work for some hard to fathom reason.
This commit is contained in:
Kovid Goyal 2015-12-11 01:08:46 +05:30
parent 963b0eeea6
commit d337aee373
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
setup/installer/windows/freeze.py
View File

@ -730,11 +730,14 @@ class Win32Freeze(Command, WixMixIn):
vc_path = os.path.join(r'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist', plat, 'Microsoft.VC140.CRT') vc_path = os.path.join(r'C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\redist', plat, 'Microsoft.VC140.CRT')
if not os.path.exists(vc_path): if not os.path.exists(vc_path):
raise SystemExit('Visual Studio redistributable CRT not found') raise SystemExit('Visual Studio redistributable CRT not found')
sdk_path = os.path.join(r'C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs', plat) # I cannot get app local deployment of the UCRT to work. Things left to
if not os.path.exists(sdk_path): # try: try dlls from the windows sdk standalone, try manually loading
raise SystemExit('Windows 10 redistributable CRT not found') # ucrtbase.dll and some api dlls before loading the launcher.
for dll in glob.glob(os.path.join(sdk_path, '*.dll')): # sdk_path = os.path.join(r'C:\Program Files (x86)\Windows Kits\10\Redist\ucrt\DLLs', plat)
shutil.copy2(dll, self.dll_dir) # if not os.path.exists(sdk_path):
# raise SystemExit('Windows 10 redistributable CRT not found')
# for dll in glob.glob(os.path.join(sdk_path, '*.dll')):
# shutil.copy2(dll, self.dll_dir)
for dll in glob.glob(os.path.join(vc_path, '*.dll')): for dll in glob.glob(os.path.join(vc_path, '*.dll')):
bname = os.path.basename(dll) bname = os.path.basename(dll)
if not bname.startswith('vccorlib') and not bname.startswith('concrt'): if not bname.startswith('vccorlib') and not bname.startswith('concrt'):