aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--mesonbuild/interpreter.py2
-rw-r--r--mesonbuild/modules/gnome.py4
-rw-r--r--mesonbuild/modules/i18n.py4
-rw-r--r--mesonbuild/modules/modtest.py4
-rw-r--r--mesonbuild/modules/pkgconfig.py4
-rw-r--r--mesonbuild/modules/qt4.py8
-rw-r--r--mesonbuild/modules/qt5.py8
-rw-r--r--mesonbuild/modules/rpm.py4
-rw-r--r--mesonbuild/modules/unstable_icestorm.py8
-rw-r--r--mesonbuild/modules/unstable_simd.py8
-rw-r--r--mesonbuild/modules/windows.py4
11 files changed, 29 insertions, 29 deletions
diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py
index 9d3a669..0d4c37d 100644
--- a/mesonbuild/interpreter.py
+++ b/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)
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py
index 74d0f29..a3ba172 100644
--- a/mesonbuild/modules/gnome.py
+++ b/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)
diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py
index 6c02fbb..4281200 100644
--- a/mesonbuild/modules/i18n.py
+++ b/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)
diff --git a/mesonbuild/modules/modtest.py b/mesonbuild/modules/modtest.py
index 758eeae..533989f 100644
--- a/mesonbuild/modules/modtest.py
+++ b/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)
diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index 6f0e717..934e2f4 100644
--- a/mesonbuild/modules/pkgconfig.py
+++ b/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)
diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py
index 3011de7..29992d5 100644
--- a/mesonbuild/modules/qt4.py
+++ b/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)
diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py
index 7b7acbb..19623ac 100644
--- a/mesonbuild/modules/qt5.py
+++ b/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)
diff --git a/mesonbuild/modules/rpm.py b/mesonbuild/modules/rpm.py
index dbb01f7..a2a7929 100644
--- a/mesonbuild/modules/rpm.py
+++ b/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)
diff --git a/mesonbuild/modules/unstable_icestorm.py b/mesonbuild/modules/unstable_icestorm.py
index 1f548b6..9af5325 100644
--- a/mesonbuild/modules/unstable_icestorm.py
+++ b/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)
diff --git a/mesonbuild/modules/unstable_simd.py b/mesonbuild/modules/unstable_simd.py
index b774cff..c41e96c 100644
--- a/mesonbuild/modules/unstable_simd.py
+++ b/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)
diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py
index dc6e9d8..62cb9d1 100644
--- a/mesonbuild/modules/windows.py
+++ b/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)
generated by cgit v1.1 at 2024-11-06 14:47:36 +0000