Skip to content

Support Node 0.11.4 #184

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

Merged
merged 10 commits into from
Jun 20, 2014
Merged

Support Node 0.11.4 #184

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
bb15108
Use NAN for future support.
kkoopa Jan 14, 2014
910c66a
Update macros.h
jeromew Feb 14, 2014
d01e4f6
Merge pull request #3 from jeromew/patch-1
kkoopa Feb 14, 2014
59798f1
Remove setImmediate
kkoopa Feb 14, 2014
b69ed97
Merge
kkoopa Mar 16, 2014
5174aaa
Updated for new v8
kkoopa Mar 16, 2014
cacde38
Updates
kkoopa Mar 23, 2014
f552560
Update for NAN 1.0.0
kkoopa May 18, 2014
a21226a
Update to NAN 1.1.2
kkoopa May 20, 2014
4267d54
Replaced process.nextTick with setImmediate in profile.test
kkoopa Jun 2, 2014
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
1 change: 1 addition & 0 deletions .travis.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ env:
matrix:
- export NODE_VERSION="0.8"
- export NODE_VERSION="0.10" NODE_WEBKIT="0.8.6"
- export NODE_VERSION="0.11"
global:
- secure: QhuP5E/kYL1j1KDkHGJtk6DSJr1RH4DR/JrC62Viuf5Du8jE+i0kPWfF2MxtuEmKo35orhpu8t8mzKygWfuO63WPuuIE9qd/+V/y99Lqcj0tEN6wJ5RnywktbTJWg23zphjhmYq3Xj8DLVEikCZBwHtlbygkO9Q60cn1PK+bnPg=
- secure: HxCS2dQAWI0KmCFnFNNZoucG4FeAW+itG7+Hp0dNtwmxZzGOZYFO2bZcGvTAMNfVN++oqLxTebYQI1oB5yUl5mPJjrjthaGS6Zq3S6rfJcXiv+icYgEXlR6ejQ97dsHw1Jeg8nedCQlI4kHfvG6pgBLhq9hnugxH1Cjhdt14E9U=
Expand Down
1 change: 1 addition & 0 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
"targets": [
{
"target_name": "<(module_name)",
"include_dirs": ["<!(node -e \"require('nan')\")"],
"conditions": [
["sqlite != 'internal'", {
"libraries": [
Expand Down
120 changes: 61 additions & 59 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,61 +1,63 @@
{
"name": "sqlite3",
"description": "Asynchronous, non-blocking SQLite3 bindings",
"version": "2.2.3",
"homepage": "http://github.com/mapbox/node-sqlite3",
"author": {
"name": "MapBox",
"url": "https://mapbox.com/"
},
"binary": {
"module_name": "node_sqlite3",
"module_path": "./lib/binding/{node_abi}-{platform}-{arch}",
"remote_path": "./{configuration}",
"package_name": "{module_name}-v{version}-{node_abi}-{platform}-{arch}.tar.gz",
"host": "https://node-sqlite3.s3.amazonaws.com"
},
"contributors": [
"Konstantin Käfer <[email protected]>",
"Dane Springmeyer <[email protected]>",
"Will White <[email protected]>",
"Orlando Vazquez <[email protected]>",
"Artem Kustikov <[email protected]>",
"Eric Fredricksen <[email protected]>",
"John Wright <[email protected]>",
"Ryan Dahl <[email protected]>",
"Tom MacWright <[email protected]>",
"Carter Thaxton <[email protected]>",
"Audrius Kažukauskas <[email protected]>",
"Johannes Schauer <[email protected]>",
"Nathan Rajlich <[email protected]>",
"AJ ONeal <[email protected]>",
"Mithgol"
],
"repository": {
"type": "git",
"url": "git://github.com/mapbox/node-sqlite3.git"
},
"dependencies": {
"node-pre-gyp": "0.5.13"
},
"bundledDependencies": [
"node-pre-gyp"
],
"devDependencies": {
"mocha": "*"
},
"engines": {
"node": ">= 0.8.0 < 0.11.0"
},
"scripts": {
"install": "node-pre-gyp install --fallback-to-build",
"pretest": "node test/support/createdb.js",
"test": "mocha -R spec --timeout 200000"
},
"licenses": [
{
"type": "BSD"
}
],
"main": "./lib/sqlite3"
"name": "sqlite3",
"description": "Asynchronous, non-blocking SQLite3 bindings",
"version": "2.2.3",
"homepage": "http://github.com/mapbox/node-sqlite3",
"author": {
"name": "MapBox",
"url": "https://mapbox.com/"
},
"binary": {
"module_name": "node_sqlite3",
"module_path": "./lib/binding/{node_abi}-{platform}-{arch}",
"remote_path": "./{configuration}",
"package_name": "{module_name}-v{version}-{node_abi}-{platform}-{arch}.tar.gz",
"host": "https://node-sqlite3.s3.amazonaws.com"
},
"contributors": [
"Konstantin Käfer <[email protected]>",
"Dane Springmeyer <[email protected]>",
"Will White <[email protected]>",
"Orlando Vazquez <[email protected]>",
"Artem Kustikov <[email protected]>",
"Eric Fredricksen <[email protected]>",
"John Wright <[email protected]>",
"Ryan Dahl <[email protected]>",
"Tom MacWright <[email protected]>",
"Carter Thaxton <[email protected]>",
"Audrius Kažukauskas <[email protected]>",
"Johannes Schauer <[email protected]>",
"Nathan Rajlich <[email protected]>",
"AJ ONeal <[email protected]>",
"Mithgol"
],
"repository": {
"type": "git",
"url": "git://github.com/mapbox/node-sqlite3.git"
},
"dependencies": {
"nan": "1.1.2",
"node-pre-gyp": "0.5.13",
"set-immediate": "0.1.1"
},
"bundledDependencies": [
"node-pre-gyp"
],
"devDependencies": {
"mocha": "*"
},
"engines": {
"node": ">= 0.8.0"
},
"scripts": {
"install": "node-pre-gyp install --fallback-to-build",
"pretest": "node test/support/createdb.js",
"test": "mocha -R spec --timeout 200000 -s 20000"
},
"licenses": [
{
"type": "BSD"
}
],
"main": "./lib/sqlite3"
}
2 changes: 1 addition & 1 deletion src/async.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ template <class Item, class Parent> class Async {
: callback(cb_), parent(parent_) {
watcher.data = this;
NODE_SQLITE3_MUTEX_INIT
uv_async_init(uv_default_loop(), &watcher, listener);
uv_async_init(uv_default_loop(), &watcher, reinterpret_cast<uv_async_cb>(listener));
}

static void listener(uv_async_t* handle, int status) {
Expand Down
Loading