diff options
| -rw-r--r-- | docs/markdown/snippets/introspect_multiple.md | 1 | ||||
| -rw-r--r-- | mesonbuild/mintro.py | 6 | ||||
| -rwxr-xr-x | run_unittests.py | 4 |
3 files changed, 7 insertions, 4 deletions
diff --git a/docs/markdown/snippets/introspect_multiple.md b/docs/markdown/snippets/introspect_multiple.md index 97fdf8c..2a885e4 100644 --- a/docs/markdown/snippets/introspect_multiple.md +++ b/docs/markdown/snippets/introspect_multiple.md @@ -18,3 +18,4 @@ directory. This dump will be (re)generated each time meson updates the configura Additionlly the format of `meson introspect target` was changed: - New: the `sources` key. It stores the source files of a target and there compiler parameters + - Added new target types (`jar`, `shared module`) diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index fa92a1a..ce9d81e 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -472,8 +472,10 @@ def run(options): list_buildoptions_from_source(sourcedir, options.backend) return 0 if not os.path.isdir(datadir) or not os.path.isdir(infodir): - print('Current directory is not a build dir. Please specify it or ' - 'change the working directory to it.') + print('Current directory is not a meson build directory.' + 'Please specify a valid build dir or change the working directory to it.' + 'It is also possible that the build directory was generated with an old' + 'meson version. Please regenerate it in this case.') return 1 results = [] diff --git a/run_unittests.py b/run_unittests.py index 69fac13..349375e 100755 --- a/run_unittests.py +++ b/run_unittests.py @@ -2569,7 +2569,7 @@ int main(int argc, char **argv) { for t in t_intro: id = t['id'] tf_intro = self.introspect(['--target-files', id]) - tf_intro = list(map(lambda x: os.path.relpath(x, testdir), tf_intro)) + #tf_intro = list(map(lambda x: os.path.relpath(x, testdir), tf_intro)) TODO make paths absolute in future PR self.assertEqual(tf_intro, expected[id]) self.wipe() @@ -2585,7 +2585,7 @@ int main(int argc, char **argv) { id = t['id'] tf_intro = self.introspect(['--target-files', id]) print(tf_intro) - tf_intro = list(map(lambda x: os.path.relpath(x, testdir), tf_intro)) + #tf_intro = list(map(lambda x: os.path.relpath(x, testdir), tf_intro)) TODO make paths absolute in future PR print(tf_intro) self.assertEqual(tf_intro, expected[id]) self.wipe() |