fix a mistake that I put a broken version into stable tree, I added a line that shouldn't be there
This commit is contained in:
parent
26b2de0d67
commit
7428365f06
4 changed files with 7 additions and 10 deletions
13
meson.build
13
meson.build
|
@ -1,10 +1,11 @@
|
|||
project('patricus utils', 'c', version: '3.4')
|
||||
|
||||
# Get the short git commit hash
|
||||
git_hash = run_command('git', 'rev-parse', 'HEAD', check: true).stdout().strip()
|
||||
|
||||
# Combine version and hash
|
||||
full_version = '@0@(@1@)'.format(meson.project_version(), git_hash)
|
||||
branch_name = run_command('git', 'rev-parse', '--abbrev-ref', 'HEAD', check: true).stdout().strip()
|
||||
if branch_name.startswith('stable/')
|
||||
full_version = meson.project_version()
|
||||
else
|
||||
git_hash = run_command('git', 'rev-parse', 'HEAD', check: true).stdout().strip()
|
||||
full_version = '@0@(@1@)'.format(meson.project_version(), git_hash)
|
||||
endif
|
||||
|
||||
# Generate header
|
||||
conf = configuration_data()
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue