mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-28 16:01:20 +02:00
Code Issues Packages Projects Releases Wiki Activity

- imageinfo: show both vcs-info and built-date

Browse Source
This commit is contained in:
svenhoefer
2013-06-01 09:52:19 +02:00
parent 5c0a692f13
commit ed9b4278b4
5 changed files with 15 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
src/gui/imageinfo.cpp
View File

@@ -40,8 +40,7 @@
#include <system/flashtool.h>
#include "version.h"
#define GIT_DESC "GIT Desc.:"
#define GIT_REV "GIT Build:"
#define LICENSEDIR DATADIR "/neutrino/license/"
using namespace std;
@@ -168,13 +167,13 @@ void CImageInfo::InitInfos()
{
v_info.clear();
#ifdef GITVERSION
const char * builddate = GITVERSION;
#ifdef BUILT_DATE
const char * builddate = BUILT_DATE;
#else
const char * builddate = config.getString("builddate", BUILT_DATE).c_str();
const char * builddate = config.getString("builddate", "n/a").c_str();
#endif
const char * _version = config.getString("version", "no version").c_str();
const char * _version = config.getString("version", "n/a").c_str();
static CFlashVersionInfo versionInfo(_version);
std::string version_string;
@@ -186,10 +185,14 @@ void CImageInfo::InitInfos()
image_info_t imagename = {LOCALE_IMAGEINFO_IMAGE, config.getString("imagename", "Neutrino-HD")};
v_info.push_back(imagename);
image_info_t date = {LOCALE_IMAGEINFO_DATE, builddate};
v_info.push_back(date);
image_info_t version = {LOCALE_IMAGEINFO_VERSION, version_string};
v_info.push_back(version);
#ifdef VCS
image_info_t vcs = {LOCALE_IMAGEINFO_VCS, VCS};
v_info.push_back(vcs);
#endif
image_info_t date = {LOCALE_IMAGEINFO_DATE, builddate};
v_info.push_back(date);
if (uname(&uts_info) == 0) {
image_info_t kernel = {LOCALE_IMAGEINFO_KERNEL, uts_info.release};
v_info.push_back(kernel);