Skip to content
This repository has been archived by the owner on Oct 15, 2020. It is now read-only.

Merge N-API JSRT implementation from abi-stable-node #238

Merged
merged 4 commits into from
May 15, 2017
Merged

Merge N-API JSRT implementation from abi-stable-node #238

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
5cad632
n-api: Merge N-API JSRT from abi-stable-node
jasongin May 5, 2017
f8cbdde
n-api: Fix cc lint errors in node_api_jsrt.cc
boingoing May 6, 2017
cc20967
n-api: Make sources conditional on V8 / ChakraCore
jasongin May 15, 2017
28cdc33
n-api: Minor updates for review feedback
jasongin May 15, 2017
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
19 changes: 15 additions & 4 deletions node.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,6 @@
'src/handle_wrap.cc',
'src/js_stream.cc',
'src/node.cc',
'src/node_api.cc',
'src/node_api.h',
'src/node_api_types.h',
'src/node_buffer.cc',
'src/node_config.cc',
'src/node_constants.cc',
Expand Down Expand Up @@ -219,6 +216,8 @@
'src/handle_wrap.h',
'src/js_stream.h',
'src/node.h',
'src/node_api.h',
'src/node_api_types.h',
'src/node_buffer.h',
'src/node_constants.h',
'src/node_debug_options.h',
Expand Down Expand Up @@ -265,6 +264,18 @@
# Warn when using deprecated V8 APIs.
'V8_DEPRECATION_WARNINGS=1',
],

'conditions': [
[ 'node_engine=="chakracore"', {
'sources': [
'src/node_api_jsrt.cc',
],
}, {
'sources': [
'src/node_api.cc',
],
}],
],
},
{
'target_name': 'mkssldef',
Expand Down Expand Up @@ -644,7 +655,7 @@
'GTEST_DONT_DEFINE_ASSERT_NE=1',
'NODE_WANT_INTERNALS=1',
],

'sources': [
'test/cctest/test_base64.cc',
'test/cctest/test_environment.cc',
Expand Down
Loading