pjht/swaylock
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #53 from swaywm/fix-meson-version

Browse Source 
Fix --version when building from tarball
This commit is contained in:
Drew DeVault 2019-02-12 23:27:26 +01:00 committed by GitHub
commit 6b3be42264
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
meson.build
View File

@ -48,12 +48,13 @@ git = find_program('git', required: false)
scdoc = find_program('scdoc', required: get_option('man-pages')) scdoc = find_program('scdoc', required: get_option('man-pages'))
wayland_scanner = find_program('wayland-scanner') wayland_scanner = find_program('wayland-scanner')
version = '"@0@"'.format(meson.project_version())
if git.found() if git.found()
git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip() git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags'])
git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip() git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD'])
version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch) if git_commit_hash.returncode() == 0 and git_branch.returncode() == 0
else version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash.stdout().strip(), git_branch.stdout().strip())
version = '"@0@"'.format(meson.project_version()) endif
endif endif
add_project_arguments('-DSWAYLOCK_VERSION=@0@'.format(version), language: 'c') add_project_arguments('-DSWAYLOCK_VERSION=@0@'.format(version), language: 'c')