move version info to the top of the output
This commit is contained in:
parent
5210f94a56
commit
26d348b6d1
3
Makefile
3
Makefile
|
@ -390,6 +390,7 @@ endef
|
||||||
define BUILD
|
define BUILD
|
||||||
MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR)
|
MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR)
|
||||||
COMMANDS += $$(COMMAND)
|
COMMANDS += $$(COMMAND)
|
||||||
|
MAKE_MSG = QMK Firmware v$$(shell git describe --abbrev=0 --tags 2>/dev/null)\n\n$(MAKE_MSG)
|
||||||
COMMAND_true_$$(COMMAND) := \
|
COMMAND_true_$$(COMMAND) := \
|
||||||
printf "$$(MAKE_MSG)" | \
|
printf "$$(MAKE_MSG)" | \
|
||||||
$$(MAKE_MSG_FORMAT); \
|
$$(MAKE_MSG_FORMAT); \
|
||||||
|
@ -420,7 +421,7 @@ define BUILD_TEST
|
||||||
COMMAND := $1
|
COMMAND := $1
|
||||||
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_test.mk $$(MAKE_TARGET)
|
MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_test.mk $$(MAKE_TARGET)
|
||||||
MAKE_VARS := TEST=$$(TEST_NAME) FULL_TESTS="$$(FULL_TESTS)"
|
MAKE_VARS := TEST=$$(TEST_NAME) FULL_TESTS="$$(FULL_TESTS)"
|
||||||
MAKE_MSG := $$(MSG_MAKE_TEST)
|
MAKE_MSG := QMK Firmware v$$(shell git describe --abbrev=0 --tags 2>/dev/null)\n\n$$(MSG_MAKE_TEST)
|
||||||
$$(eval $$(call BUILD))
|
$$(eval $$(call BUILD))
|
||||||
ifneq ($$(MAKE_TARGET),clean)
|
ifneq ($$(MAKE_TARGET),clean)
|
||||||
TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf
|
TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf
|
||||||
|
|
|
@ -237,10 +237,6 @@ sizeafter: $(BUILD_DIR)/$(TARGET).hex
|
||||||
# test file sizes eventually
|
# test file sizes eventually
|
||||||
# @if [[ $($(SIZE) --target=$(FORMAT) $(TARGET).hex | $(AWK) 'NR==2 {print "0x"$5}') -gt 0x200 ]]; then $(SECHO) "File is too big!"; fi
|
# @if [[ $($(SIZE) --target=$(FORMAT) $(TARGET).hex | $(AWK) 'NR==2 {print "0x"$5}') -gt 0x200 ]]; then $(SECHO) "File is too big!"; fi
|
||||||
|
|
||||||
# Display qmk version information.
|
|
||||||
qmkversion :
|
|
||||||
@$(SILENT) || printf "QMK Firmware v$(shell git describe --abbrev=0 --tags 2>/dev/null)\n\n"
|
|
||||||
|
|
||||||
# Display compiler version information.
|
# Display compiler version information.
|
||||||
gccversion :
|
gccversion :
|
||||||
@$(SILENT) || $(CC) --version
|
@$(SILENT) || $(CC) --version
|
||||||
|
@ -279,7 +275,7 @@ gccversion :
|
||||||
$(eval CMD=$(BIN) $< $@ || exit 0)
|
$(eval CMD=$(BIN) $< $@ || exit 0)
|
||||||
@$(BUILD_CMD)
|
@$(BUILD_CMD)
|
||||||
|
|
||||||
BEGIN = qmkversion gccversion sizebefore
|
BEGIN = gccversion sizebefore
|
||||||
|
|
||||||
# Link: create ELF output file from object files.
|
# Link: create ELF output file from object files.
|
||||||
.SECONDARY : $(BUILD_DIR)/$(TARGET).elf
|
.SECONDARY : $(BUILD_DIR)/$(TARGET).elf
|
||||||
|
|
Loading…
Reference in New Issue