diff options
| author | Drew DeVault <sir@cmpwn.com> | 2019-02-12 23:22:13 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-12 23:22:13 +0100 |
| commit | f390a6ef8c8956c85409f95b5c70d8b9f0a8f55c (patch) | |
| tree | fbb49d4c743f817a6c4668369b62762decf6cbc1 /meson.build | |
| parent | fb4f29289fd8d1f94975e64fded6657222ed5390 (diff) | |
| parent | cfee167b7bd1c67f8dbed96d69de4050d8860b06 (diff) | |
Merge pull request #3667 from emersion/fix-meson-version
Fix --version when building from tarball
Diffstat (limited to 'meson.build')
| -rw-r--r-- | meson.build | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/meson.build b/meson.build index c50fab17..2336a148 100644 --- a/meson.build +++ b/meson.build @@ -128,12 +128,13 @@ endif add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') +version = '"@0@"'.format(meson.project_version()) if git.found() - git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip() - git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip() - version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch) -else - version = '"@0@"'.format(meson.project_version()) + 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()) + endif endif add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c') |