From a3f429da46699b62aec0487c6a742942b103544b Mon Sep 17 00:00:00 2001 From: LM Date: Sun, 26 Jul 2015 22:12:46 +0200 Subject: [PATCH] switch from node-pre-gyp to prebuild --- .travis.yml | 5 ++--- binding.js | 11 +++++++++++ leveldown.js | 4 ++-- package.json | 10 +++------- prebuilt.js | 5 ----- 5 files changed, 18 insertions(+), 17 deletions(-) create mode 100644 binding.js delete mode 100644 prebuilt.js diff --git a/.travis.yml b/.travis.yml index 67677cb2..65840d7f 100644 --- a/.travis.yml +++ b/.travis.yml @@ -2,8 +2,7 @@ language: node_js before_install: - export JOBS=max - - npm install -g node-gyp-install - - node-gyp-install + - export prebuild_compile=true node_js: - "2.2" @@ -13,7 +12,7 @@ node_js: - "0.10" install: - - npm install --build-from-source + - npm install script: - npm test diff --git a/binding.js b/binding.js new file mode 100644 index 00000000..abfaa208 --- /dev/null +++ b/binding.js @@ -0,0 +1,11 @@ +const bindings = require('bindings') + , opts = { + bindings : 'leveldown' + , try : [ + [ 'module_root', 'build-pre-gyp', 'bindings' ] + , [ 'module_root', 'build', 'Debug', 'bindings' ] + , [ 'module_root', 'build', 'Release', 'bindings' ] + ] + } + +module.exports = bindings(opts).leveldown diff --git a/leveldown.js b/leveldown.js index a9b37983..434f2e6f 100644 --- a/leveldown.js +++ b/leveldown.js @@ -1,7 +1,7 @@ const util = require('util') , AbstractLevelDOWN = require('abstract-leveldown').AbstractLevelDOWN - , binding = require('./prebuilt') + , binding = require('./binding') , ChainedBatch = require('./chained-batch') , Iterator = require('./iterator') @@ -99,4 +99,4 @@ LevelDOWN.repair = function (location, callback) { } -module.exports = LevelDOWN \ No newline at end of file +module.exports = LevelDOWN diff --git a/package.json b/package.json index c9b25b43..c5df8b05 100644 --- a/package.json +++ b/package.json @@ -32,7 +32,7 @@ "bindings": "~1.2.1", "fast-future": "~1.0.0", "nan": "~1.8.4", - "node-pre-gyp": "~0.6.2" + "prebuild": "~2.1.0" }, "devDependencies": { "async": "~1.0.0", @@ -50,15 +50,11 @@ "tape": "~4.0.0" }, "scripts": { - "install": "node-pre-gyp install --fallback-to-build", - "test": "tape test/*-test.js | faucet", - "prebuild": "node-pre-gyp rebuild && node-pre-gyp package" + "install": "prebuild --download", + "test": "tape test/*-test.js | faucet" }, "license": "MIT", "gypfile": true, - "bundledDependencies": [ - "node-pre-gyp" - ], "binary": { "module_name": "leveldown", "module_path": "./build-pre-gyp/", diff --git a/prebuilt.js b/prebuilt.js deleted file mode 100644 index 5cab8169..00000000 --- a/prebuilt.js +++ /dev/null @@ -1,5 +0,0 @@ -var binary = require('node-pre-gyp'); -var path = require('path'); -var binding_path = binary.find(path.resolve(path.join(__dirname,'./package.json'))); - -module.exports = require(binding_path).leveldown; \ No newline at end of file