Start using patch versioning for launcher (#3605)
This commit is contained in:
@@ -282,6 +282,10 @@ PrismUpdaterApp::PrismUpdaterApp(int& argc, char** argv) : QApplication(argc, ar
|
||||
auto version_parts = version.split('.');
|
||||
m_prismVersionMajor = version_parts.takeFirst().toInt();
|
||||
m_prismVersionMinor = version_parts.takeFirst().toInt();
|
||||
if (!version_parts.isEmpty())
|
||||
m_prismVersionPatch = version_parts.takeFirst().toInt();
|
||||
else
|
||||
m_prismVersionPatch = 0;
|
||||
}
|
||||
|
||||
m_allowPreRelease = parser.isSet("pre-release");
|
||||
@@ -540,6 +544,7 @@ void PrismUpdaterApp::run()
|
||||
m_prismVersion = BuildConfig.printableVersionString();
|
||||
m_prismVersionMajor = BuildConfig.VERSION_MAJOR;
|
||||
m_prismVersionMinor = BuildConfig.VERSION_MINOR;
|
||||
m_prismVersionPatch = BuildConfig.VERSION_PATCH;
|
||||
m_prsimVersionChannel = BuildConfig.VERSION_CHANNEL;
|
||||
m_prismGitCommit = BuildConfig.GIT_COMMIT;
|
||||
}
|
||||
@@ -548,6 +553,7 @@ void PrismUpdaterApp::run()
|
||||
qDebug() << "Executable reports as:" << m_prismBinaryName << "version:" << m_prismVersion;
|
||||
qDebug() << "Version major:" << m_prismVersionMajor;
|
||||
qDebug() << "Version minor:" << m_prismVersionMinor;
|
||||
qDebug() << "Version minor:" << m_prismVersionPatch;
|
||||
qDebug() << "Version channel:" << m_prsimVersionChannel;
|
||||
qDebug() << "Git Commit:" << m_prismGitCommit;
|
||||
|
||||
@@ -1261,6 +1267,10 @@ bool PrismUpdaterApp::loadPrismVersionFromExe(const QString& exe_path)
|
||||
return false;
|
||||
m_prismVersionMajor = version_parts.takeFirst().toInt();
|
||||
m_prismVersionMinor = version_parts.takeFirst().toInt();
|
||||
if (!version_parts.isEmpty())
|
||||
m_prismVersionPatch = version_parts.takeFirst().toInt();
|
||||
else
|
||||
m_prismVersionPatch = 0;
|
||||
m_prismGitCommit = lines.takeFirst().simplified();
|
||||
return true;
|
||||
}
|
||||
@@ -1384,7 +1394,7 @@ GitHubRelease PrismUpdaterApp::getLatestRelease()
|
||||
|
||||
bool PrismUpdaterApp::needUpdate(const GitHubRelease& release)
|
||||
{
|
||||
auto current_ver = Version(QString("%1.%2").arg(QString::number(m_prismVersionMajor)).arg(QString::number(m_prismVersionMinor)));
|
||||
auto current_ver = Version(QString("%1.%2.%3").arg(m_prismVersionMajor).arg(m_prismVersionMinor).arg(m_prismVersionPatch));
|
||||
return current_ver < release.version;
|
||||
}
|
||||
|
||||
|
||||
@@ -121,6 +121,7 @@ class PrismUpdaterApp : public QApplication {
|
||||
QString m_prismVersion;
|
||||
int m_prismVersionMajor = -1;
|
||||
int m_prismVersionMinor = -1;
|
||||
int m_prismVersionPatch = -1;
|
||||
QString m_prsimVersionChannel;
|
||||
QString m_prismGitCommit;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user