mirror of
https://github.com/monero-project/monero-gui.git
synced 2026-04-14 05:37:27 -04:00
Merge pull request #400
a760672change monero build check (Jaquee)a8f3021add monero as git submodule (Jaquee)
This commit is contained in:
4
.gitmodules
vendored
Normal file
4
.gitmodules
vendored
Normal file
@@ -0,0 +1,4 @@
|
|||||||
|
[submodule "monero"]
|
||||||
|
path = monero
|
||||||
|
url = https://github.com/monero-project/monero
|
||||||
|
ignore = dirty
|
||||||
2
build.sh
2
build.sh
@@ -41,7 +41,7 @@ MONERO_DIR=monero
|
|||||||
MONEROD_EXEC=monerod
|
MONEROD_EXEC=monerod
|
||||||
|
|
||||||
# Build libwallet if monero folder doesnt exist
|
# 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
|
$SHELL get_libwallet_api.sh $BUILD_TYPE
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|||||||
@@ -54,14 +54,11 @@ source $ROOT_DIR/utils.sh
|
|||||||
INSTALL_DIR=$ROOT_DIR/wallet
|
INSTALL_DIR=$ROOT_DIR/wallet
|
||||||
MONERO_DIR=$ROOT_DIR/monero
|
MONERO_DIR=$ROOT_DIR/monero
|
||||||
|
|
||||||
|
# init and update monero submodule
|
||||||
if [ ! -d $MONERO_DIR ]; then
|
if [ ! -d $MONERO_DIR/src ]; then
|
||||||
git clone --depth=1 $MONERO_URL $MONERO_DIR --branch $MONERO_BRANCH --single-branch
|
git submodule init monero
|
||||||
else
|
|
||||||
cd $MONERO_DIR;
|
|
||||||
git checkout $MONERO_BRANCH
|
|
||||||
git pull;
|
|
||||||
fi
|
fi
|
||||||
|
git submodule update
|
||||||
|
|
||||||
echo "cleaning up existing monero build dir, libs and includes"
|
echo "cleaning up existing monero build dir, libs and includes"
|
||||||
rm -fr $MONERO_DIR/build
|
rm -fr $MONERO_DIR/build
|
||||||
|
|||||||
1
monero
Submodule
1
monero
Submodule
Submodule monero added at d98db4868d
Reference in New Issue
Block a user