diff options
| author | skullydazed <skullydazed@users.noreply.github.com> | 2018-09-27 13:32:01 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-09-27 13:32:01 -0700 |
| commit | 8ef747accf6e59ff50a3dde1cb34f56e4edce9fe (patch) | |
| tree | b2cf006b77230f7dbf6c62db9b4ee281d3ff46c5 /tmk_core | |
| parent | 8b2591c707abe670dbd1ab21237870bc989d0614 (diff) | |
| download | qmk_firmware-8ef747accf6e59ff50a3dde1cb34f56e4edce9fe.tar.gz qmk_firmware-8ef747accf6e59ff50a3dde1cb34f56e4edce9fe.zip | |
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
Diffstat (limited to 'tmk_core')
| -rw-r--r-- | tmk_core/rules.mk | 2 |
1 files changed, 1 insertions, 1 deletions
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: | |||
| 378 | $(eval OVER_SIZE=$(shell expr $(CURRENT_SIZE) - $(MAX_SIZE))) | 378 | $(eval OVER_SIZE=$(shell expr $(CURRENT_SIZE) - $(MAX_SIZE))) |
| 379 | if [ $(MAX_SIZE) -gt 0 ] && [ $(CURRENT_SIZE) -gt 0 ]; then \ | 379 | if [ $(MAX_SIZE) -gt 0 ] && [ $(CURRENT_SIZE) -gt 0 ]; then \ |
| 380 | $(SILENT) || printf "$(MSG_CHECK_FILESIZE)" | $(AWK_CMD); \ | 380 | $(SILENT) || printf "$(MSG_CHECK_FILESIZE)" | $(AWK_CMD); \ |
| 381 | 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 \ | 381 | 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 \ |
| 382 | fi | 382 | fi |
| 383 | else | 383 | else |
| 384 | check-size: | 384 | check-size: |