diff --git a/.gitignore b/.gitignore index 89a1832..fa6ba18 100644 --- a/.gitignore +++ b/.gitignore @@ -3,6 +3,6 @@ ebin priv/*.so c_src/system -c_src/wiredtiger-*/ +c_src/wiredtiger*/ c_src/*.o *~ diff --git a/c_src/build_deps.sh b/c_src/build_deps.sh index cfded1f..111eb8d 100755 --- a/c_src/build_deps.sh +++ b/c_src/build_deps.sh @@ -2,7 +2,7 @@ set -e -WT_VSN=1.4.2 +WT_BRANCH=basho [ `basename $PWD` != "c_src" ] && cd c_src @@ -10,19 +10,24 @@ BASEDIR="$PWD" case "$1" in clean) - rm -rf system wiredtiger-$WT_VSN + rm -rf system wiredtiger ;; *) test -f system/lib/libwiredtiger.a && exit 0 - tar -xjf wiredtiger-$WT_VSN.tar.bz2 - - (cd wiredtiger-$WT_VSN/build_posix && \ + if [ -d wiredtiger/.git ]; then + (cd wiredtiger && \ + git fetch && \ + git merge origin/$WT_BRANCH) + else + git clone https://github.com/wiredtiger/wiredtiger.git -b $WT_BRANCH && \ + (cd wiredtiger && ./autogen.sh) + fi + (cd wiredtiger/build_posix && \ ../configure --with-pic \ --prefix=$BASEDIR/system && \ make && make install) - ;; esac diff --git a/c_src/wiredtiger-1.4.2.tar.bz2 b/c_src/wiredtiger-1.4.2.tar.bz2 deleted file mode 100644 index 49f69b3..0000000 Binary files a/c_src/wiredtiger-1.4.2.tar.bz2 and /dev/null differ