diff options
| author | Jack Humbert <jack.humb@gmail.com> | 2017-08-08 15:26:19 -0400 |
|---|---|---|
| committer | Jack Humbert <jack.humb@gmail.com> | 2017-08-08 16:06:45 -0400 |
| commit | 26d348b6d14e38c297c7c752740b5ffae8c6198c (patch) | |
| tree | 1467ad2c627632397c02fca9724fbf2f62bff2ef | |
| parent | 5210f94a56483c23f5d302e654702d56ca70c206 (diff) | |
| download | qmk_firmware-26d348b6d14e38c297c7c752740b5ffae8c6198c.tar.gz qmk_firmware-26d348b6d14e38c297c7c752740b5ffae8c6198c.zip | |
move version info to the top of the output
| -rw-r--r-- | Makefile | 3 | ||||
| -rw-r--r-- | tmk_core/rules.mk | 6 |
2 files changed, 3 insertions, 6 deletions
@@ -390,6 +390,7 @@ endef define BUILD MAKE_VARS += VERBOSE=$(VERBOSE) COLOR=$(COLOR) COMMANDS += $$(COMMAND) + MAKE_MSG = QMK Firmware v$$(shell git describe --abbrev=0 --tags 2>/dev/null)\n\n$(MAKE_MSG) COMMAND_true_$$(COMMAND) := \ printf "$$(MAKE_MSG)" | \ $$(MAKE_MSG_FORMAT); \ @@ -420,7 +421,7 @@ define BUILD_TEST COMMAND := $1 MAKE_CMD := $$(MAKE) -r -R -C $(ROOT_DIR) -f build_test.mk $$(MAKE_TARGET) 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)) ifneq ($$(MAKE_TARGET),clean) TEST_EXECUTABLE := $$(TEST_DIR)/$$(TEST_NAME).elf diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index c198f9edbb..be06d611b6 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -237,10 +237,6 @@ sizeafter: $(BUILD_DIR)/$(TARGET).hex # 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 -# 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. gccversion : @$(SILENT) || $(CC) --version @@ -279,7 +275,7 @@ gccversion : $(eval CMD=$(BIN) $< $@ || exit 0) @$(BUILD_CMD) -BEGIN = qmkversion gccversion sizebefore +BEGIN = gccversion sizebefore # Link: create ELF output file from object files. .SECONDARY : $(BUILD_DIR)/$(TARGET).elf |