Skip to content

Commit de87eea

Browse files
kgrytekgryte
committed
Fix env var bugs
1 parent 6fe9034 commit de87eea

File tree

12 files changed

+54
-25
lines changed

12 files changed

+54
-25
lines changed

‎Makefile‎

Lines changed: 23 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,6 @@
11

22
# VARIABLES #
33

4-
# Define the Node environment:
5-
NODE_ENV ?=
6-
7-
# Define the Node path:
8-
NODE_PATH ?=
9-
104
# Define whether the make commands are running on a hosted continuous integration service:
115
ifeq ($(TRAVIS), true)
126
CI_SERVICE ?= travis
@@ -81,6 +75,29 @@ EXAMPLES_FOLDER ?= examples
8175
# Define the folder name convention for benchmark files:
8276
BENCHMARKS_FOLDER ?= benchmark
8377

78+
# Define Node paths:
79+
NODE_PATH ?= $(ROOT_DIR)/lib/node_modules
80+
NODE_PATH_BENCHMARK ?= $(NODE_PATH)
81+
NODE_PATH_EXAMPLES ?= $(NODE_PATH)
82+
NODE_PATH_REPL ?= $(NODE_PATH)
83+
NODE_PATH_TEST ?= $(NODE_PATH)
84+
NODE_PATH_WORKSHOPS ?= $(NODE_PATH)
85+
86+
# Define Node environments:
87+
ifdef ($(NODE_ENV))
88+
NODE_ENV_BENCHMARK := $(NODE_ENV)
89+
NODE_ENV_EXAMPLES := $(NODE_ENV)
90+
NODE_ENV_REPL := $(NODE_ENV)
91+
NODE_ENV_TEST := $(NODE_ENV)
92+
NODE_ENV_WORKSHOPS := $(NODE_ENV)
93+
else
94+
NODE_ENV_BENCHMARK ?= benchmark
95+
NODE_ENV_EXAMPLES ?= examples
96+
NODE_ENV_REPL ?= repl
97+
NODE_ENV_TEST ?= test
98+
NODE_ENV_WORKSHOPS ?= workshop
99+
endif
100+
84101
# Define whether delete operations should be safe (i.e., deleted items are sent to trash, rather than permanently deleted):
85102
SAFE_DELETE ?= false
86103

‎tools/ci/appveyor.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77

88
# VARIABLES #
99

10-
# Define the Node path:
11-
export NODE_PATH=./
12-
1310
# Define a heartbeat interval to periodically print messages to `stdout`:
1411
export HEARTBEAT_INTERVAL=30s
1512

‎tools/ci/travis.sh‎

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,6 @@
77

88
# VARIABLES #
99

10-
# Define the Node path:
11-
export NODE_PATH=./
12-
1310
# Define a heartbeat interval to prevent Travis CI from prematurely ending due to long running commands:
1411
export HEARTBEAT_INTERVAL=30s
1512

‎tools/make/lib/benchmark/javascript.mk‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
NODE ?= node
66

77
# Define the Node environment:
8-
NODE_ENV ?= benchmark
8+
NODE_ENV_BENCHMARK ?= $(NODE_ENV)
99

1010
# Define the Node path:
11-
NODE_PATH ?= $(NODE_PATH_BENCHMARK)
11+
NODE_PATH_BENCHMARK ?= $(NODE_PATH)
1212

1313

1414
# TARGETS #
@@ -21,6 +21,8 @@ benchmark-javascript: $(NODE_MODULES)
2121
for file in $(BENCHMARKS); do \
2222
echo ""; \
2323
echo "Running benchmark: $$file"; \
24+
NODE_ENV=$(NODE_ENV_BENCHMARK) \
25+
NODE_PATH=$(NODE_PATH_BENCHMARK) \
2426
$(NODE) $$file || exit 1; \
2527
done
2628

‎tools/make/lib/examples/Makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,10 +5,10 @@
55
NODE ?= node
66

77
# Define the Node environment:
8-
NODE_ENV ?= examples
8+
NODE_ENV_EXAMPLES ?= $(NODE_ENV)
99

1010
# Define the Node path:
11-
NODE_PATH ?= $(NODE_PATH_EXAMPLES)
11+
NODE_PATH_EXAMPLES ?= $(NODE_PATH)
1212

1313

1414
# TARGETS #
@@ -21,6 +21,8 @@ examples: $(NODE_MODULES)
2121
for file in $(EXAMPLES); do \
2222
echo ""; \
2323
echo "Running example: $$file"; \
24+
NODE_ENV=$(NODE_ENV_EXAMPLES) \
25+
NODE_PATH=$(NODE_PATH_EXAMPLES) \
2426
$(NODE) $$file || exit 1; \
2527
done
2628

‎tools/make/lib/repl/Makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# VARIABLES #
33

44
# Define the Node environment:
5-
NODE_ENV ?= repl
5+
NODE_ENV_REPL ?= $(NODE_ENV)
66

77
# Define the Node path:
8-
NODE_PATH ?= $(NODE_PATH_REPL)
8+
NODE_PATH_REPL ?= $(NODE_PATH)
99

1010
# Define the path of the REPL executable:
1111
REPL ?= $(LOCAL_BIN_DIR)/repl
@@ -23,6 +23,8 @@ REPL_DIR ?= $(ROOT_DIR)
2323
repl: $(NODE_MODULES) $(REPL)
2424
@cd $(REPL_DIR); \
2525
echo "Starting REPL..."; \
26+
NODE_ENV=$(NODE_ENV_REPL) \
27+
NODE_PATH=$(NODE_PATH_REPL) \
2628
$(REPL)
2729

2830
.PHONY: repl

‎tools/make/lib/test-browsers/Makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# VARIABLES #
33

44
# Define the Node environment:
5-
NODE_ENV ?= test
5+
NODE_ENV_TEST ?= $(NODE_ENV)
66

77
# Define the Node path:
8-
NODE_PATH ?= $(NODE_PATH_TEST)
8+
NODE_PATH_TEST ?= $(NODE_PATH)
99

1010
# Define the browser test runner:
1111
BROWSER_TEST_RUNNER ?= testling
@@ -47,6 +47,8 @@ endif
4747
# [3]: https://github.com/scottcorgan/tap-spec
4848

4949
test-browsers: $(NODE_MODULES)
50+
NODE_ENV=$(NODE_ENV_TEST) \
51+
NODE_PATH=$(NODE_PATH_TEST) \
5052
$(BROWSERIFY) \
5153
$(BROWSERIFY_FLAGS) \
5254
$(TESTS) \

‎tools/make/lib/test-browsers/testling.mk‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# VARIABLES #
33

44
# Define the Node environment:
5-
NODE_ENV ?= test
5+
NODE_ENV_TEST ?= $(NODE_ENV)
66

77
# Determine the host kernel:
88
KERNEL ?= $(shell uname -s)
@@ -37,6 +37,7 @@ BROWSER_TEST_FLAGS ?=
3737
# [1]: https://github.com/substack/testling
3838

3939
view-testling: $(NODE_MODULES)
40+
NODE_ENV=$(NODE_ENV_TEST) \
4041
$(BROWSERIFY) \
4142
$(BROWSERIFY_FLAGS) \
4243
$(TESTS) \

‎tools/make/lib/test-cov/istanbul.mk‎

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,8 @@ JAVASCRIPT_TEST_COV_FLAGS ?= --no-default-excludes \
4444
# [1]: https://github.com/gotwarlost/istanbul
4545

4646
test-istanbul: $(NODE_MODULES)
47+
NODE_ENV=$(NODE_ENV_TEST) \
48+
NODE_PATH=$(NODE_PATH_TEST) \
4749
$(JAVASCRIPT_TEST_COV) $(JAVASCRIPT_TEST_COV_FLAGS) $(JAVASCRIPT_TEST) -- $(JAVASCRIPT_TEST_FLAGS) $(TESTS)
4850

4951
.PHONY: test-istanbul

‎tools/make/lib/test-cov/javascript.mk‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,10 +2,10 @@
22
# VARIABLES #
33

44
# Define the Node environment:
5-
NODE_ENV ?= test
5+
NODE_ENV_TEST ?= $(NODE_ENV)
66

77
# Define the Node path:
8-
NODE_PATH ?= $(NODE_PATH_TEST)
8+
NODE_PATH_TEST ?= $(NODE_PATH)
99

1010
# Define the code coverage instrumentation utility:
1111
JAVASCRIPT_CODE_INSTRUMENTER ?= istanbul

0 commit comments

Comments
 (0)