Merge pull request #256

401d09f Don't build monerod on win32 (Jaquee)
5437820 build and install monerod (Jaquee)

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,21 @@ 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
+if [ "$platform" != "mingw32" ]; then
+cp ../$MONERO_DIR/bin/$MONEROD_EXEC $BIN_PATH
+fi
+
 # make deploy
 popd
 

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,23 @@ 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
+# 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)
 # for Linux, we use libunbound shipped with the system, so we don't need to build it