Include-path-juggle node_api.h instead of napi.h (#41) #42
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
jasongin
reviewed
May 17, 2017
| } | ||
| ``` | ||
|
|
||
| 2. Reference this package's include directory and gyp file in `binding.gyp`: | ||
| ```gyp | ||
| 'include_dirs': ["<!(node -p \"require('node-addon-api').include\")"], | ||
| 'include_dirs': ["<!@(node -p \"require('node-addon-api').include\")"], |
There was a problem hiding this comment.
It indicates that the output of the command is to be used to fill out an array. In this case, it uses the double quotes I add in index.js to correctly split the output into array elements, stripping the quotes, so the paths are not misinterpreted.
jasongin
reviewed
May 17, 2017
README.md
Outdated
| @@ -16,13 +16,13 @@ To use N-API in a native module: | |||
| 1. Add a dependency on this package to `package.json`: | |||
| ```json | |||
| "dependencies": { | |||
| "node-addon-api": "github:nodejs/node-addon-api", | |||
| "node-addon-api": "github:nodejs/node-api", | |||
There was a problem hiding this comment.
I was expecting this repo would actually get renamed to node-addon-api. @mhdawson what do you think?
jasongin
approved these changes
May 18, 2017
Instead of making the path from which napi.h is included conditional upon the Node.js version, make the path of node_api.h thusly conditional. This way, no additional modification needs to be made to a dependent's binding.gyp in order to add the EXTERNAL_NAPI preprocessor directive when the C++ wrappers are not used. By this mechanism the C++ wrapper napi.h will also refer to the correct version of node_api.h. Fixes #41
|
@jasongin the PR no longer changes the README.md example showing how to depend on the repo. |
|
@gabrielschulhof I published |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Instead of making the path from which napi.h is included conditional
upon the Node.js version, make the path of node_api.h thusly
conditional. This way, no additional modification needs to be made to a
dependent's binding.gyp in order to add the EXTERNAL_NAPI preprocessor
directive when the C++ wrappers are not used.
By this mechanism the C++ wrapper napi.h will also refer to the correct
version of node_api.h.
Fixes #40Fixes #41