diff options
| author | Riccardo Spagni <ric@spagni.net> | 2017-01-14 10:44:55 -0500 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2017-01-14 10:44:55 -0500 |
| commit | 7cbd61dae21fdf8a27081d28ebb130195d77ed69 (patch) | |
| tree | aeb0b66a0c1cda2063772c0125152fc69d0e5b2c | |
| parent | e8a47e322d0156e8fb19d3bcee12b96c5ebffd30 (diff) | |
| parent | a76067296e619ec27944e488c08f9f815643c1bc (diff) | |
| download | monzero-gui-7cbd61dae21fdf8a27081d28ebb130195d77ed69.tar.gz monzero-gui-7cbd61dae21fdf8a27081d28ebb130195d77ed69.tar.xz monzero-gui-7cbd61dae21fdf8a27081d28ebb130195d77ed69.zip | |
Merge pull request #400
a760672 change monero build check (Jaquee)
a8f3021 add monero as git submodule (Jaquee)
| -rw-r--r-- | .gitmodules | 4 | ||||
| -rwxr-xr-x | build.sh | 2 | ||||
| -rwxr-xr-x | get_libwallet_api.sh | 11 | ||||
| m--------- | monero | 0 |
4 files changed, 9 insertions, 8 deletions
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 @@ -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 +Subproject d98db4868ddd7727866b053eeeb8fe154363896 |