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; 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 diff --git a/src/version.h.in b/src/version.h.in index 9dfd81f9..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 156 +#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 "]" diff --git a/utils/build_script_mac_osx.sh b/utils/build_script_mac_osx.sh index 7153fff9..79d74827 100755 --- a/utils/build_script_mac_osx.sh +++ b/utils/build_script_mac_osx.sh @@ -60,7 +60,7 @@ 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/ +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 @@ -84,8 +84,7 @@ 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_libs @executable_path/../Frameworks/boost_libs Zano.app/Contents/Frameworks/boost_libs "$ZANO_QT_PATH/clang_64/bin/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 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