diff options
-rw-r--r-- | build_keyboard.mk | 2 | ||||
-rwxr-xr-x | lib/python/qmk/cli/generate/rules_mk.py | 6 |
2 files changed, 6 insertions, 2 deletions
diff --git a/build_keyboard.mk b/build_keyboard.mk index b2a152bb9..366d1f5d2 100644 --- a/build_keyboard.mk +++ b/build_keyboard.mk | |||
@@ -97,7 +97,7 @@ MAIN_KEYMAP_PATH_4 := $(KEYBOARD_PATH_4)/keymaps/$(KEYMAP) | |||
97 | MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP) | 97 | MAIN_KEYMAP_PATH_5 := $(KEYBOARD_PATH_5)/keymaps/$(KEYMAP) |
98 | 98 | ||
99 | # Pull in rules from info.json | 99 | # Pull in rules from info.json |
100 | INFO_RULES_MK = $(shell bin/qmk generate-rules-mk --quiet --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/rules.mk) | 100 | INFO_RULES_MK = $(shell bin/qmk generate-rules-mk --quiet --escape --keyboard $(KEYBOARD) --output $(KEYBOARD_OUTPUT)/src/rules.mk) |
101 | include $(INFO_RULES_MK) | 101 | include $(INFO_RULES_MK) |
102 | 102 | ||
103 | # Check for keymap.json first, so we can regenerate keymap.c | 103 | # Check for keymap.json first, so we can regenerate keymap.c |
diff --git a/lib/python/qmk/cli/generate/rules_mk.py b/lib/python/qmk/cli/generate/rules_mk.py index c21ab5090..15917987b 100755 --- a/lib/python/qmk/cli/generate/rules_mk.py +++ b/lib/python/qmk/cli/generate/rules_mk.py | |||
@@ -36,6 +36,7 @@ def process_mapping_rule(kb_info_json, rules_key, info_dict): | |||
36 | 36 | ||
37 | @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to') | 37 | @cli.argument('-o', '--output', arg_only=True, type=normpath, help='File to write to') |
38 | @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages") | 38 | @cli.argument('-q', '--quiet', arg_only=True, action='store_true', help="Quiet mode, only output error messages") |
39 | @cli.argument('-e', '--escape', arg_only=True, action='store_true', help="Escape spaces in quiet mode") | ||
39 | @cli.argument('-kb', '--keyboard', help='Keyboard to generate config.h for.') | 40 | @cli.argument('-kb', '--keyboard', help='Keyboard to generate config.h for.') |
40 | @cli.subcommand('Used by the make system to generate info_config.h from info.json', hidden=True) | 41 | @cli.subcommand('Used by the make system to generate info_config.h from info.json', hidden=True) |
41 | @automagic_keyboard | 42 | @automagic_keyboard |
@@ -83,7 +84,10 @@ def generate_rules_mk(cli): | |||
83 | cli.args.output.write_text(rules_mk) | 84 | cli.args.output.write_text(rules_mk) |
84 | 85 | ||
85 | if cli.args.quiet: | 86 | if cli.args.quiet: |
86 | print(cli.args.output) | 87 | if cli.args.escape: |
88 | print(cli.args.output.as_posix().replace(' ', '\\ ')) | ||
89 | else: | ||
90 | print(cli.args.output) | ||
87 | else: | 91 | else: |
88 | cli.log.info('Wrote rules.mk to %s.', cli.args.output) | 92 | cli.log.info('Wrote rules.mk to %s.', cli.args.output) |
89 | 93 | ||