Merge remote-tracking branch 'origin/master' into develop
This commit is contained in:
		
						commit
						ac3a1c3569
					
				
					 1 changed files with 16 additions and 16 deletions
				
			
		| 
						 | 
				
			
			@ -64,18 +64,18 @@ def mass_compile(cli):
 | 
			
		|||
                # yapf: disable
 | 
			
		||||
                f.write(
 | 
			
		||||
                    f"""\
 | 
			
		||||
    all: {keyboard_safe}_{keymap_name}_binary
 | 
			
		||||
    {keyboard_safe}_{keymap_name}_binary:
 | 
			
		||||
        @rm -f "{build_log}" || true
 | 
			
		||||
        @echo "Compiling QMK Firmware for target: '{keyboard_name}:{keymap_name}'..." >>"{build_log}"
 | 
			
		||||
        +@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/builddefs/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{keymap_name}" COLOR=true SILENT=false {' '.join(cli.args.env)} \\
 | 
			
		||||
            >>"{build_log}" 2>&1 \\
 | 
			
		||||
            || cp "{build_log}" "{failed_log}"
 | 
			
		||||
        @{{ grep '\[ERRORS\]' "{build_log}" >/dev/null 2>&1 && printf "Build %-64s \e[1;31m[ERRORS]\e[0m\\n" "{keyboard_name}:{keymap_name}" ; }} \\
 | 
			
		||||
            || {{ grep '\[WARNINGS\]' "{build_log}" >/dev/null 2>&1 && printf "Build %-64s \e[1;33m[WARNINGS]\e[0m\\n" "{keyboard_name}:{keymap_name}" ; }} \\
 | 
			
		||||
            || printf "Build %-64s \e[1;32m[OK]\e[0m\\n" "{keyboard_name}:{keymap_name}"
 | 
			
		||||
        @rm -f "{build_log}" || true
 | 
			
		||||
    """# noqa
 | 
			
		||||
all: {keyboard_safe}_{keymap_name}_binary
 | 
			
		||||
{keyboard_safe}_{keymap_name}_binary:
 | 
			
		||||
	@rm -f "{build_log}" || true
 | 
			
		||||
	@echo "Compiling QMK Firmware for target: '{keyboard_name}:{keymap_name}'..." >>"{build_log}"
 | 
			
		||||
	+@$(MAKE) -C "{QMK_FIRMWARE}" -f "{QMK_FIRMWARE}/builddefs/build_keyboard.mk" KEYBOARD="{keyboard_name}" KEYMAP="{keymap_name}" COLOR=true SILENT=false {' '.join(cli.args.env)} \\
 | 
			
		||||
		>>"{build_log}" 2>&1 \\
 | 
			
		||||
		|| cp "{build_log}" "{failed_log}"
 | 
			
		||||
	@{{ grep '\[ERRORS\]' "{build_log}" >/dev/null 2>&1 && printf "Build %-64s \e[1;31m[ERRORS]\e[0m\\n" "{keyboard_name}:{keymap_name}" ; }} \\
 | 
			
		||||
		|| {{ grep '\[WARNINGS\]' "{build_log}" >/dev/null 2>&1 && printf "Build %-64s \e[1;33m[WARNINGS]\e[0m\\n" "{keyboard_name}:{keymap_name}" ; }} \\
 | 
			
		||||
		|| printf "Build %-64s \e[1;32m[OK]\e[0m\\n" "{keyboard_name}:{keymap_name}"
 | 
			
		||||
	@rm -f "{build_log}" || true
 | 
			
		||||
"""# noqa
 | 
			
		||||
                )
 | 
			
		||||
                # yapf: enable
 | 
			
		||||
 | 
			
		||||
| 
						 | 
				
			
			@ -83,10 +83,10 @@ def mass_compile(cli):
 | 
			
		|||
                    # yapf: disable
 | 
			
		||||
                    f.write(
 | 
			
		||||
                        f"""\
 | 
			
		||||
        @rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{keymap_name}.elf" 2>/dev/null || true
 | 
			
		||||
        @rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{keymap_name}.map" 2>/dev/null || true
 | 
			
		||||
        @rm -rf "{QMK_FIRMWARE}/.build/obj_{keyboard_safe}_{keymap_name}" || true
 | 
			
		||||
    """# noqa
 | 
			
		||||
	@rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{keymap_name}.elf" 2>/dev/null || true
 | 
			
		||||
	@rm -rf "{QMK_FIRMWARE}/.build/{keyboard_safe}_{keymap_name}.map" 2>/dev/null || true
 | 
			
		||||
	@rm -rf "{QMK_FIRMWARE}/.build/obj_{keyboard_safe}_{keymap_name}" || true
 | 
			
		||||
"""# noqa
 | 
			
		||||
                    )
 | 
			
		||||
                    # yapf: enable
 | 
			
		||||
                f.write('\n')
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue