riot-ci/RIOT
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

makefiles/color: detect if writing to terminal.

Browse Source 
The current code for detecting whether colors should be used by default
was not working. Normally what programs such as git or grep do is check
if they are writing to a pipe.

To see the issue by yourself:

$ BOARD=samr21-xpro make -C tests/periph_qdec > I_SHOULD_NOT_HAVE_COLORS 2>&1

This commit uses MAKE_TERMOUT, MAKE_TERMERR and if ANY of them is NOT
a terminal, colors are disabled.
This commit is contained in:
Juan Carrano 2019-08-30 16:30:41 +02:00
parent 93fa48df71
commit 0d6a8879bc
1 changed files with 2 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
makefiles/color.inc.mk
View File

@ -8,12 +8,8 @@ COLOR_RESET :=
COLOR_ECHO := /bin/echo COLOR_ECHO := /bin/echo
ifeq ($(CC_NOCOLOR),) ifeq ($(CC_NOCOLOR),)
available_colors:=$(shell tput colors 2> /dev/null) IS_TERMINAL = $(if $(MAKE_TERMOUT),$(MAKE_TERMERR),)
ifeq ($(available_colors),) ifeq ($(IS_TERMINAL),)
CC_NOCOLOR = 1
else ifeq ($(available_colors),-1)
CC_NOCOLOR = 1
else ifeq ($(available_colors),0)
CC_NOCOLOR = 1 CC_NOCOLOR = 1
else else
CC_NOCOLOR = 0 CC_NOCOLOR = 0