From f96e9d5ab71e0818d9c431a589279badbfa9a8b9 Mon Sep 17 00:00:00 2001 From: xmrig Date: Sun, 20 Aug 2017 10:32:52 +0300 Subject: [PATCH 1/6] Update README.md --- README.md | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 972777df..e6648bc5 100644 --- a/README.md +++ b/README.md @@ -18,9 +18,10 @@ Originally based on cpuminer-multi with heavy optimizations/rewrites and removin * [Contacts](#contacts) ## Features -* High performance (290+ H/s on i7 6700). +* High performance. * Official Windows support. -* Small Windows executable, only 535 KB without dependencies. +* Small Windows executable, without dependencies. +* x86/x64 support. * Support for backup (failover) mining server. * keepalived support. * Command line options compatible with cpuminer. From 7b44fa37372217684b0609dbbf130c3b65d8f02a Mon Sep 17 00:00:00 2001 From: XMRig Date: Sun, 20 Aug 2017 10:39:19 +0300 Subject: [PATCH 2/6] v2.3.0 --- src/version.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/version.h b/src/version.h index 81e95391..4e55f786 100644 --- a/src/version.h +++ b/src/version.h @@ -26,8 +26,8 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" -#define APP_DESC "Monero (XMR) CPU miner" -#define APP_VERSION "2.3.0-dev" +#define APP_DESC "XMRig CPU miner" +#define APP_VERSION "2.3.0" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2017 xmrig.com" From 4e039a9bce01508e4925bd22469484983ae327f5 Mon Sep 17 00:00:00 2001 From: XMRig Date: Tue, 22 Aug 2017 11:16:33 +0300 Subject: [PATCH 3/6] #68 Fixed console output in docker containers. --- src/log/ConsoleLog.cpp | 7 ++++++- src/version.h | 4 ++-- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/src/log/ConsoleLog.cpp b/src/log/ConsoleLog.cpp index 6439eb07..1ea81a39 100644 --- a/src/log/ConsoleLog.cpp +++ b/src/log/ConsoleLog.cpp @@ -133,7 +133,12 @@ void ConsoleLog::text(const char* fmt, va_list args) bool ConsoleLog::isWritable() const { - return uv_is_writable(reinterpret_cast(&m_tty)) == 1 && uv_guess_handle(1) == UV_TTY; + if (uv_is_writable(reinterpret_cast(&m_tty)) != 1) { + return false; + } + + const uv_handle_type type = uv_guess_handle(1); + return type == UV_TTY || type == UV_NAMED_PIPE; } diff --git a/src/version.h b/src/version.h index 4e55f786..2a0818a5 100644 --- a/src/version.h +++ b/src/version.h @@ -27,14 +27,14 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig CPU miner" -#define APP_VERSION "2.3.0" +#define APP_VERSION "2.3.1-dev" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2017 xmrig.com" #define APP_VER_MAJOR 2 #define APP_VER_MINOR 3 -#define APP_VER_BUILD 0 +#define APP_VER_BUILD 1 #define APP_VER_REV 0 #ifdef _MSC_VER From 6bf1ef01707ac5f6efb9a806b09d4e33e8356ec4 Mon Sep 17 00:00:00 2001 From: xmrig Date: Fri, 25 Aug 2017 22:21:58 +0300 Subject: [PATCH 4/6] Update CHANGELOG.md --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 800a7184..eee4cf70 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,6 @@ +# v2.3.1 +- [#68](https://github.com/xmrig/xmrig/issues/68) Fixed compatibility with Docker containers, was nothing print on console. + # v2.3.0 - Added `--cpu-priority` option (0 idle, 2 normal to 5 highest). - Added `--user-agent` option, to set custom user-agent string for pool. For example `cpuminer-multi/0.1`. From 6f89c51db5c69de647632acc4f9bc7f51baa320a Mon Sep 17 00:00:00 2001 From: XMRig Date: Fri, 25 Aug 2017 22:24:42 +0300 Subject: [PATCH 5/6] v2.3.1 --- src/version.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/version.h b/src/version.h index 2a0818a5..b272e7b9 100644 --- a/src/version.h +++ b/src/version.h @@ -27,7 +27,7 @@ #define APP_ID "xmrig" #define APP_NAME "XMRig" #define APP_DESC "XMRig CPU miner" -#define APP_VERSION "2.3.1-dev" +#define APP_VERSION "2.3.1" #define APP_DOMAIN "xmrig.com" #define APP_SITE "www.xmrig.com" #define APP_COPYRIGHT "Copyright (C) 2016-2017 xmrig.com" From 850e355049fb471b3ea339b44c0ef244478886f1 Mon Sep 17 00:00:00 2001 From: XMRig Date: Tue, 29 Aug 2017 23:41:57 +0300 Subject: [PATCH 6/6] Force define __STDC_FORMAT_MACROS on all platforms. --- CMakeLists.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index 04fccdc1..021ffc30 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -125,6 +125,7 @@ else() set(EXTRA_LIBS pthread) endif() +add_definitions(/D__STDC_FORMAT_MACROS) add_definitions(/DUNICODE) #add_definitions(/DAPP_DEBUG) @@ -148,7 +149,6 @@ if (CMAKE_CXX_COMPILER_ID MATCHES GNU) if (WIN32) set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static") - add_definitions(/D__STDC_FORMAT_MACROS) else() set(CMAKE_EXE_LINKER_FLAGS "${CMAKE_EXE_LINKER_FLAGS} -static-libgcc -static-libstdc++") endif()