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 /giscanner | |
| 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 'giscanner')
| -rw-r--r-- | giscanner/dumper.py | 2 | ||||
| -rw-r--r-- | giscanner/meson.build | 7 |
2 files changed, 8 insertions, 1 deletions
diff --git a/giscanner/dumper.py b/giscanner/dumper.py index f61c46c1..22afd61e 100644 --- a/giscanner/dumper.py +++ b/giscanner/dumper.py @@ -102,7 +102,7 @@ class DumpCompiler(object): tpl_args = {} if self._uninst_srcdir is not None: - gdump_path = os.path.join(self._uninst_srcdir, 'girepository', 'gdump.c') + gdump_path = os.path.join(self._uninst_srcdir, 'giscanner', 'gdump.c') else: try: gdump_path = GDUMP_PATH diff --git a/giscanner/meson.build b/giscanner/meson.build index 098b7b6b..41edcd44 100644 --- a/giscanner/meson.build +++ b/giscanner/meson.build @@ -44,6 +44,13 @@ foreach f : giscanner_files configuration : giscanner_conf_data) endforeach +# Copy to builddir for use with dumper.py when running uninstalled +configure_file(input : '../girepository/gdump.c', + output : 'gdump.c', + copy: true, + install_dir: join_paths(get_option('datadir'), 'gobject-introspection-1.0'), +) + install_subdir('doctemplates', install_dir: giscannerdir) # XXX: this doesn't track the input, but there is nothing to copy many files |