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

Move version-related code into version.cpp.

Browse Source
This commit is contained in:
sawinglogz 2020-01-13 18:37:32 -05:00
parent 097362dfa1
commit 6f194507a8
7 changed files with 189 additions and 184 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

43
oscar/SleepLib/common.cpp
View File

@ -30,7 +30,6 @@
#include <zlib.h>
#endif
#include "git_info.h"
#include "version.h"
#include "profiles.h"
#include "mainwindow.h"
@ -68,15 +67,6 @@ void SetDateFormat () {
qDebug() << "shortened date format" << MedDateFormat << "dayFirst" << dayFirst;
}
const QString & gitRevision()
{
return GIT_REVISION;
}
const QString & gitBranch()
{
return GIT_BRANCH;
}
const QString getDeveloperName()
{
return STR_DeveloperName;
@ -92,9 +82,9 @@ const QString getAppName()
QString name = STR_AppName;
// Append branch if there is a branch specified
if (GIT_BRANCH != "master") {
name += "-"+GIT_BRANCH;
// qDebug() << "getAppName, not master, name is" << name << "branch is" << GIT_BRANCH;
if (gitBranch() != "master") {
name += "-"+gitBranch();
// qDebug() << "getAppName, not master, name is" << name << "branch is" << gitBranch();
}
// Append "-test" if not release
@ -112,8 +102,8 @@ const QString getModifiedAppData()
QString appdata = STR_AppData;
// Append branch if there is a branch specified
if (GIT_BRANCH != "master")
appdata += "-"+GIT_BRANCH;
if (gitBranch() != "master")
appdata += "-"+gitBranch();
// Append "-test" if not release
else if (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) ||
@ -214,23 +204,6 @@ QString getGraphicsEngine()
#endif
return gfxEngine;
}
QString getBranchVersion()
{
QString version = STR_TR_AppVersion;
if (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) ||
(ReleaseStatus.compare("release", Qt::CaseInsensitive)==0)))
version += " ("+GIT_REVISION + ")";
if (GIT_BRANCH != "master") {
version += " [Branch: " + GIT_BRANCH + "]";
}
#ifdef BROKEN_OPENGL_BUILD
version += " ["+CSTR_GFX_BrokenGL+"]";
#endif
return version;
}
QStringList buildInfo;
@ -238,10 +211,10 @@ QStringList makeBuildInfo (QString relinfo, QString forcedEngine){
buildInfo << (STR_AppName + " " + VersionString + " " + relinfo);
buildInfo << (QObject::tr("Built with Qt") + " " + QT_VERSION_STR + " on " + __DATE__ + " " + __TIME__);
QString branch = "";
if (GIT_BRANCH != "master") {
branch = QObject::tr("Branch:") + " " + GIT_BRANCH + ", ";
if (gitBranch() != "master") {
branch = QObject::tr("Branch:") + " " + gitBranch() + ", ";
}
buildInfo << branch + (QObject::tr("Revision")) + " " + GIT_REVISION;
buildInfo << branch + (QObject::tr("Revision")) + " " + gitRevision();
if (getAppName() != STR_AppName) // Report any non-standard app key
buildInfo << (QObject::tr("App key:") + " " + getAppName());
buildInfo << QString("");

5
oscar/SleepLib/common.h
View File

@ -1,4 +1,4 @@
/* Common code and junk
/* Common code and junk
*
* Copyright (C) 2011-2018 Mark Watkins <mark@jedimark.net>
*
@ -33,7 +33,6 @@ extern bool dayFirst;
//! \brief Gets the first day of week from the system locale, to show in the calendars.
Qt::DayOfWeek firstDayOfWeekFromLocale();
QString getBranchVersion();
QString getGFXEngine();
bool gfxEgnineIsSupported(GFXEngine e);
@ -44,8 +43,6 @@ QString appResourcePath();
QString getGraphicsEngine();
QString getOpenGLVersionString();
float getOpenGLVersion();
const QString & gitRevision();
const QString & gitBranch();
QStringList makeBuildInfo(QString relinfo, QString forcedEngine);
QStringList getBuildInfo();

143
oscar/UpdaterWindow.cpp
View File

@ -1,4 +1,4 @@
/* UpdaterWindow
/* UpdaterWindow
*
* Copyright (c) 2011-2018 Mark Watkins <mark@jedimark.net>
*
@ -273,147 +273,6 @@ void UpdaterWindow::requestFile()
************************************************************/
#endif
int checkVersionStatus(QString statusstr)
{
bool ok;
// because Qt Install Framework is dumb and doesn't handle beta/release strings in version numbers,
// so we store them numerically instead
int v =statusstr.toInt(&ok);
if (ok) {
return v;
}
if ((statusstr.compare("testing", Qt::CaseInsensitive) == 0) || (statusstr.compare("unstable", Qt::CaseInsensitive) == 0)) return 0;
else if ((statusstr.compare("beta", Qt::CaseInsensitive) == 0) || (statusstr.compare("untamed", Qt::CaseInsensitive) == 0)) return 1;
else if ((statusstr.compare("rc", Qt::CaseInsensitive) == 0) || (statusstr.compare("almost", Qt::CaseInsensitive) == 0)) return 2;
else if ((statusstr.compare("r", Qt::CaseInsensitive) == 0) || (statusstr.compare("stable", Qt::CaseInsensitive) == 0)) return 3;
// anything else is considered a test build
return 0;
}
struct VersionStruct {
short major;
short minor;
short revision;
short status;
short build;
};
VersionStruct parseVersion(QString versionstring)
{
static VersionStruct version;
QStringList parts = versionstring.split(".");
bool ok, dodgy = false;
if (parts.size() < 3) dodgy = true;
short major = parts[0].toInt(&ok);
if (!ok) dodgy = true;
short minor = parts[1].toInt(&ok);
if (!ok) dodgy = true;
QStringList patchver = parts[2].split("-");
if (patchver.size() < 3) dodgy = true;
short rev = patchver[0].toInt(&ok);
if (!ok) dodgy = true;
short build = patchver[2].toInt(&ok);
if (!ok) dodgy = true;
int status = checkVersionStatus(patchver[1]);
if (!dodgy) {
version.major = major;
version.minor = minor;
version.revision = rev;
version.status = status;
version.build = build;
}
return version;
}
// Compare supplied version string with current version
// < 0 = this one is newer or version supplied is dodgy, 0 = same, and > 0 there is a newer version
int compareVersion(QString version)
{
// v1.0.0-beta-2
QStringList parts = version.split(".");
bool ok;
if (parts.size() < 3) {
// dodgy version string supplied.
return -1;
}
int major = parts[0].toInt(&ok);
if (!ok) return -1;
int minor = parts[1].toInt(&ok);
if (!ok) return -1;
if (major > major_version) {
return 1;
} else if (major < major_version) {
return -1;
}
if (minor > minor_version) {
return 1;
} else if (minor < minor_version) {
return -1;
}
int build_index = 1;
int build = 0;
int status = 0;
QStringList patchver = parts[2].split("-");
if (patchver.size() >= 3) {
build_index = 2;
status = checkVersionStatus(patchver[1]);
} else if (patchver.size() < 2) {
return -1;
// dodgy version string supplied.
}
int rev = patchver[0].toInt(&ok);
if (!ok) return -1;
if (rev > revision_number) {
return 1;
} else if (rev < revision_number) {
return -1;
}
build = patchver[build_index].toInt(&ok);
if (!ok) return -1;
int rstatus = checkVersionStatus(ReleaseStatus);
if (patchver.size() == 3) {
// read it if it's actually present.
}
if (status > rstatus) {
return 1;
} else if (status < rstatus) {
return -1;
}
if (build > build_number) {
return 1;
} else if (build < build_number) {
return -1;
}
// Versions match
return 0;
}
#ifndef NO_UPDATER
const QString UPDATE_ROSCAR = "com.jedimark.sleepyhead";

2
oscar/main.cpp
View File

@ -45,8 +45,6 @@
MainWindow *mainwin = nullptr;
int compareVersion(QString version);
int numFilesCopied = 0;
// Count the number of files in this directory and all subdirectories

1
oscar/mainwindow.cpp
View File

@ -56,7 +56,6 @@
#include "UpdaterWindow.h"
#include "SleepLib/calcs.h"
#include "SleepLib/progressdialog.h"
#include "version.h"
#include "reports.h"
#include "statistics.h"

173
oscar/version.cpp
View File

@ -7,6 +7,8 @@
* for more details. */
#include "version.h"
#include "git_info.h"
#include "SleepLib/common.h"
const int major_version = 1; // incompatible API changes
const int minor_version = 1; // new features that don't break things
@ -28,3 +30,174 @@ const QString PlatformString = "Linux";
#elif defined(Q_OS_HAIKU)
const QString PlatformString = "Haiku";
#endif
const QString & gitRevision()
{
return GIT_REVISION;
}
const QString & gitBranch()
{
return GIT_BRANCH;
}
QString getBranchVersion()
{
QString version = STR_TR_AppVersion;
if (!((ReleaseStatus.compare("r", Qt::CaseInsensitive)==0) ||
(ReleaseStatus.compare("release", Qt::CaseInsensitive)==0)))
version += " ("+GIT_REVISION + ")";
if (GIT_BRANCH != "master") {
version += " [Branch: " + GIT_BRANCH + "]";
}
#ifdef BROKEN_OPENGL_BUILD
version += " ["+CSTR_GFX_BrokenGL+"]";
#endif
return version;
}
int checkVersionStatus(QString statusstr)
{
bool ok;
// because Qt Install Framework is dumb and doesn't handle beta/release strings in version numbers,
// so we store them numerically instead
int v =statusstr.toInt(&ok);
if (ok) {
return v;
}
if ((statusstr.compare("testing", Qt::CaseInsensitive) == 0) || (statusstr.compare("unstable", Qt::CaseInsensitive) == 0)) return 0;
else if ((statusstr.compare("beta", Qt::CaseInsensitive) == 0) || (statusstr.compare("untamed", Qt::CaseInsensitive) == 0)) return 1;
else if ((statusstr.compare("rc", Qt::CaseInsensitive) == 0) || (statusstr.compare("almost", Qt::CaseInsensitive) == 0)) return 2;
else if ((statusstr.compare("r", Qt::CaseInsensitive) == 0) || (statusstr.compare("stable", Qt::CaseInsensitive) == 0)) return 3;
// anything else is considered a test build
return 0;
}
struct VersionStruct {
short major;
short minor;
short revision;
short status;
short build;
};
VersionStruct parseVersion(QString versionstring)
{
static VersionStruct version;
QStringList parts = versionstring.split(".");
bool ok, dodgy = false;
if (parts.size() < 3) dodgy = true;
short major = parts[0].toInt(&ok);
if (!ok) dodgy = true;
short minor = parts[1].toInt(&ok);
if (!ok) dodgy = true;
QStringList patchver = parts[2].split("-");
if (patchver.size() < 3) dodgy = true;
short rev = patchver[0].toInt(&ok);
if (!ok) dodgy = true;
short build = patchver[2].toInt(&ok);
if (!ok) dodgy = true;
int status = checkVersionStatus(patchver[1]);
if (!dodgy) {
version.major = major;
version.minor = minor;
version.revision = rev;
version.status = status;
version.build = build;
}
return version;
}
// Compare supplied version string with current version
// < 0 = this one is newer or version supplied is dodgy, 0 = same, and > 0 there is a newer version
int compareVersion(const QString & version)
{
// v1.0.0-beta-2
QStringList parts = version.split(".");
bool ok;
if (parts.size() < 3) {
// dodgy version string supplied.
return -1;
}
int major = parts[0].toInt(&ok);
if (!ok) return -1;
int minor = parts[1].toInt(&ok);
if (!ok) return -1;
if (major > major_version) {
return 1;
} else if (major < major_version) {
return -1;
}
if (minor > minor_version) {
return 1;
} else if (minor < minor_version) {
return -1;
}
int build_index = 1;
int build = 0;
int status = 0;
QStringList patchver = parts[2].split("-");
if (patchver.size() >= 3) {
build_index = 2;
status = checkVersionStatus(patchver[1]);
} else if (patchver.size() < 2) {
return -1;
// dodgy version string supplied.
}
int rev = patchver[0].toInt(&ok);
if (!ok) return -1;
if (rev > revision_number) {
return 1;
} else if (rev < revision_number) {
return -1;
}
build = patchver[build_index].toInt(&ok);
if (!ok) return -1;
int rstatus = checkVersionStatus(ReleaseStatus);
if (patchver.size() == 3) {
// read it if it's actually present.
}
if (status > rstatus) {
return 1;
} else if (status < rstatus) {
return -1;
}
if (build > build_number) {
return 1;
} else if (build < build_number) {
return -1;
}
// Versions match
return 0;
}

6
oscar/version.h
View File

@ -23,4 +23,10 @@ extern const QString ShortVersionString;
extern const QString PlatformString;
int compareVersion(const QString & version);
QString getBranchVersion();
const QString & gitRevision();
const QString & gitBranch();
#endif // VERSION_H