update version
This commit is contained in:
parent
b98d88c17e
commit
5c71f5d13e
@ -162,7 +162,7 @@ int main(int argc, char* argv[])
|
|||||||
|
|
||||||
if (command_line::get_arg(vm, command_line::arg_help))
|
if (command_line::get_arg(vm, command_line::arg_help))
|
||||||
{
|
{
|
||||||
std::cout << CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL << ENDL << ENDL;
|
std::cout << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL << ENDL;
|
||||||
std::cout << desc_options << std::endl;
|
std::cout << desc_options << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -152,7 +152,7 @@ int main(int argc, char* argv[])
|
|||||||
|
|
||||||
if (command_line::get_arg(vm, command_line::arg_help))
|
if (command_line::get_arg(vm, command_line::arg_help))
|
||||||
{
|
{
|
||||||
std::cout << CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL << ENDL << ENDL;
|
std::cout << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL << ENDL;
|
||||||
std::cout << desc_options << std::endl;
|
std::cout << desc_options << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -86,7 +86,7 @@ int main(int argc, char* argv[])
|
|||||||
|
|
||||||
if (command_line::get_arg(vm, command_line::arg_help))
|
if (command_line::get_arg(vm, command_line::arg_help))
|
||||||
{
|
{
|
||||||
std::cout << CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL << ENDL << ENDL;
|
std::cout << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL << ENDL;
|
||||||
std::cout << desc_options << std::endl;
|
std::cout << desc_options << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -615,7 +615,7 @@ int main(int argc, char* argv[])
|
|||||||
|
|
||||||
if (command_line::get_arg(vm, command_line::arg_help))
|
if (command_line::get_arg(vm, command_line::arg_help))
|
||||||
{
|
{
|
||||||
std::cout << CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL << ENDL << ENDL;
|
std::cout << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL << ENDL;
|
||||||
std::cout << desc_options << std::endl;
|
std::cout << desc_options << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -75,7 +75,7 @@ int main(int argc, char* argv[])
|
|||||||
|
|
||||||
if (command_line::get_arg(vm, command_line::arg_help))
|
if (command_line::get_arg(vm, command_line::arg_help))
|
||||||
{
|
{
|
||||||
std::cout << CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL << ENDL << ENDL;
|
std::cout << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL << ENDL;
|
||||||
std::cout << desc_options << std::endl;
|
std::cout << desc_options << std::endl;
|
||||||
return 1;
|
return 1;
|
||||||
}
|
}
|
||||||
|
@ -251,7 +251,7 @@ bool t_command_server::help(const std::vector<std::string>& args)
|
|||||||
std::string t_command_server::get_commands_str()
|
std::string t_command_server::get_commands_str()
|
||||||
{
|
{
|
||||||
std::stringstream ss;
|
std::stringstream ss;
|
||||||
ss << CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL << std::endl;
|
ss << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << std::endl;
|
||||||
ss << "Commands: " << std::endl;
|
ss << "Commands: " << std::endl;
|
||||||
std::string usage = m_command_lookup.get_usage();
|
std::string usage = m_command_lookup.get_usage();
|
||||||
boost::replace_all(usage, "\n", "\n ");
|
boost::replace_all(usage, "\n", "\n ");
|
||||||
|
@ -56,7 +56,7 @@ namespace daemonize
|
|||||||
boost::program_options::variables_map const & vm
|
boost::program_options::variables_map const & vm
|
||||||
)
|
)
|
||||||
{
|
{
|
||||||
LOG_PRINT_L0(CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL);
|
LOG_PRINT_L0("Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL);
|
||||||
return t_daemon{vm};
|
return t_daemon{vm};
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -112,7 +112,7 @@ int main(int argc, char const * argv[])
|
|||||||
|
|
||||||
if (command_line::get_arg(vm, command_line::arg_help))
|
if (command_line::get_arg(vm, command_line::arg_help))
|
||||||
{
|
{
|
||||||
std::cout << CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL << ENDL << ENDL;
|
std::cout << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL << ENDL;
|
||||||
std::cout << "Usage: " + std::string{argv[0]} + " [options|settings] [daemon_command...]" << std::endl << std::endl;
|
std::cout << "Usage: " + std::string{argv[0]} + " [options|settings] [daemon_command...]" << std::endl << std::endl;
|
||||||
std::cout << visible_options << std::endl;
|
std::cout << visible_options << std::endl;
|
||||||
return 0;
|
return 0;
|
||||||
@ -121,7 +121,7 @@ int main(int argc, char const * argv[])
|
|||||||
// Monero Version
|
// Monero Version
|
||||||
if (command_line::get_arg(vm, command_line::arg_version))
|
if (command_line::get_arg(vm, command_line::arg_version))
|
||||||
{
|
{
|
||||||
std::cout << CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL << ENDL;
|
std::cout << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")" << ENDL;
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -81,7 +81,7 @@ namespace daemonizer
|
|||||||
}
|
}
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
//LOG_PRINT_L0(CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL);
|
//LOG_PRINT_L0("Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL);
|
||||||
return executor.run_interactive(vm);
|
return executor.run_interactive(vm);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -175,7 +175,7 @@ namespace daemonizer
|
|||||||
}
|
}
|
||||||
else // interactive
|
else // interactive
|
||||||
{
|
{
|
||||||
//LOG_PRINT_L0(CRYPTONOTE_NAME << " v" << MONERO_VERSION_FULL);
|
//LOG_PRINT_L0("Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL);
|
||||||
return executor.run_interactive(vm);
|
return executor.run_interactive(vm);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -2467,14 +2467,14 @@ int main(int argc, char* argv[])
|
|||||||
|
|
||||||
if (command_line::get_arg(vm, command_line::arg_help))
|
if (command_line::get_arg(vm, command_line::arg_help))
|
||||||
{
|
{
|
||||||
success_msg_writer() << CRYPTONOTE_NAME << " " << sw::tr("wallet") << " v" << MONERO_VERSION_FULL;
|
success_msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
|
||||||
success_msg_writer() << sw::tr("Usage:") << " simplewallet [--wallet-file=<file>|--generate-new-wallet=<file>] [--daemon-address=<host>:<port>] [<COMMAND>]";
|
success_msg_writer() << sw::tr("Usage:") << " simplewallet [--wallet-file=<file>|--generate-new-wallet=<file>] [--daemon-address=<host>:<port>] [<COMMAND>]";
|
||||||
success_msg_writer() << desc_all;
|
success_msg_writer() << desc_all;
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
else if (command_line::get_arg(vm, command_line::arg_version))
|
else if (command_line::get_arg(vm, command_line::arg_version))
|
||||||
{
|
{
|
||||||
success_msg_writer() << CRYPTONOTE_NAME << " " << sw::tr("wallet") << " v" << MONERO_VERSION_FULL;
|
success_msg_writer() << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
|
||||||
return false;
|
return false;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2507,7 +2507,7 @@ int main(int argc, char* argv[])
|
|||||||
LOG_LEVEL_4
|
LOG_LEVEL_4
|
||||||
);
|
);
|
||||||
|
|
||||||
message_writer(epee::log_space::console_color_white, true) << CRYPTONOTE_NAME << " " << sw::tr("wallet") << " v" << MONERO_VERSION_FULL;
|
message_writer(epee::log_space::console_color_white, true) << "Monero '" << MONERO_RELEASE_NAME << "' (v" << MONERO_VERSION_FULL << ")";
|
||||||
|
|
||||||
if(command_line::has_arg(vm, arg_log_level))
|
if(command_line::has_arg(vm, arg_log_level))
|
||||||
log_level = command_line::get_arg(vm, arg_log_level);
|
log_level = command_line::get_arg(vm, arg_log_level);
|
||||||
|
@ -1,3 +1,4 @@
|
|||||||
#define MONERO_VERSION_TAG "@VERSIONTAG@"
|
#define MONERO_VERSION_TAG "@VERSIONTAG@"
|
||||||
#define MONERO_VERSION "0.8.8.7"
|
#define MONERO_VERSION "0.9.0.0"
|
||||||
|
#define MONERO_RELEASE_NAME "Hydrogen Helix"
|
||||||
#define MONERO_VERSION_FULL MONERO_VERSION "-" MONERO_VERSION_TAG
|
#define MONERO_VERSION_FULL MONERO_VERSION "-" MONERO_VERSION_TAG
|
||||||
|
Loading…
Reference in New Issue
Block a user