From 120fa83a64a1cbd7388149fd3ca8217519787da0 Mon Sep 17 00:00:00 2001 From: "J. Krieg" Date: Sat, 13 Jul 2013 14:49:04 +0200 Subject: [PATCH] imageinfo: add possibility to display a custom text for image version Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/a1640dd9586ae7b2bd26facf6d09d23743be3cf0 Author: J. Krieg Date: 2013-07-13 (Sat, 13 Jul 2013) ------------------ No further description and justification available within origin commit message! ------------------ This commit was generated by Migit --- src/gui/imageinfo.cpp | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/gui/imageinfo.cpp b/src/gui/imageinfo.cpp index 3135e7577..289a0c53d 100644 --- a/src/gui/imageinfo.cpp +++ b/src/gui/imageinfo.cpp @@ -186,16 +186,20 @@ void CImageInfo::InitInfos() const char * builddate = config.getString("builddate", "n/a").c_str(); #endif + std::string version_string; +#ifdef IMAGE_VERSION + version_string = IMAGE_VERSION; +#else const char * _version = config.getString("version", "U000000000000000").c_str(); static CFlashVersionInfo versionInfo(_version); - std::string version_string; version_string = versionInfo.getReleaseCycle(); version_string += " "; version_string += versionInfo.getType(); version_string += " ("; version_string += versionInfo.getDate(); version_string += ")"; +#endif struct utsname uts_info;