diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 00000000..3fa9487e --- /dev/null +++ b/.gitmodules @@ -0,0 +1,4 @@ +[submodule "monero"] + path = monero + url = https://github.com/monero-project/monero + ignore = dirty \ No newline at end of file diff --git a/build.sh b/build.sh index 3e1eb5e9..568660bd 100755 --- a/build.sh +++ b/build.sh @@ -41,7 +41,7 @@ MONERO_DIR=monero MONEROD_EXEC=monerod # Build libwallet if monero folder doesnt exist -if [ ! -d $MONERO_DIR ]; then +if [ ! -d $MONERO_DIR/src ]; then $SHELL get_libwallet_api.sh $BUILD_TYPE fi diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index f74978ac..7f1967ff 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -54,14 +54,11 @@ source $ROOT_DIR/utils.sh INSTALL_DIR=$ROOT_DIR/wallet MONERO_DIR=$ROOT_DIR/monero - -if [ ! -d $MONERO_DIR ]; then - git clone --depth=1 $MONERO_URL $MONERO_DIR --branch $MONERO_BRANCH --single-branch -else - cd $MONERO_DIR; - git checkout $MONERO_BRANCH - git pull; +# init and update monero submodule +if [ ! -d $MONERO_DIR/src ]; then + git submodule init monero fi +git submodule update echo "cleaning up existing monero build dir, libs and includes" rm -fr $MONERO_DIR/build diff --git a/monero b/monero new file mode 160000 index 00000000..d98db486 --- /dev/null +++ b/monero @@ -0,0 +1 @@ +Subproject commit d98db4868ddd7727866b053eeeb8fe154363896c