-
Notifications
You must be signed in to change notification settings - Fork 83
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.
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
Feature/napi #111
Open
ghinks
wants to merge
30
commits into
TooTallNate:master
Choose a base branch
from
ghinks:feature/napi
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
Feature/napi #111
Changes from 27 commits
Commits
Show all changes
30 commits
Select commit
Hold shift + click to select a range
26252d4
interim checkin
ghinks 4acee45
partial working code with the napi somewhat working in place of the nan.
ghinks 5f65bb6
fixing unit tests,
ghinks 1492871
remove logging and commented out nan code from previous api
ghinks b148855
indentation for binding.gyp,
ghinks 05a9dc1
remove unused code
ghinks 9d74999
add package-lock to change control
ghinks 010da54
update the travis.yml file
ghinks 6d82d7f
update travis, attempt node 4 onwards
ghinks 3e0273c
add osx to the build os
ghinks 9eba579
remove specifics for g++
ghinks b3ef31d
add all node versions for both osx and linux
ghinks a817a24
add windows os
ghinks f201e09
test of windows and linux as canary
ghinks 59aefa9
add windows section of the build back in again ready for
ghinks 63d9df7
log out the windows tzname
ghinks d7eaf23
add in non windows debug
ghinks cc71db3
take out the debug that shows how unix type systems and windows syste…
ghinks 14b2cc6
fix then statement in yml file.
ghinks 88e475b
remove the xyz obj test dead code.
ghinks a53b8f4
add node 6 and osx to unit tests
ghinks 074897e
change to versions 8,10, lastest
ghinks 400af56
change from "latest" to "node"
ghinks 67774c4
merge windows travis branch back in
ghinks bb15d49
remove older time.cc file
ghinks 4b8d16a
revert unit test changes that were used for break points in the debugger
ghinks b7f5217
update appveyor windows testing to node 8-11
ghinks 3b06c85
remove gypfile true from the package.json as the presence of binding.…
ghinks 95ec3ff
explicitly use node 11 and use 'node' to trigger a build against the …
ghinks da83f48
add comment on what travis mean by node version 'node'
ghinks File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,38 +1,25 @@ | ||
sudo: false | ||
os: | ||
- linux | ||
- windows | ||
- osx | ||
|
||
env: | ||
- CXX=g++-4.8 | ||
addons: | ||
apt: | ||
sources: | ||
- ubuntu-toolchain-r-test | ||
packages: | ||
- g++-4.8 | ||
sudo: false | ||
|
||
language: node_js | ||
|
||
node_js: | ||
- "0.8" | ||
- "0.10" | ||
- "0.12" | ||
- "1" | ||
- "2" | ||
- "3" | ||
- "4" | ||
- "5" | ||
- "6" | ||
- "7" | ||
- "8" | ||
- "10" | ||
- "node" | ||
|
||
install: | ||
- PATH="`npm bin`:`npm bin -g`:$PATH" | ||
# Node 0.8 comes with a too obsolete npm | ||
- if [[ "`node --version`" =~ ^v0\.8\. ]]; then npm install -g [email protected] ; fi | ||
# Install dependencies and build | ||
- npm install | ||
|
||
# note, the original master branch using nan did not have a travis | ||
# job on windows and when unit tested was found to have breaking | ||
# tests. If these were fixed existing work arounds would be broken | ||
# on windows. | ||
script: | ||
# Output useful info for debugging | ||
- node --version | ||
- npm --version | ||
# Run tests | ||
- npm test | ||
- if [[ "$TRAVIS_OS_NAME" != "windows" ]]; then npm test ; fi |
This file contains 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
This file contains 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
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,30 +1,37 @@ | ||
{ | ||
'targets': [ | ||
{ | ||
'target_name': 'time', | ||
'include_dirs': [ | ||
'<!(node -e "require(\'nan\')")' | ||
], | ||
'sources': [ 'src/time.cc' ], | ||
'conditions': [ | ||
['OS=="mac"', { | ||
'defines': [ | ||
'__DARWIN_UNIX03', # For char* timezone | ||
'HAVE_TM_GMTOFF' | ||
] | ||
}], | ||
['OS=="linux"', { | ||
'defines': [ | ||
'HAVE_TM_GMTOFF' | ||
] | ||
}], | ||
['OS=="solaris"', { | ||
'defines': [ | ||
'HAVE_ALTZONE', | ||
'HAVE_TIMEZONE' | ||
] | ||
}] | ||
] | ||
} | ||
] | ||
'targets': [{ | ||
'target_name': 'time', | ||
'sources': [ 'src/time_napi.cc' ], | ||
'include_dirs': ["<!@(node -p \"require('node-addon-api').include\")"], | ||
'dependencies': ["<!(node -p \"require('node-addon-api').gyp\")"], | ||
'cflags!': [ '-fno-exceptions' ], | ||
'cflags_cc!': [ '-fno-exceptions' ], | ||
'xcode_settings': { | ||
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES', | ||
'CLANG_CXX_LIBRARY': 'libc++', | ||
'MACOSX_DEPLOYMENT_TARGET': '10.7' | ||
}, | ||
'msvs_settings': { | ||
'VCCLCompilerTool': { 'ExceptionHandling': 1 }, | ||
}, | ||
'conditions': [ | ||
['OS=="mac"', { | ||
'defines': [ | ||
'__DARWIN_UNIX03', # For char* timezone | ||
'HAVE_TM_GMTOFF' | ||
] | ||
}], | ||
['OS=="linux"', { | ||
'defines': [ | ||
'HAVE_TM_GMTOFF' | ||
] | ||
}], | ||
['OS=="solaris"', { | ||
'defines': [ | ||
'HAVE_ALTZONE', | ||
'HAVE_TIMEZONE' | ||
] | ||
}] | ||
] | ||
}] | ||
} |
This file contains 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
Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.
Oops, something went wrong.
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
What is this version?
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
We should also test
11
for now I thinkThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
yes, node means the latest node and that presently is 11.6.0.