aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/interpreter.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2016-12-03 23:45:59 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2016-12-06 20:27:59 +0200
commitb28da68faf2485fff018fb59bae2030c379f2376 (patch)
tree28e587a3597f8491f1b9828e13bc4b10cea43438 /mesonbuild/interpreter.py
parentc7a2664cb7043160d653718179de97d4c7976e34 (diff)
downloadmeson-b28da68faf2485fff018fb59bae2030c379f2376.zip
meson-b28da68faf2485fff018fb59bae2030c379f2376.tar.gz
meson-b28da68faf2485fff018fb59bae2030c379f2376.tar.bz2
Expose project information with mesonintrospect. Closes #1118.
Diffstat (limited to 'mesonbuild/interpreter.py')
-rw-r--r--mesonbuild/interpreter.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index dbf3eba..bb523b4 100644
--- a/mesonbuild/interpreter.py
+++ b/mesonbuild/interpreter.py
@@ -1399,7 +1399,7 @@ class Interpreter(InterpreterBase):
raise InterpreterException('Subproject %s version is %s but %s required.' % (dirname, pv, wanted))
self.active_projectname = current_active
mlog.log('\nSubproject', mlog.bold(dirname), 'finished.')
- self.build.subprojects[dirname] = True
+ self.build.subprojects[dirname] = subi.project_version
self.subprojects.update(subi.subprojects)
self.subprojects[dirname] = SubprojectHolder(subi)
self.build_def_files += subi.build_def_files
@@ -1473,6 +1473,8 @@ class Interpreter(InterpreterBase):
raise InvalidArguments('Not enough arguments to project(). Needs at least the project name and one language')
self.active_projectname = args[0]
self.project_version = kwargs.get('version', 'undefined')
+ if self.build.project_version is None:
+ self.build.project_version = self.project_version
proj_license = mesonlib.stringlistify(kwargs.get('license', 'unknown'))
self.build.dep_manifest[args[0]] = {'version': self.project_version,
'license': proj_license}