From 0390ed83f8153faeda67881018d29222e3f0aec7 Mon Sep 17 00:00:00 2001
From: Klaus Basan <klaus.basan@klausbasan.de>
Date: Tue, 19 Dec 2017 03:09:52 +0100
Subject: [PATCH] Ref T210, removed branch flags

Our distribution concept allows dynamic assigments of the distribution.
So a particular version can change its stability.
---
 mkspecs/features/config.pri            |  2 --
 src/blackconfig/buildconfig.cpp        | 45 ++++++++++++++++----------
 src/blackconfig/buildconfig.h          | 10 ++----
 src/blackconfig/buildconfig_gen.cpp.in | 20 ------------
 4 files changed, 30 insertions(+), 47 deletions(-)

diff --git a/mkspecs/features/config.pri b/mkspecs/features/config.pri
index 14e022ee3..a4bbb7c59 100644
--- a/mkspecs/features/config.pri
+++ b/mkspecs/features/config.pri
@@ -56,8 +56,6 @@ include(vatsim.pri)
 !contains(BLACK_CONFIG, FS9) { DEFINE_WITH_FS9 = "//" }
 !contains(BLACK_CONFIG, FSUIPC) { DEFINE_WITH_FSUIPC = "//" }
 !contains(BLACK_CONFIG, XPlane) { DEFINE_WITH_XPLANE = "//" }
-!contains(BLACK_CONFIG, SwiftDevBranch) { DEFINE_SWIFT_DEV_BRANCH = "//" }
-!contains(BLACK_CONFIG, SwiftStableBranch) { DEFINE_SWIFT_STABLE_BRANCH = "//" }
 !contains(BLACK_CONFIG, SwiftVatsimSupport) { DEFINE_SWIFT_VATSIM_SUPPORT = "//" }
 
 # Global compiler Macros
diff --git a/src/blackconfig/buildconfig.cpp b/src/blackconfig/buildconfig.cpp
index b6f621070..814f8c9d0 100644
--- a/src/blackconfig/buildconfig.cpp
+++ b/src/blackconfig/buildconfig.cpp
@@ -120,22 +120,30 @@ namespace BlackConfig
 #endif
     }
 
-    bool CBuildConfig::isLifetimeExpired()
+    namespace Private
     {
-        if (getEol().isValid())
+        bool isLocalDeveloperBuildImpl()
         {
-            return QDateTime::currentDateTime() > getEol();
-        }
-        else
-        {
-            return true;
+            const QString p = QCoreApplication::applicationDirPath().toLower();
+
+            // guessing, feel free to add path checks
+            if (p.contains("build")) { return true; }
+            if (p.contains("msvc")) { return true; }
+            return false;
         }
     }
 
-    bool CBuildConfig::canRunInDeveloperEnvironment()
+    bool CBuildConfig::isLocalDeveloperDebugBuild()
     {
-        if (CBuildConfig::isDevBranch()) { return true; }
-        return !CBuildConfig::isStableBranch();
+        if (!CBuildConfig::isDebugBuild()) { return false; }
+        static const bool devBuild = Private::isLocalDeveloperBuildImpl();
+        return devBuild;
+    }
+
+    bool CBuildConfig::isLifetimeExpired()
+    {
+        if (!getEol().isValid()) { return true; }
+        return QDateTime::currentDateTime() > getEol();
     }
 
     QString boolToYesNo(bool v)
@@ -263,18 +271,21 @@ namespace BlackConfig
         return parts;
     }
 
-    int buildWordSizeImpl()
+    namespace Private
     {
-        if (CBuildConfig::getBuildAbiParts().length() < 3) { return -1; }
-        const QString abiWs = CBuildConfig::getBuildAbiParts()[2];
-        if (abiWs.contains("32")) { return 32; }
-        if (abiWs.contains("64")) { return 64; }
-        return -1;
+        int buildWordSizeImpl()
+        {
+            if (CBuildConfig::getBuildAbiParts().length() < 3) { return -1; }
+            const QString abiWs = CBuildConfig::getBuildAbiParts()[2];
+            if (abiWs.contains("32")) { return 32; }
+            if (abiWs.contains("64")) { return 64; }
+            return -1;
+        }
     }
 
     int CBuildConfig::buildWordSize()
     {
-        static const int bws = buildWordSizeImpl();
+        static const int bws = Private::buildWordSizeImpl();
         return bws;
     }
 } // ns
diff --git a/src/blackconfig/buildconfig.h b/src/blackconfig/buildconfig.h
index 3af2a8fa5..966d9bf78 100644
--- a/src/blackconfig/buildconfig.h
+++ b/src/blackconfig/buildconfig.h
@@ -62,14 +62,8 @@ namespace BlackConfig
         //! Release build?
         static bool isReleaseBuild();
 
-        //! DEV. branch?
-        static bool isDevBranch(); // defined in buildconfig_gen.cpp.in
-
-        //! STABLE branch?
-        static bool isStableBranch(); // defined in buildconfig_gen.cpp.in
-
-        //! Can run in dev. environment?
-        static bool canRunInDeveloperEnvironment();
+        //! Local build for developers
+        static bool isLocalDeveloperDebugBuild();
 
         //! Vatsim enabled version?
         static bool isVatsimVersion(); // defined in buildconfig_gen.cpp.in
diff --git a/src/blackconfig/buildconfig_gen.cpp.in b/src/blackconfig/buildconfig_gen.cpp.in
index 22bcf27a1..be8af07c7 100644
--- a/src/blackconfig/buildconfig_gen.cpp.in
+++ b/src/blackconfig/buildconfig_gen.cpp.in
@@ -23,8 +23,6 @@ $$DEFINE_WITH_P3D#define WITH_P3D
 $$DEFINE_WITH_FS9#define WITH_FS9
 $$DEFINE_WITH_FSUIPC#define WITH_FSUIPC
 $$DEFINE_WITH_XPLANE#define WITH_XPLANE
-$$DEFINE_SWIFT_DEV_BRANCH#define SWIFT_DEV_BRANCH
-$$DEFINE_SWIFT_STABLE_BRANCH#define SWIFT_STABLE_BRANCH
 $$DEFINE_SWIFT_VATSIM_SUPPORT#define SWIFT_VATSIM_SUPPORT
 
 bool BlackConfig::CBuildConfig::isCompiledWithBlackCore()
@@ -108,24 +106,6 @@ bool BlackConfig::CBuildConfig::isCompiledWithGui()
 #endif
 }
 
-bool BlackConfig::CBuildConfig::isDevBranch()
-{
-#ifdef SWIFT_DEV_BRANCH
-        return true;
-#else
-        return false;
-#endif
-}
-
-bool BlackConfig::CBuildConfig::isStableBranch()
-{
-#ifdef SWIFT_STABLE_BRANCH
-    return true;
-#else
-    return false;
-#endif
-}
-
 bool BlackConfig::CBuildConfig::isVatsimVersion()
 {
 #ifdef SWIFT_VATSIM_SUPPORT