luc14n0/glib
1
0
Fork 0
mirror of https://gitlab.gnome.org/GNOME/glib.git synced 2025-02-23 10:42:11 +01:00
Code Issues Packages Projects Releases Wiki Activity

build: Factor out a variable for the GIR XML directory suffix

Browse Source 
Signed-off-by: Simon McVittie <smcv@collabora.com>
This commit is contained in:
Simon McVittie 2025-02-21 20:12:48 +00:00
parent 9f18bb6258
commit 2c358ec7f8
3 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
girepository/meson.build
View File

@ -29,7 +29,10 @@ else
gir_dir_pc_prefix = join_paths('${prefix}', gir_dir_prefix) gir_dir_pc_prefix = join_paths('${prefix}', gir_dir_prefix)
endif endif
glib_girdir = get_option('prefix') / gir_dir_prefix / 'gir-1.0' # This is effectively the GIR XML format major version
gir_suffix = 'gir-1.0'
glib_girdir = get_option('prefix') / gir_dir_prefix / gir_suffix
gir_includedir = glib_includedir / 'girepository' gir_includedir = glib_includedir / 'girepository'
@ -81,7 +84,7 @@ install_headers(girepo_headers + girepo_ffi_headers, install_dir: gir_includedir
gir_c_args = [ gir_c_args = [
'-DGI_COMPILATION', '-DGI_COMPILATION',
'-DG_LOG_DOMAIN="GLib-GIRepository"', '-DG_LOG_DOMAIN="GLib-GIRepository"',
'-DGIR_SUFFIX="gir-1.0"', '-DGIR_SUFFIX="@0@"'.format(gir_suffix),
'-DGIR_DIR="@0@"'.format(glib_girdir), '-DGIR_DIR="@0@"'.format(glib_girdir),
'-DGOBJECT_INTROSPECTION_LIBDIR="@0@"'.format(glib_libdir), '-DGOBJECT_INTROSPECTION_LIBDIR="@0@"'.format(glib_libdir),
'-DGOBJECT_INTROSPECTION_DATADIR="@0@"'.format(glib_datadir), '-DGOBJECT_INTROSPECTION_DATADIR="@0@"'.format(glib_datadir),
@ -227,7 +230,7 @@ executable('gi-dump-types',
pkgconfig_variables = [ pkgconfig_variables = [
'gidatadir=${datadir}/gobject-introspection-1.0', 'gidatadir=${datadir}/gobject-introspection-1.0',
'girdir=' + gir_dir_pc_prefix / 'gir-1.0', 'girdir=' + gir_dir_pc_prefix / gir_suffix,
'typelibdir=${libdir}/girepository-1.0', 'typelibdir=${libdir}/girepository-1.0',
'gi_compile_repository=' + pkgconfig_multiarch_bindir / 'gi-compile-repository' 'gi_compile_repository=' + pkgconfig_multiarch_bindir / 'gi-compile-repository'
] ]

2
tests/lib/glibconfig.py.in
View File

@ -25,5 +25,5 @@ else:
# /usr/share fallback # /usr/share fallback
GIR_XML_SEARCH_PATHS = [ GIR_XML_SEARCH_PATHS = [
Path(r"@glib_girdir@"), Path(r"@glib_girdir@"),
Path(r"@glib_datadir@") / "gir-1.0", Path(r"@glib_datadir@") / r"@gir_suffix@",
] ]

1
tests/lib/meson.build
View File

@ -12,6 +12,7 @@ install_data(
) )
tests_conf = configuration_data() tests_conf = configuration_data()
tests_conf.set('gir_suffix', gir_suffix)
tests_conf.set('glib_datadir', glib_datadir) tests_conf.set('glib_datadir', glib_datadir)
tests_conf.set('glib_girdir', glib_girdir) tests_conf.set('glib_girdir', glib_girdir)