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

Merge pull request #45 from jubalh/version

Browse Source 
Set version in project file
This commit is contained in:
Drew DeVault 2019-02-05 14:37:17 +01:00 committed by GitHub
commit 1db5c78037
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 4 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
meson.build
View File

@ -1,6 +1,7 @@
project( project(
'swaylock', 'swaylock',
'c', 'c',
version: '1.3',
license: 'MIT', license: 'MIT',
meson_version: '>=0.48.0', meson_version: '>=0.48.0',
default_options: [ default_options: [
@ -47,17 +48,12 @@ 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 = get_option('swaylock-version') if git.found()
if version != ''
version = '"@0@"'.format(version)
else
if not git.found()
error('git is required to make the version string')
endif
git_commit_hash = run_command([git.path(), 'describe', '--always', '--tags']).stdout().strip() 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() git_branch = run_command([git.path(), 'rev-parse', '--abbrev-ref', 'HEAD']).stdout().strip()
version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch) version = '"@0@ (" __DATE__ ", branch \'@1@\')"'.format(git_commit_hash, git_branch)
else
version = '"@0@"'.format(meson.project_version())
endif endif
add_project_arguments('-DSWAYLOCK_VERSION=@0@'.format(version), language: 'c') add_project_arguments('-DSWAYLOCK_VERSION=@0@'.format(version), language: 'c')

1
meson_options.txt
View File

@ -1,4 +1,3 @@
option('swaylock-version', type : 'string', description: 'The version string reported in `swaylock --version`')
option('pam', type: 'feature', value: 'auto', description: 'Use PAM instead of shadow') option('pam', type: 'feature', value: 'auto', description: 'Use PAM instead of shadow')
option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats') option('gdk-pixbuf', type: 'feature', value: 'auto', description: 'Enable support for more image formats')
option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages') option('man-pages', type: 'feature', value: 'auto', description: 'Generate and install man pages')