diff options
| author | Zach White <skullydazed@gmail.com> | 2021-03-07 19:10:03 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-07 19:10:03 -0800 |
| commit | b0069c5c05dac2c910d51ef7f3bf4133721a9c49 (patch) | |
| tree | ea8a7afb278f0ab4adb2e5390ef952c569ce3592 /Makefile | |
| parent | 7d45b7f269ddcfc1b33a55d8fed77bdfbf81ba8b (diff) | |
| download | qmk_firmware-b0069c5c05dac2c910d51ef7f3bf4133721a9c49.tar.gz qmk_firmware-b0069c5c05dac2c910d51ef7f3bf4133721a9c49.zip | |
Begin the process of deprecating bin/qmk in favor of the global cli (#12109)
* Begin the process of deprecating bin/qmk in favor of the global cli
* Correctly set the qmk bin
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 11 |
1 files changed, 9 insertions, 2 deletions
| @@ -29,6 +29,13 @@ $(info QMK Firmware $(QMK_VERSION)) | |||
| 29 | endif | 29 | endif |
| 30 | endif | 30 | endif |
| 31 | 31 | ||
| 32 | # Determine which qmk cli to use | ||
| 33 | ifeq (, $(shell which qmk)) | ||
| 34 | QMK_BIN = bin/qmk | ||
| 35 | else | ||
| 36 | QMK_BIN = qmk | ||
| 37 | endif | ||
| 38 | |||
| 32 | # avoid 'Entering|Leaving directory' messages | 39 | # avoid 'Entering|Leaving directory' messages |
| 33 | MAKEFLAGS += --no-print-directory | 40 | MAKEFLAGS += --no-print-directory |
| 34 | 41 | ||
| @@ -501,8 +508,8 @@ endef | |||
| 501 | %: | 508 | %: |
| 502 | # Check if we have the CMP tool installed | 509 | # Check if we have the CMP tool installed |
| 503 | cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; | 510 | cmp $(ROOT_DIR)/Makefile $(ROOT_DIR)/Makefile >/dev/null 2>&1; if [ $$? -gt 0 ]; then printf "$(MSG_NO_CMP)"; exit 1; fi; |
| 504 | # Ensure that bin/qmk works. | 511 | # Ensure that $(QMK_BIN) works. |
| 505 | if ! bin/qmk hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; exit 1; fi | 512 | if ! $(QMK_BIN) hello 1> /dev/null 2>&1; then printf "$(MSG_PYTHON_MISSING)"; exit 1; fi |
| 506 | # Check if the submodules are dirty, and display a warning if they are | 513 | # Check if the submodules are dirty, and display a warning if they are |
| 507 | ifndef SKIP_GIT | 514 | ifndef SKIP_GIT |
| 508 | if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --depth 50 --init lib/chibios; fi | 515 | if [ ! -e lib/chibios ]; then git submodule sync lib/chibios && git submodule update --depth 50 --init lib/chibios; fi |
