Made the bindings work with node v0.12. There was A LOT of api breakages in node and v8 since!
This commit is contained in:
parent
2888e814f2
commit
4e0939ca3c
2
Makefile
2
Makefile
@ -1,6 +1,6 @@
|
|||||||
all:
|
all:
|
||||||
@node-gyp clean 2>/dev/null
|
@node-gyp clean 2>/dev/null
|
||||||
node-gyp configure
|
node-gyp -d configure
|
||||||
node-gyp build
|
node-gyp build
|
||||||
|
|
||||||
clean:
|
clean:
|
||||||
|
|||||||
10
binding.gyp
10
binding.gyp
@ -21,19 +21,25 @@
|
|||||||
'<(LEVELDB_INCLUDE)',
|
'<(LEVELDB_INCLUDE)',
|
||||||
'<(BITCOIN_DIR)/src',
|
'<(BITCOIN_DIR)/src',
|
||||||
'./libbitcoind/src/leveldb/helpers/memenv',
|
'./libbitcoind/src/leveldb/helpers/memenv',
|
||||||
'/usr/local/Cellar/openssl/1.0.2a-1/include',
|
|
||||||
'<!(node -e "require(\'nan\')")',
|
'<!(node -e "require(\'nan\')")',
|
||||||
],
|
],
|
||||||
'sources': [
|
'sources': [
|
||||||
'./src/bitcoindjs.cc',
|
'./src/bitcoindjs.cc',
|
||||||
],
|
],
|
||||||
|
'conditions': [
|
||||||
|
['OS=="mac"', {
|
||||||
|
'xcode_settings': {
|
||||||
|
'GCC_ENABLE_CPP_EXCEPTIONS': 'YES',
|
||||||
|
'GCC_ENABLE_CPP_RTTI': 'YES'
|
||||||
|
}
|
||||||
|
}]
|
||||||
|
],
|
||||||
'cflags_cc': [
|
'cflags_cc': [
|
||||||
'-fexceptions',
|
'-fexceptions',
|
||||||
'-frtti',
|
'-frtti',
|
||||||
'-fpermissive',
|
'-fpermissive',
|
||||||
],
|
],
|
||||||
'libraries': [
|
'libraries': [
|
||||||
'-L/usr/local/Cellar/openssl/1.0.2a-1/lib',
|
|
||||||
'-lssl',
|
'-lssl',
|
||||||
'-lcrypto',
|
'-lcrypto',
|
||||||
'-lboost_system',
|
'-lboost_system',
|
||||||
|
|||||||
@ -6,10 +6,10 @@
|
|||||||
|
|
||||||
process.title = 'bitcoind.js';
|
process.title = 'bitcoind.js';
|
||||||
|
|
||||||
var util = require('util');
|
//var util = require('util');
|
||||||
var fs = require('fs');
|
//var fs = require('fs');
|
||||||
var argv = require('optimist').argv;
|
var argv = require('optimist').argv;
|
||||||
var rimraf = require('rimraf');
|
//var rimraf = require('rimraf');
|
||||||
var assert = require('assert');
|
var assert = require('assert');
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -135,10 +135,12 @@ bitcoind.on('open', function(status) {
|
|||||||
bitcoind.log('status="%s"', status);
|
bitcoind.log('status="%s"', status);
|
||||||
|
|
||||||
if (argv.list) {
|
if (argv.list) {
|
||||||
|
bitcoind.log('args list true');
|
||||||
return bitcoind.log(bitcoind.wallet.listAccounts());
|
return bitcoind.log(bitcoind.wallet.listAccounts());
|
||||||
}
|
}
|
||||||
|
|
||||||
if (argv.blocks) {
|
if (argv.blocks) {
|
||||||
|
bitcoind.log('args block true');
|
||||||
return getBlocks(bitcoind);
|
return getBlocks(bitcoind);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -6,7 +6,7 @@
|
|||||||
|
|
||||||
var net = require('net');
|
var net = require('net');
|
||||||
var EventEmitter = require('events').EventEmitter;
|
var EventEmitter = require('events').EventEmitter;
|
||||||
var bitcoindjs = require('../build/Release/bitcoindjs.node');
|
var bitcoindjs = require('../build/Debug/bitcoindjs.node');
|
||||||
var util = require('util');
|
var util = require('util');
|
||||||
var fs = require('fs');
|
var fs = require('fs');
|
||||||
var mkdirp = require('mkdirp');
|
var mkdirp = require('mkdirp');
|
||||||
|
|||||||
File diff suppressed because it is too large
Load Diff
Loading…
Reference in New Issue
Block a user