Skip to content

Meson: extract config vars defined inside configuration_data({...}) #4275

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Sep 26, 2025
Merged

Meson: extract config vars defined inside configuration_data({...}) #4275

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ff3f7ae
Meson: extract config vars defined inside configuration_data({...})
masatake Jun 11, 2025
8511130
Meson: reorder entries in the tables for optimizing
masatake Jun 12, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions Units/parser-meson.r/config-inline.d/args.ctags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
--sort=no
--map-Meson=+.meson
--fields=+K
32 changes: 32 additions & 0 deletions Units/parser-meson.r/config-inline.d/expected.tags
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,32 @@
insights-client input.meson /^project('insights-client',$/;" project
python input.meson /^python = import('python')$/;" variable
python_installation input.meson /^python_installation = python.find_installation(get_option('python'))$/;" variable
python_exec input.meson /^python_exec = '\/usr\/bin\/python3'$/;" variable
systemd input.meson /^systemd = dependency('systemd', version: '>=231')$/;" variable
config_data input.meson /^config_data = configuration_data({$/;" cfgdata
bindir input.meson /^ 'bindir': get_option('prefix') \/ get_option('bindir'),$/;" cfgvar cfgdata:config_data
BINDIR input.meson /^ 'BINDIR': get_option('prefix') \/ get_option('bindir'),$/;" cfgvar cfgdata:config_data
DATADIR input.meson /^ 'DATADIR': get_option('prefix') \/ get_option('datadir'),$/;" cfgvar cfgdata:config_data
DATAROOTDIR input.meson /^ 'DATAROOTDIR':get_option('prefix') \/ get_option('datadir'),$/;" cfgvar cfgdata:config_data
DOCDIR input.meson /^ 'DOCDIR': get_option('prefix') \/ get_option('datadir') \/ 'doc' \/ meson.project_name(),$/;" cfgvar cfgdata:config_data
LIBEXECDIR input.meson /^ 'LIBEXECDIR': get_option('prefix') \/ get_option('libexecdir'),$/;" cfgvar cfgdata:config_data
LOCALSTATEDIR input.meson /^ 'LOCALSTATEDIR': get_option('localstatedir'),$/;" cfgvar cfgdata:config_data
PACKAGE input.meson /^ 'PACKAGE': meson.project_name(),$/;" cfgvar cfgdata:config_data
PACKAGE_VERSION input.meson /^ 'PACKAGE_VERSION': meson.project_version(),$/;" cfgvar cfgdata:config_data
pkgsysconfdir input.meson /^ 'pkgsysconfdir': '\/' \/ get_option('sysconfdir') \/ meson.project_name(),$/;" cfgvar cfgdata:config_data
PREFIX input.meson /^ 'PREFIX': get_option('prefix'),$/;" cfgvar cfgdata:config_data
PYTHON input.meson /^ 'PYTHON': python_exec,$/;" cfgvar cfgdata:config_data
pythondir input.meson /^ 'pythondir': python_installation.get_install_dir(),$/;" cfgvar cfgdata:config_data
SBINDIR input.meson /^ 'SBINDIR': get_option('prefix') \/ get_option('sbindir'),$/;" cfgvar cfgdata:config_data
SYSCONFDIR input.meson /^ 'SYSCONFDIR': '\/' \/ get_option('sysconfdir'),$/;" cfgvar cfgdata:config_data
sysconfdir input.meson /^ 'sysconfdir': '\/' \/ get_option('sysconfdir'),$/;" cfgvar cfgdata:config_data
top_srcdir input.meson /^ 'top_srcdir': meson.source_root()$/;" cfgvar cfgdata:config_data
update-egg input.meson /^run_target('update-egg', command: 'scripts\/01-upgrade-egg.sh')$/;" run
data input.meson /^subdir('data')$/;" subdir
docs input.meson /^subdir('docs')$/;" subdir
src input.meson /^subdir('src')$/;" subdir
configuration input.meson /^configuration = '**Configuration**\\n'$/;" variable
cfgf5631d8f0109 input-0.meson /^configuration_data({$/;" cfgdata
a input-0.meson /^ 'a': get_option('prefix') \/ get_option('bindir'),$/;" cfgvar cfgdata:cfgf5631d8f0109
b input-0.meson /^ 'b': meson.source_root()$/;" cfgvar cfgdata:cfgf5631d8f0109
update-eggx input-0.meson /^run_target('update-eggx', command: 'scripts\/01-upgrade-egg.sh')$/;" run
7 changes: 7 additions & 0 deletions Units/parser-meson.r/config-inline.d/input-0.meson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
configuration_data({
'a': get_option('prefix') / get_option('bindir'),
# ...
'b': meson.source_root()
})

run_target('update-eggx', command: 'scripts/01-upgrade-egg.sh')
54 changes: 54 additions & 0 deletions Units/parser-meson.r/config-inline.d/input.meson
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,54 @@
# Taken from insights-client-3.2.8/meson.build

project('insights-client',
version: '3.2.8',
meson_version: '>=0.49'
)

python = import('python')

python_installation = python.find_installation(get_option('python'))

python_exec = '/usr/bin/python3'

systemd = dependency('systemd', version: '>=231')

config_data = configuration_data({
'bindir': get_option('prefix') / get_option('bindir'),
'BINDIR': get_option('prefix') / get_option('bindir'),
'DATADIR': get_option('prefix') / get_option('datadir'),
'DATAROOTDIR':get_option('prefix') / get_option('datadir'),
'DOCDIR': get_option('prefix') / get_option('datadir') / 'doc' / meson.project_name(),
'LIBEXECDIR': get_option('prefix') / get_option('libexecdir'),
'LOCALSTATEDIR': get_option('localstatedir'),
'PACKAGE': meson.project_name(),
'PACKAGE_VERSION': meson.project_version(),
'pkgsysconfdir': '/' / get_option('sysconfdir') / meson.project_name(),
'PREFIX': get_option('prefix'),
'PYTHON': python_exec,
'pythondir': python_installation.get_install_dir(),
'SBINDIR': get_option('prefix') / get_option('sbindir'),
'SYSCONFDIR': '/' / get_option('sysconfdir'),
'sysconfdir': '/' / get_option('sysconfdir'),
'top_srcdir': meson.source_root()
})

run_target('update-egg', command: 'scripts/01-upgrade-egg.sh')

subdir('data')
subdir('docs')
subdir('src')

configuration = '**Configuration**\n'
configuration += '\tpython\t\t\t: ' + get_option('python') + '\n'
if get_option('checkin').enabled()
configuration += '\tcheckin\t: ' + 'enabled' + '\n'
else
configuration += '\tcheckin\t: ' + 'disabled' + '\n'
endif
if get_option('auto_registration').enabled()
configuration += '\tauto_registration\t: ' + 'enabled' + '\n'
else
configuration += '\tauto_registration\t: ' + 'disabled' + '\n'
endif
message(configuration)
4 changes: 4 additions & 0 deletions docs/news/HEAD.rst
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,10 @@ C#:
* Fix a bug that prevents the parser from extracting methods
if the method has nullable parameters.

Meson:

* Extract config vars defined inside configuration_data({...}).

New parsers
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
The following parsers have been added:
Expand Down
Loading
Loading