diff options
| author | Drew DeVault <sir@cmpwn.com> | 2019-02-05 14:37:31 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-02-05 14:37:31 +0100 |
| commit | 876bc9e44c41661664aceee3cf4585b1586afbd9 (patch) | |
| tree | 7ee293bf255b7778629c268f382689739a607981 | |
| parent | 478b128c26057dcd7c97aaf5f91aa08dfce7d38f (diff) | |
| parent | 77587ee632db2f047e5e0b7979b0319ed2257405 (diff) | |
Merge pull request #3578 from jubalh/version
Set version in project file
| -rw-r--r-- | meson.build | 12 | ||||
| -rw-r--r-- | meson_options.txt | 1 |
2 files changed, 4 insertions, 9 deletions
diff --git a/meson.build b/meson.build index 766bf012..c50fab17 100644 --- a/meson.build +++ b/meson.build @@ -1,6 +1,7 @@ project( 'sway', 'c', + version: '1.0', license: 'MIT', meson_version: '>=0.48.0', default_options: [ @@ -127,17 +128,12 @@ endif add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c') -version = get_option('sway-version') -if version != '' - version = '"@0@"'.format(version) -else - if not git.found() - error('git is required to make the version string') - endif - +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()) endif add_project_arguments('-DSWAY_VERSION=@0@'.format(version), language: 'c') diff --git a/meson_options.txt b/meson_options.txt index 04b29e17..d3667acf 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -1,4 +1,3 @@ -option('sway-version', type : 'string', description: 'The version string reported in `sway --version`.') option('default-wallpaper', type: 'boolean', value: true, description: 'Install the default wallpaper.') option('zsh-completions', type: 'boolean', value: true, description: 'Install zsh shell completions.') option('bash-completions', type: 'boolean', value: true, description: 'Install bash shell completions.') |