From 5fb6d478caf0388dcbbf6c2a430fcfe66d28b2b4 Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 29 May 2019 14:17:49 +0300 Subject: [PATCH 1/3] build: Linux build script improvements --- utils/build_script_linux.sh | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/utils/build_script_linux.sh b/utils/build_script_linux.sh index 33f317e3..68c917a0 100755 --- a/utils/build_script_linux.sh +++ b/utils/build_script_linux.sh @@ -9,12 +9,24 @@ # export BOOST_ROOT=/home/user/boost_1_66_0 # export QT_PREFIX_PATH=/home/user/Qt5.10.1/5.10.1/gcc_64 +ARCHIVE_NAME_PREFIX=zano-linux-x64- + : "${BOOST_ROOT:?BOOST_ROOT should be set to the root of Boost, ex.: /home/user/boost_1_66_0}" : "${QT_PREFIX_PATH:?QT_PREFIX_PATH should be set to Qt libs folder, ex.: /home/user/Qt5.10.1/5.10.1/gcc_64}" +if [-n "$build_prefix"]; then + ARCHIVE_NAME_PREFIX=${ARCHIVE_NAME_PREFIX}${build_prefix}- +fi + +if [-n "$testnet"]; then + testnet_def=-D TESTNET=TRUE + ARCHIVE_NAME_PREFIX=${ARCHIVE_NAME_PREFIX}testnet- +fi + + prj_root=$(pwd) -git pull +git pull --ff-only if [ $? -ne 0 ]; then echo "Failed to pull" exit $? @@ -26,7 +38,7 @@ echo "--------------------------------------------------" echo "Building...." rm -rf build; mkdir -p build/release; cd build/release; -cmake -D STATIC=true -D ARCH=x86-64 -D BUILD_GUI=TRUE -D CMAKE_PREFIX_PATH="$QT_PREFIX_PATH" -D CMAKE_BUILD_TYPE=Release ../.. +cmake $testnet_def -D STATIC=true -D ARCH=x86-64 -D BUILD_GUI=TRUE -D CMAKE_PREFIX_PATH="$QT_PREFIX_PATH" -D CMAKE_BUILD_TYPE=Release ../.. if [ $? -ne 0 ]; then echo "Failed to run cmake" exit 1 @@ -98,7 +110,7 @@ cp $QT_PREFIX_PATH/plugins/xcbglintegrations/libqxcb-glx-integration.so ./Zano/x cp -Rv src/zanod src/Zano src/simplewallet src/connectivity_tool ./Zano -package_filename=zano-linux-x64-$version_str.tar.bz2 +package_filename=${ARCHIVE_NAME_PREFIX}${version_str}.tar.bz2 rm -f ./$package_filename tar -cjvf $package_filename Zano From f61d9f6bfffd05ccb2e073fe652eed318cd4181f Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 29 May 2019 14:23:13 +0300 Subject: [PATCH 2/3] build: Linux build script fix a typo --- utils/build_script_linux.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/utils/build_script_linux.sh b/utils/build_script_linux.sh index 68c917a0..eedb7946 100755 --- a/utils/build_script_linux.sh +++ b/utils/build_script_linux.sh @@ -14,11 +14,11 @@ ARCHIVE_NAME_PREFIX=zano-linux-x64- : "${BOOST_ROOT:?BOOST_ROOT should be set to the root of Boost, ex.: /home/user/boost_1_66_0}" : "${QT_PREFIX_PATH:?QT_PREFIX_PATH should be set to Qt libs folder, ex.: /home/user/Qt5.10.1/5.10.1/gcc_64}" -if [-n "$build_prefix"]; then +if [ -n "$build_prefix" ]; then ARCHIVE_NAME_PREFIX=${ARCHIVE_NAME_PREFIX}${build_prefix}- fi -if [-n "$testnet"]; then +if [ -n "$testnet" ]; then testnet_def=-D TESTNET=TRUE ARCHIVE_NAME_PREFIX=${ARCHIVE_NAME_PREFIX}testnet- fi From f747b0e24bf1c0868afe9e6838e5e9f9b8feded6 Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 29 May 2019 17:45:21 +0300 Subject: [PATCH 3/3] build: scripts for Linux and macOS are being adapted for testnet --- utils/build_script_linux.sh | 6 +++--- utils/build_script_mac_osx.sh | 18 +++++++++++++++--- 2 files changed, 18 insertions(+), 6 deletions(-) diff --git a/utils/build_script_linux.sh b/utils/build_script_linux.sh index eedb7946..43d329d9 100755 --- a/utils/build_script_linux.sh +++ b/utils/build_script_linux.sh @@ -1,4 +1,4 @@ -#!/bin/bash +#!/bin/bash -x # Environment prerequisites: # 1) QT_PREFIX_PATH should be set to Qt libs folder @@ -19,7 +19,7 @@ if [ -n "$build_prefix" ]; then fi if [ -n "$testnet" ]; then - testnet_def=-D TESTNET=TRUE + testnet_def="-D TESTNET=TRUE" ARCHIVE_NAME_PREFIX=${ARCHIVE_NAME_PREFIX}testnet- fi @@ -64,7 +64,7 @@ fi -read version_str <<< $(./src/zanod --version | awk '/^Zano / { print $2 }') +read version_str <<< $(./src/zanod --version | awk '/^Zano/ { print $2 }') version_str=${version_str} echo $version_str diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index 953462f6..07b78b3f 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -8,9 +8,21 @@ curr_path=${BASH_SOURCE%/*} : "${ZANO_BUILD_DIR:?variable not set, see also macosx_build_config.command}" : "${CMAKE_OSX_SYSROOT:?CMAKE_OSX_SYSROOT should be set to macOS SDK path, e.g.: /Applications/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.13.sdk}" +ARCHIVE_NAME_PREFIX=zano-macos-x64- + +if [ -n "$build_prefix" ]; then + ARCHIVE_NAME_PREFIX=${ARCHIVE_NAME_PREFIX}${build_prefix}- +fi + +if [ -n "$testnet" ]; then + testnet_def="-D TESTNET=TRUE" + ARCHIVE_NAME_PREFIX=${ARCHIVE_NAME_PREFIX}testnet- +fi + + rm -rf $ZANO_BUILD_DIR; mkdir -p "$ZANO_BUILD_DIR/release"; cd "$ZANO_BUILD_DIR/release" -cmake -D CMAKE_OSX_SYSROOT=$CMAKE_OSX_SYSROOT -D BUILD_GUI=TRUE -D CMAKE_PREFIX_PATH="$ZANO_QT_PATH/clang_64" -D CMAKE_BUILD_TYPE=Release -D BOOST_ROOT="$ZANO_BOOST_ROOT" -D BOOST_LIBRARYDIR="$ZANO_BOOST_LIBS_PATH" ../.. +cmake $testnet_def -D CMAKE_OSX_SYSROOT=$CMAKE_OSX_SYSROOT -D BUILD_GUI=TRUE -D CMAKE_PREFIX_PATH="$ZANO_QT_PATH/clang_64" -D CMAKE_BUILD_TYPE=Release -D BOOST_ROOT="$ZANO_BOOST_ROOT" -D BOOST_LIBRARYDIR="$ZANO_BOOST_LIBS_PATH" ../.. if [ $? -ne 0 ]; then echo "Failed to cmake" exit 1 @@ -87,7 +99,7 @@ if [ $? -ne 0 ]; then exit 1 fi -read version_str <<< $(DYLD_LIBRARY_PATH=$ZANO_BOOST_LIBS_PATH ./connectivity_tool --version | awk '/^Zano / { print $2 }') +read version_str <<< $(DYLD_LIBRARY_PATH=$ZANO_BOOST_LIBS_PATH ./connectivity_tool --version | awk '/^Zano/ { print $2 }') version_str=${version_str} echo $version_str @@ -105,7 +117,7 @@ if [ $? -ne 0 ]; then exit 1 fi -package_filename="zano-macos-x64-$version_str.dmg" +package_filename=${ARCHIVE_NAME_PREFIX}${version_str}.dmg source ../../../utils/macosx_dmg_builder.sh build_fancy_dmg package_folder $package_filename