Updated all modules to work with the new API.

mesonbuild/interpreter.py

@@ -2745,7 +2745,7 @@ root and issuing %s.
         exe = args[1]
         if not isinstance(exe, (ExecutableHolder, JarHolder, ExternalProgramHolder)):
             if isinstance(exe, mesonlib.File):
-                exe = self.func_find_program(node, (args[1], ), {})
+                exe = self.func_find_program(node, args[1], {})
             else:
                 raise InterpreterException('Second argument must be executable.')
         par = kwargs.get('is_parallel', True)

mesonbuild/modules/gnome.py

@@ -1355,9 +1355,9 @@ G_END_DECLS'''
         pkg_cmd, vapi_depends, vapi_packages, vapi_includes = self._extract_vapi_packages(state, kwargs)
         target_name = 'generate_vapi({})'.format(library)
         if 'VAPIGEN' in os.environ:
-            cmd = [self.interpreter.func_find_program(None, os.environ['VAPIGEN'], {}), target_name]
+            cmd = [self.interpreter.func_find_program(None, os.environ['VAPIGEN'], {})]
         else:
-            cmd = [self.interpreter.func_find_program(None, 'vapigen'), target_name]
+            cmd = [self.interpreter.func_find_program(None, 'vapigen', {})]
         cmd += ['--quiet', '--library=' + library, '--directory=' + build_dir]
         cmd += self._vapi_args_to_command('--vapidir=', 'vapi_dirs', kwargs)
         cmd += self._vapi_args_to_command('--metadatadir=', 'metadata_dirs', kwargs)

mesonbuild/modules/i18n.py

@@ -143,5 +143,5 @@ class I18nModule(ExtensionModule):
 
         return ModuleReturnValue(None, targets)
 
-def initialize():
-    return I18nModule()
+def initialize(*args, **kwargs):
+    return I18nModule(*args, **kwargs)

mesonbuild/modules/modtest.py

@@ -24,5 +24,5 @@ class TestModule(ExtensionModule):
         rv = ModuleReturnValue(None, [])
         return rv
 
-def initialize():
-    return TestModule()
+def initialize(*args, **kwargs):
+    return TestModule(*args, **kwargs)

mesonbuild/modules/pkgconfig.py

@@ -393,5 +393,5 @@ class PkgConfigModule(ExtensionModule):
         res = build.Data(mesonlib.File(True, state.environment.get_scratch_dir(), pcfile), pkgroot)
         return ModuleReturnValue(res, [res])
 
-def initialize():
-    return PkgConfigModule()
+def initialize(*args, **kwargs):
+    return PkgConfigModule(*args, **kwargs)

mesonbuild/modules/qt4.py

@@ -19,11 +19,11 @@ from . import ExtensionModule
 
 class Qt4Module(ExtensionModule, QtBaseModule):
 
-    def __init__(self):
+    def __init__(self, interpreter):
         QtBaseModule.__init__(self, qt_version=4)
-        ExtensionModule.__init__(self)
+        ExtensionModule.__init__(self, interpreter)
 
-def initialize():
+def initialize(*args, **kwargs):
     mlog.warning('rcc dependencies will not work properly until this upstream issue is fixed:',
                  mlog.bold('https://bugreports.qt.io/browse/QTBUG-45460'))
-    return Qt4Module()
+    return Qt4Module(*args, **kwargs)

mesonbuild/modules/qt5.py

@@ -19,11 +19,11 @@ from . import ExtensionModule
 
 class Qt5Module(ExtensionModule, QtBaseModule):
 
-    def __init__(self):
+    def __init__(self, interpreter):
         QtBaseModule.__init__(self, qt_version=5)
-        ExtensionModule.__init__(self)
+        ExtensionModule.__init__(self, interpreter)
 
-def initialize():
+def initialize(*args, **kwargs):
     mlog.warning('rcc dependencies will not work reliably until this upstream issue is fixed:',
                  mlog.bold('https://bugreports.qt.io/browse/QTBUG-45460'))
-    return Qt5Module()
+    return Qt5Module(*args, **kwargs)

mesonbuild/modules/rpm.py

@@ -160,5 +160,5 @@ class RPMModule(ExtensionModule):
         mlog.log('RPM spec template written to %s.spec.\n' % proj)
         return ModuleReturnValue(None, [])
 
-def initialize():
-    return RPMModule()
+def initialize(*args, **kwargs):
+    return RPMModule(*args, **kwargs)

mesonbuild/modules/unstable_icestorm.py

@@ -18,8 +18,8 @@ from . import ExtensionModule
 
 class IceStormModule(ExtensionModule):
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, interpreter):
+        super().__init__(interpreter)
         self.snippets.add('project')
         self.yosys_bin = None
 
@@ -80,5 +80,5 @@ class IceStormModule(ExtensionModule):
         interpreter.func_run_target(None, [time_name], {
             'command': [self.icetime_bin, bin_target]})
 
-def initialize():
-    return IceStormModule()
+def initialize(*args, **kwargs):
+    return IceStormModule(*args, **kwargs)

mesonbuild/modules/unstable_simd.py

@@ -18,8 +18,8 @@ from . import ExtensionModule
 
 class SimdModule(ExtensionModule):
 
-    def __init__(self):
-        super().__init__()
+    def __init__(self, interpreter):
+        super().__init__(interpreter)
         self.snippets.add('check')
         # FIXME add Altivec and AVX512.
         self.isets = ('mmx',
@@ -79,5 +79,5 @@ class SimdModule(ExtensionModule):
             result.append(interpreter.func_static_lib(None, [libname], lib_kwargs))
         return [result, cdata]
 
-def initialize():
-    return SimdModule()
+def initialize(*args, **kwargs):
+    return SimdModule(*args, **kwargs)

mesonbuild/modules/windows.py

@@ -104,5 +104,5 @@ class WindowsModule(ExtensionModule):
 
         return ModuleReturnValue(res_targets, [res_targets])
 
-def initialize():
-    return WindowsModule()
+def initialize(*args, **kwargs):
+    return WindowsModule(*args, **kwargs)