Skip to content

Use previous/expected build process #1

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

Open
wilhelmklopp wants to merge 1 commit into
base: vscode
Choose a base branch
from
Open

Use previous/expected build process #1

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
26 changes: 13 additions & 13 deletions binding.gyp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
},
"targets": [
{
"target_name": "vscode-sqlite3",
"target_name": "<(module_name)",
"cflags!": [ "-fno-exceptions" ],
"cflags_cc!": [ "-fno-exceptions" ],
"xcode_settings": { "GCC_ENABLE_CPP_EXCEPTIONS": "YES",
Expand Down Expand Up @@ -62,18 +62,18 @@
"src/node_sqlite3.cc",
"src/statement.cc"
],
"defines": [ "NAPI_DISABLE_CPP_EXCEPTIONS=1", "NODE_API_SWALLOW_UNTHROWABLE_EXCEPTIONS" ]
"defines": [ "NAPI_VERSION=<(napi_build_version)", "NAPI_DISABLE_CPP_EXCEPTIONS=1", "NODE_API_SWALLOW_UNTHROWABLE_EXCEPTIONS" ]
},
#{
# "target_name": "action_after_build",
# "type": "none",
# "dependencies": [ "<(module_name)" ],
# "copies": [
# {
# "files": [ "<(PRODUCT_DIR)/<(module_name).node" ],
# "destination": "<(module_path)"
# }
# ]
#}
{
"target_name": "action_after_build",
"type": "none",
"dependencies": [ "<(module_name)" ],
"copies": [
{
"files": [ "<(PRODUCT_DIR)/<(module_name).node" ],
"destination": "<(module_path)"
}
]
}
]
}
6 changes: 3 additions & 3 deletions lib/sqlite3-binding.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
/*var binary = require('@mapbox/node-pre-gyp');
var binary = require('@mapbox/node-pre-gyp');
var path = require('path');
var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')));*/
var binding = require('../build/Release/vscode-sqlite3.node');
var binding_path = binary.find(path.resolve(path.join(__dirname,'../package.json')));
var binding = require(binding_path);
module.exports = exports = binding;
6 changes: 4 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
{
"name": "@vscode/sqlite3",
"name": "sqlite3",
"description": "Asynchronous, non-blocking SQLite3 bindings",
"version": "5.0.8",
"homepage": "https://github.com/mapbox/node-sqlite3",
"homepage": "https://github.com/kolofordjango/vscode-node-sqlite3",
"author": {
"name": "MapBox",
"url": "https://mapbox.com/"
Expand Down Expand Up @@ -40,6 +40,7 @@
"url": "git://github.com/mapbox/node-sqlite3.git"
},
"dependencies": {
"@mapbox/node-pre-gyp": "^1.0.9",
"node-addon-api": "^4.2.0"
},
"devDependencies": {
Expand All @@ -50,6 +51,7 @@
"mocha": "^5.2.0"
},
"scripts": {
"install": "node-pre-gyp install --fallback-to-build",
"pretest": "node test/support/createdb.js",
"test": "mocha -R spec --timeout 480000",
"pack": "node-pre-gyp package"
Expand Down