Virtualization
/
meson
mirror of https://gitlab.com/qemu-project/meson.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Fixed the remaining modules.

This commit is contained in:
Jussi Pakkanen 2017-06-25 20:33:02 +03:00
parent 80d665e8de
commit 4a37baf3c5
4 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
mesonbuild/modules/qt4.py
View File

@ -20,6 +20,7 @@ from ..dependencies import Qt4Dependency
from . import ExtensionModule from . import ExtensionModule
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from . import ModuleReturnValue from . import ModuleReturnValue
from . import permittedKwargs
class Qt4Module(ExtensionModule): class Qt4Module(ExtensionModule):
tools_detected = False tools_detected = False
@ -96,6 +97,7 @@ class Qt4Module(ExtensionModule):
except Exception: except Exception:
return [] return []
@permittedKwargs(set(['moc_headers', 'moc_sources', 'ui_files', 'qresources', 'method']))
def preprocess(self, state, args, kwargs): def preprocess(self, state, args, kwargs):
rcc_files = kwargs.pop('qresources', []) rcc_files = kwargs.pop('qresources', [])
if not isinstance(rcc_files, list): if not isinstance(rcc_files, list):

2
mesonbuild/modules/qt5.py
View File

@ -20,6 +20,7 @@ from ..dependencies import Qt5Dependency
from . import ExtensionModule from . import ExtensionModule
import xml.etree.ElementTree as ET import xml.etree.ElementTree as ET
from . import ModuleReturnValue from . import ModuleReturnValue
from . import permittedKwargs
class Qt5Module(ExtensionModule): class Qt5Module(ExtensionModule):
tools_detected = False tools_detected = False
@ -102,6 +103,7 @@ class Qt5Module(ExtensionModule):
except Exception: except Exception:
return [] return []
@permittedKwargs(set(['moc_headers', 'moc_sources', 'ui_files', 'qresources', 'method']))
def preprocess(self, state, args, kwargs): def preprocess(self, state, args, kwargs):
rcc_files = kwargs.pop('qresources', []) rcc_files = kwargs.pop('qresources', [])
if not isinstance(rcc_files, list): if not isinstance(rcc_files, list):

2
mesonbuild/modules/rpm.py
View File

@ -22,11 +22,13 @@ from .. import mlog
from . import GirTarget, TypelibTarget from . import GirTarget, TypelibTarget
from . import ModuleReturnValue from . import ModuleReturnValue
from . import ExtensionModule from . import ExtensionModule
from . import noKwargs
import os import os
class RPMModule(ExtensionModule): class RPMModule(ExtensionModule):
@noKwargs
def generate_spec_template(self, state, args, kwargs): def generate_spec_template(self, state, args, kwargs):
compiler_deps = set() compiler_deps = set()
for compiler in state.compilers.values(): for compiler in state.compilers.values():

2
mesonbuild/modules/windows.py
View File

@ -20,6 +20,7 @@ from ..mesonlib import MesonException
from . import get_include_args from . import get_include_args
from . import ModuleReturnValue from . import ModuleReturnValue
from . import ExtensionModule from . import ExtensionModule
from . import permittedKwargs
class WindowsModule(ExtensionModule): class WindowsModule(ExtensionModule):
@ -29,6 +30,7 @@ class WindowsModule(ExtensionModule):
return compilers[l] return compilers[l]
raise MesonException('Resource compilation requires a C or C++ compiler.') raise MesonException('Resource compilation requires a C or C++ compiler.')
@permittedKwargs(set(['args', 'include_directories']))
def compile_resources(self, state, args, kwargs): def compile_resources(self, state, args, kwargs):
comp = self.detect_compiler(state.compilers) comp = self.detect_compiler(state.compilers)