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

- configure: change release cycle handling; we don't need two defines for release cycle

Browse Source 
Signed-off-by: GetAway <get-away@t-online.de>
This commit is contained in:
svenhoefer
2020-06-14 12:33:59 +02:00
committed by GetAway
parent 33ecf51bdb
commit c0c21f7daf
3 changed files with 4 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
configure.ac
View File

@@ -2,7 +2,7 @@
define(ver_major, 3) define(ver_major, 3)
define(ver_minor, 11) define(ver_minor, 11)
define(ver_micro, 1) define(ver_micro, 1)
define(neutrino_rel_cycle, ver_major.ver_minor) define(rel_cycle, "ver_major.0")
# sync with current git # sync with current git
define(ver_git, m4_esyscmd([ define(ver_git, m4_esyscmd([
@@ -20,14 +20,13 @@ AC_INIT(Tuxbox-Neutrino,ver_major.ver_minor.ver_micro)
AM_INIT_AUTOMAKE([nostdinc foreign]) AM_INIT_AUTOMAKE([nostdinc foreign])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
AC_DEFINE(RELEASE_CYCLE, "3.0", [Release cycle information; used in update code; only relevant for flash image releases ]) AC_DEFINE(PACKAGE_RELEASE_CYCLE, rel_cycle, [Release cycle information; used in update code; only relevant for flash image releases ])
AC_DEFINE(PACKAGE_VERSION_MAJOR, ver_major, [Major version number]) AC_DEFINE(PACKAGE_VERSION_MAJOR, ver_major, [Major version number])
AC_DEFINE(PACKAGE_VERSION_MINOR, ver_minor, [Minor version number]) AC_DEFINE(PACKAGE_VERSION_MINOR, ver_minor, [Minor version number])
AC_DEFINE(PACKAGE_VERSION_MICRO, ver_micro, [Micro version number]) AC_DEFINE(PACKAGE_VERSION_MICRO, ver_micro, [Micro version number])
AC_DEFINE(PACKAGE_VERSION_GIT, "ver_git", [internal vcs version info]) AC_DEFINE(PACKAGE_VERSION_GIT, "ver_git", [internal vcs version info])
AC_DEFINE(PACKAGE_VERSION_DATE, "ver_date", [internal built date]) AC_DEFINE(PACKAGE_VERSION_DATE, "ver_date", [internal built date])
AC_DEFINE(PACKAGE_VERSION_NEUTRINO_REL_CYCLE, neutrino_rel_cycle, [Neutrino release cycle])
TUXBOX_APPS TUXBOX_APPS
TUXBOX_APPS_DIRECTORY TUXBOX_APPS_DIRECTORY

2
src/gui/update.cpp
View File

@@ -432,7 +432,7 @@ bool CFlashUpdate::checkVersion4Update()
if (gotImage) if (gotImage)
{ {
if ((strncmp(RELEASE_CYCLE, versionInfo->getReleaseCycle(), 2) != 0) && if ((strncmp(PACKAGE_RELEASE_CYCLE, versionInfo->getReleaseCycle(), 2) != 0) &&
(ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_WRONGBASE, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE) != CMsgBox::mbrYes)) (ShowMsg(LOCALE_MESSAGEBOX_INFO, LOCALE_FLASHUPDATE_WRONGBASE, CMsgBox::mbrYes, CMsgBox::mbYes | CMsgBox::mbNo, NEUTRINO_ICON_UPDATE) != CMsgBox::mbrYes))
{ {
delete versionInfo; delete versionInfo;

2
src/system/flashtool.cpp
View File

@@ -463,7 +463,7 @@ CFlashVersionInfo::CFlashVersionInfo(const std::string & _versionString)
snapshot = versionString[0]; snapshot = versionString[0];
// recover release cycle version // recover release cycle version
// will be compared with RELEASE_CYCLE, which is defined in configure.ac as "x.0" // will be compared with PACKAGE_RELEASE_CYCLE, which is defined in configure.ac as "x.0"
releaseCycle[0] = versionString[1]; releaseCycle[0] = versionString[1];
releaseCycle[1] = '.'; releaseCycle[1] = '.';
releaseCycle[2] = '0'; releaseCycle[2] = '0';