From 61db02b977b19d31a47ecfa2dcc87ba59995013c Mon Sep 17 00:00:00 2001 From: vanhofen Date: Tue, 26 Dec 2017 00:36:06 +0100 Subject: [PATCH] update: move RELEASE_CYCLE define to configure.ac Origin commit data ------------------ Commit: https://github.com/neutrino-images/ni-neutrino/commit/32a5689d19a548b41070586abefc38e41acb02ff Author: vanhofen Date: 2017-12-26 (Tue, 26 Dec 2017) Origin message was: ------------------ - update: move RELEASE_CYCLE define to configure.ac --- configure.ac | 8 +++++++- src/gui/update.cpp | 1 - 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/configure.ac b/configure.ac index dfc4a91af..79f5b8b90 100644 --- a/configure.ac +++ b/configure.ac @@ -1,7 +1,13 @@ -AC_INIT(NI-Neutrino,3.50.0) +define(ver_major, 3) +define(ver_minor, 50) +define(ver_micro, 0) + +AC_INIT(NI-Neutrino, ver_major.ver_minor.ver_micro) AM_INIT_AUTOMAKE([1.0.1 nostdinc]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES]) +AC_DEFINE(RELEASE_CYCLE, "ver_major.0", [Release cycle information; used in update code]) + TUXBOX_APPS TUXBOX_APPS_DIRECTORY TUXBOX_APPS_PKGCONFIG diff --git a/src/gui/update.cpp b/src/gui/update.cpp index 35d24406d..f81335dbd 100644 --- a/src/gui/update.cpp +++ b/src/gui/update.cpp @@ -91,7 +91,6 @@ extern int allow_flash; #define LIST_OF_UPDATES_LOCAL_FILENAME "coolstream.list" #define UPDATE_LOCAL_FILENAME "update.img" -#define RELEASE_CYCLE "3.0" #define FILEBROWSER_UPDATE_FILTER "img" #define MTD_OF_WHOLE_IMAGE 0