diff options
| author | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-02-16 16:58:58 +0100 |
|---|---|---|
| committer | Daan De Meyer <daan.j.demeyer@gmail.com> | 2024-02-21 14:01:25 +0100 |
| commit | 3f6ce3d4f04de0f765bb3bde0e400d0823829486 (patch) | |
| tree | dffc973b75f87412a4298f251abeaa8a6fd92fc1 /meson_options.txt | |
| parent | Set SYSTEMD_LOG_LEVEL=info explicitly in test-sysusers (diff) | |
| download | systemd-3f6ce3d4f04de0f765bb3bde0e400d0823829486.tar.xz systemd-3f6ce3d4f04de0f765bb3bde0e400d0823829486.zip | |
meson: Decouple the version tag from the vcs tag
Let's split off a new vcs-tag option from version-tag that configures whether
the current commit should be appended to the version tag. Doing this saves
us from having to fiddle around with generating git versions in packaging
specs and instead let's meson do it for us, even if we pass in a custom
version tag.
With this approach there's no more need for tools/meson-vcs-tag.sh so
we remove it.
Diffstat (limited to 'meson_options.txt')
| -rw-r--r-- | meson_options.txt | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/meson_options.txt b/meson_options.txt index b51af01721..4dea1a8bf3 100644 --- a/meson_options.txt +++ b/meson_options.txt @@ -2,9 +2,11 @@ # SPDX-License-Identifier: LGPL-2.1-or-later option('version-tag', type : 'string', - description : 'override the git version string') + description : 'set the extended version string (defaults to project version)') option('shared-lib-tag', type : 'string', description : 'override the private shared library version tag (defaults to project version)') +option('vcs-tag', type : 'boolean', value : true, + description : 'append current git commit to version output when git information is available') option('mode', type : 'combo', choices : ['developer', 'release'], description : 'autoenable features suitable for systemd development/release builds') |