diff options
| author | Jussi Pakkanen <jpakkane@gmail.com> | 2015-11-29 21:30:14 +0200 |
|---|---|---|
| committer | Jussi Pakkanen <jpakkane@gmail.com> | 2015-11-29 21:30:14 +0200 |
| commit | 278339855d7065159e154d20e56e31edb4a56870 (patch) | |
| tree | cc94a388c1248590aa262630fc33912ff3fb4d7e | |
| parent | a4809cf63291b3fa2eeb48a82094ca75d9a64113 (diff) | |
| download | meson-278339855d7065159e154d20e56e31edb4a56870.zip meson-278339855d7065159e154d20e56e31edb4a56870.tar.gz meson-278339855d7065159e154d20e56e31edb4a56870.tar.bz2 | |
Projects can specify a license which is written to the dep manifest.
| -rw-r--r-- | interpreter.py | 6 | ||||
| -rw-r--r-- | test cases/common/49 subproject/meson.build | 4 | ||||
| -rw-r--r-- | test cases/common/49 subproject/subprojects/sublib/meson.build | 4 |
3 files changed, 10 insertions, 4 deletions
diff --git a/interpreter.py b/interpreter.py index 3da71a1..85d472e 100644 --- a/interpreter.py +++ b/interpreter.py @@ -872,7 +872,7 @@ class MesonMain(InterpreterObject): self.build.dep_manifest_name = args[0] def project_version_method(self, args, kwargs): - return self.build.dep_manifest[self.interpreter.active_projectname] + return self.build.dep_manifest[self.interpreter.active_projectname]['version'] class Interpreter(): @@ -1377,7 +1377,9 @@ class Interpreter(): self.parse_default_options(kwargs['default_options']) self.active_projectname = args[0] self.project_version = kwargs.get('version', 'undefined') - self.build.dep_manifest[args[0]] = self.project_version + license = mesonlib.stringlistify(kwargs.get('license', 'unknown')) + self.build.dep_manifest[args[0]] = {'version': self.project_version, + 'license': license} if self.subproject in self.build.projects: raise InvalidCode('Second call to project().') if not self.is_subproject() and 'subproject_dir' in kwargs: diff --git a/test cases/common/49 subproject/meson.build b/test cases/common/49 subproject/meson.build index 2616853..1e05ddf 100644 --- a/test cases/common/49 subproject/meson.build +++ b/test cases/common/49 subproject/meson.build @@ -1,4 +1,6 @@ -project('subproj user', 'c', version : '2.3.4') +project('subproj user', 'c', + version : '2.3.4', + license : 'mylicense') sub = subproject('sublib', version : '1.0.0') diff --git a/test cases/common/49 subproject/subprojects/sublib/meson.build b/test cases/common/49 subproject/subprojects/sublib/meson.build index 922c6cf..3da031b 100644 --- a/test cases/common/49 subproject/subprojects/sublib/meson.build +++ b/test cases/common/49 subproject/subprojects/sublib/meson.build @@ -1,4 +1,6 @@ -project('subproject', 'c', version : '1.0.0') +project('subproject', 'c', + version : '1.0.0', + license : ['sublicense1', 'sublicense2']) if not meson.is_subproject() error('Claimed to be master project even though we are a subproject.') |