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

Dont chdir as part of sip-build command

Browse Source 
Instead chdir overall, makes the command simpler.
This commit is contained in:
Kovid Goyal 2021-05-13 07:48:08 +05:30
parent 4b5f899366
commit d368c4f96e
No known key found for this signature in database
GPG Key ID: 06BC317B515ACE7C
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
setup/build.py
View File

@ -333,10 +333,10 @@ class Build(Command):
jobs = []
sbf_map = {}
for (ext, dest) in pyqt_extensions:
cmd, sbf = self.get_sip_commands(ext)
cmd, sbf, cwd = self.get_sip_commands(ext)
sbf_map[id(ext)] = sbf
if cmd is not None:
jobs.append(create_job(cmd))
jobs.append(create_job(cmd, cwd=cwd))
if jobs:
self.info(f'SIPing {len(jobs)} files...')
if not parallel_build(jobs, self.info):
@ -523,16 +523,18 @@ sip-file = "{os.path.basename(sipf)}"
sipf = ext.sip_files[0]
sbf = self.j(src_dir, self.b(sipf)+'.sbf')
cmd = None
cwd = None
if self.newer(sbf, [sipf] + ext.headers + ext.sources):
shutil.rmtree(src_dir, ignore_errors=True)
os.makedirs(src_dir)
self.create_sip_build_skeleton(src_dir, ext)
cwd = src_dir
cmd = [
sys.executable, '-c',
f'''import os; os.chdir({src_dir!r}); from sipbuild.tools.build import main; main();''',
'''from sipbuild.tools.build import main; main();''',
'--verbose', '--no-make', '--qmake', QMAKE
]
return cmd, sbf
return cmd, sbf, cwd
def build_pyqt_extension(self, ext, dest, sbf):
self.info(f'\n####### Building {ext.name} extension', '#'*7)