diff options
| author | Simon Ser <contact@emersion.fr> | 2019-10-14 15:03:28 +0300 |
|---|---|---|
| committer | Drew DeVault <sir@cmpwn.com> | 2019-10-16 09:42:28 -0400 |
| commit | 72ba9bef4b538279b13f9e5abfcca93010688607 (patch) | |
| tree | b30ce0632d8cd212ed42b6cfe4217692e2387ca3 | |
| parent | 344c259ec0479c3e8243d4c9b0519103c3297d23 (diff) | |
| download | sway-72ba9bef4b538279b13f9e5abfcca93010688607.tar.xz | |
build: always use the project version
Don't use the latest tag, always use the project version for the version
string. Because of version branches, getting the version from Git can be
unreliable.
Closes: https://github.com/swaywm/sway/issues/4631
| -rw-r--r-- | meson.build | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/meson.build b/meson.build index cb0715f6..d74861f1 100644 --- a/meson.build +++ b/meson.build @@ -54,7 +54,6 @@ elogind = dependency('libelogind', version: '>=239', required: false) xcb = dependency('xcb', required: get_option('xwayland')) math = cc.find_library('m') rt = cc.find_library('rt') -git = find_program('git', native: true, required: false) # Try first to find wlroots as a subproject, then as a system dependency wlroots_version = ['>=0.8.1', '<0.9.0'] @@ -130,11 +129,16 @@ endif add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') version = '"@0@"'.format(meson.project_version()) +git = find_program('git', native: true, required: false) if git.found() - git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']) - git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']) - if git_commit_hash.returncode() == 0 and git_branch.returncode() == 0 - version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash.stdout().strip(), git_branch.stdout().strip()) + git_commit = run_command([git, 'rev-parse', '--short', 'HEAD']) + git_branch = run_command([git, 'rev-parse', '--abbrev-ref', 'HEAD']) + if git_commit.returncode() == 0 and git_branch.returncode() == 0 + version = '"@0@-@1@ (" __DATE__ ", branch \'@2@\')"'.format( + meson.project_version(), + git_commit.stdout().strip(), + git_branch.stdout().strip(), + ) endif endif add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c') |