Windows build: Fix a regression in 0.9.9 that caused calibre to not start on some windows system that were missing the VC.90 dlls (some older XP systems)

This commit is contained in:
Kovid Goyal 2012-12-21 00:34:36 +05:30
parent 30e073fbeb
commit 8538079882

View File

@ -102,7 +102,8 @@ class Win32Freeze(Command, WixMixIn):
repl_pat = re.compile( repl_pat = re.compile(
r'(?is)<dependency>.*?Microsoft\.VC\d+\.CRT.*?</dependency>') r'(?is)<dependency>.*?Microsoft\.VC\d+\.CRT.*?</dependency>')
for dll in glob.glob(self.j(self.dll_dir, '*.dll')): for dll in (glob.glob(self.j(self.dll_dir, '*.dll')) +
glob.glob(self.j(self.plugins_dir, '*.pyd'))):
bn = self.b(dll) bn = self.b(dll)
with open(dll, 'rb') as f: with open(dll, 'rb') as f:
raw = f.read() raw = f.read()