Changeset 36082

Timestamp:

2013-03-17T22:12:02+01:00 (5 years ago)

Author:

nbd

Message:

build: make the color of the 'configuration out of sync' warning red to make it harder for users to overlook

Location:

trunk/include

Files:

• toplevel.mk (modified) (3 diffs)
• verbose.mk (modified) (3 diffs)

trunk/include/toplevel.mk

@@ -9 +9 @@
 RELEASE:=Barrier Breaker
 PREP_MK= OPENWRT_BUILD= QUIET=0
+
+export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 
 include $(TOPDIR)/include/verbose.mk
@@ -23 +25 @@
 export REVISION
 export OPENWRTVERSION
-export IS_TTY=$(shell tty -s && echo 1 || echo 0)
 export LD_LIBRARY_PATH:=$(subst ::,:,$(if $(LD_LIBRARY_PATH),$(LD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib)
 export DYLD_LIBRARY_PATH:=$(subst ::,:,$(if $(DYLD_LIBRARY_PATH),$(DYLD_LIBRARY_PATH):)$(STAGING_DIR_HOST)/lib)
@@ -149 +150 @@
                 ./scripts/config/conf -D tmp/.config -w tmp/.config Config.in > /dev/null 2>&1; \
                 if ./scripts/kconfig.pl '>' .config tmp/.config | grep -q CONFIG; then \
-                        echo "WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!" >&2; \
+                        printf "$(_R)WARNING: your configuration is out of sync. Please run make menuconfig, oldconfig or defconfig!$(_N)\n" >&2; \
                 fi \
         )

trunk/include/verbose.mk

@@ -28 +28 @@
   ifneq ($(strip $(NO_COLOR)),1)
     _Y:=\\033[33m
+    _R:=\\033[31m
     _N:=\\033[m
   endif
@@ -35 +36 @@
   define MESSAGE
         printf "$(_Y)%s$(_N)\n" "$(1)" >&8
+  endef
+
+  define ERROR_MESSAGE
+        printf "$(_R)%s$(_N)\n" "$(1)" >&8
   endef
 
@@ -59 +64 @@
     printf "%s\n" "$(1)"
   endef
+  ERROR_MESSAGE=$(MESSAGE)
 endif