diff options
| author | Joel Challis <git@zvecr.com> | 2022-02-10 17:45:51 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-10 09:45:51 -0800 |
| commit | f7e7671f691cfd42f322198f04690727f6493d73 (patch) | |
| tree | 9c705a6a1a594263ab273cba62affa3fa7e5d28e /lib/python/qmk | |
| parent | 7a0fd646e37795aa843d369a5c80d99118cca868 (diff) | |
Migrate more makefile utilities to builddefs sub-directory (#16002)
Diffstat (limited to 'lib/python/qmk')
| -rwxr-xr-x | lib/python/qmk/cli/multibuild.py | 2 | ||||
| -rw-r--r-- | lib/python/qmk/commands.py | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/python/qmk/cli/multibuild.py b/lib/python/qmk/cli/multibuild.py index ad059edff3..dff8c88422 100755 --- a/lib/python/qmk/cli/multibuild.py +++ b/lib/python/qmk/cli/multibuild.py | |||
| @@ -69,7 +69,7 @@ def multibuild(cli): | |||
| 69 | all: {keyboard_safe}_binary | 69 | all: {keyboard_safe}_binary |
| 70 | {keyboard_safe}_binary: | 70 | {keyboard_safe}_binary: |
| 71 | @rm -f "{QMK_FIRMWARE}/.build/failed.log.{keyboard_safe}" || true | 71 | @rm -f "{QMK_FIRMWARE}/.build/failed.log.{keyboard_safe}" || true |
| 72 | +@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{cli.args.keymap}" REQUIRE_PLATFORM_KEY= COLOR=true SILENT=false {' '.join(cli.args.env)} \\ | 72 | +@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/builddefs/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{cli.args.keymap}" REQUIRE_PLATFORM_KEY= COLOR=true SILENT=false {' '.join(cli.args.env)} \\ |
| 73 | >>"{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" 2>&1 \\ | 73 | >>"{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" 2>&1 \\ |
| 74 | || cp "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" "{QMK_FIRMWARE}/.build/failed.log.{os.getpid()}.{keyboard_safe}" | 74 | || cp "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" "{QMK_FIRMWARE}/.build/failed.log.{os.getpid()}.{keyboard_safe}" |
| 75 | @{{ grep '\[ERRORS\]' "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" >/dev/null 2>&1 && printf "Build %-64s \e[1;31m[ERRORS]\e[0m\\n" "{keyboard_name}:{cli.args.keymap}" ; }} \\ | 75 | @{{ grep '\[ERRORS\]' "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" >/dev/null 2>&1 && printf "Build %-64s \e[1;31m[ERRORS]\e[0m\\n" "{keyboard_name}:{cli.args.keymap}" ; }} \\ |
diff --git a/lib/python/qmk/commands.py b/lib/python/qmk/commands.py index 90a68ca3cd..275cd72e5c 100644 --- a/lib/python/qmk/commands.py +++ b/lib/python/qmk/commands.py | |||
| @@ -213,7 +213,7 @@ def compile_configurator_json(user_keymap, bootloader=None, parallel=1, **env_va | |||
| 213 | '-r', | 213 | '-r', |
| 214 | '-R', | 214 | '-R', |
| 215 | '-f', | 215 | '-f', |
| 216 | 'build_keyboard.mk', | 216 | 'builddefs/build_keyboard.mk', |
| 217 | ]) | 217 | ]) |
| 218 | 218 | ||
| 219 | if bootloader: | 219 | if bootloader: |
