aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild
diff options
context:
space:
mode:
authorCharles Brunet <charles.brunet@optelgroup.com>2023-05-01 15:57:13 -0400
committerJussi Pakkanen <jpakkane@gmail.com>2023-05-22 22:12:29 +0300
commit8d30577a2d085a3c0945af80bc99da8557cb9e44 (patch)
treea21ed34cb64844c1a0dfa7bddcfbcf3e8660329c /mesonbuild
parent12a2dc86ca736249b2ea4d47ae36b165225a3fdf (diff)
downloadmeson-8d30577a2d085a3c0945af80bc99da8557cb9e44.zip
meson-8d30577a2d085a3c0945af80bc99da8557cb9e44.tar.gz
meson-8d30577a2d085a3c0945af80bc99da8557cb9e44.tar.bz2
intro: add more details to generated files(part 2)
- add `extra_paths` to intro-tests.json to know paths needed to run a test on Windows; - add `depends` to alias targets in intro-targets.json to know what targets does an alias point to; - add `depends` to intro-dependencies.json to know libraries linked with an internal dependency; - renamed `deps` to `dependencies` in `intro-dependencies.json` for more uniformity.
Diffstat (limited to 'mesonbuild')
-rw-r--r--mesonbuild/mintro.py6
1 files changed, 5 insertions, 1 deletions
diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py
index dd1a000..c921ce6 100644
--- a/mesonbuild/mintro.py
+++ b/mesonbuild/mintro.py
@@ -220,6 +220,7 @@ def list_targets_from_source(intr: IntrospectionInterpreter) -> T.List[T.Dict[st
'sources': [str(x) for x in sources],
'generated_sources': []
}],
+ 'depends': [],
'extra_files': [str(x) for x in extra_f],
'subproject': None, # Subprojects are not supported
'installed': i['installed']
@@ -263,6 +264,7 @@ def list_targets(builddata: build.Build, installdata: backends.InstallData, back
'extra_files': [os.path.normpath(os.path.join(src_dir, x.subdir, x.fname)) for x in target.extra_files],
'subproject': target.subproject or None,
'dependencies': [d.name for d in getattr(target, 'external_deps', [])],
+ 'depends': [lib.get_id() for lib in getattr(target, 'dependencies', [])]
}
vs_module_defs = getattr(target, 'vs_module_defs', None)
@@ -411,7 +413,8 @@ def list_deps(coredata: cdata.CoreData, backend: backends.Backend) -> T.List[T.D
'include_directories': [i for idirs in d.get_include_dirs() for i in idirs.to_string_list(backend.source_dir)],
'sources': [f for s in d.get_sources() for f in _src_to_str(s)],
'extra_files': [f for s in d.get_extra_files() for f in _src_to_str(s)],
- 'deps': [e.name for e in d.ext_deps],
+ 'dependencies': [e.name for e in d.ext_deps],
+ 'depends': [lib.get_id() for lib in getattr(d, 'libraries', [])],
'meson_variables': [varname] if varname else [],
}
@@ -451,6 +454,7 @@ def get_test_list(testdata: T.List[backends.TestSerialisation]) -> T.List[T.Dict
to['priority'] = t.priority
to['protocol'] = str(t.protocol)
to['depends'] = t.depends
+ to['extra_paths'] = t.extra_paths
result.append(to)
return result