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

Update preference sandbox logic.

Browse Source 
Release/RC version: no sandbox
Testing releases (tagged prerelease version): -test
Development builds: -branchname (if at the head of a branch)
                    -(commitid) (if in a headless state)

And in the unlikely event someone tries to build a non-release version
from a tarball instead of git, its sandbox will be "-unreleased".
This commit is contained in:
sawinglogz 2020-01-17 15:59:29 -05:00
parent f7502d6369
commit 796f4659ab
1 changed files with 25 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
oscar/version.cpp
View File

@ -33,17 +33,32 @@ static const QString s_BuildDateTime = __DATE__ " " __TIME__;
QString getPrereleaseSuffix() QString getPrereleaseSuffix()
{ {
QString suffix; QString suffix;
// Append branch if there is a branch specified
if (GIT_BRANCH != "master") {
suffix += "-" GIT_BRANCH;
}
// Append "-test" if not release or release candidate if (getVersion().IsReleaseVersion() || getVersion().PrereleaseType().compare("rc") == 0) {
else if (getVersion().IsReleaseVersion() == false) { // No suffix for release or rc versions.
if (getVersion().PrereleaseType().compare("rc") != 0) { suffix = "";
suffix += "-test"; } else {
} #ifdef GIT_TAG
// If this commit has a tag, then it's a full testing (alpha/beta/etc.) release.
// Put preferences/data in "-test".
suffix = "-test";
#else
// Otherwise it's a development build, which will be identified by its branch in most cases.
#ifdef GIT_BRANCH
suffix = "-" GIT_BRANCH;
#elif GIT_REVISION
// If we've checked out an older version, we're in a headless state and not on any branch.
// If the older version was a previous testing release, it should be tagged, in which case
// it's treated as a testing release above.
//
// Otherwise this is probably being used for regression testing an older build.
suffix = "-" GIT_REVISION;
#else
// In theory someone might try to build a prerelease from a tarball, so we don't have any
// revision information. Just put it in an "-unreleased" sandbox.
suffix = "-unreleased";
#endif
#endif
} }
return suffix; return suffix;