chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-06 11:10:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

Update version logic to drive entirely from defined string rather than individual components.

Browse Source
This commit is contained in:
sawinglogz 2020-01-15 19:27:03 -05:00
parent 93b9007f67
commit f7f1ddfcbd
2 changed files with 21 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
oscar/version.cpp
View File

@ -9,19 +9,10 @@
#include "version.h" #include "version.h"
#include "git_info.h" #include "git_info.h"
#include "SleepLib/common.h" #include "SleepLib/common.h"
#include <QRegularExpression> #include <QRegularExpression>
const int major_version = 1; // incompatible API changes
const int minor_version = 1; // new features that don't break things
const int revision_number = 0; // bugfixes, revisions
const QString ReleaseStatus = "beta"; // testing/nightly/unstable, beta/untamed, rc/almost, r/stable
#include "build_number.h"
#define VERSION "1.1.0-beta-1" #define VERSION "1.1.0-beta-1"
extern const QString VersionString = VERSION;
const QString VersionString = QString("%1.%2.%3-%4-%5").arg(major_version).arg(minor_version).arg(revision_number).arg(ReleaseStatus).arg(build_number);
const QString ShortVersionString = QString("%1.%2.%3").arg(major_version).arg(minor_version).arg(revision_number);
#ifdef Q_OS_MAC #ifdef Q_OS_MAC
const QString PlatformString = "MacOSX"; const QString PlatformString = "MacOSX";
@ -49,8 +40,7 @@ QString getBranchVersion()
{ {
QString version = STR_TR_AppVersion; QString version = STR_TR_AppVersion;
if (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || if (getVersion().IsReleaseVersion() == false)
(ReleaseStatus.compare("release", Qt::CaseInsensitive)==0)))
version += " ("+GIT_REVISION + ")"; version += " ("+GIT_REVISION + ")";
if (GIT_BRANCH != "master") { if (GIT_BRANCH != "master") {
@ -73,10 +63,11 @@ QString getPrereleaseSuffix()
suffix += "-"+gitBranch(); suffix += "-"+gitBranch();
} }
// Append "-test" if not release // Append "-test" if not release or release candidate
else if (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) || else if (getVersion().IsReleaseVersion() == false) {
(ReleaseStatus.compare("rc", Qt::CaseInsensitive)==0) )) { if (getVersion().PrereleaseType().compare("rc") != 0) {
suffix += "-test"; suffix += "-test";
}
} }
return suffix; return suffix;
@ -85,7 +76,7 @@ QString getPrereleaseSuffix()
bool isReleaseVersion() bool isReleaseVersion()
{ {
return (ReleaseStatus == "r"); return getVersion().IsReleaseVersion();
} }
@ -106,6 +97,18 @@ Version::operator const QString &() const
return mString; return mString;
} }
// This is application-specific interpretation of the prerelease data.
const QString Version::PrereleaseType() const
{
// Extract the first identifier
QString type = mPrerelease.section(".", 0);
// Remove any "-2", etc. that's included in the first identifier rather than as a dot-separated identifier
type = type.section("-", 0);
return type.toLower();
}
// Parse a version string as specified by Semantic Versioning 2.0.0, see https://semver.org/spec/v2.0.0.html // Parse a version string as specified by Semantic Versioning 2.0.0, see https://semver.org/spec/v2.0.0.html
void Version::ParseSemanticVersion() void Version::ParseSemanticVersion()
{ {

1
oscar/version.h
View File

@ -18,6 +18,7 @@ class Version
public: public:
Version(const QString & version_string); Version(const QString & version_string);
operator const QString &() const; operator const QString &() const;
const QString PrereleaseType() const;
bool IsReleaseVersion() const { return mPrerelease.isEmpty(); } bool IsReleaseVersion() const { return mPrerelease.isEmpty(); }
bool IsValid() const { return mIsValid; } bool IsValid() const { return mIsValid; }
bool operator==(const Version & b) const { return Compare(*this, b) == 0; } bool operator==(const Version & b) const { return Compare(*this, b) == 0; }