mirror of
https://github.com/kovidgoyal/kitty.git
synced 2024-11-13 12:09:35 +03:00
Generate Wayland protocol definitions in parallel as well
This commit is contained in:
parent
39f6071c68
commit
67f23664c9
11
glfw/glfw.py
11
glfw/glfw.py
@ -84,7 +84,8 @@ def init_env(env, pkg_config, at_least_version, test_compile, module='x11'):
|
||||
return ans
|
||||
|
||||
|
||||
def build_wayland_protocols(env, run_tool, emphasis, newer, dest_dir):
|
||||
def build_wayland_protocols(env, Command, parallel_run, emphasis, newer, dest_dir):
|
||||
items = []
|
||||
for protocol in env.wayland_protocols:
|
||||
src = os.path.join(env.wayland_packagedir, protocol)
|
||||
if not os.path.exists(src):
|
||||
@ -94,8 +95,12 @@ def build_wayland_protocols(env, run_tool, emphasis, newer, dest_dir):
|
||||
dest = os.path.join(dest_dir, dest)
|
||||
if newer(dest, src):
|
||||
q = 'client-header' if ext == 'h' else env.wayland_scanner_code
|
||||
run_tool([env.wayland_scanner, q, src, dest],
|
||||
desc='Generating {} ...'.format(emphasis(os.path.basename(dest))))
|
||||
items.append(Command(
|
||||
'Generating {} ...'.format(emphasis(os.path.basename(dest))),
|
||||
[env.wayland_scanner, q, src, dest],
|
||||
lambda: True, None, None, None))
|
||||
if items:
|
||||
parallel_run(items)
|
||||
|
||||
|
||||
class Arg:
|
||||
|
4
setup.py
4
setup.py
@ -403,7 +403,7 @@ def parallel_run(items):
|
||||
while len(workers):
|
||||
wait()
|
||||
if not verbose:
|
||||
print()
|
||||
print(' done')
|
||||
if failed:
|
||||
print(failed.desc)
|
||||
run_tool(failed.cmd)
|
||||
@ -552,7 +552,7 @@ def compile_glfw(compilation_database):
|
||||
all_headers = [os.path.join('glfw', x) for x in genv.all_headers]
|
||||
if module == 'wayland':
|
||||
try:
|
||||
glfw.build_wayland_protocols(genv, run_tool, emphasis, newer, os.path.join(base, 'glfw'))
|
||||
glfw.build_wayland_protocols(genv, Command, parallel_run, emphasis, newer, os.path.join(base, 'glfw'))
|
||||
except SystemExit as err:
|
||||
print(err, file=sys.stderr)
|
||||
print(error('Disabling building of wayland backend'), file=sys.stderr)
|
||||
|
Loading…
Reference in New Issue
Block a user