From 761243c724c6659fa08f5ea4c01be6105b628d9f Mon Sep 17 00:00:00 2001
From: Chris Kleeschulte <chrisk@bitpay.com>
Date: Tue, 4 Aug 2015 14:18:45 -0400
Subject: [PATCH] Removed the need for the platform directory. Now, the binding
 can be cached in the build dir because it is one file that includes bitcoin
 core.

---
 .travis.yml           |  3 +--
 bin/build-libbitcoind | 40 +++++-----------------------------------
 binding.gyp           |  6 +++---
 etc/patch_sha.txt     |  1 +
 platform/os.sh        | 26 ++++++++------------------
 5 files changed, 18 insertions(+), 58 deletions(-)
 create mode 100644 etc/patch_sha.txt

diff --git a/.travis.yml b/.travis.yml
index 16935783..4531b189 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -12,5 +12,4 @@ script:
   - _mocha -R spec --recursive
 cache:
   directories:
-    - platform/ubuntu
-
+    - build 
diff --git a/bin/build-libbitcoind b/bin/build-libbitcoind
index 5e4abc64..27a4b8b3 100755
--- a/bin/build-libbitcoind
+++ b/bin/build-libbitcoind
@@ -7,29 +7,11 @@ os_dir=$(${root_dir}/platform/os.sh osdir)
 host=$(${root_dir}/platform/os.sh host)
 btc_dir="${root_dir}/libbitcoind"
 ext=$($root_dir/platform/os.sh ext)
-artifacts_dir=$($root_dir/platform/os.sh artifacts_dir)
 export CPPFLAGS="-I${h_and_a_dir}/include/boost -I${h_and_a_dir}/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.9.sdk/usr/include -I/Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.10.sdk/usr/include -L${h_and_a_dir}/lib"
 echo "Using BTC directory: ${btc_dir}"
 
 cd "${root_dir}"
 
-copy_files () {
-  if [[ -d "${artifacts_dir}" && -d "${h_and_a_dir}" && -d "${btc_dir}" ]]; then
-    mkdir -p "${artifacts_dir}/include" > /dev/null 2>&1
-    pushd "${root_dir}"
-    echo "Copying headers for caching purposes, this can take a while (but will only be done once), please wait..."
-    find libbitcoind -type f \( -name "*.h" -or -name "*.hpp" -or -name "*.ipp" \) -print0 | xargs -0 -I{} rsync -R {} "${artifacts_dir}"/include
-    mkdir -p "${artifacts_dir}/lib" > /dev/null 2>&1
-    cp -r "${h_and_a_dir}"/lib/libboost_filesystem-mt.a "${h_and_a_dir}"/lib/libboost_thread-mt.a "${h_and_a_dir}"/lib/libboost_chrono-mt.a \
-    "${h_and_a_dir}"/lib/libboost_program_options-mt.a "${h_and_a_dir}"/lib/libboost_system-mt.a  "${btc_dir}"/src/secp256k1/.libs/libsecp256k1.a \
-    "${btc_dir}"/src/.libs/libbitcoind.a "${btc_dir}"/src/leveldb/libleveldb.a "${btc_dir}"/src/leveldb/libmemenv.a "${artifacts_dir}"/lib/
-    if [ "${test}" = true ]; then
-      cp -r "${h_and_a_dir}"/lib/libdb* "${artifacts_dir}"/lib/
-    fi
-    popd
-  fi
-}
-
 build_dependencies () {
   if [ -d "${btc_dir}" ]; then
     pushd "${depends_dir}"
@@ -82,17 +64,13 @@ if [ "${BITCORENODE_ENV}" == "test" ]; then
 fi
 
 patch_file_sha=$(shasum -a 256 "${root_dir}/etc/bitcoin.patch" | awk '{print $1}')
-patch_sha=`find "${os_dir}" -iname patch_sha.txt`
+patch_sha="${root_dir}"/etc/patch_sha.txt
 last_patch_file_sha=
 if [ -e "${patch_sha}" ]; then 
-  if [ "${ext}" == "dylib" ]; then
-    last_patch_file_sha=$(cat "${os_dir}"/lib/patch_sha.txt)
-  else
-    last_patch_file_sha=$(cat "${os_dir}"/patch_sha.txt)
-  fi
+  last_patch_file_sha=$(cat "${patch_sha}")
 fi
 shared_file_built=false
-if [[ "${last_patch_file_sha}" == "${patch_file_sha}" && -d "${artifacts_dir}/include" ]]; then
+if [ "${last_patch_file_sha}" == "${patch_file_sha}" ]; then
   shared_file_built=true
 fi
 
@@ -163,16 +141,8 @@ apply the current patch from "${root_dir}"/etc/bitcoin.patch? (y/N): "
   echo 'make V=1'
   make V=1
 
-  echo 'Copying files to their appropriate location.'
-  if test -e "${btc_dir}/src/.libs/libbitcoind.a"; then
-    mkdir -p "${artifacts_dir}"
-    echo "Creating the sha marker for the patching in libbitcoind..."
-    echo -n `shasum -a 256 "${root_dir}"/etc/bitcoin.patch | awk '{print $1}'` > "${artifacts_dir}"/patch_sha.txt
-    copy_files
-  else
-    echo "Could not find the libraries after they should have been built, please run make clean inside the libbitcoind dir and run npm install again."
-    exit 1
-  fi
+  echo "Creating the sha marker for the patching in libbitcoind..."
+  echo -n `shasum -a 256 "${root_dir}"/etc/bitcoin.patch | awk '{print $1}'` > "${root_dir}"/etc/patch_sha.txt
   echo 'Build finished successfully.'
 else
   echo 'Using existing shared library.'
diff --git a/binding.gyp b/binding.gyp
index d9f37e13..a76f9017 100755
--- a/binding.gyp
+++ b/binding.gyp
@@ -3,9 +3,9 @@
     'target_name': "<(module_name)",
     'include_dirs' : [
       '<!(node -e "require(\'nan\')")',
-      '<!(./platform/os.sh artifacts_dir)/include/libbitcoind/src',
-      '<!(./platform/os.sh artifacts_dir)/include/libbitcoind/depends/<!(./platform/os.sh host)/include',
-      '<!(./platform/os.sh artifacts_dir)/include/libbitcoind/src/leveldb/include'
+      '<!(./platform/os.sh btcdir)/src',
+      '<!(./platform/os.sh btcdir)/depends/<!(./platform/os.sh host)/include',
+      '<!(./platform/os.sh btcdir)/src/leveldb/include'
     ],
     'sources': [
       './src/libbitcoind.cc',
diff --git a/etc/patch_sha.txt b/etc/patch_sha.txt
new file mode 100644
index 00000000..bd89fa5e
--- /dev/null
+++ b/etc/patch_sha.txt
@@ -0,0 +1 @@
+8f9cdc31ef10317a01573c54509e6b8381c296aa49e7650185b3b3594ff8fa13
\ No newline at end of file
diff --git a/platform/os.sh b/platform/os.sh
index 986de31b..6bd83daf 100755
--- a/platform/os.sh
+++ b/platform/os.sh
@@ -63,17 +63,11 @@ fi
 
 os_dir=${root_dir}/platform/${os}
 
-if [ "${os}"  == "osx" ]; then
-  artifacts_dir="${os_dir}/lib"
-else
-  artifacts_dir="${os_dir}"
-fi
-
-thread="${artifacts_dir}"/lib/libboost_thread-mt.a
-filesystem="${artifacts_dir}"/lib/libboost_filesystem-mt.a
-chrono="${artifacts_dir}"/lib/libboost_chrono-mt.a
-program_options="${artifacts_dir}"/lib/libboost_program_options-mt.a
-system="${artifacts_dir}"/lib/libboost_system-mt.a
+thread="${BITCOIN_DIR}"/depends/"${host}"/lib/libboost_thread-mt.a
+filesystem="${BITCOIN_DIR}"/depends/"${host}"/lib/libboost_filesystem-mt.a
+chrono="${BITCOIN_DIR}"/depends/"${host}"/lib/libboost_chrono-mt.a
+program_options="${BITCOIN_DIR}"/depends/"${host}"/lib/libboost_program_options-mt.a
+system="${BITCOIN_DIR}"/depends/"${host}"/lib/libboost_system-mt.a
 leveldb="${BITCOIN_DIR}"/src/leveldb/libleveldb.a
 memenv="${BITCOIN_DIR}"/src/leveldb/libmemenv.a
 libsecp256k1="${BITCOIN_DIR}"/src/secp256k1/.libs/libsecp256k1.a
@@ -146,7 +140,7 @@ fi
 
 if test -z "$1" -o x"$1" = x'bdb'; then
   if [ "${BITCORENODE_ENV}" == "test" ]; then
-    echo -n "${artifacts_dir}/lib/libdb_cxx.a"
+    echo -n "${BITCOIN_DIR}"/depends/"${host}"/lib/libdb_cxx.a
   fi
 fi
 
@@ -154,19 +148,15 @@ if test -z "$1" -o x"$1" = x'load_archive'; then
   if [ "${os}"  == "osx" ]; then
     echo -n "-Wl,-all_load -Wl,--no-undefined"
   else
-    echo -n "-Wl,--whole-archive ${filesystem} ${thread} "${artifacts_dir}"/lib/libbitcoind.a -Wl,--no-whole-archive"
+    echo -n "-Wl,--whole-archive ${filesystem} ${thread} "${BITCOIN_DIR}"/src/.libs/libbitcoind.a -Wl,--no-whole-archive"
   fi
 fi
 
-if test -z "$1" -o x"$1" = x'artifacts_dir'; then
-  echo -n "${artifacts_dir}" 
-fi
-
 if test -z "$1" -o x"$1" = x'mac_dependencies'; then
   check_mac_build_system
   echo -n "${mac_response}"
 fi
 
 if test -z "$1" -o x"$1" = x'bitcoind'; then
-  echo -n "${artifacts_dir}"/lib/libbitcoind.a
+  echo -n "${BITCOIN_DIR}"/src/.libs/libbitcoind.a
 fi