diff options
| author | John Ericson <John.Ericson@Obsidian.Systems> | 2021-02-23 13:11:22 -0500 |
|---|---|---|
| committer | John Ericson <John.Ericson@Obsidian.Systems> | 2021-05-23 12:56:21 -0400 |
| commit | f9c1b6f65bec623d593835c400d2d55d981715c8 (patch) | |
| tree | 2fbcc56bc165ba6d15268eb2e22588027e2a26d0 /gir | |
| parent | 00bce5569b5e7fd0f6e373857a89996e07bf0725 (diff) | |
| download | gobject-introspection-f9c1b6f65bec623d593835c400d2d55d981715c8.tar.gz | |
Make test suite work with cross-related options
Because of skepticism I received in #224, I made this PR which keeps the
testsuite and CI improvements but doesn't add any new build options. I
hope this would be less controversial:
- no new knobs
- tests for those using existing build options
- CI tests `build_introspection_data = false`
Diffstat (limited to 'gir')
| -rw-r--r-- | gir/meson.build | 29 |
1 files changed, 19 insertions, 10 deletions
diff --git a/gir/meson.build b/gir/meson.build index 557e5517..61fbdfb1 100644 --- a/gir/meson.build +++ b/gir/meson.build @@ -178,11 +178,20 @@ endforeach # out of date. glib_files += files('glib-2.0.c') +gir_giscanner_pymod = [] +gir_giscanner_built_files = [] +if not get_option('gi_cross_use_prebuilt_gi') + # The right thing to do is just make these dependencies of the + # `configure_file` python executable, but that isn't yet supported. + gir_giscanner_pymod = giscanner_pymod + gir_giscanner_built_files = giscanner_built_files +endif + glib_gir = custom_target('gir-glib', input: glib_files, output: 'GLib-2.0.gir', - depends: giscanner_pymod, - depend_files: giscanner_built_files, + depends: gir_giscanner_pymod, + depend_files: gir_giscanner_built_files, install: true, install_dir: girdir, command: glib_command + [ @@ -244,8 +253,8 @@ gobject_files += files('gobject-2.0.c') gobject_gir = custom_target('gir-gobject', input: gobject_files, output: 'GObject-2.0.gir', - depends: [glib_gir, giscanner_pymod], - depend_files: giscanner_built_files, + depends: [glib_gir, gir_giscanner_pymod], + depend_files: gir_giscanner_built_files, install: true, install_dir: girdir, command: gobject_command + [ @@ -291,8 +300,8 @@ gmodule_files += files('gmodule-2.0.c') gir_files += custom_target('gir-gmodule', input: gmodule_files, output: 'GModule-2.0.gir', - depends: [glib_gir, giscanner_pymod], - depend_files: giscanner_built_files, + depends: [glib_gir, gir_giscanner_pymod], + depend_files: gir_giscanner_built_files, install: true, install_dir: girdir, command: gmodule_command + [ @@ -380,8 +389,8 @@ gio_files += files('gio-2.0.c') gio_gir = custom_target('gir-gio', input: gio_files, output: 'Gio-2.0.gir', - depends: [gobject_gir, giscanner_pymod], - depend_files: giscanner_built_files, + depends: [gobject_gir, gir_giscanner_pymod], + depend_files: gir_giscanner_built_files, install: true, install_dir: girdir, command: gio_command + [ @@ -417,8 +426,8 @@ endif gir_files += custom_target('gir-girepository', input: girepo_gir_sources, output: 'GIRepository-2.0.gir', - depends: [gobject_gir, giscanner_pymod, girepo_lib], - depend_files: giscanner_built_files, + depends: [gobject_gir, gir_giscanner_pymod, girepo_lib], + depend_files: gir_giscanner_built_files, install: true, install_dir: girdir, command: girepository_command + [ |