Merge pull request #451 from RedGl0w/someFixOnOmega21

Added env var for omega state

apps/settings/Makefile

@@ -26,6 +26,8 @@ app_settings_src = $(addprefix apps/settings/,\
   sub_menu/selectable_view_with_messages.cpp \
 )
 
+SFLAGS += -DOMEGA_STATE="$(OMEGA_STATE)"
+
 app_settings_src += $(app_settings_test_src)
 apps_src += $(app_settings_src)
 

apps/settings/sub_menu/about_controller.cpp

@@ -9,6 +9,10 @@
 #define MP_STRINGIFY_HELPER(x) #x
 #define MP_STRINGIFY(x) MP_STRINGIFY_HELPER(x)
 
+#ifndef OMEGA_STATE
+#error This file expects OMEGA_STATE to be defined
+#endif
+
 namespace Settings {
 
 AboutController::AboutController(Responder * parentResponder) :
@@ -53,7 +57,7 @@ bool AboutController::handleEvent(Ion::Events::Event event) {
       if (childLabel == I18n::Message::OmegaVersion) {
         MessageTableCellWithBuffer * myCell = (MessageTableCellWithBuffer *)m_selectableTableView.selectedCell();
         if (strcmp(myCell->accessoryText(), Ion::omegaVersion()) == 0) {
-          myCell->setAccessoryText("Dev"); //Change for public/dev
+          myCell->setAccessoryText(MP_STRINGIFY(OMEGA_STATE)); //Change for public/dev
           return true;
         }
         myCell->setAccessoryText(Ion::omegaVersion());

build/config.mak

@@ -7,6 +7,7 @@ HOME_DISPLAY_EXTERNALS ?= 1
 EPSILON_VERSION ?= 15.3.1
 OMEGA_VERSION ?= 1.21.0
 # OMEGA_USERNAME ?= N/A
+OMEGA_STATE ?= dev
 EPSILON_APPS ?= calculation rpn graph code statistics probability solver atom sequence regression settings external
 EPSILON_I18N ?= en fr
 EPSILON_COUNTRIES ?= WW CA DE ES FR GB IT NL PT US