chris/OSCAR-code
1
0
Fork 0
mirror of https://gitlab.com/pholy/OSCAR-code.git synced 2025-04-09 20:50:43 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fix annoying precompiler limitation/bug in version sandbox logic.

Browse Source
This commit is contained in:
sawinglogz 2020-01-17 16:25:01 -05:00
parent 79ec192051
commit 62b5ba3a60
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
oscar/version.cpp
View File

@ -46,17 +46,19 @@ QString getPrereleaseSuffix()
// Otherwise it's a development build, which will be identified by its branch in most cases. // Otherwise it's a development build, which will be identified by its branch in most cases.
#ifdef GIT_BRANCH #ifdef GIT_BRANCH
suffix = "-" GIT_BRANCH; suffix = "-" GIT_BRANCH;
#elif GIT_REVISION #else
#ifdef GIT_REVISION
// If we've checked out an older version, we're in a headless state and not on any branch. // 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 // If the older version was a previous testing release, it should be tagged, in which case
// it's treated as a testing release above. // it's treated as a testing release above.
// //
// Otherwise this is probably being used for regression testing an older build. // Otherwise this is probably being used for regression testing an older build.
suffix = "-" GIT_REVISION; suffix = "-" GIT_REVISION;
#else #else
// In theory someone might try to build a prerelease from a tarball, so we don't have any // 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. // revision information. Just put it in an "-unreleased" sandbox.
suffix = "-unreleased"; suffix = "-unreleased";
#endif
#endif #endif
#endif #endif
} }