diff options
Diffstat (limited to 'mesonbuild')
| -rw-r--r-- | mesonbuild/ast/introspection.py | 4 | ||||
| -rw-r--r-- | mesonbuild/mintro.py | 4 |
2 files changed, 5 insertions, 3 deletions
diff --git a/mesonbuild/ast/introspection.py b/mesonbuild/ast/introspection.py index f0ff43f..4a6e6de 100644 --- a/mesonbuild/ast/introspection.py +++ b/mesonbuild/ast/introspection.py @@ -96,8 +96,8 @@ class IntrospectionInterpreter(AstInterpreter): if not self.is_subproject() and 'subproject_dir' in kwargs: spdirname = kwargs['subproject_dir'] - if isinstance(spdirname, str): - self.subproject_dir = spdirname + if isinstance(spdirname, mparser.ElementaryNode): + self.subproject_dir = spdirname.value if not self.is_subproject(): self.project_data['subprojects'] = [] subprojects_dir = os.path.join(self.source_root, self.subproject_dir) diff --git a/mesonbuild/mintro.py b/mesonbuild/mintro.py index 8f9ed1d..b1e6509 100644 --- a/mesonbuild/mintro.py +++ b/mesonbuild/mintro.py @@ -288,7 +288,8 @@ def list_benchmarks(benchdata): def list_projinfo(builddata: build.Build): result = {'version': builddata.project_version, - 'descriptive_name': builddata.project_name} + 'descriptive_name': builddata.project_name, + 'subproject_dir': builddata.subproject_dir} subprojects = [] for k, v in builddata.subprojects.items(): c = {'name': k, @@ -313,6 +314,7 @@ def list_projinfo_from_source(sourcedir, indent): files = [x for x in files if not x.startswith(basedir)] intr.project_data['buildsystem_files'] = files + intr.project_data['subproject_dir'] = intr.subproject_dir print(json.dumps(intr.project_data, indent=indent)) def run(options): |