From 5437820af0f4e04563b158f6f1e982479ae8a333 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Fri, 9 Dec 2016 09:42:12 +0100 Subject: [PATCH 1/2] build and install monerod --- build.sh | 15 +++++++++++++++ get_libwallet_api.sh | 9 +++++++++ 2 files changed, 24 insertions(+) diff --git a/build.sh b/build.sh index 6ddcee10..c5318d8d 100755 --- a/build.sh +++ b/build.sh @@ -10,7 +10,9 @@ source ./utils.sh pushd $(pwd) ROOT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )" MONERO_DIR=monero +MONEROD_EXEC=monerod +# Build libwallet if monero folder doesnt exist if [ ! -d $MONERO_DIR ]; then $SHELL get_libwallet_api.sh $BUILD_TYPE fi @@ -19,11 +21,14 @@ if [ ! -d build ]; then mkdir build; fi if [ "$BUILD_TYPE" == "Release" ]; then CONFIG="CONFIG+=release"; + BIN_PATH=release/bin else CONFIG="CONFIG+=debug" + BIN_PATH=debug/bin fi +# Platform indepenent settings platform=$(get_platform) if [ "$platform" == "linux" ]; then distro=$(lsb_release -is) @@ -32,9 +37,19 @@ if [ "$platform" == "linux" ]; then fi fi +if [ "$platform" == "darwin" ]; then + BIN_PATH=$BIN_PATH/monero-core.app/Contents/MacOS/ +elif [ "$platform" == "mingw64" ] || [ "$platform" == "mingw32" ]; then + MONEROD_EXEC=monerod.exe +fi + cd build qmake ../monero-core.pro "$CONFIG" make + +# Copy monerod to bin folder +cp ../$MONERO_DIR/bin/$MONEROD_EXEC $BIN_PATH + # make deploy popd diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 9f69cade..6926d977 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -36,6 +36,8 @@ echo "cleaning up existing monero build dir, libs and includes" rm -fr $MONERO_DIR/build rm -fr $MONERO_DIR/lib rm -fr $MONERO_DIR/include +rm -fr $MONERO_DIR/bin + mkdir -p $MONERO_DIR/build/release pushd $MONERO_DIR/build/release @@ -68,12 +70,19 @@ else fi +# Build libwallet_merged pushd $MONERO_DIR/build/release/src/wallet eval $make_exec version -C ../.. eval $make_exec -j$CPU_CORE_COUNT eval $make_exec install -j$CPU_CORE_COUNT popd +# Build monerod +pushd $MONERO_DIR/build/release/src/daemon +eval $make_exec -j$CPU_CORE_COUNT +eval $make_exec install -j$CPU_CORE_COUNT +popd + # unbound is one more dependency. can't be merged to the wallet_merged # since filename conflict (random.c.obj) # for Linux, we use libunbound shipped with the system, so we don't need to build it From 401d09fab7f911ea7d22e5befc446f156ddac046 Mon Sep 17 00:00:00 2001 From: Jaquee Date: Fri, 9 Dec 2016 11:12:53 +0100 Subject: [PATCH 2/2] Don't build monerod on win32 Signed-off-by: Jaquee --- build.sh | 2 ++ get_libwallet_api.sh | 12 ++++++++---- 2 files changed, 10 insertions(+), 4 deletions(-) diff --git a/build.sh b/build.sh index c5318d8d..f110fb02 100755 --- a/build.sh +++ b/build.sh @@ -48,7 +48,9 @@ qmake ../monero-core.pro "$CONFIG" make # Copy monerod to bin folder +if [ "$platform" != "mingw32" ]; then cp ../$MONERO_DIR/bin/$MONEROD_EXEC $BIN_PATH +fi # make deploy popd diff --git a/get_libwallet_api.sh b/get_libwallet_api.sh index 6926d977..06309ecd 100755 --- a/get_libwallet_api.sh +++ b/get_libwallet_api.sh @@ -78,10 +78,14 @@ eval $make_exec install -j$CPU_CORE_COUNT popd # Build monerod -pushd $MONERO_DIR/build/release/src/daemon -eval $make_exec -j$CPU_CORE_COUNT -eval $make_exec install -j$CPU_CORE_COUNT -popd +# win32 need to build daemon manually with msys2 toolchain +if [ "$platform" != "mingw32" ]; then + pushd $MONERO_DIR/build/release/src/daemon + eval make -j$CPU_CORE_COUNT + eval make install -j$CPU_CORE_COUNT + popd +fi + # unbound is one more dependency. can't be merged to the wallet_merged # since filename conflict (random.c.obj)