tyler.durden/icinga2
1
0
Fork 0
mirror of https://github.com/Icinga/icinga2.git synced 2025-07-19 19:54:34 +02:00
Code Issues Packages Projects Releases Wiki Activity

Add Windows version string to --version

Browse Source 
fixes #8888
This commit is contained in:
Jean Flach 2015-04-28 12:34:33 +02:00 committed by Jean-Marcel Flach
parent f13460a2dd
commit 1c7d6895bd
1 changed files with 72 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
lib/base/application.cpp
View File

@ -42,6 +42,9 @@
#ifdef __linux__ #ifdef __linux__
#include <sys/prctl.h> #include <sys/prctl.h>
#endif /* __linux__ */ #endif /* __linux__ */
#ifdef _WIN32
#include <VersionHelpers.h>
#endif /*_WIN32*/
using namespace icinga; using namespace icinga;
@ -538,6 +541,29 @@ int ReleaseHelper(std::string &result)
return 0; return 0;
} }
#else
static String WindowsVersionHelper()
{
//Minimum required Version, the installer/user is in the responsibility to take care of that
String winver = "Windows Vista";
if (IsWindowsVistaSP1OrGreater())
winver = "Windows Vista SP1";
if (IsWindowsVistaSP2OrGreater())
winver = "Windows Vista SP2";
if (IsWindows7OrGreater())
winver = "Windows 7";
if (IsWindows7SP1OrGreater())
winver = "Windows 7 SP1";
if (IsWindows8OrGreater())
winver = "Windows 8";
if (IsWindows8Point1OrGreater())
winver = "Windows 8.1 or greater";
if (IsWindowsServer())
winver += " (Server)";
return winver;
}
#endif /* _WIN32 */ #endif /* _WIN32 */
/** /**
@ -567,6 +593,11 @@ void Application::DisplayInfoMessage(std::ostream& os, bool skipVersion)
<< " Operating system: " << UnameHelper('s') << "\n" << " Operating system: " << UnameHelper('s') << "\n"
<< " Operating system version: " << UnameHelper('r') << "\n" << " Operating system version: " << UnameHelper('r') << "\n"
<< " Architecture: " << UnameHelper('m') << "\n"; << " Architecture: " << UnameHelper('m') << "\n";
#else
os << "\n"
<< "System information:\n"
<< " Operating system: Windows\n"
<< " Operating system version: " << WindowsVersionHelper() << "\n";
#endif /* _WIN32 */ #endif /* _WIN32 */
#ifdef __linux__ #ifdef __linux__