mirrors/neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-neutrino/neutrino.git synced 2025-08-27 07:23:09 +02:00
Code Issues Packages Projects Releases Wiki Activity

imageinfo: add clean packag names, add fallback for missing built date

Browse Source
This commit is contained in:
Thilo Graf
2020-03-02 21:48:16 +01:00
parent a2ecf223fd
commit c687e87e7a
1 changed files with 10 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
src/gui/imageinfo.cpp
View File

@@ -45,7 +45,7 @@
#ifdef VCS #ifdef VCS
#include "version.h" #include "version.h"
#endif #endif
#include <gui/buildinfo.h> #include "buildinfo.h"
#define LICENSEDIR DATADIR "/neutrino/license/" #define LICENSEDIR DATADIR "/neutrino/license/"
#define POLICY_DIR DATADIR "/neutrino/policy/" #define POLICY_DIR DATADIR "/neutrino/policy/"
#ifdef ENABLE_LUA #ifdef ENABLE_LUA
@@ -307,11 +307,14 @@ void CImageInfo::InitInfoData()
config.loadConfig(VERSION_FILE); config.loadConfig(VERSION_FILE);
string builddate = "";
#ifdef BUILT_DATE #ifdef BUILT_DATE
const char * builddate = BUILT_DATE; builddate = BUILT_DATE;
#else #else
const char * builddate = config.getString("builddate", "n/a").c_str(); builddate = config.getString("builddate", "").c_str();
#endif #endif
if (builddate.empty())
builddate = PACKAGE_VERSION_DATE;
string version_string = config.getString("version", ""); string version_string = config.getString("version", "");
@@ -365,18 +368,20 @@ void CImageInfo::InitInfoData()
v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_CREATOR), creator}); v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_CREATOR), creator});
//gui //gui
v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_GUI), config.getString("gui", PACKAGE_STRING)}); v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_GUI), config.getString("gui", PACKAGE_NAME)});
#ifdef VCS #ifdef VCS
//gui vcs //gui vcs
v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS), VCS}); v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS), VCS});
#else
v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS), PACKAGE_VERSION_GIT});
#endif #endif
#if USE_STB_HAL #if USE_STB_HAL
hal_libversion_t ver; hal_libversion_t ver;
hal_get_lib_version(&ver); hal_get_lib_version(&ver);
//libstb-hal version //libstb-hal version
v_info.push_back({"libstb-hal:", ver.vStr}); v_info.push_back({"libstb-hal:", ver.vName});
//libstb-hal git status //libstb-hal git status
v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS), ver.vGitDescribe}); v_info.push_back({g_Locale->getText(LOCALE_IMAGEINFO_VCS), ver.vGitDescribe});
#endif #endif