fix: build profile can be specified manually
Some checks are pending
/ cargo-fmtcheck (push) Waiting to run
/ cargo-clippy (push) Waiting to run
/ cargo-test (push) Waiting to run
/ appimage (push) Waiting to run

This commit is contained in:
Gabriele Musco 2024-12-08 12:15:00 +01:00
parent 68d7757aa4
commit 46df6d36e5
2 changed files with 22 additions and 8 deletions

View file

@ -38,8 +38,12 @@ iconsdir = datadir / 'icons'
podir = meson.project_source_root() / 'po' podir = meson.project_source_root() / 'po'
gettext_package = meson.project_name() gettext_package = meson.project_name()
# are we building a tagged version? opt_profile = get_option('profile')
if run_command('git', 'describe', '--tags', '--exact-match').returncode() != 0
# if a profile isn't specified infer from git
if opt_profile == 'default'
# are we building a tagged version?
if run_command('git', 'describe', '--tags', '--exact-match').returncode() != 0
profile = 'Devel' profile = 'Devel'
vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD', check: false).stdout().strip() vcs_tag = run_command('git', 'rev-parse', '--short', 'HEAD', check: false).stdout().strip()
if vcs_tag == '' if vcs_tag == ''
@ -48,7 +52,16 @@ if run_command('git', 'describe', '--tags', '--exact-match').returncode() != 0
version_suffix = '-@0@'.format(vcs_tag) version_suffix = '-@0@'.format(vcs_tag)
endif endif
application_id = '@0@.@1@'.format(base_id, profile) application_id = '@0@.@1@'.format(base_id, profile)
else else
profile = ''
version_suffix = ''
application_id = base_id
endif
elif opt_profile == 'development'
profile = 'Devel'
version_suffix = '-devel'
application_id = '@0@.@1@'.format(base_id, profile)
elif opt_profile == 'release'
profile = '' profile = ''
version_suffix = '' version_suffix = ''
application_id = base_id application_id = base_id

View file

@ -3,6 +3,7 @@ option(
type: 'combo', type: 'combo',
choices: [ choices: [
'default', 'default',
'release',
'development' 'development'
], ],
value: 'default', value: 'default',