Merge
This commit is contained in:
parent
c6f2a87158
commit
4da897287b
|
@ -9,6 +9,6 @@ if test x"$1" = x'debug'; then
|
||||||
debug=--debug
|
debug=--debug
|
||||||
fi
|
fi
|
||||||
|
|
||||||
node-gyp ${debug} rebuild
|
node-pre-gyp ${debug} rebuild --fallback-to-build
|
||||||
|
|
||||||
|
|
||||||
|
|
13
binding.gyp
13
binding.gyp
|
@ -1,6 +1,6 @@
|
||||||
{
|
{
|
||||||
'targets': [{
|
'targets': [{
|
||||||
'target_name': 'libbitcoind',
|
'target_name': "<(module_name)",
|
||||||
'include_dirs' : [
|
'include_dirs' : [
|
||||||
'<!(node -e "require(\'nan\')")',
|
'<!(node -e "require(\'nan\')")',
|
||||||
'<!(./platform/os.sh artifacts_dir)/include/libbitcoind/src',
|
'<!(./platform/os.sh artifacts_dir)/include/libbitcoind/src',
|
||||||
|
@ -44,5 +44,16 @@
|
||||||
'<!(./platform/os.sh load_archive)'
|
'<!(./platform/os.sh load_archive)'
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
},
|
||||||
|
{
|
||||||
|
"target_name": "action_after_build",
|
||||||
|
"type": "none",
|
||||||
|
"dependencies": [ "<(module_name)" ],
|
||||||
|
"copies": [
|
||||||
|
{
|
||||||
|
"files": [ "<(PRODUCT_DIR)/<(module_name).node" ],
|
||||||
|
"destination": "<(module_path)"
|
||||||
|
}
|
||||||
|
]
|
||||||
}]
|
}]
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,9 +1,10 @@
|
||||||
'use strict';
|
'use strict';
|
||||||
|
|
||||||
var EventEmitter = require('events').EventEmitter;
|
var EventEmitter = require('events').EventEmitter;
|
||||||
var bitcoind = require('bindings')('bitcoind.node');
|
var binary = require('node-pre-gyp');
|
||||||
var chainlib = require('chainlib');
|
var path = require('path');
|
||||||
var log = chainlib.log;
|
var binding_path = binary.find(path.resolve(path.join(__dirname,'./package.json')));
|
||||||
|
var bitcoindjs = require(binding_path);
|
||||||
var util = require('util');
|
var util = require('util');
|
||||||
var bitcore = require('bitcore');
|
var bitcore = require('bitcore');
|
||||||
var $ = bitcore.util.preconditions;
|
var $ = bitcore.util.preconditions;
|
||||||
|
|
10
package.json
10
package.json
|
@ -39,6 +39,7 @@
|
||||||
"bitcoind"
|
"bitcoind"
|
||||||
],
|
],
|
||||||
"dependencies": {
|
"dependencies": {
|
||||||
|
"node-pre-gyp": "0.5.x",
|
||||||
"async": "1.3.0",
|
"async": "1.3.0",
|
||||||
"bindings": "^1.2.1",
|
"bindings": "^1.2.1",
|
||||||
"bitcore": "^0.12.15",
|
"bitcore": "^0.12.15",
|
||||||
|
@ -50,6 +51,7 @@
|
||||||
"socket.io": "^1.3.6"
|
"socket.io": "^1.3.6"
|
||||||
},
|
},
|
||||||
"devDependencies": {
|
"devDependencies": {
|
||||||
|
"aws-sdk": "~2.0.0-rc.15",
|
||||||
"benchmark": "1.0.0",
|
"benchmark": "1.0.0",
|
||||||
"bitcoin": "^2.3.2",
|
"bitcoin": "^2.3.2",
|
||||||
"bitcoind-rpc": "^0.3.0",
|
"bitcoind-rpc": "^0.3.0",
|
||||||
|
@ -58,5 +60,13 @@
|
||||||
"proxyquire": "^1.3.1",
|
"proxyquire": "^1.3.1",
|
||||||
"rimraf": "^2.4.2",
|
"rimraf": "^2.4.2",
|
||||||
"sinon": "^1.15.4"
|
"sinon": "^1.15.4"
|
||||||
|
},
|
||||||
|
"bundledDependencies": ["node-pre-gyp"],
|
||||||
|
"binary": {
|
||||||
|
"module_name" : "bitcoindjs",
|
||||||
|
"module_path" : "./build/{configuration}/{node_abi}-{platform}-{arch}/",
|
||||||
|
"remote_path" : "./{module_name}/v{version}/{configuration}/",
|
||||||
|
"package_name": "{module_name}-v{version}-{node_abi}-{platform}-{arch}.tar.gz",
|
||||||
|
"host" : "https://kleetus-bitcoindjs.s3-us-east-1.amazonaws.com"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue