diff --git a/CMakeLists.txt b/CMakeLists.txt index 29aac86c..a7083856 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -88,12 +88,16 @@ add_executable (qt_client rai/qt_client/entry.cpp) add_executable (qt_system - rai/qt_system/entry.cpp) +rai/qt_system/entry.cpp) + +set (CPACK_PACKAGE_VERSION_MAJOR "3") +set (CPACK_PACKAGE_VERSION_MINOR "1") +set (CPACK_PACKAGE_VERSION_PATCH "0") SET (ACTIVE_NETWORK rai_active_network CACHE STRING "Selects which network parameters are used") set_property (CACHE ACTIVE_NETWORK PROPERTY STRINGS rai_test_network rai_beta_network rai_live_network) -set_target_properties (secure core core_test slow_test qt_test cli qt qt_client qt_system landing PROPERTIES COMPILE_FLAGS "-std=c++11 -Werror=switch ${PLATFORM_COMPILE_FLAGS} -DQT_NO_KEYWORDS -DACTIVE_NETWORK=${ACTIVE_NETWORK} -DED25519_CUSTOMHASH -DED25519_CUSTOMRNG") +set_target_properties (secure core core_test slow_test qt_test cli qt qt_client qt_system landing PROPERTIES COMPILE_FLAGS "-std=c++11 -Werror=switch ${PLATFORM_COMPILE_FLAGS} -DQT_NO_KEYWORDS -DACTIVE_NETWORK=${ACTIVE_NETWORK} -DED25519_CUSTOMHASH -DED25519_CUSTOMRNG -DRAIBLOCKS_VERSION_MAJOR=${CPACK_PACKAGE_VERSION_MAJOR} -DRAIBLOCKS_VERSION_MINOR=${CPACK_PACKAGE_VERSION_MINOR} -DRAIBLOCKS_VERSION_PATCH=${CPACK_PACKAGE_VERSION_PATCH}") set_target_properties (qt_client qt_test PROPERTIES LINK_FLAGS "${PLATFORM_GUI_EXE_LINK_FLAGS}") if (WIN32) @@ -184,8 +188,4 @@ else () install (TARGETS qt_client DESTINATION .) endif () -set (CPACK_PACKAGE_VERSION_MAJOR "3") -set (CPACK_PACKAGE_VERSION_MINOR "1") -set (CPACK_PACKAGE_VERSION_PATCH "0") - include (CPack) diff --git a/rai/core/core.cpp b/rai/core/core.cpp index 12040352..7a6448da 100644 --- a/rai/core/core.cpp +++ b/rai/core/core.cpp @@ -1197,7 +1197,7 @@ service (processor_a) } boost::log::add_common_attributes (); boost::log::add_file_log (boost::log::keywords::target = application_path_a / "log", boost::log::keywords::file_name = application_path_a / "log" / "log_%Y-%m-%d_%H-%M-%S.%N.log", boost::log::keywords::rotation_size = 4 * 1024 * 1024, boost::log::keywords::auto_flush = rai::rai_network != rai::rai_networks::rai_test_network, boost::log::keywords::scan_method = boost::log::sinks::file::scan_method::scan_matching, boost::log::keywords::max_size = 16 * 1024 * 1024, boost::log::keywords::format = "[%TimeStamp%]: %Message%"); - BOOST_LOG (log) << "Client starting"; + BOOST_LOG (log) << "Client starting, version: " << RAIBLOCKS_VERSION_MAJOR << "." << RAIBLOCKS_VERSION_MINOR << "." << RAIBLOCKS_VERSION_PATCH; ledger.send_observer = [this] (rai::send_block const & block_a, rai::account const & account_a, rai::amount const & balance_a) { for (auto & i: send_observers) @@ -1988,7 +1988,7 @@ void rai::rpc::operator () (boost::network::http::server ::request con response.content = "Bad account number"; } } - else if (action == "wallet_list") + else if (action == "account_list") { std::string wallet_text (request_l.get ("wallet")); rai::uint256_union wallet;