[checkmk-commits] 6189 FIX OpenHardwareMonitorCLI did not run on some Win7 machines

Module: check_mk Branch: master Commit: f7e83db8a82dc2f2d94c893daa23f94aa03a2383 URL: http://git.mathias-kettner.de/git/?p=check_mk.git;a=commit;h=f7e83db8a82dc2… Author: Jukka Aro <ja(a)mathias-kettner.de> Date: Fri May 25 08:24:56 2018 +0200 6189 FIX OpenHardwareMonitorCLI did not run on some Win7 machines OpenHardwareMonitorCLI, the executable wrapper for triggering OpenHardwareMonitor by Check_MK Windows Agent, did not run on some Win7 machines. Moreover, it was not possible to compile OpenHardwareMonitorCLI with versions 4.x of Mono (tried with Mono 4.6.2.0 / XBuild 14.0). Providing the build option /p:TargetFrameworkVersion="v4.5" both fixed the build with Mono 4.x and made resulting executable compatible with all tested Windows versions (tested on Win7 and Server 2016). Change-Id: Ibb1dbef32dee769a6a0e99ef80a16214c2d01787 --- .werks/6189 | 19 +++++++++++++++++++ omd/packages/openhardwaremonitor/Makefile | 2 +- .../Bin/Release/OpenHardwareMonitorCLI.exe | Bin 12288 -> 11264 bytes .../Bin/Release/OpenHardwareMonitorLib.dll | Bin 262144 -> 273408 bytes 4 files changed, 20 insertions(+), 1 deletion(-) diff --git a/.werks/6189 b/.werks/6189 new file mode 100644 index 0000000..a6445dc6 --- /dev/null +++ b/.werks/6189 @@ -0,0 +1,19 @@ +Title: OpenHardwareMonitorCLI did not run on some Win7 machines +Level: 1 +Component: checks +Compatible: compat +Edition: cre +Version: 1.6.0i1 +Date: 1527230306 +Class: fix + +OpenHardwareMonitorCLI, the executable wrapper for triggering +OpenHardwareMonitor by Check_MK Windows Agent, did not run on +some Win7 machines. Moreover, it was not possible to compile +OpenHardwareMonitorCLI with versions 4.x of Mono (tried with +Mono 4.6.2.0 / XBuild 14.0). Providing the build option +/p:TargetFrameworkVersion="v4.5" both fixed the build with Mono +4.x and made resulting executable compatible with all tested +Windows versions (tested on Win7 and Server 2016). + + diff --git a/omd/packages/openhardwaremonitor/Makefile b/omd/packages/openhardwaremonitor/Makefile index 90c352d..feb5f73 100755 --- a/omd/packages/openhardwaremonitor/Makefile +++ b/omd/packages/openhardwaremonitor/Makefile @@ -12,7 +12,7 @@ build: clean if [ -x "`which xbuild`" ] ; then \ unzip -d . $(DIR).zip ; \ cp -R OpenHardwareMonitorCLI OpenHardwareMonitor.sln $(DIR) ; \ - xbuild /p:Configuration=Release $(DIR)/OpenHardwareMonitor.sln /target:OpenHardwareMonitorCLI ; \ + xbuild /p:Configuration=Release /p:TargetFrameworkVersion="v4.5" $(DIR)/OpenHardwareMonitor.sln /target:OpenHardwareMonitorCLI ; \ fi install: diff --git a/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe b/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe old mode 100644 new mode 100755 index be2bc81..f116955 Binary files a/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe and b/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorCLI.exe differ diff --git a/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorLib.dll b/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorLib.dll old mode 100644 new mode 100755 index c953e57..fff3d88 Binary files a/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorLib.dll and b/omd/packages/openhardwaremonitor/openhardwaremonitor-0.8.0/Bin/Release/OpenHardwareMonitorLib.dll differ