AstralTransRocketries/FjordLauncher
1
0
Fork 0
mirror of https://github.com/unmojang/FjordLauncher.git synced 2025-09-12 16:55:13 -04:00
Code Issues Packages Projects Releases Wiki Activity

updater: support patch version number

Browse Source
This commit is contained in:
Evan Goode 2025-01-11 20:24:51 -05:00
parent 9914a729bd
commit 16e396748c
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
launcher/updater/prismupdater/PrismUpdater.cpp
View File

@ -297,6 +297,7 @@ 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();
m_prismVersionPatch = version_parts.takeFirst().toInt();
}
m_allowPreRelease = parser.isSet("pre-release");
@ -543,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;
}
@ -551,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 patch:" << m_prismVersionPatch;
qDebug() << "Version channel:" << m_prsimVersionChannel;
qDebug() << "Git Commit:" << m_prismGitCommit;
@ -1266,6 +1269,7 @@ bool PrismUpdaterApp::loadPrismVersionFromExe(const QString& exe_path)
return false;
m_prismVersionMajor = version_parts.takeFirst().toInt();
m_prismVersionMinor = version_parts.takeFirst().toInt();
m_prismVersionPatch = version_parts.takeFirst().toInt();
m_prismGitCommit = lines.takeFirst().simplified();
return true;
}
@ -1389,7 +1393,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(QString::number(m_prismVersionMajor)).arg(QString::number(m_prismVersionMinor)).arg(QString::number(m_prismVersionPatch)));
return current_ver < release.version;
}

1
launcher/updater/prismupdater/PrismUpdater.h
View File

@ -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;