Added support for using internal dependencies (boost).

This commit is contained in:
Chris Kleeschulte 2015-07-24 15:31:06 -04:00
parent bee86257ca
commit c53b47890b
4 changed files with 17 additions and 10 deletions

View File

@ -4,10 +4,6 @@ env:
node_js:
- "0.12"
before_install:
- sudo apt-get install libboost1.48-all-dev
- sudo add-apt-repository -y ppa:bitcoin/bitcoin
- sudo apt-get update
- sudo apt-get install libdb4.8-dev libdb4.8++-dev
- git config --global user.email "dev@bitpay.com"
- git config --global user.name "BitPay, Inc."
script:

View File

@ -28,13 +28,12 @@
],
'link_settings': {
'libraries': [
'-lboost_filesystem',
'-L/usr/local/lib',
'<!(./platform/os.sh filesystem)',
'<!(./platform/os.sh thread)',
'<!(./platform/os.sh lib)'
],
'ldflags': [
'-Wl,-rpath,<!(./platform/os.sh osdir),-rpath,<!(./platform/os.sh btcdir)/src/leveldb'
'-Wl,-rpath,<!(./platform/os.sh osdir),-rpath,<!(./platform/os.sh btcdir)/src/leveldb,-rpath,<!(./platform/os.sh boost_dir)'
]
}
}]

View File

@ -14,7 +14,6 @@ process.title = 'bitcoind.js';
var daemon = require('../').daemon({
datadir: process.env.BITCOINDJS_DIR || '~/.bitcoin',
network: 'regtest'
});
daemon.on('error', function(err) {

View File

@ -6,7 +6,10 @@ root_dir="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)/.."
BITCOIN_DIR="${root_dir}/libbitcoind"
os=
ext=so
thread=-lboost_thread
boost_dir="${root_dir}"/libbitcoind/depends/x86_64-linux/lib
thread="${boost_dir}"/libboost_thread-mt.so
filesystem="${boost_dir}"/libboost_filesystem.so
if test -f /etc/centos-release \
|| grep -q 'CentOS' /etc/redhat-release \
@ -20,7 +23,9 @@ elif test -f /etc/redhat_release \
elif uname -a | grep -q '^Darwin'; then
os=osx
ext=dylib
thread=-lboost_thread-mt
boost_dir="${root_dir}"/libbitcoind/depends/x86_64-darwin/lib
thread="${boost_dir}"/libboost_thread-mt.dylib
filesystem="${boost_dir}"/libboost_filesystem.dylib
elif test -f /etc/SuSE-release; then
os=suse
elif test -f /etc/mandrake-release \
@ -74,6 +79,14 @@ if test -z "$1" -o x"$1" = x'thread'; then
echo -n "${thread}"
fi
if test -z "$1" -o x"$1" = x'filesystem'; then
echo -n "${filesystem}"
fi
if test -z "$1" -o x"$1" = x'boost_dir'; then
echo -n "${boost_dir}"
fi
if test -z "$1" -o x"$1" = x'lib'; then
if test -e "${os_dir}/libbitcoind.${ext}" -o -e "${os_dir}/lib/libbitcoind.${ext}"; then
if test -e "${os_dir}/lib/libbitcoind.${ext}"; then