Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[WIP] Rename napi #37108

Closed
wants to merge 8 commits into from
Closed

[WIP] Rename napi #37108

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
7dbc94b
n-api: rename to node-api
Jan 24, 2021
3f67fe2
update tests
Jan 26, 2021
272dcfe
rename benchmarks
Jan 26, 2021
8e0addf
update docs tools and src some more
Jan 26, 2021
97dc2f8
working on fixing github ci
Jan 26, 2021
43dc098
update benchmark test
Jan 28, 2021
f4a5a6e
rename things in configure.py
Jan 28, 2021
7f1b8bb
cannot rename node_api_build_version
Jan 28, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions .github/CODEOWNERS
View file
Open in desktop
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -100,12 +100,12 @@
/lib/internal/bootstrap/loaders.js @nodejs/modules
/src/module_wrap* @nodejs/modules @nodejs/vm

# N-API
# Node.js API
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

"Node.js API" seems like it will inevitably cause confusion. Is this the name that reached consensus in discussion? (I can't find the issue in the tracker. Maybe I'm looking in the wrong repository?)

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@Trott I believe the name is still open for discussion at nodejs/abi-stable-node#420.

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

node-api was what was being discussion to replace n-api and napi.


/src/node_api* @nodejs/n-api
/src/js_native_api* @nodejs/n-api
/doc/guides/adding-new-napi-api.md @nodejs/n-api
/doc/api/n-api.md @nodejs/n-api
/doc/guides/adding-new-node-api.md @nodejs/n-api
/doc/api/node-api.md @nodejs/n-api

# WASI
/deps/uvwasi/ @nodejs/wasi
Expand Down
28 changes: 14 additions & 14 deletions Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -143,7 +143,7 @@ out/Makefile: config.gypi common.gypi node.gyp \
tools/v8_gypfiles/inspector.gypi tools/v8_gypfiles/v8.gyp
$(PYTHON) tools/gyp_node.py -f make

# node_version.h is listed because the N-API version is taken from there
# node_version.h is listed because the Node.js API version is taken from there
# and included in config.gypi
config.gypi: configure configure.py src/node_version.h
@if [ -x config.status ]; then \
Expand Down Expand Up @@ -436,16 +436,16 @@ test/node-api/.buildstamp: $(ADDONS_PREREQS) \
# TODO(bnoordhuis) Force rebuild after gyp or node-gyp update.
build-node-api-tests: | $(NODE_EXE) test/node-api/.buildstamp

BENCHMARK_NAPI_BINDING_GYPS := $(wildcard benchmark/napi/*/binding.gyp)
BENCHMARK_NODE_API_BINDING_GYPS := $(wildcard benchmark/node-api/*/binding.gyp)

BENCHMARK_NAPI_BINDING_SOURCES := \
$(wildcard benchmark/napi/*/*.c) \
$(wildcard benchmark/napi/*/*.cc) \
$(wildcard benchmark/napi/*/*.h)
BENCHMARK_NODE_API_BINDING_SOURCES := \
$(wildcard benchmark/node-api/*/*.c) \
$(wildcard benchmark/node-api/*/*.cc) \
$(wildcard benchmark/node-api/*/*.h)

benchmark/napi/.buildstamp: $(ADDONS_PREREQS) \
$(BENCHMARK_NAPI_BINDING_GYPS) $(BENCHMARK_NAPI_BINDING_SOURCES)
@$(call run_build_addons,"$$PWD/benchmark/napi",$@)
benchmark/node-api/.buildstamp: $(ADDONS_PREREQS) \
$(BENCHMARK_NODE_API_BINDING_GYPS) $(BENCHMARK_NODE_API_BINDING_SOURCES)
@$(call run_build_addons,"$$PWD/benchmark/node-api",$@)

.PHONY: clear-stalled
clear-stalled:
Expand Down Expand Up @@ -488,7 +488,7 @@ endif
# Build and test addons without building anything else
# Related CI job: node-test-commit-arm-fanned
test-ci-native: LOGLEVEL := info
test-ci-native: | benchmark/napi/.buildstamp test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
test-ci-native: | benchmark/node-api/.buildstamp test/addons/.buildstamp test/js-native-api/.buildstamp test/node-api/.buildstamp
$(PYTHON) tools/test.py $(PARALLEL_ARGS) -p tap --logfile test.tap \
--mode=$(BUILDTYPE_LOWER) --flaky-tests=$(FLAKY_TESTS) \
$(TEST_CI_ARGS) $(CI_NATIVE_SUITES)
Expand Down Expand Up @@ -1157,12 +1157,12 @@ bench bench-all: bench-addons-build

# Build required addons for benchmark before running it.
.PHONY: bench-addons-build
bench-addons-build: | $(NODE_EXE) benchmark/napi/.buildstamp
bench-addons-build: | $(NODE_EXE) benchmark/node-api/.buildstamp

.PHONY: bench-addons-clean
bench-addons-clean:
$(RM) -r benchmark/napi/*/build
$(RM) benchmark/napi/.buildstamp
$(RM) -r benchmark/node-api/*/build
$(RM) benchmark/node-api/.buildstamp

.PHONY: lint-md-rollup
lint-md-rollup:
Expand Down Expand Up @@ -1251,7 +1251,7 @@ LINT_CPP_EXCLUDE += $(wildcard test/js-native-api/??_*/*.cc test/js-native-api/?
LINT_CPP_EXCLUDE += src/tracing/trace_event.h src/tracing/trace_event_common.h

LINT_CPP_FILES = $(filter-out $(LINT_CPP_EXCLUDE), $(wildcard \
benchmark/napi/*/*.cc \
benchmark/node-api/*/*.cc \
src/*.c \
src/*.cc \
src/*.h \
Expand Down
231 changes: 0 additions & 231 deletions benchmark/napi/function_args/napi_binding.c
View file
Open in desktop

This file was deleted.

26 changes: 0 additions & 26 deletions benchmark/napi/function_call/napi_binding.c
View file
Open in desktop

This file was deleted.

Loading