diff options
| author | Riccardo Spagni <ric@spagni.net> | 2014-09-12 13:06:51 +0200 |
|---|---|---|
| committer | Riccardo Spagni <ric@spagni.net> | 2014-09-12 13:06:51 +0200 |
| commit | 14b3b6ea02ab5a228a2551bc8be7212ec7c15f37 (patch) | |
| tree | 25bdf5988b19ded9df97555d9b8a808c1ad7acb9 /src/daemon | |
| parent | always check git diff (diff) | |
| download | monero-14b3b6ea02ab5a228a2551bc8be7212ec7c15f37.tar.xz | |
versioning now includes the commit hash, or -final for tagged releases
Diffstat (limited to 'src/daemon')
| -rw-r--r-- | src/daemon/daemon.cpp | 6 | ||||
| -rw-r--r-- | src/daemon/daemon_commands_handler.h | 2 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/daemon/daemon.cpp b/src/daemon/daemon.cpp index 461068837..fc7ec4ed2 100644 --- a/src/daemon/daemon.cpp +++ b/src/daemon/daemon.cpp @@ -109,7 +109,7 @@ int main(int argc, char* argv[]) if (command_line::get_arg(vm, command_line::arg_help)) { - std::cout << CRYPTONOTE_NAME << " v" << PROJECT_VERSION_LONG << ENDL << ENDL; + std::cout << CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL << ENDL << ENDL; std::cout << desc_options << std::endl; return false; } @@ -144,7 +144,7 @@ int main(int argc, char* argv[]) log_dir = log_file_path.has_parent_path() ? log_file_path.parent_path().string() : log_space::log_singletone::get_default_log_folder(); log_space::log_singletone::add_logger(LOGGER_FILE, log_file_path.filename().string().c_str(), log_dir.c_str()); - LOG_PRINT_L0(CRYPTONOTE_NAME << " v" << PROJECT_VERSION_LONG); + LOG_PRINT_L0(CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL); if (command_line_preprocessor(vm)) { @@ -240,7 +240,7 @@ bool command_line_preprocessor(const boost::program_options::variables_map& vm) bool exit = false; if (command_line::get_arg(vm, command_line::arg_version)) { - std::cout << CRYPTONOTE_NAME << " v" << PROJECT_VERSION_LONG << ENDL; + std::cout << CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL << ENDL; exit = true; } if (command_line::get_arg(vm, arg_os_version)) diff --git a/src/daemon/daemon_commands_handler.h b/src/daemon/daemon_commands_handler.h index 165cded21..2d0f7e5a8 100644 --- a/src/daemon/daemon_commands_handler.h +++ b/src/daemon/daemon_commands_handler.h @@ -83,7 +83,7 @@ private: std::string get_commands_str() { std::stringstream ss; - ss << CRYPTONOTE_NAME << " v" << PROJECT_VERSION_LONG << ENDL; + ss << CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL << ENDL; ss << "Commands: " << ENDL; std::string usage = m_cmd_binder.get_usage(); boost::replace_all(usage, "\n", "\n "); |