move version info to the top of the output

add version to make output
Change installation of avr-libc to avr-gcc, now that avr-libc is integrated into the avr-gcc build
2017-08-08 16:06:45 -04:00 · 2017-08-08 16:06:45 -04:00 · 2017-08-08 10:03:19 -04:00
3 changed files with 6 additions and 5 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
@@ -50,10 +50,10 @@ If you have trouble and want to ask for help, it is useful to generate a *Win_Ch
 If you're using [homebrew,](http://brew.sh/) you can use the following commands:
    brew tap osx-cross/avr
-    brew install avr-libc
+    brew install avr-gcc
    brew install dfu-programmer
-This is the recommended method. If you don't have homebrew, [install it!](http://brew.sh/) It's very much worth it for anyone who works in the command line. Note that the `make` and `make install` portion during the homebrew installation of avr-libc can take over 20 minutes and exhibit high CPU usage.
+This is the recommended method. If you don't have homebrew, [install it!](http://brew.sh/) It's very much worth it for anyone who works in the command line. Note that the `make` and `make install` portion during the homebrew installation of avr-gcc can take over 20 minutes and exhibit high CPU usage.
 You can also try these instructions:
@@ -382,7 +382,7 @@ $(eval $(foreach OUTPUT,$(OUTPUTS),$(shell mkdir -p $(OUTPUT) 2>/dev/null)))
 # Listing of phony targets.
-.PHONY : all finish sizebefore sizeafter gccversion \
+.PHONY : all finish sizebefore sizeafter qmkversion \
-build elf hex eep lss sym coff extcoff \
+gccversion build elf hex eep lss sym coff extcoff \
 clean clean_list debug gdb-config show_path \
 program teensy dfu flip dfu-ee flip-ee dfu-start
Author	SHA1	Message	Date
Jack Humbert	26d348b6d1	move version info to the top of the output	2017-08-08 16:06:45 -04:00
Jack Humbert	5210f94a56	add version to make output	2017-08-08 16:06:45 -04:00
Danny Nguyen	f1536a3f54	Change installation of avr-libc to avr-gcc, now that avr-libc is integrated into the avr-gcc build	2017-08-08 10:03:19 -04:00