Merge pull request #1752

722e37f get_libwallet_api: init/update submodules after optional merging of PRs (stoffu)
This commit is contained in:
luigi1111 2018-12-01 12:44:28 -06:00
commit eb7e271fc6
No known key found for this signature in database
GPG key ID: F4ACA0183641E010

View file

@ -26,9 +26,6 @@ popd
# create local monero branch
git -C $MONERO_DIR checkout -B $VERSIONTAG
git -C $MONERO_DIR submodule init
git -C $MONERO_DIR submodule update
# Merge monero PR dependencies
# Workaround for git username requirements
@ -50,6 +47,9 @@ done
$(git -C $MONERO_DIR config user.name "$OLD_GIT_USER")
$(git -C $MONERO_DIR config user.email "$OLD_GIT_EMAIL")
git -C $MONERO_DIR submodule init
git -C $MONERO_DIR submodule update
# Build libwallet if it doesnt exist
if [ ! -f $MONERO_DIR/lib/libwallet_merged.a ]; then
echo "libwallet_merged.a not found - Building libwallet"