diff options
Diffstat (limited to 'mesonbuild/modules')
| -rw-r--r-- | mesonbuild/modules/gnome.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/pkgconfig.py | 12 | ||||
| -rw-r--r-- | mesonbuild/modules/qt4.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/qt5.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/windows.py | 2 |
5 files changed, 10 insertions, 10 deletions
diff --git a/mesonbuild/modules/gnome.py b/mesonbuild/modules/gnome.py index 55bb321..f0de363 100644 --- a/mesonbuild/modules/gnome.py +++ b/mesonbuild/modules/gnome.py @@ -18,7 +18,7 @@ functionality such as gobject-introspection and gresources.''' from .. import build import os, sys import subprocess -from ..coredata import MesonException +from ..mesonlib import MesonException from .. import mlog from .. import mesonlib diff --git a/mesonbuild/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py index ffe03e2..fe5ca45 100644 --- a/mesonbuild/modules/pkgconfig.py +++ b/mesonbuild/modules/pkgconfig.py @@ -55,7 +55,7 @@ class PkgConfigModule: def generate(self, state, args, kwargs): if len(args) > 0: - raise coredata.MesonException('Pkgconfig_gen takes no positional arguments.') + raise mesonlib.MesonException('Pkgconfig_gen takes no positional arguments.') libs = kwargs.get('libraries', []) if not isinstance(libs, list): libs = [libs] @@ -64,22 +64,22 @@ class PkgConfigModule: if hasattr(l, 'held_object'): l = l.held_object if not (isinstance(l, build.SharedLibrary) or isinstance(l, build.StaticLibrary)): - raise coredata.MesonException('Library argument not a library object.') + raise mesonlib.MesonException('Library argument not a library object.') processed_libs.append(l) libs = processed_libs subdirs = mesonlib.stringlistify(kwargs.get('subdirs', ['.'])) version = kwargs.get('version', '') if not isinstance(version, str): - raise coredata.MesonException('Version must be a string.') + raise mesonlib.MesonException('Version must be a string.') name = kwargs.get('name', None) if not isinstance(name, str): - raise coredata.MesonException('Name not specified.') + raise mesonlib.MesonException('Name not specified.') filebase = kwargs.get('filebase', name) if not isinstance(filebase, str): - raise coredata.MesonException('Filebase must be a string.') + raise mesonlib.MesonException('Filebase must be a string.') description = kwargs.get('description', None) if not isinstance(description, str): - raise coredata.MesonException('Description is not a string.') + raise mesonlib.MesonException('Description is not a string.') pub_reqs = mesonlib.stringlistify(kwargs.get('requires', [])) priv_reqs = mesonlib.stringlistify(kwargs.get('requires_private', [])) priv_libs = mesonlib.stringlistify(kwargs.get('libraries_private', [])) diff --git a/mesonbuild/modules/qt4.py b/mesonbuild/modules/qt4.py index 162b553..81a70fc 100644 --- a/mesonbuild/modules/qt4.py +++ b/mesonbuild/modules/qt4.py @@ -15,7 +15,7 @@ from .. import dependencies, mlog import os, subprocess from .. import build -from ..coredata import MesonException +from ..mesonlib import MesonException import xml.etree.ElementTree as ET class Qt4Module(): diff --git a/mesonbuild/modules/qt5.py b/mesonbuild/modules/qt5.py index cb743a6..f669d77 100644 --- a/mesonbuild/modules/qt5.py +++ b/mesonbuild/modules/qt5.py @@ -15,7 +15,7 @@ from .. import dependencies, mlog import os, subprocess from .. import build -from ..coredata import MesonException +from ..mesonlib import MesonException import xml.etree.ElementTree as ET class Qt5Module(): diff --git a/mesonbuild/modules/windows.py b/mesonbuild/modules/windows.py index a785250..29d6236 100644 --- a/mesonbuild/modules/windows.py +++ b/mesonbuild/modules/windows.py @@ -13,7 +13,7 @@ # limitations under the License. from .. import mesonlib, dependencies, build -from ..coredata import MesonException +from ..mesonlib import MesonException import os class WindowsModule: |