Skip to content

Commit db003e9

Browse files
kgrytekgryte
committed
Remove KERNEL environment variable
1 parent 7897ec3 commit db003e9

File tree

16 files changed

+31
-76
lines changed

16 files changed

+31
-76
lines changed

‎tools/make/lib/complexity/plato.mk‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,8 @@
11

22
# VARIABLES #
33

4-
# Determine the host kernel:
5-
KERNEL ?= $(shell uname -s)
6-
7-
# Based on the kernel, determine the `open` command:
8-
ifeq ($(KERNEL), Darwin)
4+
# Based on the OS, determine the `open` command:
5+
ifeq ($(OS), Darwin)
96
OPEN ?= open
107
else
118
OPEN ?= xdg-open

‎tools/make/lib/coverage-service/codecov.mk‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ CODECOV ?= bash <(curl -s https://codecov.io/bash)
1414
CODECOV_FLAGS ?= \
1515
-f "$(LCOV_INFO)" \
1616
-F $(CI_SERVICE) \
17-
-F $(shell echo $(KERNEL) | tr '[:upper:]' '[:lower:]') \
17+
-F $(shell echo $(OS) | tr '[:upper:]' '[:lower:]') \
1818
-F $(shell $(NODE) --version | tr '\.' '_' | (printf 'node_' && $(CAT))) \
1919
-X fix \
2020
-Z

‎tools/make/lib/docs/documentationjs.mk‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
DELETE ?= -rm
66
DELETE_FLAGS ?= -rf
77

8-
# Determine the host kernel:
9-
KERNEL ?= $(shell uname -s)
10-
11-
# Based on the kernel, determine the `open` command:
12-
ifeq ($(KERNEL), Darwin)
8+
# Based on the OS, determine the `open` command:
9+
ifeq ($(OS), Darwin)
1310
OPEN ?= open
1411
else
1512
OPEN ?= xdg-open

‎tools/make/lib/docs/jsdoc.mk‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -5,11 +5,8 @@
55
DELETE ?= -rm
66
DELETE_FLAGS ?= -rf
77

8-
# Determine the host kernel:
9-
KERNEL ?= $(shell uname -s)
10-
11-
# Based on the kernel, determine the `open` command:
12-
ifeq ($(KERNEL), Darwin)
8+
# Based on the OS, determine the `open` command:
9+
ifeq ($(OS), Darwin)
1310
OPEN ?= open
1411
else
1512
OPEN ?= xdg-open

‎tools/make/lib/ls/benchmarks.mk‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44
# Define the folder name for benchmarks files:
55
BENCHMARKS_FOLDER ?= benchmark
66

7-
# Determine the host kernel:
8-
KERNEL ?= $(shell uname -s)
9-
107
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
118

12-
ifeq ($(KERNEL), Darwin)
9+
ifeq ($(OS), Darwin)
1310
find_kernel_prefix := -E
1411
else
1512
find_kernel_prefix :=
@@ -31,7 +28,7 @@ FIND_BENCHMARKS_FLAGS ?= \
3128
-not -path "$(REPORTS_DIR)/*"
3229

3330

34-
ifneq ($(KERNEL), Darwin)
31+
ifneq ($(OS), Darwin)
3532
FIND_BENCHMARKS_FLAGS := -regextype posix-extended $(FIND_BENCHMARKS_FLAGS)
3633
endif
3734

‎tools/make/lib/ls/examples.mk‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -4,12 +4,9 @@
44
# Define the folder name for examples files:
55
EXAMPLES_FOLDER ?= examples
66

7-
# Determine the host kernel:
8-
KERNEL ?= $(shell uname -s)
9-
107
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
118

12-
ifeq ($(KERNEL), Darwin)
9+
ifeq ($(OS), Darwin)
1310
find_kernel_prefix := -E
1411
else
1512
find_kernel_prefix :=
@@ -32,7 +29,7 @@ FIND_EXAMPLES_FLAGS ?= \
3229
-not -path "$(ROOT_DIR)/**/$(EXAMPLES_FOLDER)/fixtures/*"
3330

3431

35-
ifneq ($(KERNEL), Darwin)
32+
ifneq ($(OS), Darwin)
3633
FIND_EXAMPLES_FLAGS := -regextype posix-extended $(FIND_EXAMPLES_FLAGS)
3734
endif
3835

‎tools/make/lib/ls/files.mk‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11

22
# VARIABLES #
33

4-
# Determine the host kernel:
5-
KERNEL ?= $(shell uname -s)
6-
74
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
85

9-
ifeq ($(KERNEL), Darwin)
6+
ifeq ($(OS), Darwin)
107
find_kernel_prefix := -E
118
else
129
find_kernel_prefix :=
@@ -26,7 +23,7 @@ FIND_FILES_FLAGS ?= \
2623
-not -path "$(REPORTS_DIR)/*" \
2724
-not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*"
2825

29-
ifneq ($(KERNEL), Darwin)
26+
ifneq ($(OS), Darwin)
3027
FIND_FILES_FLAGS := -regextype posix-extended $(FIND_FILES_FLAGS)
3128
endif
3229

‎tools/make/lib/ls/markdown.mk‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11

22
# VARIABLES #
33

4-
# Determine the host kernel:
5-
KERNEL ?= $(shell uname -s)
6-
74
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
85

9-
ifeq ($(KERNEL), Darwin)
6+
ifeq ($(OS), Darwin)
107
find_kernel_prefix := -E
118
else
129
find_kernel_prefix :=
@@ -25,7 +22,7 @@ FIND_MARKDOWN_FLAGS ?= \
2522
-not -path "$(REPORTS_DIR)/*" \
2623
-not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*"
2724

28-
ifneq ($(KERNEL), Darwin)
25+
ifneq ($(OS), Darwin)
2926
FIND_MARKDOWN_FLAGS := -regextype posix-extended $(FIND_MARKDOWN_FLAGS)
3027
endif
3128

‎tools/make/lib/ls/pkgs.mk‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11

22
# VARIABLES #
33

4-
# Determine the host kernel:
5-
KERNEL ?= $(shell uname -s)
6-
74
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
85

9-
ifeq ($(KERNEL), Darwin)
6+
ifeq ($(OS), Darwin)
107
find_kernel_prefix := -E
118
else
129
find_kernel_prefix :=
@@ -25,7 +22,7 @@ FIND_PACKAGES_FLAGS ?= \
2522
-not -path "$(REPORTS_DIR)/*" \
2623
-exec dirname {} \;
2724

28-
ifneq ($(KERNEL), Darwin)
25+
ifneq ($(OS), Darwin)
2926
FIND_PACKAGES_FLAGS := -regextype posix-extended $(FIND_PACKAGES_FLAGS)
3027
endif
3128

‎tools/make/lib/ls/sources.mk‎

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,9 @@
11

22
# VARIABLES #
33

4-
# Determine the host kernel:
5-
KERNEL ?= $(shell uname -s)
6-
74
# On Mac OSX, in order to use `|` and other regular expression operators, we need to use enhanced regular expression syntax (-E); see https://developer.apple.com/library/mac/documentation/Darwin/Reference/ManPages/man7/re_format.7.html#//apple_ref/doc/man/7/re_format.
85

9-
ifeq ($(KERNEL), Darwin)
6+
ifeq ($(OS), Darwin)
107
find_kernel_prefix := -E
118
else
129
find_kernel_prefix :=
@@ -30,7 +27,7 @@ FIND_SOURCES_FLAGS ?= \
3027
-not -path "$(ROOT_DIR)/**/$(BENCHMARKS_FOLDER)/*" \
3128
-not -path "$(ROOT_DIR)/**/$(BUILD_FOLDER)/*"
3229

33-
ifneq ($(KERNEL), Darwin)
30+
ifneq ($(OS), Darwin)
3431
FIND_SOURCES_FLAGS := -regextype posix-extended $(FIND_SOURCES_FLAGS)
3532
endif
3633

0 commit comments

Comments
 (0)