From de24fddbd149d465dc737d707fed204bdf8d06cc Mon Sep 17 00:00:00 2001
From: Jussi Pakkanen <jpakkane@gmail.com>
Date: Wed, 4 Jan 2017 21:01:06 +0200
Subject: Create a module return value object.

---
 mesonbuild/modules/__init__.py  | 5 +++++
 mesonbuild/modules/modtest.py   | 4 ++++
 mesonbuild/modules/pkgconfig.py | 5 ++++-
 3 files changed, 13 insertions(+), 1 deletion(-)

(limited to 'mesonbuild/modules')

diff --git a/mesonbuild/modules/__init__.py b/mesonbuild/modules/__init__.py
index 184d85aef..16cada08d 100644
--- a/mesonbuild/modules/__init__.py
+++ b/mesonbuild/modules/__init__.py
@@ -45,6 +45,11 @@ def get_include_args(environment, include_dirs, prefix='-I'):
 
     return dirs_str
 
+class ModuleReturnValue:
+    def __init__(self, return_value, new_objects):
+        self.return_value = return_value
+        assert(isinstance(new_objects, list))
+        self.new_objects = new_objects
 
 class GResourceTarget(build.CustomTarget):
     def __init__(self, name, subdir, kwargs):
diff --git a/mesonbuild/modules/modtest.py b/mesonbuild/modules/modtest.py
index c9247e6bf..dc347e236 100644
--- a/mesonbuild/modules/modtest.py
+++ b/mesonbuild/modules/modtest.py
@@ -12,10 +12,14 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+from . import ModuleReturnValue
+
 class TestModule:
 
     def print_hello(self, state, args, kwargs):
         print('Hello from a Meson module')
+        rv = ModuleReturnValue(None, [])
+        return rv
 
 def initialize():
     return TestModule()
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index aaf0746c7..38358f3b2 100644
--- a/mesonbuild/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
@@ -15,6 +15,8 @@
 from .. import build
 from .. import mesonlib
 from .. import mlog
+from . import ModuleReturnValue
+
 import os
 
 class PkgConfigModule:
@@ -138,7 +140,8 @@ class PkgConfigModule:
         self.generate_pkgconfig_file(state, libs, subdirs, name, description, url,
                                      version, pcfile, pub_reqs, priv_reqs,
                                      conflicts, priv_libs)
-        return build.Data(mesonlib.File(True, state.environment.get_scratch_dir(), pcfile), pkgroot)
+        res = build.Data(mesonlib.File(True, state.environment.get_scratch_dir(), pcfile), pkgroot)
+        return ModuleReturnValue(res, [res])
 
 def initialize():
     return PkgConfigModule()
-- 
cgit v1.2.3