Add -DVERSION flag for release version numbers #1194
Merged
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Currently, the version number (as shown by
sway --version
and used in other places) is based ongit describe
. But when packaging sway for Debian, where it is built outside of git, these information aren't available. Moreover, the version string contains information, such as date and branch, that aren't relevant for release builds, not to mention that the boilerplate to generate that version string is duplicated across the code base, which I fixed as well by havingCMakeList.txt
generate the version string. Finally, while on it, I also fixed the JSON version information in the IPC code.Note that I removed the code path for when
SWAY_GIT_VERSION
andSWAY_GIT_BRANCH
aren't defined. This was dead code anyway, asCMakeList.txt
always defined these macros, but merely with an empty string if running outside of git. Moreover, I think it is preferable having the build fail if neither-DVERSION
was given nor when building from git. Otherwise, package maintainers will easily forget to use-DVERSION
.