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

Parallelize building sip files

Browse Source
This commit is contained in:
Kovid Goyal 2019-12-06 14:30:18 +05:30
parent dc4e482799
commit dd12f0a76e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 23 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
setup/build.py
View File

@ -308,9 +308,20 @@ class Build(Command):
for cmd in link_commands: for cmd in link_commands:
self.post_link_cleanup(cmd) self.post_link_cleanup(cmd)
jobs = []
sbf_map = {}
for (ext, dest) in pyqt_extensions: for (ext, dest) in pyqt_extensions:
self.info('\n####### Building extension', ext.name, '#'*7) cmd, sbf = self.get_sip_commands(ext)
self.build_pyqt_extension(ext, dest) sbf_map[id(ext)] = sbf
if cmd is not None:
jobs.append(create_job(cmd))
if jobs:
self.info(f'SIPing {len(jobs)} files...')
if not parallel_build(jobs, self.info):
raise SystemExit(1)
for (ext, dest) in pyqt_extensions:
sbf = sbf_map[id(ext)]
self.build_pyqt_extension(ext, dest, sbf)
if opts.only in {'all', 'headless'}: if opts.only in {'all', 'headless'}:
self.build_headless() self.build_headless()
@ -452,17 +463,21 @@ class Build(Command):
if isosx: if isosx:
os.rename(self.j(self.d(target), 'libheadless.dylib'), self.j(self.d(target), 'headless.so')) os.rename(self.j(self.d(target), 'libheadless.dylib'), self.j(self.d(target), 'headless.so'))
def build_sip_files(self, ext, src_dir): def get_sip_commands(self, ext):
pyqt_dir = self.j(self.build_dir, 'pyqt')
src_dir = self.j(pyqt_dir, ext.name)
from setup.build_environment import pyqt from setup.build_environment import pyqt
sip_files = ext.sip_files sip_files = ext.sip_files
ext.sip_files = [] ext.sip_files = []
sipf = sip_files[0] sipf = sip_files[0]
os.makedirs(src_dir, exist_ok=True)
sbf = self.j(src_dir, self.b(sipf)+'.sbf') sbf = self.j(src_dir, self.b(sipf)+'.sbf')
cmd = None
if self.newer(sbf, [sipf]+ext.headers): if self.newer(sbf, [sipf]+ext.headers):
cmd = [pyqt['sip_bin'], '-w', '-c', src_dir, '-b', sbf, '-I' + pyqt['pyqt_sip_dir']] + shlex.split(pyqt['sip_flags']) + [sipf] cmd = [pyqt['sip_bin'], '-w', '-c', src_dir, '-b', sbf, '-I' + pyqt['pyqt_sip_dir']] + shlex.split(pyqt['sip_flags']) + [sipf]
self.info(' '.join(cmd)) return cmd, sbf
self.check_call(cmd)
self.info('') def get_sip_data(self, sbf):
with open(sbf, 'rb') as f: with open(sbf, 'rb') as f:
raw = f.read().decode('utf-8') raw = f.read().decode('utf-8')
@ -473,7 +488,7 @@ class Build(Command):
return ans return ans
return {x:read(x) for x in ('target', 'sources', 'headers')} return {x:read(x) for x in ('target', 'sources', 'headers')}
def build_pyqt_extension(self, ext, dest): def build_pyqt_extension(self, ext, dest, sbf):
from setup.build_environment import pyqt, qmakespec, QMAKE from setup.build_environment import pyqt, qmakespec, QMAKE
from setup.parallel_build import cpu_count from setup.parallel_build import cpu_count
from distutils import sysconfig from distutils import sysconfig
@ -481,7 +496,7 @@ class Build(Command):
src_dir = self.j(pyqt_dir, ext.name) src_dir = self.j(pyqt_dir, ext.name)
if not os.path.exists(src_dir): if not os.path.exists(src_dir):
os.makedirs(src_dir) os.makedirs(src_dir)
sip = self.build_sip_files(ext, src_dir) sip = self.get_sip_data(sbf)
pro = textwrap.dedent( pro = textwrap.dedent(
'''\ '''\
TEMPLATE = lib TEMPLATE = lib