diff --git a/mesonbuild/backend/vs2010backend.py b/mesonbuild/backend/vs2010backend.py index 15bebbaa1..0f67771a7 100644 --- a/mesonbuild/backend/vs2010backend.py +++ b/mesonbuild/backend/vs2010backend.py @@ -15,17 +15,16 @@ import os, sys import pickle import re +import xml.dom.minidom +import xml.etree.ElementTree as ET -from mesonbuild import compilers -from mesonbuild.build import BuildTarget -from mesonbuild.mesonlib import File from . import backends from .. import build from .. import dependencies from .. import mlog -import xml.etree.ElementTree as ET -import xml.dom.minidom -from ..mesonlib import MesonException +from .. import compilers +from ..build import BuildTarget +from ..mesonlib import MesonException, File from ..environment import Environment def split_o_flags_args(args): diff --git a/mesonbuild/interpreter.py b/mesonbuild/interpreter.py index 6b62d756c..ff67e0ef2 100644 --- a/mesonbuild/interpreter.py +++ b/mesonbuild/interpreter.py @@ -23,10 +23,10 @@ from . import compilers from .wrap import wrap from . import mesonlib from .dependencies import InternalDependency, Dependency -from mesonbuild.interpreterbase import InterpreterBase -from mesonbuild.interpreterbase import check_stringlist, noPosargs, noKwargs, stringArgs -from mesonbuild.interpreterbase import InterpreterException, InvalidArguments, InvalidCode -from mesonbuild.interpreterbase import InterpreterObject, MutableInterpreterObject +from .interpreterbase import InterpreterBase +from .interpreterbase import check_stringlist, noPosargs, noKwargs, stringArgs +from .interpreterbase import InterpreterException, InvalidArguments, InvalidCode +from .interpreterbase import InterpreterObject, MutableInterpreterObject import os, sys, subprocess, shutil, uuid, re diff --git a/mesonbuild/scripts/gettext.py b/mesonbuild/scripts/gettext.py index be2f94bd9..8baf32379 100644 --- a/mesonbuild/scripts/gettext.py +++ b/mesonbuild/scripts/gettext.py @@ -16,7 +16,7 @@ import os import shutil import argparse import subprocess -from mesonbuild.scripts import destdir_join +from . import destdir_join parser = argparse.ArgumentParser() parser.add_argument('command') diff --git a/mesonbuild/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py index e34b541bc..41a4efe5d 100755 --- a/mesonbuild/scripts/gtkdochelper.py +++ b/mesonbuild/scripts/gtkdochelper.py @@ -17,8 +17,8 @@ import sys, os import subprocess import shutil import argparse -from mesonbuild.mesonlib import MesonException -from mesonbuild.scripts import destdir_join +from ..mesonlib import MesonException +from . import destdir_join parser = argparse.ArgumentParser() diff --git a/mesonbuild/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py index 5cf02e6e4..14539e090 100755 --- a/mesonbuild/scripts/meson_install.py +++ b/mesonbuild/scripts/meson_install.py @@ -16,8 +16,8 @@ import sys, pickle, os, shutil, subprocess, gzip, platform from glob import glob -from mesonbuild.scripts import depfixer -from mesonbuild.scripts import destdir_join +from . import depfixer +from . import destdir_join install_log_file = None diff --git a/mesonbuild/scripts/regen_checker.py b/mesonbuild/scripts/regen_checker.py index e8e107748..5077970e2 100755 --- a/mesonbuild/scripts/regen_checker.py +++ b/mesonbuild/scripts/regen_checker.py @@ -29,7 +29,7 @@ def need_regen(regeninfo, regen_timestamp): # We must make sure to recreate it, even if we do not regenerate the solution. # Otherwise, Visual Studio will always consider the REGEN project out of date. print("Everything is up-to-date, regeneration of build files is not needed.") - from mesonbuild.backend.vs2010backend import Vs2010Backend + from ..backend.vs2010backend import Vs2010Backend Vs2010Backend.touch_regen_timestamp(regeninfo.build_dir) return False diff --git a/mesonbuild/scripts/yelphelper.py b/mesonbuild/scripts/yelphelper.py index 524ef45be..4eec42542 100644 --- a/mesonbuild/scripts/yelphelper.py +++ b/mesonbuild/scripts/yelphelper.py @@ -16,9 +16,9 @@ import sys, os import subprocess import shutil import argparse -from mesonbuild import mlog -from mesonbuild.mesonlib import MesonException -from mesonbuild.scripts import destdir_join +from .. import mlog +from ..mesonlib import MesonException +from . import destdir_join parser = argparse.ArgumentParser() parser.add_argument('command')