diff options
Diffstat (limited to 'lib/python/qmk')
| -rwxr-xr-x | lib/python/qmk/cli/multibuild.py | 35 | 
1 files changed, 22 insertions, 13 deletions
| diff --git a/lib/python/qmk/cli/multibuild.py b/lib/python/qmk/cli/multibuild.py index 2848a3b829..bdb0b493c8 100755 --- a/lib/python/qmk/cli/multibuild.py +++ b/lib/python/qmk/cli/multibuild.py @@ -2,6 +2,7 @@  This will compile everything in parallel, for testing purposes.  """ +import os  import re  from pathlib import Path  from subprocess import DEVNULL @@ -11,6 +12,7 @@ from milc import cli  from qmk.constants import QMK_FIRMWARE  from qmk.commands import _find_make  import qmk.keyboard +import qmk.keymap  def _make_rules_mk_filter(key, value): @@ -29,6 +31,7 @@ def _is_split(keyboard_name):  @cli.argument('-j', '--parallel', type=int, default=1, help="Set the number of parallel make jobs to run.")  @cli.argument('-c', '--clean', arg_only=True, action='store_true', help="Remove object files before compiling.")  @cli.argument('-f', '--filter', arg_only=True, action='append', default=[], help="Filter the list of keyboards based on the supplied value in rules.mk. Supported format is 'SPLIT_KEYBOARD=yes'. May be passed multiple times.") [email protected]('-km', '--keymap', type=str, default='default', help="The keymap name to build. Default is 'default'.")  @cli.subcommand('Compile QMK Firmware for all keyboards.', hidden=False if cli.config.user.developer else True)  def multibuild(cli):      """Compile QMK Firmware against all keyboards. @@ -57,23 +60,29 @@ def multibuild(cli):      builddir.mkdir(parents=True, exist_ok=True)      with open(makefile, "w") as f:          for keyboard_name in keyboard_list: -            keyboard_safe = keyboard_name.replace('/', '_') -            # yapf: disable -            f.write( -                f"""\ +            if qmk.keymap.locate_keymap(keyboard_name, cli.args.keymap) is not None: +                keyboard_safe = keyboard_name.replace('/', '_') +                # yapf: disable +                f.write( +                    f"""\  all: {keyboard_safe}_binary  {keyboard_safe}_binary:  	@rm -f "{QMK_FIRMWARE}/.build/failed.log.{keyboard_safe}" || true -	+@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="default" REQUIRE_PLATFORM_KEY= COLOR=true SILENT=false \\ -		>>"{QMK_FIRMWARE}/.build/build.log.{keyboard_safe}" 2>&1 \\ -		|| cp "{QMK_FIRMWARE}/.build/build.log.{keyboard_safe}" "{QMK_FIRMWARE}/.build/failed.log.{keyboard_safe}" -	@{{ grep '\[ERRORS\]' "{QMK_FIRMWARE}/.build/build.log.{keyboard_safe}" >/dev/null 2>&1 && printf "Build %-64s \e[1;31m[ERRORS]\e[0m\\n" "{keyboard_name}:default" ; }} \\ -		|| {{ grep '\[WARNINGS\]' "{QMK_FIRMWARE}/.build/build.log.{keyboard_safe}" >/dev/null 2>&1 && printf "Build %-64s \e[1;33m[WARNINGS]\e[0m\\n" "{keyboard_name}:default" ; }} \\ -		|| printf "Build %-64s \e[1;32m[OK]\e[0m\\n" "{keyboard_name}:default" -	@rm -f "{QMK_FIRMWARE}/.build/build.log.{keyboard_safe}" || true +	+@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{cli.args.keymap}" REQUIRE_PLATFORM_KEY= COLOR=true SILENT=false \\ +		>>"{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" 2>&1 \\ +		|| cp "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" "{QMK_FIRMWARE}/.build/failed.log.{os.getpid()}.{keyboard_safe}" +	@{{ 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}" ; }} \\ +		|| {{ grep '\[WARNINGS\]' "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" >/dev/null 2>&1 && printf "Build %-64s \e[1;33m[WARNINGS]\e[0m\\n" "{keyboard_name}:{cli.args.keymap}" ; }} \\ +		|| printf "Build %-64s \e[1;32m[OK]\e[0m\\n" "{keyboard_name}:{cli.args.keymap}" +	@rm -f "{QMK_FIRMWARE}/.build/build.log.{os.getpid()}.{keyboard_safe}" || true  """# noqa -            ) -            # yapf: enable +                ) +                # yapf: enable      cli.run([make_cmd, '-j', str(cli.args.parallel), '-f', makefile.as_posix(), 'all'], capture_output=False, stdin=DEVNULL) + +    # Check for failures +    failures = [f for f in builddir.glob(f'failed.log.{os.getpid()}.*')] +    if len(failures) > 0: +        return False | 
