From e08871a77e5c61788204db8b82e602482b08c1b6 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Mon, 16 Jan 2017 12:34:34 +0100 Subject: [PATCH 1/3] Update monero submodule to 16b8b66 --- monero | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/monero b/monero index d98db486..16b8b66a 160000 --- a/monero +++ b/monero @@ -1 +1 @@ -Subproject commit d98db4868ddd7727866b053eeeb8fe154363896c +Subproject commit 16b8b66adcad57983b099fdf3ac1b52519390bc6 From 7f9cc7348568610a32d2fe02799a7facf4417786 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Mon, 16 Jan 2017 14:14:12 +0100 Subject: [PATCH 2/3] Build libwallet if new version exists --- build.sh | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) diff --git a/build.sh b/build.sh index 568660bd..9301efa9 100755 --- a/build.sh +++ b/build.sh @@ -40,9 +40,27 @@ ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" MONERO_DIR=monero MONEROD_EXEC=monerod -# Build libwallet if monero folder doesnt exist -if [ ! -d $MONERO_DIR/src ]; then +# Build libwallet if it doesnt exist +if [ ! -f $MONERO_DIR/lib/libwallet_merged.a ]; then + echo "libwallet_merged.a not found - Building libwallet" $SHELL get_libwallet_api.sh $BUILD_TYPE +else + source ./$MONERO_DIR/version.sh + # update monero submodule + git submodule update + # compare submodule version with latest build + pushd "$MONERO_DIR" + get_tag + popd + echo "latest libwallet version: $GUI_MONERO_VERSION" + echo "Installed libwallet version: $VERSIONTAG" + # check if recent + if [ "$VERSIONTAG" != "$GUI_MONERO_VERSION" ]; then + echo "Building new libwallet version $GUI_MONERO_VERSION" + $SHELL get_libwallet_api.sh $BUILD_TYPE + else + echo "latest libwallet ($GUI_MONERO_VERSION) is already built. Run ./get_libwallet_api.sh to force rebuild" + fi fi # build zxcvbn @@ -73,6 +91,7 @@ pushd "$MONERO_DIR" get_tag popd echo "var GUI_MONERO_VERSION = \"$VERSIONTAG\"" >> version.js +echo "GUI_MONERO_VERSION=\"$VERSIONTAG\"" >> $MONERO_DIR/version.sh cd build qmake ../monero-wallet-gui.pro "$CONFIG" From 977f5125e6295f61c098a5c96548beef44ce836a Mon Sep 17 00:00:00 2001 From: Jaquee Date: Mon, 16 Jan 2017 14:17:30 +0100 Subject: [PATCH 3/3] check if version.h exists --- build.sh | 3 +++ 1 file changed, 3 insertions(+) diff --git a/build.sh b/build.sh index 9301efa9..445dd2ad 100755 --- a/build.sh +++ b/build.sh @@ -44,6 +44,9 @@ MONEROD_EXEC=monerod if [ ! -f $MONERO_DIR/lib/libwallet_merged.a ]; then echo "libwallet_merged.a not found - Building libwallet" $SHELL get_libwallet_api.sh $BUILD_TYPE +elif [ ! -f $MONERO_DIR/version.sh ]; then + echo "monero/version.h not found - Building libwallet" + $SHELL get_libwallet_api.sh $BUILD_TYPE else source ./$MONERO_DIR/version.sh # update monero submodule