diff options
author | Joel Challis <git@zvecr.com> | 2021-02-07 21:02:51 +0000 |
---|---|---|
committer | GitHub <noreply@github.com> | 2021-02-07 21:02:51 +0000 |
commit | ccc9c43161282bd6f37813cc85c13da1eb51b88d (patch) | |
tree | 92fc97bb2489ba92e2ab95597e4e88c7fcd8bbb9 /lib/python/qmk/cli/compile.py | |
parent | fc29c7a589837c2d1e4173d59d2849f89d3cb72b (diff) | |
download | qmk_firmware-ccc9c43161282bd6f37813cc85c13da1eb51b88d.tar.gz qmk_firmware-ccc9c43161282bd6f37813cc85c13da1eb51b88d.zip |
Allow flash/compile to accept relative json paths (#11767)
* Allow flash/compile to accept relative paths
* Review suggestions
* Review comments
* Put back exists check otherwise stdin fails
* fix lint
Diffstat (limited to 'lib/python/qmk/cli/compile.py')
-rwxr-xr-x | lib/python/qmk/cli/compile.py | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/lib/python/qmk/cli/compile.py b/lib/python/qmk/cli/compile.py index 322ce6a25..db195f78a 100755 --- a/lib/python/qmk/cli/compile.py +++ b/lib/python/qmk/cli/compile.py | |||
@@ -2,15 +2,14 @@ | |||
2 | 2 | ||
3 | You can compile a keymap already in the repo or using a QMK Configurator export. | 3 | You can compile a keymap already in the repo or using a QMK Configurator export. |
4 | """ | 4 | """ |
5 | from argparse import FileType | ||
6 | |||
7 | from milc import cli | 5 | from milc import cli |
8 | 6 | ||
7 | import qmk.path | ||
9 | from qmk.decorators import automagic_keyboard, automagic_keymap | 8 | from qmk.decorators import automagic_keyboard, automagic_keymap |
10 | from qmk.commands import compile_configurator_json, create_make_command, parse_configurator_json | 9 | from qmk.commands import compile_configurator_json, create_make_command, parse_configurator_json |
11 | 10 | ||
12 | 11 | ||
13 | @cli.argument('filename', nargs='?', arg_only=True, type=FileType('r'), help='The configurator export to compile') | 12 | @cli.argument('filename', nargs='?', arg_only=True, type=qmk.path.FileType('r'), help='The configurator export to compile') |
14 | @cli.argument('-kb', '--keyboard', help='The keyboard to build a firmware for. Ignored when a configurator export is supplied.') | 13 | @cli.argument('-kb', '--keyboard', help='The keyboard to build a firmware for. Ignored when a configurator export is supplied.') |
15 | @cli.argument('-km', '--keymap', help='The keymap to build a firmware for. Ignored when a configurator export is supplied.') | 14 | @cli.argument('-km', '--keymap', help='The keymap to build a firmware for. Ignored when a configurator export is supplied.') |
16 | @cli.argument('-n', '--dry-run', arg_only=True, action='store_true', help="Don't actually build, just show the make command to be run.") | 15 | @cli.argument('-n', '--dry-run', arg_only=True, action='store_true', help="Don't actually build, just show the make command to be run.") |