diff options
| -rw-r--r-- | mesonbuild/backend/__init__.py | 0 | ||||
| -rw-r--r-- | mesonbuild/backend/backends.py (renamed from mesonbuild/backends.py) | 10 | ||||
| -rw-r--r-- | mesonbuild/backend/ninjabackend.py (renamed from mesonbuild/ninjabackend.py) | 14 | ||||
| -rw-r--r-- | mesonbuild/backend/vs2010backend.py (renamed from mesonbuild/vs2010backend.py) | 11 | ||||
| -rw-r--r-- | mesonbuild/backend/xcodebackend.py (renamed from mesonbuild/xcodebackend.py) | 9 | ||||
| -rw-r--r-- | mesonbuild/mesonmain.py | 6 |
6 files changed, 26 insertions, 24 deletions
diff --git a/mesonbuild/backend/__init__.py b/mesonbuild/backend/__init__.py new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/mesonbuild/backend/__init__.py diff --git a/mesonbuild/backends.py b/mesonbuild/backend/backends.py index c583a7b..cab3b8f 100644 --- a/mesonbuild/backends.py +++ b/mesonbuild/backend/backends.py @@ -1,4 +1,4 @@ -# Copyright 2012-2014 The Meson development team +# Copyright 2012-2016 The Meson development team # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -13,11 +13,11 @@ # limitations under the License. import os, pickle, re -from . import build -from . import dependencies -from . import mesonlib +from .. import build +from .. import dependencies +from .. import mesonlib import json -from .coredata import MesonException +from ..coredata import MesonException class InstallData(): def __init__(self, source_dir, build_dir, prefix, depfixer): diff --git a/mesonbuild/ninjabackend.py b/mesonbuild/backend/ninjabackend.py index a15ac68..e748def 100644 --- a/mesonbuild/ninjabackend.py +++ b/mesonbuild/backend/ninjabackend.py @@ -13,14 +13,14 @@ # limitations under the License. from . import backends -from . import environment, mesonlib -from . import build -from . import mlog -from . import dependencies -from .mesonlib import File +from .. import environment, mesonlib +from .. import build +from .. import mlog +from .. import dependencies +from ..mesonlib import File from .backends import InstallData -from .build import InvalidArguments -from .coredata import MesonException +from ..build import InvalidArguments +from ..coredata import MesonException import os, sys, pickle, re import subprocess, shutil diff --git a/mesonbuild/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 84bad40..c9fe09f 100644 --- a/mesonbuild/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -1,4 +1,4 @@ -# Copyright 2014-2015 The Meson development team +# Copyright 2014-2016 The Meson development team # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -14,12 +14,13 @@ import os, sys import pickle -from . import backends, build -from . import dependencies -from . import mlog +from . import backends +from .. import build +from .. import dependencies +from .. import mlog import xml.etree.ElementTree as ET import xml.dom.minidom -from .coredata import MesonException +from ..coredata import MesonException class RegenInfo(): def __init__(self, source_dir, build_dir, depfiles, solutionfile): diff --git a/mesonbuild/xcodebackend.py b/mesonbuild/backend/xcodebackend.py index 8ac3f67..d874be9 100644 --- a/mesonbuild/xcodebackend.py +++ b/mesonbuild/backend/xcodebackend.py @@ -1,4 +1,4 @@ -# Copyright 2014 The Meson development team +# Copyright 2014-2016 The Meson development team # Licensed under the Apache License, Version 2.0 (the "License"); # you may not use this file except in compliance with the License. @@ -12,11 +12,12 @@ # See the License for the specific language governing permissions and # limitations under the License. -from . import backends, build -from . import mesonlib +from . import backends +from .. import build +from .. import mesonlib import uuid, os, sys -from .coredata import MesonException +from ..coredata import MesonException class XCodeBackend(backends.Backend): def __init__(self, build): diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py index 6317c95..5cca0a5 100644 --- a/mesonbuild/mesonmain.py +++ b/mesonbuild/mesonmain.py @@ -138,13 +138,13 @@ itself as required.''' mlog.log('Build type:', mlog.bold('native build')) b = build.Build(env) if self.options.backend == 'ninja': - from . import ninjabackend + from .backend import ninjabackend g = ninjabackend.NinjaBackend(b) elif self.options.backend == 'vs2010': - from . import vs2010backend + from .backend import vs2010backend g = vs2010backend.Vs2010Backend(b) elif self.options.backend == 'xcode': - from . import xcodebackend + from .backend import xcodebackend g = xcodebackend.XCodeBackend(b) else: raise RuntimeError('Unknown backend "%s".' % self.options.backend) |