Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
a0c95cb07e
2 changed files with 30 additions and 12 deletions
|
@ -29,6 +29,33 @@ def _find_make():
|
|||
return make_cmd
|
||||
|
||||
|
||||
def create_make_target(target, parallel=1, **env_vars):
|
||||
"""Create a make command
|
||||
|
||||
Args:
|
||||
|
||||
target
|
||||
Usually a make rule, such as 'clean' or 'all'.
|
||||
|
||||
parallel
|
||||
The number of make jobs to run in parallel
|
||||
|
||||
**env_vars
|
||||
Environment variables to be passed to make.
|
||||
|
||||
Returns:
|
||||
|
||||
A command that can be run to make the specified keyboard and keymap
|
||||
"""
|
||||
env = []
|
||||
make_cmd = _find_make()
|
||||
|
||||
for key, value in env_vars.items():
|
||||
env.append(f'{key}={value}')
|
||||
|
||||
return [make_cmd, '-j', str(parallel), *env, target]
|
||||
|
||||
|
||||
def create_make_command(keyboard, keymap, target=None, parallel=1, **env_vars):
|
||||
"""Create a make compile command
|
||||
|
||||
|
@ -53,17 +80,12 @@ def create_make_command(keyboard, keymap, target=None, parallel=1, **env_vars):
|
|||
|
||||
A command that can be run to make the specified keyboard and keymap
|
||||
"""
|
||||
env = []
|
||||
make_args = [keyboard, keymap]
|
||||
make_cmd = _find_make()
|
||||
|
||||
if target:
|
||||
make_args.append(target)
|
||||
|
||||
for key, value in env_vars.items():
|
||||
env.append(f'{key}={value}')
|
||||
|
||||
return [make_cmd, '-j', str(parallel), *env, ':'.join(make_args)]
|
||||
return create_make_target(':'.join(make_args), parallel, **env_vars)
|
||||
|
||||
|
||||
def get_git_version(repo_dir='.', check_dir='.'):
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue