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 /tools | |
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 'tools')
-rwxr-xr-x | tools/g-ir-tool-template.in | 2 | ||||
-rw-r--r-- | tools/meson.build | 14 |
2 files changed, 9 insertions, 7 deletions
diff --git a/tools/g-ir-tool-template.in b/tools/g-ir-tool-template.in index 75bf759c..6e98f52e 100755 --- a/tools/g-ir-tool-template.in +++ b/tools/g-ir-tool-template.in @@ -81,7 +81,7 @@ if not os.path.isfile(os.path.join(pylibdir, 'giscanner', '_giscanner' + py_mod_ builddir = os.path.abspath(os.path.join(filedir, '..')) pylibdir = builddir builtins.__dict__['GIRDIR'].append(os.path.join(filedir, os.pardir, 'gir')) - gdump_path = os.path.join(builddir, 'girepository', 'gdump.c') + gdump_path = os.path.join(builddir, 'giscanner', 'gdump.c') if os.path.isfile(gdump_path): builtins.__dict__['GDUMP_PATH'] = gdump_path else: diff --git a/tools/meson.build b/tools/meson.build index f272c955..46b487e0 100644 --- a/tools/meson.build +++ b/tools/meson.build @@ -30,6 +30,11 @@ foreach tool : tools output: tool[0], configuration: tools_conf, install_dir: get_option('bindir'), + # Not yet supported, but put here to document intention. + # depends: [ + # giscanner_pymod + # ], + # depend_files: giscanner_built_files, ) tool_output += tool_bin # Provide tools for others when we're a subproject and they use the Meson GNOME module @@ -59,6 +64,7 @@ gircompiler = executable('g-ir-compiler', 'compiler.c', install: true, c_args: custom_c_args, ) +meson.override_find_program('g-ir-compiler', gircompiler) girgenerate = executable('g-ir-generate', 'generate.c', dependencies: [ @@ -68,15 +74,11 @@ girgenerate = executable('g-ir-generate', 'generate.c', install: true, c_args: custom_c_args, ) +meson.override_find_program('g-ir-generate', girgenerate) girinspect = executable('g-ir-inspect', 'g-ir-inspect.c', dependencies: girepo_dep, install: true, c_args: custom_c_args, ) - -if not get_option('gi_cross_use_prebuilt_gi') - meson.override_find_program('g-ir-compiler', gircompiler) - meson.override_find_program('g-ir-generate', girgenerate) - meson.override_find_program('g-ir-inspect', girinspect) -endif +meson.override_find_program('g-ir-inspect', girinspect) |