Can compile full test suite.

meson/interpreter.py

@@ -1094,7 +1094,7 @@ class Interpreter():
             raise InvalidCode('Import takes one argument.')
         modname = args[0]
         if not modname in self.environment.coredata.modules:
-            module = importlib.import_module('modules.' + modname).initialize()
+            module = importlib.import_module('meson.modules.' + modname).initialize()
             self.environment.coredata.modules[modname] = module
         return ModuleHolder(modname, self.environment.coredata.modules[modname], self)
 

meson/modules/gnome.py

@@ -15,13 +15,13 @@
 '''This module provides helper functions for Gnome/GLib related
 functionality such as gobject-introspection and gresources.'''
 
-import build
+from .. import build
 import os, sys
 import subprocess
-from coredata import MesonException
+from ..coredata import MesonException
-import mlog
+from .. import mlog
 import xml.etree.ElementTree as ET
-from mesonlib import File
+from ..mesonlib import File
 
 girwarning_printed = False
 

meson/modules/pkgconfig.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import coredata, build
+from .. import coredata, build
-import mesonlib
+from .. import mesonlib
 import os
 
 class PkgConfigModule:

meson/modules/qt4.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import dependencies, mlog
+from .. import dependencies, mlog
 import os, subprocess
-import build
+from .. import build
-from coredata import MesonException
+from ..coredata import MesonException
 import xml.etree.ElementTree as ET
 
 class Qt4Module():

meson/modules/qt5.py

@@ -12,10 +12,10 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import dependencies, mlog
+from .. import dependencies, mlog
 import os, subprocess
-import build
+from .. import build
-from coredata import MesonException
+from ..coredata import MesonException
 import xml.etree.ElementTree as ET
 
 class Qt5Module():

meson/modules/rpm.py

@@ -15,11 +15,11 @@
 '''This module provides helper functions for RPM related
 functionality such as generating template RPM spec file.'''
 
-import build
+from .. import build
-import compilers
+from .. import compilers
-import datetime
+from .. import datetime
-import mlog
+from .. import mlog
-import modules.gnome
+from .. import modules.gnome
 import os
 
 class RPMModule:

meson/modules/windows.py

@@ -12,8 +12,8 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import mesonlib, dependencies, build
+from .. import mesonlib, dependencies, build
-from coredata import MesonException
+from ..coredata import MesonException
 import os
 
 class WindowsModule:

scripts/symbolextractor.py

@@ -23,7 +23,7 @@
 # http://cgit.freedesktop.org/libreoffice/core/commit/?id=3213cd54b76bc80a6f0516aac75a48ff3b2ad67c
 
 import sys, subprocess
-import mesonlib
+from meson import mesonlib
 import argparse
 
 parser = argparse.ArgumentParser()