From 0bae47a75488e2fd1bcab8b141976763e4d81e95 Mon Sep 17 00:00:00 2001 From: Unknown Date: Fri, 10 Nov 2017 19:19:07 +0000 Subject: Define GIT_COMMIT_HASH via cmake or git archive --- xmrstak/cli/cli-miner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xmrstak/cli/cli-miner.cpp') diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp index 5c16c1b..d103293 100644 --- a/xmrstak/cli/cli-miner.cpp +++ b/xmrstak/cli/cli-miner.cpp @@ -85,7 +85,7 @@ void help() cout<<" -u, --user USERNAME pool user name or wallet address"< Date: Fri, 10 Nov 2017 20:39:25 +0000 Subject: Versioning final version --- xmrstak/cli/cli-miner.cpp | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) (limited to 'xmrstak/cli/cli-miner.cpp') diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp index d103293..6a6191b 100644 --- a/xmrstak/cli/cli-miner.cpp +++ b/xmrstak/cli/cli-miner.cpp @@ -85,7 +85,7 @@ void help() cout<<" -u, --user USERNAME pool user name or wallet address"<print_str("-------------------------------------------------------------------\n"); - printer::inst()->print_str( XMR_STAK_NAME" " XMR_STAK_VERSION " mining software.\n"); + printer::inst()->print_str(get_version_str_short().c_str()); + printer::inst()->print_str("\n\n"); + printer::inst()->print_str("Brought to you by fireice_uk and psychocrypt under GPLv3.\n"); printer::inst()->print_str("Based on CPU mining code by wolf9466 (heavily optimized by fireice_uk).\n"); #ifndef CONF_NO_CUDA - printer::inst()->print_str("NVIDIA mining code was written by KlausT and psychocrypt.\n"); + printer::inst()->print_str("Original NVIDIA mining code was written by KlausT and psychocrypt.\n"); #endif #ifndef CONF_NO_OPENCL - printer::inst()->print_str("AMD mining code was written by wolf9466.\n"); + printer::inst()->print_str("Original mining code was written by wolf9466.\n"); #endif - printer::inst()->print_str("Brought to you by fireice_uk and psychocrypt under GPLv3.\n\n"); char buffer[64]; - snprintf(buffer, sizeof(buffer), "Configurable dev donation level is set to %.1f %%\n\n", fDevDonationLevel * 100.0); + snprintf(buffer, sizeof(buffer), "\nConfigurable dev donation level is set to %.1f%%\n\n", fDevDonationLevel * 100.0); printer::inst()->print_str(buffer); printer::inst()->print_str("You can use following keys to display reports:\n"); printer::inst()->print_str("'h' - hashrate\n"); -- cgit v1.1 From f0875b614c6fe77a70af443052cef07756e135b4 Mon Sep 17 00:00:00 2001 From: psychocrypt Date: Sat, 11 Nov 2017 21:50:26 +0100 Subject: add cli option `-v/--version` --- xmrstak/cli/cli-miner.cpp | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'xmrstak/cli/cli-miner.cpp') diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp index 6a6191b..6e391d9 100644 --- a/xmrstak/cli/cli-miner.cpp +++ b/xmrstak/cli/cli-miner.cpp @@ -63,6 +63,7 @@ void help() cout<<"Usage: "< Date: Mon, 13 Nov 2017 19:56:41 +0000 Subject: Add version to web and json --- xmrstak/cli/cli-miner.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'xmrstak/cli/cli-miner.cpp') diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp index 6e391d9..038b51b 100644 --- a/xmrstak/cli/cli-miner.cpp +++ b/xmrstak/cli/cli-miner.cpp @@ -299,7 +299,7 @@ int main(int argc, char *argv[]) } if(opName.compare("-v") == 0 || opName.compare("--version") == 0) { - std::cout<< "Version: " << get_version_str() << std::endl; + std::cout<< "Version: " << get_version_str_short() << std::endl; return 0; } else if(opName.compare("--noCPU") == 0) -- cgit v1.1 From 2fe70265070627042a24041eea17e6527d642918 Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 13 Nov 2017 20:28:16 +0000 Subject: Added long version as a separate option --- xmrstak/cli/cli-miner.cpp | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'xmrstak/cli/cli-miner.cpp') diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp index 038b51b..b4de18d 100644 --- a/xmrstak/cli/cli-miner.cpp +++ b/xmrstak/cli/cli-miner.cpp @@ -302,6 +302,11 @@ int main(int argc, char *argv[]) std::cout<< "Version: " << get_version_str_short() << std::endl; return 0; } + else if(opName.compare("-V") == 0 || opName.compare("--version-long") == 0) + { + std::cout<< "Version: " << get_version_str() << std::endl; + return 0; + } else if(opName.compare("--noCPU") == 0) { params::inst().useCPU = false; -- cgit v1.1 From 48071db7386d50e6418ec8df9d005564c960906a Mon Sep 17 00:00:00 2001 From: Unknown Date: Mon, 13 Nov 2017 20:31:09 +0000 Subject: Change attribution --- xmrstak/cli/cli-miner.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'xmrstak/cli/cli-miner.cpp') diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp index b4de18d..da0db15 100644 --- a/xmrstak/cli/cli-miner.cpp +++ b/xmrstak/cli/cli-miner.cpp @@ -449,10 +449,10 @@ int main(int argc, char *argv[]) printer::inst()->print_str("Brought to you by fireice_uk and psychocrypt under GPLv3.\n"); printer::inst()->print_str("Based on CPU mining code by wolf9466 (heavily optimized by fireice_uk).\n"); #ifndef CONF_NO_CUDA - printer::inst()->print_str("Original NVIDIA mining code was written by KlausT and psychocrypt.\n"); + printer::inst()->print_str("Based on NVIDIA mining code by KlausT and psychocrypt.\n"); #endif #ifndef CONF_NO_OPENCL - printer::inst()->print_str("Original mining code was written by wolf9466.\n"); + printer::inst()->print_str("Based on OpenCL mining code by wolf9466.\n"); #endif char buffer[64]; snprintf(buffer, sizeof(buffer), "\nConfigurable dev donation level is set to %.1f%%\n\n", fDevDonationLevel * 100.0); -- cgit v1.1 From 04e4d28c98a76e9b0982674fdeb9f27a82a6790e Mon Sep 17 00:00:00 2001 From: psychocrypt Date: Mon, 13 Nov 2017 21:37:28 +0100 Subject: update help and documentation - update usage.md - hpdate help output --- xmrstak/cli/cli-miner.cpp | 1 + 1 file changed, 1 insertion(+) (limited to 'xmrstak/cli/cli-miner.cpp') diff --git a/xmrstak/cli/cli-miner.cpp b/xmrstak/cli/cli-miner.cpp index da0db15..284cf4a 100644 --- a/xmrstak/cli/cli-miner.cpp +++ b/xmrstak/cli/cli-miner.cpp @@ -64,6 +64,7 @@ void help() cout<<" "<