mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-27 15:32:52 +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 
Origin commit data
------------------
Branch: ni/coolstream
Commit: 729b17dd1e
Author: vanhofen <vanhofen@gmx.de>
Date: 2019-01-01 (Tue, 01 Jan 2019)

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

------------------
No further description and justification available within origin commit message!

------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2019-01-01 21:50:50 +01:00
parent 648ab3d6bd
commit 1661c09a84
3 changed files with 4 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
configure.ac
View File

@@ -8,18 +8,16 @@ define(ver_micro, m4_esyscmd([
GITREV=$(git rev-list $GITTAG..HEAD --count); GITREV=$(git rev-list $GITTAG..HEAD --count);
printf "$GITREV" printf "$GITREV"
])) ]))
define(neutrino_rel_cycle, ver_major.ver_minor) define(rel_cycle, "ver_major.0")
AC_INIT(NI-Neutrino, ver_major.ver_minor.ver_micro) AC_INIT(NI-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, "ver_major.0", [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_NEUTRINO_REL_CYCLE, neutrino_rel_cycle, [Neutrino release cycle]) AC_DEFINE(PACKAGE_RELEASE_CYCLE, rel_cycle, [Release cycle information; used in update code; only relevant for flash image releases ])
TUXBOX_APPS TUXBOX_APPS
TUXBOX_APPS_DIRECTORY TUXBOX_APPS_DIRECTORY

2
src/gui/update.cpp
View File

@@ -418,7 +418,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

@@ -481,7 +481,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';