Commit 5c74dc7
build: refactor Makefile
* add character classes
* replace echo -n with printf
Co-authored-by: Antoine du Hamel <duhamelantoine1995@gmail.com>
PR-URL: #36759
Reviewed-By: Antoine du Hamel <duhamelantoine1995@gmail.com>1 parent ea0b069 commit 5c74dc7
1 file changed
Lines changed: 6 additions & 6 deletions
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
@@ -9,7 +9,7 @@ FLAKY_TESTS ?= run | |||
| 9 | 9 | TEST_CI_ARGS ?= | |
| 10 | 10 | STAGINGSERVER ?= node-www | |
| 11 | 11 | LOGLEVEL ?= silent | |
| 12 | - OSTYPE := $(shell uname -s | tr '[A-Z]' '[a-z]') | ||
| 12 | + OSTYPE := $(shell uname -s | tr '[:upper:]' '[:lower:]') | ||
| 13 | 13 | COVTESTS ?= test-cov | |
| 14 | 14 | COV_SKIP_TESTS ?= core_line_numbers.js,testFinalizer.js,test_function/test.js | |
| 15 | 15 | GTEST_FILTER ?= "*" | |
@@ -40,7 +40,7 @@ ifeq ($(OSTYPE), darwin) | |||
| 40 | 40 | GCOV = xcrun llvm-cov gcov | |
| 41 | 41 | endif | |
| 42 | 42 | ||
| 43 | - BUILDTYPE_LOWER := $(shell echo $(BUILDTYPE) | tr '[A-Z]' '[a-z]') | ||
| 43 | + BUILDTYPE_LOWER := $(shell echo $(BUILDTYPE) | tr '[:upper:]' '[:lower:]') | ||
| 44 | 44 | ||
| 45 | 45 | # Determine EXEEXT | |
| 46 | 46 | EXEEXT := $(shell $(PYTHON) -c \ | |
@@ -85,7 +85,7 @@ endif | |||
| 85 | 85 | # To add a target to the help, add a double comment (##) on the target line. | |
| 86 | 86 | help: ## Print help for targets with comments. | |
| 87 | 87 | @printf "For more targets and info see the comments in the Makefile.\n\n" | |
| 88 | - @grep -E '^[a-zA-Z0-9._-]+:.*?## .*$$' Makefile | sort | \ | ||
| 88 | + @grep -E '^[[:alnum:]._-]+:.*?## .*$$' Makefile | sort | \ | ||
| 89 | 89 | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-15s\033[0m %s\n", $$1, $$2}' | |
| 90 | 90 | ||
| 91 | 91 | # The .PHONY is needed to ensure that we recursively use the out/Makefile | |
@@ -243,10 +243,10 @@ coverage-test: coverage-build | |||
| 243 | 243 | --gcov-exclude='.*\b(deps|usr|out|cctest|embedding)\b' -v \ | |
| 244 | 244 | -r Release/obj.target --html --html-detail -o ../coverage/cxxcoverage.html \ | |
| 245 | 245 | --gcov-executable="$(GCOV)") | |
| 246 | - @echo -n "Javascript coverage %: " | ||
| 246 | + @printf "Javascript coverage %%: " | ||
| 247 | 247 | @grep -B1 Lines coverage/index.html | head -n1 \ | |
| 248 | 248 | | sed 's/<[^>]*>//g'| sed 's/ //g' | |
| 249 | - @echo -n "C++ coverage %: " | ||
| 249 | + @printf "C++ coverage %%: " | ||
| 250 | 250 | @grep -A3 Lines coverage/cxxcoverage.html | grep style \ | |
| 251 | 251 | | sed 's/<[^>]*>//g'| sed 's/ //g' | |
| 252 | 252 | ||
@@ -1359,7 +1359,7 @@ lint: ## Run JS, C++, MD and doc linters. | |||
| 1359 | 1359 | $(MAKE) lint-addon-docs || EXIT_STATUS=$$? ; \ | |
| 1360 | 1360 | $(MAKE) lint-md || EXIT_STATUS=$$? ; \ | |
| 1361 | 1361 | exit $$EXIT_STATUS | |
| 1362 | - CONFLICT_RE=^>>>>>>> [0-9A-Fa-f]+|^<<<<<<< [A-Za-z]+ | ||
| 1362 | + CONFLICT_RE=^>>>>>>> [[:xdigit:]]+|^<<<<<<< [[:alpha:]]+ | ||
| 1363 | 1363 | ||
| 1364 | 1364 | # Related CI job: node-test-linter | |
| 1365 | 1365 | lint-ci: lint-js-ci lint-cpp lint-py lint-md lint-addon-docs | |
0 commit comments