status-im
/
nimbus-build-system
mirror of https://github.com/status-im/nimbus-build-system.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

fix build output color on macOS (#26) 

On macOS, `echo` does not support the `\e` extension from GNU coreutils.
Replacing with the portable `\x1B` to fix Terminal build output colors.
This commit is contained in:
Etan Kissling 2021-09-09 14:12:17 +02:00 committed by GitHub
parent 15bc75d4cf
commit 9d6b4b6e98
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
makefiles/variables.mk
View File

@ -56,7 +56,7 @@ EMPTY :=
SPACE := $(EMPTY) $(EMPTY) SPACE := $(EMPTY) $(EMPTY)
# coloured messages # coloured messages
BUILD_MSG := "\\e[92mBuilding:\\e[39m" BUILD_MSG := "\\x1B[92mBuilding:\\x1B[39m"
GIT_CLONE := git clone --quiet --recurse-submodules GIT_CLONE := git clone --quiet --recurse-submodules
GIT_PULL := git pull --recurse-submodules GIT_PULL := git pull --recurse-submodules
@ -96,7 +96,7 @@ ifeq ($(BUILD_SYSTEM_DIR),)
endif endif
# we want a "recursively expanded" (delayed interpolation) variable here, so we can set CMD in rule recipes # we want a "recursively expanded" (delayed interpolation) variable here, so we can set CMD in rule recipes
RUN_CMD_IN_ALL_REPOS = git submodule foreach --recursive --quiet 'echo -e "\n\e[32m$$name:\e[39m"; $(CMD)'; echo -e "\n\e[32m$$($(PWD)):\e[39m"; $(CMD) RUN_CMD_IN_ALL_REPOS = git submodule foreach --recursive --quiet 'echo -e "\n\x1B[32m$$name:\x1B[39m"; $(CMD)'; echo -e "\n\x1B[32m$$($(PWD)):\x1B[39m"; $(CMD)
# absolute path, since it will be run at various subdirectory depths # absolute path, since it will be run at various subdirectory depths
ENV_SCRIPT := "$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/env.sh" ENV_SCRIPT := "$(CURDIR)/$(BUILD_SYSTEM_DIR)/scripts/env.sh"