Better documentation

pull/4547/head
Daniel Mensinger 6 years ago
parent c33df1fd73
commit 02734cc5c3
No known key found for this signature in database
GPG Key ID: 54DD94C131E277D4
  1. 1
      docs/markdown/snippets/introspect_multiple.md
  2. 6
      mesonbuild/mintro.py
  3. 4
      run_unittests.py

@ -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`)

@ -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 = []

@ -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()

Loading…
Cancel
Save