mirror of
https://gitlab.gnome.org/GNOME/glib.git
synced 2024-11-06 17:36:14 +01:00
1fdbc06385
Various parts of the build (such as `objectmanager-rst-gen`) depend on running `gdbus-codegen` after it’s been built, but they currently only encode a dependency to the main codegen Python file and not the supporting files. This can cause `gdbus-codegen` to fail with an `ImportError` if the build races so that `objectmanager-rst-gen` is built before the codegen supporting files. Example failure here: https://gitlab.gnome.org/pwithnall/glib/-/jobs/3266471 ``` FAILED: gio/tests/gdbus-object-manager-example/objectmanager-rst-gen-org.gtk.GDBus.Example.ObjectManager.Animal.rst gio/tests/gdbus-object-manager-example/objectmanager-rst-gen-org.gtk.GDBus.Example.ObjectManager.Cat.rst /usr/bin/python3 gio/gdbus-2.0/codegen/gdbus-codegen --interface-prefix org.gtk.GDBus.Example.ObjectManager. --generate-rst objectmanager-rst-gen --output-directory gio/tests/gdbus-object-manager-example ../gio/tests/gdbus-object-manager-example/gdbus-example-objectmanager.xml Traceback (most recent call last): File "/builds/pwithnall/glib/_build/gio/gdbus-2.0/codegen/gdbus-codegen", line 53, in <module> from codegen import codegen_main File "/builds/pwithnall/glib/_build/gio/gdbus-2.0/codegen/codegen_main.py", line 29, in <module> from . import dbustypes File "/builds/pwithnall/glib/_build/gio/gdbus-2.0/codegen/dbustypes.py", line 22, in <module> from . import utils ImportError: cannot import name 'utils' from 'codegen' (/builds/pwithnall/glib/_build/gio/gdbus-2.0/codegen/__init__.py) ``` Signed-off-by: Philip Withnall <philip@tecnocode.co.uk>
68 lines
2.6 KiB
Meson
68 lines
2.6 KiB
Meson
gdbus_example_objectmanager_visibility_h = configure_file(
|
|
output: 'gdbus-example-objectmanager-visibility.h',
|
|
command: [gen_visibility_macros, '2.0', 'visibility-macros',
|
|
'GDBUS_OBJECT_MANAGER_EXAMPLE', '@OUTPUT@'],
|
|
)
|
|
|
|
gdbus_example_objectmanager_xml = files('gdbus-example-objectmanager.xml')
|
|
gdbus_example_objectmanager_generated = custom_target('objectmanager-gen',
|
|
input : gdbus_example_objectmanager_xml,
|
|
output : ['objectmanager-gen.h',
|
|
'objectmanager-gen.c',
|
|
'objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Animal.xml',
|
|
'objectmanager-gen-org.gtk.GDBus.Example.ObjectManager.Cat.xml'],
|
|
command : [python, gdbus_codegen,
|
|
'--interface-prefix', 'org.gtk.GDBus.Example.ObjectManager.',
|
|
'--c-namespace', 'Example',
|
|
'--c-generate-object-manager',
|
|
'--output-directory', '@OUTDIR@',
|
|
'--generate-c-code', 'objectmanager-gen',
|
|
'--generate-docbook', 'objectmanager-gen',
|
|
'--symbol-decorator', 'GDBUS_OBJECT_MANAGER_EXAMPLE_AVAILABLE_IN_ALL',
|
|
'--symbol-decorator-header', 'gdbus-example-objectmanager-visibility.h',
|
|
'@INPUT@'],
|
|
depend_files : gdbus_codegen_built_files,
|
|
depends : gdbus_codegen_built_targets,
|
|
)
|
|
|
|
gdbus_example_objectmanager_rst_gen = custom_target('objectmanager-rst-gen',
|
|
input: gdbus_example_objectmanager_xml,
|
|
output: [
|
|
'objectmanager-rst-gen-org.gtk.GDBus.Example.ObjectManager.Animal.rst',
|
|
'objectmanager-rst-gen-org.gtk.GDBus.Example.ObjectManager.Cat.rst',
|
|
],
|
|
command: [
|
|
python,
|
|
gdbus_codegen,
|
|
'--interface-prefix', 'org.gtk.GDBus.Example.ObjectManager.',
|
|
'--generate-rst', 'objectmanager-rst-gen',
|
|
'--output-directory', '@OUTDIR@',
|
|
'@INPUT@',
|
|
],
|
|
depend_files: gdbus_codegen_built_files,
|
|
depends: gdbus_codegen_built_targets,
|
|
)
|
|
|
|
extra_c_args = []
|
|
if glib_build_static_only
|
|
extra_c_args = '-DGDBUS_OBJECT_MANAGER_EXAMPLE_STATIC_COMPILATION'
|
|
endif
|
|
|
|
libgdbus_example_objectmanager = library('gdbus-example-objectmanager',
|
|
gdbus_example_objectmanager_generated, gdbus_example_objectmanager_visibility_h,
|
|
c_args : [test_c_args, extra_c_args,
|
|
'-DGDBUS_OBJECT_MANAGER_EXAMPLE_COMPILATION'],
|
|
dependencies : [libglib_dep, libgmodule_dep, libgobject_dep, libgio_dep],
|
|
install : installed_tests_enabled,
|
|
install_dir : installed_tests_execdir)
|
|
|
|
libgdbus_example_objectmanager_dep = declare_dependency(
|
|
sources : [
|
|
gdbus_example_objectmanager_generated[0],
|
|
gdbus_example_objectmanager_rst_gen[0],
|
|
],
|
|
link_with : libgdbus_example_objectmanager,
|
|
dependencies : [libgio_dep],
|
|
compile_args : extra_c_args,
|
|
)
|