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

Add CRT to the frozen build

Browse Source
This commit is contained in:
Kovid Goyal 2015-12-08 10:20:42 +05:30
parent ab3e048a95
commit e3d0d6e23a
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 22 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -6,7 +6,7 @@ __license__ = 'GPL v3'
__copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>' __copyright__ = '2009, Kovid Goyal <kovid@kovidgoyal.net>'
__docformat__ = 'restructuredtext en' __docformat__ = 'restructuredtext en'
import sys, os, shutil, glob, py_compile, subprocess, re, zipfile, time, textwrap, errno import sys, os, shutil, glob, py_compile, subprocess, re, zipfile, time, textwrap, errno, stat
from setup import (Command, modules, functions, basenames, __version__, from setup import (Command, modules, functions, basenames, __version__,
__appname__) __appname__)
@ -88,6 +88,7 @@ class Win32Freeze(Command, WixMixIn):
self.embed_manifests() self.embed_manifests()
self.install_site_py() self.install_site_py()
self.archive_lib_dir() self.archive_lib_dir()
self.copy_crt()
# self.create_installer() # self.create_installer()
if not is64bit: if not is64bit:
self.build_portable() self.build_portable()
@ -110,9 +111,6 @@ class Win32Freeze(Command, WixMixIn):
def freeze(self): def freeze(self):
shutil.copy2(self.j(self.src_root, 'LICENSE'), self.base) shutil.copy2(self.j(self.src_root, 'LICENSE'), self.base)
# self.info('Adding CRT')
# shutil.copytree(CRT, self.j(self.base, os.path.basename(CRT)))
self.info('Adding resources...') self.info('Adding resources...')
tgt = self.j(self.app_base, 'resources') tgt = self.j(self.app_base, 'resources')
if os.path.exists(tgt): if os.path.exists(tgt):
@ -704,3 +702,23 @@ class Win32Freeze(Command, WixMixIn):
zf.writestr(zinfo, f.read()) zf.writestr(zinfo, f.read())
self.zf_names.add(name) self.zf_names.add(name)
def copy_crt(self):
self.info('Copying CRT...')
plat = ('x64' if is64bit else 'x86')
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):
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)
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')):
bname = os.path.basename(dll)
if not bname.startswith('vccorlib') and not bname.startswith('concrt'):
# Those two DLLs are not required vccorlib is for the CORE CLR
# I think concrt is the concurrency runtime for C++ which I believe
# nothing in calibre currently uses
shutil.copy(dll, self.dll_dir)
os.chmod(os.path.join(self.dll_dir, dll), stat.S_IRWXU)