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

Commit

Permalink
n-api: Merge N-API JSRT from abi-stable-node
Browse files Browse the repository at this point in the history
 - Copy `node_api_jsrt.cc` from abi-stable-node fork
 - Update `node_api_jsrt.cc` for renamed JSRT string APIs:
   `JsCopyStringUtf8` -> `JsCopyString`, etc
 - Update `node.gyp` to build `node_api_jsrt.cc` instead of
   `node_api.cc`
 - Temporarily disable 2 N-API test cases with known failures

PR-URL: #238
Reviewed-By: Taylor Woll <[email protected]>
Reviewed-By: Kyle Farnung <[email protected]>
  • Loading branch information
jasongin authored and kfarnung committed May 15, 2017
1 parent 283781f commit 5cad632
Show file tree
Hide file tree
Showing 4 changed files with 2,077 additions and 8 deletions.
9 changes: 5 additions & 4 deletions node.gyp
Original file line number Diff line number Diff line change
Expand Up @@ -167,9 +167,8 @@
'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_api.cc',
'src/node_api_jsrt.cc',
'src/node_buffer.cc',
'src/node_config.cc',
'src/node_constants.cc',
Expand Down Expand Up @@ -219,6 +218,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 @@ -644,7 +645,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

0 comments on commit 5cad632

Please sign in to comment.