Merge pull request #400

a760672 change monero build check (Jaquee)
a8f3021 add monero as git submodule (Jaquee)
This commit is contained in:
Riccardo Spagni 2017-01-14 10:44:55 -05:00
commit 7cbd61dae2
No known key found for this signature in database
GPG key ID: 55432DF31CCD4FCD
4 changed files with 10 additions and 8 deletions

4
.gitmodules vendored Normal file
View file

@ -0,0 +1,4 @@
[submodule "monero"]
path = monero
url = https://github.com/monero-project/monero
ignore = dirty

View file

@ -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

View file

@ -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

1
monero Submodule

@ -0,0 +1 @@
Subproject commit d98db4868ddd7727866b053eeeb8fe154363896c