From 6a83735cc10da9b4f1fd9a09d0f0fdb89b277a44 Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 14 Nov 2023 17:28:52 +0100 Subject: [PATCH 01/20] updated ui --- src/gui/qt-daemon/layout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/qt-daemon/layout b/src/gui/qt-daemon/layout index 5c46578b..50e07717 160000 --- a/src/gui/qt-daemon/layout +++ b/src/gui/qt-daemon/layout @@ -1 +1 @@ -Subproject commit 5c46578ba2cf2bd9bcb377e550e0701f8e5c9b77 +Subproject commit 50e07717bff0bc00617bd8d14589e15f2647fabf From 46f4e317f46db23e5360ac3b3cdd456998122b47 Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 14 Nov 2023 17:29:40 +0100 Subject: [PATCH 02/20] === build number: 156 -> 157 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 9dfd81f9..80015802 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "2" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 156 +#define PROJECT_VERSION_BUILD_NO 157 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From dec913c4e9958cd0aed1311f658065baedf5a4ae Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 20 Nov 2023 15:50:16 +0100 Subject: [PATCH 03/20] build: an attempt to fix boost lib paths in macOS CLI binaries --- utils/build_script_mac_osx.sh | 20 ++++++++++---------- utils/macosx_fix_boost_libs_path.sh | 29 +++++++++++++++-------------- 2 files changed, 25 insertions(+), 24 deletions(-) diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index 7153fff9..bddf3fd6 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -59,12 +59,12 @@ if [ $? -ne 0 ]; then fi # copy all necessary libs into the bundle in order to workaround El Capitan's SIP restrictions -mkdir -p Zano.app/Contents/Frameworks/boost_libs -cp -R "$ZANO_BOOST_LIBS_PATH/" Zano.app/Contents/Frameworks/boost_libs/ -if [ $? -ne 0 ]; then - echo "Failed to cp workaround to MacOS" - exit 1 -fi +#mkdir -p Zano.app/Contents/Frameworks/boost_libs +#cp -R "$ZANO_BOOST_LIBS_PATH/" Zano.app/Contents/Frameworks/boost_libs/ +#if [ $? -ne 0 ]; then +# echo "Failed to cp workaround to MacOS" +# exit 1 +#fi # rename process name to big letter mv Zano.app/Contents/MacOS/zano Zano.app/Contents/MacOS/Zano @@ -81,10 +81,10 @@ fi # fix boost libs paths in main executable and libs to workaround El Capitan's SIP restrictions source ../../../utils/macosx_fix_boost_libs_path.sh -fix_boost_libs_in_binary @executable_path/../Frameworks/boost_libs Zano.app/Contents/MacOS/Zano -fix_boost_libs_in_binary @executable_path/../Frameworks/boost_libs Zano.app/Contents/MacOS/simplewallet -fix_boost_libs_in_binary @executable_path/../Frameworks/boost_libs Zano.app/Contents/MacOS/zanod -fix_boost_libs_in_libs @executable_path/../Frameworks/boost_libs Zano.app/Contents/Frameworks/boost_libs +fix_boost_libs_in_binary @executable_path/../Frameworks Zano.app/Contents/MacOS/Zano +fix_boost_libs_in_binary @executable_path/../Frameworks Zano.app/Contents/MacOS/simplewallet +fix_boost_libs_in_binary @executable_path/../Frameworks Zano.app/Contents/MacOS/zanod +#fix_boost_libs_in_libs @executable_path/../Frameworks/boost_libs Zano.app/Contents/Frameworks/boost_libs diff --git a/utils/macosx_fix_boost_libs_path.sh b/utils/macosx_fix_boost_libs_path.sh index ff290d92..15a02ce2 100644 --- a/utils/macosx_fix_boost_libs_path.sh +++ b/utils/macosx_fix_boost_libs_path.sh @@ -2,12 +2,12 @@ set -e function rel_path() # $1 - path to a target dir/file, $2 - base dir { - python -c "import os.path; print os.path.relpath('$1', os.path.dirname('$2'))" + python3 -c "import os.path; print(os.path.relpath('$1', os.path.dirname('$2')))" } function abs_path() { - python -c "import os.path; print os.path.abspath('$1')" + python3 -c "import os.path; print(os.path.abspath('$1'))" } function fix_boost_libs_in_binary() # $1 - path to boost libs, $2 - binary to fix @@ -17,23 +17,24 @@ function fix_boost_libs_in_binary() # $1 - path to boost libs, $2 - binary to fi echo "fix_boost_libs_in_binary is called with no or invalid parameters" return 1 fi - install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2 - install_name_tool -change libboost_filesystem.dylib $1/libboost_filesystem.dylib $2 - install_name_tool -change libboost_thread.dylib $1/libboost_thread.dylib $2 - install_name_tool -change libboost_date_time.dylib $1/libboost_date_time.dylib $2 - install_name_tool -change libboost_chrono.dylib $1/libboost_chrono.dylib $2 - install_name_tool -change libboost_regex.dylib $1/libboost_regex.dylib $2 - install_name_tool -change libboost_serialization.dylib $1/libboost_serialization.dylib $2 - install_name_tool -change libboost_atomic.dylib $1/libboost_atomic.dylib $2 - install_name_tool -change libboost_program_options.dylib $1/libboost_program_options.dylib $2 - install_name_tool -change libboost_locale.dylib $1/libboost_locale.dylib $2 - install_name_tool -change libboost_timer.dylib $1/libboost_timer.dylib $2 - install_name_tool -change libboost_chrono.dylib $1/libboost_chrono.dylib $2 + install_name_tool -change @rpath/libboost_system.dylib $1/libboost_system.dylib $2 + install_name_tool -change @rpath/libboost_filesystem.dylib $1/libboost_filesystem.dylib $2 + install_name_tool -change @rpath/libboost_thread.dylib $1/libboost_thread.dylib $2 + install_name_tool -change @rpath/libboost_date_time.dylib $1/libboost_date_time.dylib $2 + install_name_tool -change @rpath/libboost_chrono.dylib $1/libboost_chrono.dylib $2 + install_name_tool -change @rpath/libboost_regex.dylib $1/libboost_regex.dylib $2 + install_name_tool -change @rpath/libboost_serialization.dylib $1/libboost_serialization.dylib $2 + install_name_tool -change @rpath/libboost_atomic.dylib $1/libboost_atomic.dylib $2 + install_name_tool -change @rpath/libboost_program_options.dylib $1/libboost_program_options.dylib $2 + install_name_tool -change @rpath/libboost_locale.dylib $1/libboost_locale.dylib $2 + install_name_tool -change @rpath/libboost_timer.dylib $1/libboost_timer.dylib $2 + install_name_tool -change @rpath/libboost_chrono.dylib $1/libboost_chrono.dylib $2 return 0 } function fix_boost_libs_in_libs() # $1 - path to boost libs, $2 - path to libs folder { + return 0 # temporary disabled -- 2023-11-20, sowle install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2/libboost_filesystem.dylib install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2/libboost_thread.dylib install_name_tool -change libboost_system.dylib $1/libboost_system.dylib $2/libboost_chrono.dylib From 020ad2ec7a4e1c8c444b577013b7a876f4ce7993 Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 20 Nov 2023 15:51:13 +0100 Subject: [PATCH 04/20] === build number: 157 -> 158 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 80015802..89c14c92 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "2" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 157 +#define PROJECT_VERSION_BUILD_NO 158 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From 0e67f9449f64fccf9e553a71271d9901a6d0299e Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 20 Nov 2023 19:48:23 +0100 Subject: [PATCH 05/20] build: an attempt 2 to fix boost lib paths in macOS CLI binaries --- utils/build_script_mac_osx.sh | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index bddf3fd6..79d74827 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -59,12 +59,12 @@ if [ $? -ne 0 ]; then fi # copy all necessary libs into the bundle in order to workaround El Capitan's SIP restrictions -#mkdir -p Zano.app/Contents/Frameworks/boost_libs -#cp -R "$ZANO_BOOST_LIBS_PATH/" Zano.app/Contents/Frameworks/boost_libs/ -#if [ $? -ne 0 ]; then -# echo "Failed to cp workaround to MacOS" -# exit 1 -#fi +mkdir -p Zano.app/Contents/Frameworks/boost_libs +cp -R $ZANO_BOOST_LIBS_PATH/*.dylib Zano.app/Contents/Frameworks/boost_libs/ +if [ $? -ne 0 ]; then + echo "Failed to cp workaround to MacOS" + exit 1 +fi # rename process name to big letter mv Zano.app/Contents/MacOS/zano Zano.app/Contents/MacOS/Zano @@ -81,13 +81,12 @@ fi # fix boost libs paths in main executable and libs to workaround El Capitan's SIP restrictions source ../../../utils/macosx_fix_boost_libs_path.sh -fix_boost_libs_in_binary @executable_path/../Frameworks Zano.app/Contents/MacOS/Zano -fix_boost_libs_in_binary @executable_path/../Frameworks Zano.app/Contents/MacOS/simplewallet -fix_boost_libs_in_binary @executable_path/../Frameworks Zano.app/Contents/MacOS/zanod +fix_boost_libs_in_binary @executable_path/../Frameworks/boost_libs Zano.app/Contents/MacOS/Zano +fix_boost_libs_in_binary @executable_path/../Frameworks/boost_libs Zano.app/Contents/MacOS/simplewallet +fix_boost_libs_in_binary @executable_path/../Frameworks/boost_libs Zano.app/Contents/MacOS/zanod #fix_boost_libs_in_libs @executable_path/../Frameworks/boost_libs Zano.app/Contents/Frameworks/boost_libs - "$ZANO_QT_PATH/clang_64/bin/macdeployqt" Zano.app if [ $? -ne 0 ]; then echo "Failed to macdeployqt Zano.app" @@ -95,6 +94,8 @@ if [ $? -ne 0 ]; then fi +rm -rf Zano.app/Contents/Frameworks/libboost*.dylib + rsync -a ../../../src/gui/qt-daemon/layout/html Zano.app/Contents/MacOS --exclude less --exclude package.json --exclude gulpfile.js if [ $? -ne 0 ]; then From 6b78438d1352929733392874ed0728b87cea600e Mon Sep 17 00:00:00 2001 From: sowle Date: Mon, 20 Nov 2023 19:49:28 +0100 Subject: [PATCH 06/20] === build number: 158 -> 159 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 89c14c92..eae6763d 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "2" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 158 +#define PROJECT_VERSION_BUILD_NO 159 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From 2e573721155120e3c97bbb52b79ccbecc9cf8fcc Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 30 Nov 2023 12:56:41 +0100 Subject: [PATCH 07/20] checkpoint @ height 2390000 --- src/currency_core/checkpoints_create.h | 1 + 1 file changed, 1 insertion(+) diff --git a/src/currency_core/checkpoints_create.h b/src/currency_core/checkpoints_create.h index 49d10037..77907927 100644 --- a/src/currency_core/checkpoints_create.h +++ b/src/currency_core/checkpoints_create.h @@ -27,6 +27,7 @@ namespace currency ADD_CHECKPOINT(1161000, "96990d851b484e30190678756ba2a4d3a2f92b987e2470728ac1e38b2bf35908"); ADD_CHECKPOINT(1480000, "5dd3381eec35e8b4eba4518bfd8eec682a4292761d92218fd59b9f0ffedad3fe"); ADD_CHECKPOINT(2000000, "7b6698a8cc279aa78d6263f01fef186bd16f5b1ea263a7f4714abc1d506b9cb3"); + ADD_CHECKPOINT(2390000, "10797d34349d0ef1d1ab4b41ada6f8f2c2f86a7f7eebe44dd2ba06067cb47e0a"); #endif return true; From 3c4a52809c7b1dca42ca871bc7ec24487673a218 Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 30 Nov 2023 13:00:54 +0100 Subject: [PATCH 08/20] ====== build number: 159 -> 160 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index eae6763d..018842ef 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "2" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 159 +#define PROJECT_VERSION_BUILD_NO 160 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From fbf609c1efcf1feea4280186fa0a7049c59bc997 Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Thu, 30 Nov 2023 13:33:21 +0100 Subject: [PATCH 09/20] fixed linux desktop file link --- utils/Zano_appimage_wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/Zano_appimage_wrapper.sh b/utils/Zano_appimage_wrapper.sh index 9c588e61..563124e6 100755 --- a/utils/Zano_appimage_wrapper.sh +++ b/utils/Zano_appimage_wrapper.sh @@ -32,7 +32,7 @@ create_desktop_icon() echo GenericName=Zano | tee -a $target_file_name > /dev/null echo Comment=Privacy blockchain | tee -a $target_file_name > /dev/null echo Icon=${out_dir}/Zano.png | tee -a $target_file_name > /dev/null - echo Exec=$APPIMAGE --deeplink-params=%u | tee -a $target_file_name > /dev/null + echo Exec=$APPIMAGE --deeplink-params=\\\"%u\\\" | tee -a $target_file_name > /dev/null echo Terminal=true | tee -a $target_file_name > /dev/null echo Type=Application | tee -a $target_file_name > /dev/null echo "Categories=Qt;Utility;" | tee -a $target_file_name > /dev/null From 0ec7582cd145d340fd5633990f7d7f08c69fa395 Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 30 Nov 2023 17:32:58 +0100 Subject: [PATCH 10/20] predownload files updated --- src/common/pre_download.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/common/pre_download.h b/src/common/pre_download.h index 373c0bd4..e9aecf5b 100644 --- a/src/common/pre_download.h +++ b/src/common/pre_download.h @@ -21,8 +21,8 @@ namespace tools }; #ifndef TESTNET - static constexpr pre_download_entry c_pre_download_mdbx = { "http://95.217.42.247/pre-download/zano_mdbx_95_2200000.pak", "c3bd64c62495c3f266759750952519f13f32fc161b59547beaa8202b6e26d516", 2628767033, 5100195840 }; - static constexpr pre_download_entry c_pre_download_lmdb = { "http://95.217.42.247/pre-download/zano_lmdb_95_2200000.pak", "fcbf0ab3b23836e1a51fa675e719900fb94110cfb74790b3323cebce7fb9f5bd", 3426025872, 4954472448 }; + static constexpr pre_download_entry c_pre_download_mdbx = { "http://95.217.42.247/pre-download/zano_mdbx_95_2390000.pak", "ffc8d2220a4d8b3fba51073a422cbb6139c60858469ea086623f9d16329eb5b4", 2767268964, 5368627200 }; + static constexpr pre_download_entry c_pre_download_lmdb = { "http://95.217.42.247/pre-download/zano_lmdb_95_2390000.pak", "7e58951bc523eb12e0ec07171bc67b3f96bad4d5454dd2da56f642a872e230d3", 3618283035, 5156397056 }; #else static constexpr pre_download_entry c_pre_download_mdbx = { "", "", 0, 0 }; static constexpr pre_download_entry c_pre_download_lmdb = { "", "", 0, 0 }; From 2dd80035883b1936981634110ffcce6d99958a70 Mon Sep 17 00:00:00 2001 From: sowle Date: Thu, 30 Nov 2023 17:33:52 +0100 Subject: [PATCH 11/20] ====== build number: 160 -> 161 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 018842ef..c94f2500 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "2" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 160 +#define PROJECT_VERSION_BUILD_NO 161 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From d0ad3c7ad44d3dcb027318b7aee60ef3fc13bc0d Mon Sep 17 00:00:00 2001 From: cryptozoidberg Date: Fri, 1 Dec 2023 12:23:01 +0100 Subject: [PATCH 12/20] Update Zano_appimage_wrapper.sh --- utils/Zano_appimage_wrapper.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/Zano_appimage_wrapper.sh b/utils/Zano_appimage_wrapper.sh index 563124e6..be3171c5 100755 --- a/utils/Zano_appimage_wrapper.sh +++ b/utils/Zano_appimage_wrapper.sh @@ -33,7 +33,7 @@ create_desktop_icon() echo Comment=Privacy blockchain | tee -a $target_file_name > /dev/null echo Icon=${out_dir}/Zano.png | tee -a $target_file_name > /dev/null echo Exec=$APPIMAGE --deeplink-params=\\\"%u\\\" | tee -a $target_file_name > /dev/null - echo Terminal=true | tee -a $target_file_name > /dev/null + echo Terminal=false | tee -a $target_file_name > /dev/null echo Type=Application | tee -a $target_file_name > /dev/null echo "Categories=Qt;Utility;" | tee -a $target_file_name > /dev/null echo "MimeType=x-scheme-handler/zano;" | tee -a $target_file_name > /dev/null From 801dcd0ffef6b2179a47444a1e794a8b88da25b4 Mon Sep 17 00:00:00 2001 From: sowle Date: Fri, 1 Dec 2023 15:34:04 +0100 Subject: [PATCH 13/20] ui updated --- src/gui/qt-daemon/layout | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/gui/qt-daemon/layout b/src/gui/qt-daemon/layout index 50e07717..45e91ea2 160000 --- a/src/gui/qt-daemon/layout +++ b/src/gui/qt-daemon/layout @@ -1 +1 @@ -Subproject commit 50e07717bff0bc00617bd8d14589e15f2647fabf +Subproject commit 45e91ea2d56ad4ce60b552052ec7c5abc8f86dcc From f5958fa722cd3cc3d295b3961df2a3b1b73f4bb0 Mon Sep 17 00:00:00 2001 From: sowle Date: Fri, 1 Dec 2023 15:35:17 +0100 Subject: [PATCH 14/20] ====== build number: 161 -> 162 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index c94f2500..1fc50869 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "2" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 161 +#define PROJECT_VERSION_BUILD_NO 162 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From 46bef30daddf54d5ee3714a10a6dd062709d39df Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 5 Dec 2023 19:50:02 +0100 Subject: [PATCH 15/20] build: an attempt to make Boost searching process be more error proof --- CMakeLists.txt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 913dcb72..e4c7d668 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 2.8.6) +cmake_minimum_required(VERSION 3.19) PROJECT(Zano) @@ -185,8 +185,8 @@ else() endif() -# If BOOST_ROOT is set, ignore system-wide Boost -if(DEFINED ENV{BOOST_ROOT}) +# always use system-wide Boost (unless ZANO_USE_SYSTEM_BOOST is defined for some reason, which is not recommended) +if(not DEFINED ENV{ZANO_USE_SYSTEM_BOOST}) set(Boost_NO_SYSTEM_PATHS ON) endif() @@ -213,7 +213,7 @@ elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") set(Boost_LIBRARY_DIRS "${Boost_LIBRARY_DIRS}/${CMAKE_ANDROID_ARCH_ABI}/") set(Boost_LIBRARIES "${Boost_LIBRARY_DIRS}libboost_system.a;${Boost_LIBRARY_DIRS}libboost_filesystem.a;${Boost_LIBRARY_DIRS}libboost_thread.a;${Boost_LIBRARY_DIRS}libboost_timer.a;${Boost_LIBRARY_DIRS}libboost_date_time.a;${Boost_LIBRARY_DIRS}libboost_chrono.a;${Boost_LIBRARY_DIRS}libboost_regex.a;${Boost_LIBRARY_DIRS}libboost_serialization.a;${Boost_LIBRARY_DIRS}libboost_atomic.a;${Boost_LIBRARY_DIRS}libboost_program_options.a") else() - find_package(Boost 1.70 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale) + find_package(Boost 1.70...1.71 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale) endif() From 0caf50fde8380cde21ecb39e8f4e3c06ed6d62ae Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 5 Dec 2023 21:06:14 +0100 Subject: [PATCH 16/20] build: an attempt to make Boost searching process be more error proof (2) --- CMakeLists.txt | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index e4c7d668..880aa5d0 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,4 +1,4 @@ -cmake_minimum_required(VERSION 3.19) +cmake_minimum_required(VERSION 3.1) PROJECT(Zano) @@ -186,7 +186,7 @@ endif() # always use system-wide Boost (unless ZANO_USE_SYSTEM_BOOST is defined for some reason, which is not recommended) -if(not DEFINED ENV{ZANO_USE_SYSTEM_BOOST}) +if(NOT DEFINED ENV{ZANO_USE_SYSTEM_BOOST}) set(Boost_NO_SYSTEM_PATHS ON) endif() @@ -212,8 +212,10 @@ if(CMAKE_SYSTEM_NAME STREQUAL "iOS") elseif(CMAKE_SYSTEM_NAME STREQUAL "Android") set(Boost_LIBRARY_DIRS "${Boost_LIBRARY_DIRS}/${CMAKE_ANDROID_ARCH_ABI}/") set(Boost_LIBRARIES "${Boost_LIBRARY_DIRS}libboost_system.a;${Boost_LIBRARY_DIRS}libboost_filesystem.a;${Boost_LIBRARY_DIRS}libboost_thread.a;${Boost_LIBRARY_DIRS}libboost_timer.a;${Boost_LIBRARY_DIRS}libboost_date_time.a;${Boost_LIBRARY_DIRS}libboost_chrono.a;${Boost_LIBRARY_DIRS}libboost_regex.a;${Boost_LIBRARY_DIRS}libboost_serialization.a;${Boost_LIBRARY_DIRS}libboost_atomic.a;${Boost_LIBRARY_DIRS}libboost_program_options.a") +elseif(APPLE) + find_package(Boost 1.71 EXACT REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale) else() - find_package(Boost 1.70...1.71 REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale) + find_package(Boost 1.70 EXACT REQUIRED COMPONENTS system filesystem thread timer date_time chrono regex serialization atomic program_options locale) endif() From 0367a7970637be52e79caef617a825ab2b5f311c Mon Sep 17 00:00:00 2001 From: "crypto.sowle" Date: Tue, 5 Dec 2023 23:29:15 +0300 Subject: [PATCH 17/20] README.md: improved Linux build manual --- README.md | 55 ++++++++++++++++++++++++++++++++++++------------------- 1 file changed, 36 insertions(+), 19 deletions(-) diff --git a/README.md b/README.md index 464c1410..8eea3e1a 100644 --- a/README.md +++ b/README.md @@ -17,7 +17,7 @@ Be sure to clone the repository properly:\ | llvm/clang (Linux) | UNKNOWN | 7.0.1 | 8.0.0 | | [MSVC](https://visualstudio.microsoft.com/downloads/) (Windows) | 2015 (14.0 update 1) | 2017 (15.9.0) | 2022 (17.7.5) | | [XCode](https://developer.apple.com/downloads/) (macOS) | 9.2 | 12.3 | 12.3 | -| [CMake](https://cmake.org/download/) | 3.15.5 | 3.22.1 | 3.26.3 | +| [CMake](https://cmake.org/download/) | 3.1 | 3.22.1 | 3.26.3 | | [Boost](https://www.boost.org/users/download/) | 1.70 | 1.70 | 1.76 | | [OpenSSL](https://www.openssl.org/source/) [(win)](https://slproweb.com/products/Win32OpenSSL.html) | 1.1.1n | 1.1.1w | 1.1.1w | | [Qt](https://download.qt.io/archive/qt/) (*only for GUI*) | 5.8.0 | 5.11.2 | 5.15.2 | @@ -42,18 +42,25 @@ Recommended OS versions: Ubuntu 20.04, 22.04 LTS. sudo apt-get install -y build-essential g++ python-dev autotools-dev libicu-dev libbz2-dev cmake git screen checkinstall zlib1g-dev mesa-common-dev libglu1-mesa-dev -2. Download and build Boost\ - (Assuming you have cloned Zano into the 'zano' folder. If you used a different location for Zano, edit line 4 accordingly.) +2. Clone Zano into a local folder\ + (If for some reason you need to use alternative Zano branch, change 'master' to the required branch name.) + + git clone --recursive https://github.com/hyle-team/zano.git -b master + + In the following steps we assume that you cloned Zano into '~/zano' folder in your home directory. + +3. Download and build Boost\ + (Assuming you have cloned Zano into the 'zano' folder. If you used a different location for Zano, **edit line 4** accordingly.) curl -OL https://boostorg.jfrog.io/artifactory/main/release/1.70.0/source/boost_1_70_0.tar.bz2 echo "430ae8354789de4fd19ee52f3b1f739e1fba576f0aded0897c3c2bc00fb38778 boost_1_70_0.tar.bz2" | shasum -c && tar -xjf boost_1_70_0.tar.bz2 rm boost_1_70_0.tar.bz2 && cd boost_1_70_0 patch -p0 < ../zano/utils/boost_1.70_gcc_8.patch || cd .. ./bootstrap.sh --with-libraries=system,filesystem,thread,date_time,chrono,regex,serialization,atomic,program_options,locale,timer,log - ./b2 + ./b2 && cd .. Make sure that you see "The Boost C++ Libraries were successfully built!" message at the end. -3. Install Qt\ +4. Install Qt\ (*GUI version only, skip this step if you're building server version*) [*GUI version*] @@ -64,18 +71,19 @@ Recommended OS versions: Ubuntu 20.04, 22.04 LTS. Then follow the instructions in Wizard. Don't forget to tick the WebEngine module checkbox! -4. Install OpenSSL +5. Install OpenSSL - We recommend installing OpenSSL v1.1.1w locally unless you would like to use the same version system-wide. Adjust the local path `/home/user/openssl` in the commands below according to your needs. + We recommend installing OpenSSL v1.1.1w locally unless you would like to use the same version system-wide.\ + (Assuming that `$HOME` environment variable is set to your home directory. Otherwise, edit line 4 accordingly.) curl -OL https://www.openssl.org/source/openssl-1.1.1w.tar.gz echo "cf3098950cb4d853ad95c0841f1f9c6d3dc102dccfcacd521d93925208b76ac8 openssl-1.1.1w.tar.gz" | shasum -c && tar xaf openssl-1.1.1w.tar.gz cd openssl-1.1.1w/ - ./config --prefix=/home/user/openssl --openssldir=/home/user/openssl shared zlib - make && make test && make install + ./config --prefix=$HOME/openssl --openssldir=$HOME/openssl shared zlib + make && make test && make install && cd .. -5. Set environment variables properly\ +6. [*OPTIONAL*] Set global environment variables for convenient use\ For instance, by adding the following lines to `~/.bashrc` [*server version*] @@ -90,18 +98,27 @@ For instance, by adding the following lines to `~/.bashrc` export OPENSSL_ROOT_DIR=/home/user/openssl export QT_PREFIX_PATH=/home/user/Qt5.11.2/5.11.2/gcc_64 - Make sure you've restarted your terminal session (by reopening the terminal window or reconnecting the server) to apply these changes. - -6. Build the binaries - 1. Build daemon and simplewallet: - - cd zano/ && make -j1 - or + **NOTICE: Please edit the lines above according to your actual paths.** + **NOTICE 2:** Make sure you've restarted your terminal session (by reopening the terminal window or reconnecting the server) to apply these changes. + +8. Build the binaries + 1. If you skipped step 6 and did not set the environment variables: + + cd zano && mkdir build && cd build + BOOST_ROOT=$HOME/boost_1_70_0 OPENSSL_ROOT_DIR=$HOME/openssl cmake .. + make -j1 daemon simplewallet + + 2. If you set the variables in step 6: + cd zano && mkdir build && cd build cmake .. make -j1 daemon simplewallet + or simply: + + cd zano && make -j1 + **NOTICE**: If you are building on a machine with a relatively high amount of RAM or with the proper setting of virtual memory, then you can use `-j2` or `-j` option to speed up the building process. Use with caution. **NOTICE 2**: If you'd like to build binaries for the testnet, use `cmake -D TESTNET=TRUE ..` instead of `cmake ..` . @@ -111,12 +128,12 @@ For instance, by adding the following lines to `~/.bashrc` cd zano utils/build_script_linux.sh -7. Look for the binaries in `build` folder + Look for the binaries in `build` folder
### Windows -Recommended OS version: Windows 7 x64. +Recommended OS version: Windows 7 x64, Windows 11 x64. 1. Install required prerequisites (Boost, Qt, CMake, OpenSSL). 2. Edit paths in `utils/configure_local_paths.cmd`. 3. Run one of `utils/configure_win64_msvsNNNN_gui.cmd` according to your MSVC version. From 5349d2f2dd9437259a5767be495bb100c5081a0e Mon Sep 17 00:00:00 2001 From: sowle Date: Tue, 5 Dec 2023 21:31:01 +0100 Subject: [PATCH 18/20] ====== build number: 162 -> 163 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 1fc50869..1113b069 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "2" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 162 +#define PROJECT_VERSION_BUILD_NO 163 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]" From eb0b2529d0140d1e5b924457519cdebfb7a2739f Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 6 Dec 2023 03:11:52 +0100 Subject: [PATCH 19/20] build script windows: minor fix (using boost libs for msvc v14.2) --- utils/build_script_windows.bat | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/utils/build_script_windows.bat b/utils/build_script_windows.bat index 90fba36a..fcd8fe53 100644 --- a/utils/build_script_windows.bat +++ b/utils/build_script_windows.bat @@ -44,7 +44,7 @@ rmdir build /s /q mkdir build cd build -cmake %TESTNET_DEF% -D OPENSSL_ROOT_DIR="%OPENSSL_ROOT_DIR%" -D CMAKE_PREFIX_PATH="%QT_MSVC_PATH%" -D BUILD_GUI=TRUE -D STATIC=FALSE -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_ROOT%\lib64-msvc-14.1" -G "Visual Studio 16 2019" -A x64 -T host=x64 .. +cmake %TESTNET_DEF% -D OPENSSL_ROOT_DIR="%OPENSSL_ROOT_DIR%" -D CMAKE_PREFIX_PATH="%QT_MSVC_PATH%" -D BUILD_GUI=TRUE -D STATIC=FALSE -DBOOST_ROOT="%BOOST_ROOT%" -DBOOST_LIBRARYDIR="%BOOST_ROOT%\lib64-msvc-14.2" -G "Visual Studio 16 2019" -A x64 -T host=x64 .. IF %ERRORLEVEL% NEQ 0 ( goto error ) From 0a793b9222a83e9faab8a917cc387cabc2fcc297 Mon Sep 17 00:00:00 2001 From: sowle Date: Wed, 6 Dec 2023 03:12:35 +0100 Subject: [PATCH 20/20] ====== build number: 163 -> 164 === --- src/version.h.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h.in b/src/version.h.in index 1113b069..9f51f1d5 100644 --- a/src/version.h.in +++ b/src/version.h.in @@ -8,6 +8,6 @@ #define PROJECT_REVISION "2" #define PROJECT_VERSION PROJECT_MAJOR_VERSION "." PROJECT_MINOR_VERSION "." PROJECT_REVISION -#define PROJECT_VERSION_BUILD_NO 163 +#define PROJECT_VERSION_BUILD_NO 164 #define PROJECT_VERSION_BUILD_NO_STR STRINGIFY_EXPAND(PROJECT_VERSION_BUILD_NO) #define PROJECT_VERSION_LONG PROJECT_VERSION "." PROJECT_VERSION_BUILD_NO_STR "[" BUILD_COMMIT_ID "]"