Browse Source

- raname message macros

master
vanhofen 2 years ago
parent
commit
077d24202a
  1. 2
      make/buildsystem-bootstrap.mk
  2. 2
      make/buildsystem-clean.mk
  3. 6
      make/buildsystem-prerequisites.mk
  4. 2
      make/flash-images.mk
  5. 4
      support/misc/utils.mk

2
make/buildsystem-bootstrap.mk

@ -27,7 +27,7 @@ endif
bootstrap: $(BOOTSTRAP)
@touch $(BUILD_DIR)/.$(BOXTYPE)-$(BOXMODEL)
$(call draw_line);
@$(call MESSAGE_GREEN,"Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXNAME) ($(BOXMODEL))")
@$(call SUCCESS,"Bootstrapped for $(shell echo $(BOXTYPE) | sed 's/.*/\u&/') $(BOXNAME) ($(BOXMODEL))")
$(call draw_line);
# -----------------------------------------------------------------------------

2
make/buildsystem-clean.mk

@ -40,7 +40,7 @@ ccache-clean:
rebuild-clean: host-bin-config-clean target-clean deps-clean build-clean checkout-branches
all-clean: rebuild-clean staging-clean host-clean static-base-clean
@$(call MESSAGE_RED,"Any other key then CTRL-C will now remove CROSS_BASE")
@$(call WARNING,"Any other key then CTRL-C will now remove CROSS_BASE")
@read
make cross-base-clean

6
make/buildsystem-prerequisites.mk

@ -36,14 +36,14 @@ TOOLCHECK += find-yacc
find-%:
@TOOL=$(patsubst find-%,%,$(@)); type -p $$TOOL >/dev/null || \
{ $(call MESSAGE_RED,"Warning",": required tool $$TOOL missing."); false; }
{ $(call WARNING,"Warning",": required tool $$TOOL missing."); false; }
bashcheck:
@test "$(subst /bin/,,$(shell readlink /bin/sh))" == "bash" || \
{ $(call MESSAGE_RED,"Warning",": /bin/sh is not linked to bash"); false; }
{ $(call WARNING,"Warning",": /bin/sh is not linked to bash"); false; }
toolcheck: bashcheck $(TOOLCHECK)
@$(call MESSAGE_GREEN,"All required tools seem to be installed.")
@$(call SUCCESS,"All required tools seem to be installed.")
# -----------------------------------------------------------------------------

2
make/flash-images.mk

@ -112,7 +112,7 @@ check-image-size:
ifdef IMAGE_TO_CHECK
@IMAGE_SIZE=$(shell wc -c < $(IMAGE_TO_CHECK)); \
if [ $$IMAGE_SIZE -ge $(ROOTFS_SIZE) ]; then \
$(call MESSAGE_RED,"$(IMAGE_TO_CHECK) is too big"); \
$(call WARNING,"$(IMAGE_TO_CHECK) is too big"); \
false; \
fi
endif

4
support/misc/utils.mk

@ -82,8 +82,8 @@ TERM_RESET := $(shell tput rmso 2>/dev/null)
# MESSAGE Macro -- display a message in bold type
MESSAGE = echo -e "$(TERM_YELLOW)$(call qstrip,$(1))$(TERM_NORMAL)$(call qstrip,$(2))"
MESSAGE_GREEN = echo -e "$(TERM_GREEN)$(call qstrip,$(1))$(TERM_NORMAL)$(call qstrip,$(2))"
MESSAGE_RED = echo -e "$(TERM_RED_BOLD)$(call qstrip,$(1))$(TERM_NORMAL)$(call qstrip,$(2))"
SUCCESS = echo -e "$(TERM_GREEN)$(call qstrip,$(1))$(TERM_NORMAL)$(call qstrip,$(2))"
WARNING = echo -e "$(TERM_RED_BOLD)$(call qstrip,$(1))$(TERM_NORMAL)$(call qstrip,$(2))"
# Utility functions for 'find'
# findfileclauses(filelist) => -name 'X' -o -name 'Y'

Loading…
Cancel
Save