diff --git a/binding.gyp b/binding.gyp index 610fb34d4..58711959d 100644 --- a/binding.gyp +++ b/binding.gyp @@ -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", @@ -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)" + } + ] + } ] } diff --git a/lib/sqlite3-binding.js b/lib/sqlite3-binding.js index 5dc145e44..5205297f0 100644 --- a/lib/sqlite3-binding.js +++ b/lib/sqlite3-binding.js @@ -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; diff --git a/package.json b/package.json index 630222cc7..7137a7b18 100644 --- a/package.json +++ b/package.json @@ -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/" @@ -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": { @@ -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"