mirror of
https://github.com/openstenoproject/qmk
synced 2024-11-22 00:14:38 +00:00
Consistently use bin/qmk when that script is called (#12286)
* Pass QMK_BIN down to build_keyboard.mk * choose the correct qmk script
This commit is contained in:
parent
90b1e271a8
commit
f2715a0593
3 changed files with 4 additions and 3 deletions
4
Makefile
4
Makefile
|
@ -30,7 +30,7 @@ endif
|
||||||
endif
|
endif
|
||||||
|
|
||||||
# Determine which qmk cli to use
|
# Determine which qmk cli to use
|
||||||
ifeq (, $(shell which qmk))
|
ifeq (,$(shell which qmk))
|
||||||
QMK_BIN = bin/qmk
|
QMK_BIN = bin/qmk
|
||||||
else
|
else
|
||||||
QMK_BIN = qmk
|
QMK_BIN = qmk
|
||||||
|
@ -391,7 +391,7 @@ define PARSE_KEYMAP
|
||||||
# Format it in bold
|
# Format it in bold
|
||||||
KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR)
|
KB_SP := $(BOLD)$$(KB_SP)$(NO_COLOR)
|
||||||
# Specify the variables that we are passing forward to submake
|
# Specify the variables that we are passing forward to submake
|
||||||
MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY)
|
MAKE_VARS := KEYBOARD=$$(CURRENT_KB) KEYMAP=$$(CURRENT_KM) REQUIRE_PLATFORM_KEY=$$(REQUIRE_PLATFORM_KEY) QMK_BIN=$$(QMK_BIN)
|
||||||
# And the first part of the make command
|
# And the first part of the make command
|
||||||
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET)
|
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_keyboard.mk $$(MAKE_TARGET)
|
||||||
# The message to display
|
# The message to display
|
||||||
|
|
1
bin/qmk
1
bin/qmk
|
@ -73,6 +73,7 @@ def main():
|
||||||
"""
|
"""
|
||||||
# Change to the root of our checkout
|
# Change to the root of our checkout
|
||||||
os.environ['ORIG_CWD'] = os.getcwd()
|
os.environ['ORIG_CWD'] = os.getcwd()
|
||||||
|
os.environ['DEPRECATED_BIN_QMK'] = '1'
|
||||||
os.chdir(qmk_dir)
|
os.chdir(qmk_dir)
|
||||||
|
|
||||||
print('Warning: The bin/qmk script is being deprecated. Please install the QMK CLI: python3 -m pip install qmk', file=sys.stderr)
|
print('Warning: The bin/qmk script is being deprecated. Please install the QMK CLI: python3 -m pip install qmk', file=sys.stderr)
|
||||||
|
|
|
@ -180,7 +180,7 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va
|
||||||
f'VERBOSE={verbose}',
|
f'VERBOSE={verbose}',
|
||||||
f'COLOR={color}',
|
f'COLOR={color}',
|
||||||
'SILENT=false',
|
'SILENT=false',
|
||||||
'QMK_BIN=qmk',
|
f'QMK_BIN={"bin/qmk" if "DEPRECATED_BIN_QMK" in os.environ else "qmk"}',
|
||||||
])
|
])
|
||||||
|
|
||||||
return make_command
|
return make_command
|
||||||
|
|
Loading…
Reference in a new issue