FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

build: do not mix spaces and tabs in Makefile · nodejs/node@fb57bc4 · GitHub

/ node Public

Commit fb57bc4

Browse files
lpinca
authored and
targos
committed
build: do not mix spaces and tabs in Makefile
PR-URL: #28881 Reviewed-By: Anna Henningsen <anna@addaleax.net> Reviewed-By: Michaël Zasso <targos@protonmail.com> Reviewed-By: Yongsheng Zhang <zyszys98@gmail.com> Reviewed-By: Trivikram Kamat <trivikr.dev@gmail.com> Reviewed-By: Сковорода Никита Андреевич <chalkerx@gmail.com> Reviewed-By: Beth Griggs <Bethany.Griggs@uk.ibm.com> Reviewed-By: Colin Ihrig <cjihrig@gmail.com> Reviewed-By: James M Snell <jasnell@gmail.com> Reviewed-By: Richard Lau <riclau@uk.ibm.com> Reviewed-By: Rich Trott <rtrott@gmail.com>
1 parent cce2087 commit fb57bc4

1 file changed

Lines changed: 33 additions & 33 deletions

File tree

‎Makefile‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -19,24 +19,24 @@ PWD = $(CURDIR)
1919
BUILD_WITH ?= make
2020

2121
ifdef JOBS
22-
PARALLEL_ARGS = -j $(JOBS)
22+
PARALLEL_ARGS = -j $(JOBS)
2323
else
24-
PARALLEL_ARGS = -J
24+
PARALLEL_ARGS = -J
2525
endif
2626

2727
ifdef ENABLE_V8_TAP
28-
TAP_V8 := --junitout $(PWD)/v8-tap.xml
29-
TAP_V8_INTL := --junitout $(PWD)/v8-intl-tap.xml
30-
TAP_V8_BENCHMARKS := --junitout $(PWD)/v8-benchmarks-tap.xml
28+
TAP_V8 := --junitout $(PWD)/v8-tap.xml
29+
TAP_V8_INTL := --junitout $(PWD)/v8-intl-tap.xml
30+
TAP_V8_BENCHMARKS := --junitout $(PWD)/v8-benchmarks-tap.xml
3131
endif
3232

3333
V8_TEST_OPTIONS = $(V8_EXTRA_TEST_OPTIONS)
3434
ifdef DISABLE_V8_I18N
35-
V8_BUILD_OPTIONS += i18nsupport=off
35+
V8_BUILD_OPTIONS += i18nsupport=off
3636
endif
3737

3838
ifeq ($(OSTYPE), darwin)
39-
GCOV = xcrun llvm-cov gcov
39+
GCOV = xcrun llvm-cov gcov
4040
endif
4141

4242
BUILDTYPE_LOWER := $(shell echo $(BUILDTYPE) | tr '[A-Z]' '[a-z]')
@@ -62,7 +62,7 @@ V ?= 0
6262
# Use -e to double check in case it's a broken link
6363
# Use $(PWD) so we can cd to anywhere before calling this
6464
available-node = \
65-
if [ -x $(PWD)/$(NODE) ] && [ -e $(PWD)/$(NODE) ]; then \
65+
if [ -x $(PWD)/$(NODE) ] && [ -e $(PWD)/$(NODE) ]; then \
6666
$(PWD)/$(NODE) $(1); \
6767
elif [ -x `which node` ] && [ -e `which node` ] && [ `which node` ]; then \
6868
`which node` $(1); \
@@ -107,12 +107,12 @@ $(NODE_G_EXE): config.gypi out/Makefile
107107
else
108108
ifeq ($(BUILD_WITH), ninja)
109109
ifeq ($(V),1)
110-
NINJA_ARGS := $(NINJA_ARGS) -v
110+
NINJA_ARGS := $(NINJA_ARGS) -v
111111
endif
112112
ifdef JOBS
113-
NINJA_ARGS := $(NINJA_ARGS) -j$(JOBS)
113+
NINJA_ARGS := $(NINJA_ARGS) -j$(JOBS)
114114
else
115-
NINJA_ARGS := $(NINJA_ARGS) $(filter -j%,$(MAKEFLAGS))
115+
NINJA_ARGS := $(NINJA_ARGS) $(filter -j%,$(MAKEFLAGS))
116116
endif
117117
$(NODE_EXE): config.gypi out/Release/build.ninja
118118
ninja -C out/Release $(NINJA_ARGS)
@@ -141,9 +141,9 @@ test-code-cache: with-code-cache
141141
echo "'test-code-cache' target is a noop"
142142

143143
out/Makefile: config.gypi common.gypi node.gyp \
144-
deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
145-
tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
146-
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
144+
deps/uv/uv.gyp deps/http_parser/http_parser.gyp deps/zlib/zlib.gyp \
145+
tools/v8_gypfiles/toolchain.gypi tools/v8_gypfiles/features.gypi \
146+
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
147147
$(PYTHON) tools/gyp_node.py -f make
148148

149149
config.gypi: configure configure.py
@@ -243,7 +243,7 @@ coverage-test: coverage-build
243243
$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/*.gcda
244244
$(RM) out/$(BUILDTYPE)/obj.target/node_lib/src/tracing/*.gcda
245245
-NODE_V8_COVERAGE=out/$(BUILDTYPE)/.coverage \
246-
TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) $(COVTESTS)
246+
TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) $(COVTESTS)
247247
$(MAKE) coverage-report-js
248248
-(cd out && "../gcovr/scripts/gcovr" --gcov-exclude='.*deps' \
249249
--gcov-exclude='.*usr' -v -r Release/obj.target \
@@ -261,7 +261,7 @@ COV_REPORT_OPTIONS = --reporter=html \
261261
--resolve=./lib --exclude="benchmark/" --exclude="deps/" --exclude="test/" --exclude="tools/" \
262262
--wrapper-length=0
263263
ifdef COV_ENFORCE_THRESHOLD
264-
COV_REPORT_OPTIONS += --check-coverage --lines=$(COV_ENFORCE_THRESHOLD)
264+
COV_REPORT_OPTIONS += --check-coverage --lines=$(COV_ENFORCE_THRESHOLD)
265265
endif
266266

267267
.PHONY: coverage-report-js
@@ -299,7 +299,7 @@ coverage-run-js:
299299
$(RM) -r out/$(BUILDTYPE)/.coverage
300300
$(MAKE) coverage-build-js
301301
-NODE_V8_COVERAGE=out/$(BUILDTYPE)/.coverage CI_SKIP_TESTS=$(COV_SKIP_TESTS) \
302-
TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) jstest
302+
TEST_CI_ARGS="$(TEST_CI_ARGS) --type=coverage" $(MAKE) jstest
303303
$(MAKE) coverage-report-js
304304

305305
.PHONY: test
@@ -362,7 +362,7 @@ DOCBUILDSTAMP_PREREQS := $(DOCBUILDSTAMP_PREREQS) out/$(BUILDTYPE)/node.exp
362362
endif
363363

364364
node_use_openssl = $(call available-node,"-p" \
365-
"process.versions.openssl != undefined")
365+
"process.versions.openssl != undefined")
366366
test/addons/.docbuildstamp: $(DOCBUILDSTAMP_PREREQS) tools/doc/node_modules
367367
@if [ "$(shell $(node_use_openssl))" != "true" ]; then \
368368
echo "Skipping .docbuildstamp (no crypto)"; \
@@ -387,9 +387,9 @@ ADDONS_PREREQS := config.gypi \
387387

388388
define run_build_addons
389389
env npm_config_loglevel=$(LOGLEVEL) npm_config_nodedir="$$PWD" \
390-
npm_config_python="$(PYTHON)" $(NODE) "$$PWD/tools/build-addons" \
391-
"$$PWD/deps/npm/node_modules/node-gyp/bin/node-gyp.js" \
392-
$1
390+
npm_config_python="$(PYTHON)" $(NODE) "$$PWD/tools/build-addons" \
391+
"$$PWD/deps/npm/node_modules/node-gyp/bin/node-gyp.js" \
392+
$1
393393
touch $2
394394
endef
395395

@@ -489,9 +489,9 @@ test-all-suites: | clear-stalled test-build bench-addons-build doc-only ## Run a
489489
CI_NATIVE_SUITES ?= addons js-native-api node-api
490490
CI_JS_SUITES ?= default
491491
ifeq ($(node_use_openssl), false)
492-
CI_DOC := doctool
492+
CI_DOC := doctool
493493
else
494-
CI_DOC =
494+
CI_DOC =
495495
endif
496496

497497
.PHONY: test-ci-native
@@ -659,21 +659,21 @@ ifneq ("","$(wildcard deps/v8/tools/run-tests.py)")
659659
# Related CI job: node-test-commit-v8-linux
660660
test-v8: v8 ## Runs the V8 test suite on deps/v8.
661661
deps/v8/tools/run-tests.py --gn --arch=$(V8_ARCH) \
662-
--mode=$(BUILDTYPE_LOWER) $(V8_TEST_OPTIONS) \
662+
--mode=$(BUILDTYPE_LOWER) $(V8_TEST_OPTIONS) \
663663
mjsunit cctest debugger inspector message preparser \
664-
$(TAP_V8)
664+
$(TAP_V8)
665665
@echo Testing hash seed
666666
$(MAKE) test-hash-seed
667667

668668
test-v8-intl: v8
669669
deps/v8/tools/run-tests.py --gn --arch=$(V8_ARCH) \
670-
--mode=$(BUILDTYPE_LOWER) intl \
671-
$(TAP_V8_INTL)
670+
--mode=$(BUILDTYPE_LOWER) intl \
671+
$(TAP_V8_INTL)
672672

673673
test-v8-benchmarks: v8
674674
deps/v8/tools/run-tests.py --gn --arch=$(V8_ARCH) --mode=$(BUILDTYPE_LOWER) \
675-
benchmarks \
676-
$(TAP_V8_BENCHMARKS)
675+
benchmarks \
676+
$(TAP_V8_BENCHMARKS)
677677

678678
test-v8-updates:
679679
$(PYTHON) tools/test.py $(PARALLEL_ARGS) --mode=$(BUILDTYPE_LOWER) v8-updates
@@ -1185,8 +1185,8 @@ tools/.docmdlintstamp: $(LINT_MD_DOC_FILES)
11851185
LINT_MD_TARGETS = src lib benchmark test tools/doc tools/icu
11861186
LINT_MD_ROOT_DOCS := $(wildcard *.md)
11871187
LINT_MD_MISC_FILES := $(shell find $(LINT_MD_TARGETS) -type f \
1188-
! -path '*node_modules*' ! -path 'test/fixtures/*' -name '*.md') \
1189-
$(LINT_MD_ROOT_DOCS)
1188+
! -path '*node_modules*' ! -path 'test/fixtures/*' -name '*.md') \
1189+
$(LINT_MD_ROOT_DOCS)
11901190
run-lint-misc-md = tools/lint-md.js -q -f $(LINT_MD_MISC_FILES)
11911191
# Lint other changed markdown files maintained by us
11921192
tools/.miscmdlintstamp: $(LINT_MD_MISC_FILES)
@@ -1302,9 +1302,9 @@ else
13021302
endif
13031303

13041304
ifeq ($(V),1)
1305-
CPPLINT_QUIET =
1305+
CPPLINT_QUIET =
13061306
else
1307-
CPPLINT_QUIET = --quiet
1307+
CPPLINT_QUIET = --quiet
13081308
endif
13091309
.PHONY: lint-cpp
13101310
# Lints the C++ code with cpplint.py and check-imports.py.

0 commit comments

Comments
 (0)
Back | FazBrowse Home | New Git URL