diff options
| author | skullydazed <skullydazed@users.noreply.github.com> | 2018-09-27 22:32:01 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 22:32:01 +0200 |
| commit | 8ef747accf6e59ff50a3dde1cb34f56e4edce9fe (patch) | |
| tree | b2cf006b77230f7dbf6c62db9b4ee281d3ff46c5 | |
| parent | 8b2591c707abe670dbd1ab21237870bc989d0614 (diff) | |
| download | qmk_firmware-8ef747accf6e59ff50a3dde1cb34f56e4edce9fe.tar.gz qmk_firmware-8ef747accf6e59ff50a3dde1cb34f56e4edce9fe.tar.xz | |
Treat too-large firmwares as an error, not a warning (#3956)
* Treat too-large firmwares as an error, not a warning
* switch the order of printing
* I think I have it
* adjust the formatting some more
| -rw-r--r-- | message.mk | 6 | ||||
| -rw-r--r-- | tmk_core/rules.mk | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/message.mk b/message.mk index 427925dac..6894dd8cb 100644 --- a/message.mk +++ b/message.mk @@ -77,6 +77,6 @@ endef MSG_MAKE_TEST = $(eval $(call GENERATE_MSG_MAKE_TEST))$(MSG_MAKE_TEST_ACTUAL) MSG_TEST = Testing $(BOLD)$(TEST_NAME)$(NO_COLOR) MSG_CHECK_FILESIZE = Checking file size of $(TARGET).hex -MSG_FILE_TOO_BIG = $(ERROR_COLOR)Your file is too big!$(NO_COLOR) $(CURRENT_SIZE)/$(MAX_SIZE) ($(OVER_SIZE) over)\n -MSG_FILE_TOO_SMALL = Your file is too small! $(CURRENT_SIZE)/$(MAX_SIZE)\n -MSG_FILE_JUST_RIGHT = File size is fine - $(CURRENT_SIZE)/$(MAX_SIZE) ($(FREE_SIZE) free)\n +MSG_FILE_TOO_BIG = $(ERROR_COLOR)The firmware is too large!$(NO_COLOR) $(CURRENT_SIZE)/$(MAX_SIZE) ($(OVER_SIZE) bytes over)\n +MSG_FILE_TOO_SMALL = The firmware is too small! $(CURRENT_SIZE)/$(MAX_SIZE)\n +MSG_FILE_JUST_RIGHT = The firmware size is fine - $(CURRENT_SIZE)/$(MAX_SIZE) ($(FREE_SIZE) bytes free)\n diff --git a/tmk_core/rules.mk b/tmk_core/rules.mk index 5b1858b71..f1ef733f6 100644 --- a/tmk_core/rules.mk +++ b/tmk_core/rules.mk @@ -378,7 +378,7 @@ check-size: $(eval OVER_SIZE=$(shell expr $(CURRENT_SIZE) - $(MAX_SIZE))) if [ $(MAX_SIZE) -gt 0 ] && [ $(CURRENT_SIZE) -gt 0 ]; then \ $(SILENT) || printf "$(MSG_CHECK_FILESIZE)" | $(AWK_CMD); \ - if [ $(CURRENT_SIZE) -gt $(MAX_SIZE) ]; then $(PRINT_WARNING_PLAIN); $(SILENT) || printf " * $(MSG_FILE_TOO_BIG)" ; else $(PRINT_OK); $(SILENT) || printf " * $(MSG_FILE_JUST_RIGHT)"; fi \ + if [ $(CURRENT_SIZE) -gt $(MAX_SIZE) ]; then printf "\n * $(MSG_FILE_TOO_BIG)"; $(PRINT_ERROR_PLAIN); else $(PRINT_OK); $(SILENT) || printf " * $(MSG_FILE_JUST_RIGHT)"; fi \ fi else check-size: |