forked from forks/qmk_firmware
Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
commit
589bdedc47
|
@ -32,8 +32,9 @@ def compile(cli):
|
||||||
If a keyboard and keymap are provided this command will build a firmware based on that.
|
If a keyboard and keymap are provided this command will build a firmware based on that.
|
||||||
"""
|
"""
|
||||||
if cli.args.clean and not cli.args.filename and not cli.args.dry_run:
|
if cli.args.clean and not cli.args.filename and not cli.args.dry_run:
|
||||||
command = create_make_command(cli.config.compile.keyboard, cli.config.compile.keymap, 'clean')
|
if cli.config.compile.keyboard and cli.config.compile.keymap:
|
||||||
cli.run(command, capture_output=False, stdin=DEVNULL)
|
command = create_make_command(cli.config.compile.keyboard, cli.config.compile.keymap, 'clean')
|
||||||
|
cli.run(command, capture_output=False, stdin=DEVNULL)
|
||||||
|
|
||||||
# Build the environment vars
|
# Build the environment vars
|
||||||
envs = {}
|
envs = {}
|
||||||
|
|
|
@ -61,8 +61,9 @@ def flash(cli):
|
||||||
If bootloader is omitted the make system will use the configured bootloader for that keyboard.
|
If bootloader is omitted the make system will use the configured bootloader for that keyboard.
|
||||||
"""
|
"""
|
||||||
if cli.args.clean and not cli.args.filename and not cli.args.dry_run:
|
if cli.args.clean and not cli.args.filename and not cli.args.dry_run:
|
||||||
command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, 'clean')
|
if cli.config.flash.keyboard and cli.config.flash.keymap:
|
||||||
cli.run(command, capture_output=False, stdin=DEVNULL)
|
command = create_make_command(cli.config.flash.keyboard, cli.config.flash.keymap, 'clean')
|
||||||
|
cli.run(command, capture_output=False, stdin=DEVNULL)
|
||||||
|
|
||||||
# Build the environment vars
|
# Build the environment vars
|
||||||
envs = {}
|
envs = {}
|
||||||
|
|
Loading…
Reference in a new issue