48 files changed, 26 insertions, 27 deletions

diff --git a/meson.py b/meson
index ab8db72..b977368 100755
--- a/meson.py
+++ b/meson
@@ -14,11 +14,11 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from meson import mesonmain
+from mesonbuild import mesonmain
 import sys, os
 
 thisfile = __file__
 if not os.path.isabs(thisfile):
-    thisfile = os.path.join(os.getcwd(), thisfile)
+    thisfile = os.path.normpath(os.path.join(os.getcwd(), thisfile))
 
 sys.exit(mesonmain.run(thisfile, sys.argv[1:]))
diff --git a/meson/__init__.py b/mesonbuild/__init__.py
index e69de29..e69de29 100644
--- a/meson/__init__.py
+++ b/mesonbuild/__init__.py
diff --git a/meson/backends.py b/mesonbuild/backends.py
index c583a7b..c583a7b 100644
--- a/meson/backends.py
+++ b/mesonbuild/backends.py
diff --git a/meson/build.py b/mesonbuild/build.py
index c0ba895..c0ba895 100644
--- a/meson/build.py
+++ b/mesonbuild/build.py
diff --git a/meson/compilers.py b/mesonbuild/compilers.py
index ec0181e..ec0181e 100644
--- a/meson/compilers.py
+++ b/mesonbuild/compilers.py
diff --git a/meson/coredata.py b/mesonbuild/coredata.py
index 5b1102c..5b1102c 100644
--- a/meson/coredata.py
+++ b/mesonbuild/coredata.py
diff --git a/meson/dependencies.py b/mesonbuild/dependencies.py
index 974559f..974559f 100644
--- a/meson/dependencies.py
+++ b/mesonbuild/dependencies.py
diff --git a/meson/environment.py b/mesonbuild/environment.py
index 8df856c..8df856c 100644
--- a/meson/environment.py
+++ b/mesonbuild/environment.py
diff --git a/meson/interpreter.py b/mesonbuild/interpreter.py
index 1a32998..4894ac7 100644
--- a/meson/interpreter.py
+++ b/mesonbuild/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('meson.modules.' + modname).initialize()
+            module = importlib.import_module('mesonbuild.modules.' + modname).initialize()
             self.environment.coredata.modules[modname] = module
         return ModuleHolder(modname, self.environment.coredata.modules[modname], self)
 
diff --git a/meson/mconf.py b/mesonbuild/mconf.py
index f174425..f174425 100644
--- a/meson/mconf.py
+++ b/mesonbuild/mconf.py
diff --git a/meson/mesonlib.py b/mesonbuild/mesonlib.py
index 2ab5ce4..2ab5ce4 100644
--- a/meson/mesonlib.py
+++ b/mesonbuild/mesonlib.py
diff --git a/meson/mesonmain.py b/mesonbuild/mesonmain.py
index 7b4f2c2..82f30fe 100644
--- a/meson/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -167,37 +167,37 @@ def run_script_command(args):
     cmdname = args[0]
     cmdargs = args[1:]
     if cmdname == 'test':
-        import meson.scripts.meson_test as abc
+        import mesonbuild.scripts.meson_test as abc
         cmdfunc = abc.run
     elif cmdname == 'benchmark':
-        import meson.scripts.meson_benchmark as abc
+        import mesonbuild.scripts.meson_benchmark as abc
         cmdfunc = abc.run
     elif cmdname == 'install':
-        import meson.scripts.meson_install as abc
+        import mesonbuild.scripts.meson_install as abc
         cmdfunc = abc.run
     elif cmdname == 'commandrunner':
-        import meson.scripts.commandrunner as abc
+        import mesonbuild.scripts.commandrunner as abc
         cmdfunc = abc.run
     elif cmdname == 'delsuffix':
-        import meson.scripts.delwithsuffix as abc
+        import mesonbuild.scripts.delwithsuffix as abc
         cmdfunc = abc.run
     elif cmdname == 'depfixer':
-        import meson.scripts.depfixer as abc
+        import mesonbuild.scripts.depfixer as abc
         cmdfunc = abc.run
     elif cmdname == 'dirchanger':
-        import meson.scripts.dirchanger as abc
+        import mesonbuild.scripts.dirchanger as abc
         cmdfunc = abc.run
     elif cmdname == 'gtkdoc':
         import meson.scripts.gtkdochelper as abc
         cmdfunc = abc.run
     elif cmdname == 'regencheck':
-        import meson.scripts.regen_checker as abc
+        import mesonbuild.scripts.regen_checker as abc
         cmdfunc = abc.run
     elif cmdname == 'symbolextractor':
-        import meson.scripts.symbolextractor as abc
+        import mesonbuild.scripts.symbolextractor as abc
         cmdfunc = abc.run
     elif cmdname == 'vcstagger':
-        import meson.scripts.vcstagger as abc
+        import mesonbuild.scripts.vcstagger as abc
         cmdfunc = abc.run
     else:
         raise MesonException('Unknown internal command {}.'.format(cmdname))
@@ -239,7 +239,6 @@ def run(mainfile, args):
             mainfile = os.path.join(os.path.dirname(mainfile), resolved)
         else:
             mainfile = resolved
-
     try:
         app = MesonApp(dir1, dir2, mainfile, handshake, options)
     except Exception as e:
diff --git a/meson/mesonmain.ui b/mesonbuild/mesonmain.ui
index 209584b..209584b 100644
--- a/meson/mesonmain.ui
+++ b/mesonbuild/mesonmain.ui
diff --git a/meson/mesonrunner.ui b/mesonbuild/mesonrunner.ui
index 942c6bd..942c6bd 100644
--- a/meson/mesonrunner.ui
+++ b/mesonbuild/mesonrunner.ui
diff --git a/meson/mesonstart.ui b/mesonbuild/mesonstart.ui
index c6c5f96..c6c5f96 100644
--- a/meson/mesonstart.ui
+++ b/mesonbuild/mesonstart.ui
diff --git a/meson/mgui.py b/mesonbuild/mgui.py
index 6e57ce7..6e57ce7 100644
--- a/meson/mgui.py
+++ b/mesonbuild/mgui.py
diff --git a/meson/mintro.py b/mesonbuild/mintro.py
index b088117..b088117 100644
--- a/meson/mintro.py
+++ b/mesonbuild/mintro.py
diff --git a/meson/mlog.py b/mesonbuild/mlog.py
index 2807c2b..2807c2b 100644
--- a/meson/mlog.py
+++ b/mesonbuild/mlog.py
diff --git a/meson/modules/gnome.py b/mesonbuild/modules/gnome.py
index e552b84..e552b84 100644
--- a/meson/modules/gnome.py
+++ b/mesonbuild/modules/gnome.py
diff --git a/meson/modules/modtest.py b/mesonbuild/modules/modtest.py
index c9247e6..c9247e6 100644
--- a/meson/modules/modtest.py
+++ b/mesonbuild/modules/modtest.py
diff --git a/meson/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py
index f18decf..f18decf 100644
--- a/meson/modules/pkgconfig.py
+++ b/mesonbuild/modules/pkgconfig.py
diff --git a/meson/modules/qt4.py b/mesonbuild/modules/qt4.py
index 162b553..162b553 100644
--- a/meson/modules/qt4.py
+++ b/mesonbuild/modules/qt4.py
diff --git a/meson/modules/qt5.py b/mesonbuild/modules/qt5.py
index 81edc76..81edc76 100644
--- a/meson/modules/qt5.py
+++ b/mesonbuild/modules/qt5.py
diff --git a/meson/modules/rpm.py b/mesonbuild/modules/rpm.py
index a2c0502..a2c0502 100644
--- a/meson/modules/rpm.py
+++ b/mesonbuild/modules/rpm.py
diff --git a/meson/modules/windows.py b/mesonbuild/modules/windows.py
index a785250..a785250 100644
--- a/meson/modules/windows.py
+++ b/mesonbuild/modules/windows.py
diff --git a/meson/mparser.py b/mesonbuild/mparser.py
index 1d569d5..1d569d5 100644
--- a/meson/mparser.py
+++ b/mesonbuild/mparser.py
diff --git a/meson/ninjabackend.py b/mesonbuild/ninjabackend.py
index 36c5ce9..36c5ce9 100644
--- a/meson/ninjabackend.py
+++ b/mesonbuild/ninjabackend.py
diff --git a/meson/optinterpreter.py b/mesonbuild/optinterpreter.py
index f0c93ae..f0c93ae 100644
--- a/meson/optinterpreter.py
+++ b/mesonbuild/optinterpreter.py
diff --git a/meson/scripts/commandrunner.py b/mesonbuild/scripts/commandrunner.py
index f5a2fff..f5a2fff 100644
--- a/meson/scripts/commandrunner.py
+++ b/mesonbuild/scripts/commandrunner.py
diff --git a/meson/scripts/delwithsuffix.py b/mesonbuild/scripts/delwithsuffix.py
index 38ab406..38ab406 100644
--- a/meson/scripts/delwithsuffix.py
+++ b/mesonbuild/scripts/delwithsuffix.py
diff --git a/meson/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py
index 1ab83b6..1ab83b6 100644
--- a/meson/scripts/depfixer.py
+++ b/mesonbuild/scripts/depfixer.py
diff --git a/meson/scripts/dirchanger.py b/mesonbuild/scripts/dirchanger.py
index 93a901d..93a901d 100644
--- a/meson/scripts/dirchanger.py
+++ b/mesonbuild/scripts/dirchanger.py
diff --git a/meson/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py
index 68be8f2..68be8f2 100644
--- a/meson/scripts/gtkdochelper.py
+++ b/mesonbuild/scripts/gtkdochelper.py
diff --git a/meson/scripts/meson_benchmark.py b/mesonbuild/scripts/meson_benchmark.py
index 26f1f95..26f1f95 100644
--- a/meson/scripts/meson_benchmark.py
+++ b/mesonbuild/scripts/meson_benchmark.py
diff --git a/meson/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py
index 1ede757..1ede757 100644
--- a/meson/scripts/meson_install.py
+++ b/mesonbuild/scripts/meson_install.py
diff --git a/meson/scripts/meson_test.py b/mesonbuild/scripts/meson_test.py
index c5814ef..03fd073 100644
--- a/meson/scripts/meson_test.py
+++ b/mesonbuild/scripts/meson_test.py
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import meson
+import mesonbuild
 import sys, os, subprocess, time, datetime, pickle, multiprocessing, json
 import concurrent.futures as conc
 import argparse
diff --git a/meson/scripts/regen_checker.py b/mesonbuild/scripts/regen_checker.py
index f360a7c..f360a7c 100644
--- a/meson/scripts/regen_checker.py
+++ b/mesonbuild/scripts/regen_checker.py
diff --git a/meson/scripts/symbolextractor.py b/mesonbuild/scripts/symbolextractor.py
index 9607466..79c1264 100644
--- a/meson/scripts/symbolextractor.py
+++ b/mesonbuild/scripts/symbolextractor.py
@@ -23,7 +23,7 @@
 # http://cgit.freedesktop.org/libreoffice/core/commit/?id=3213cd54b76bc80a6f0516aac75a48ff3b2ad67c
 
 import sys, subprocess
-from meson import mesonlib
+from mesonbuild import mesonlib
 import argparse
 
 parser = argparse.ArgumentParser()
diff --git a/meson/scripts/vcstagger.py b/mesonbuild/scripts/vcstagger.py
index 390e37a..390e37a 100644
--- a/meson/scripts/vcstagger.py
+++ b/mesonbuild/scripts/vcstagger.py
diff --git a/meson/vs2010backend.py b/mesonbuild/vs2010backend.py
index 33e9646..33e9646 100644
--- a/meson/vs2010backend.py
+++ b/mesonbuild/vs2010backend.py
diff --git a/meson/wrap/wrap.py b/mesonbuild/wrap/wrap.py
index 2818fa0..2818fa0 100644
--- a/meson/wrap/wrap.py
+++ b/mesonbuild/wrap/wrap.py
diff --git a/meson/wrap/wraptool.py b/mesonbuild/wrap/wraptool.py
index d2f0a28..d2f0a28 100755
--- a/meson/wrap/wraptool.py
+++ b/mesonbuild/wrap/wraptool.py
diff --git a/meson/xcodebackend.py b/mesonbuild/xcodebackend.py
index 8ac3f67..8ac3f67 100644
--- a/meson/xcodebackend.py
+++ b/mesonbuild/xcodebackend.py
diff --git a/mesonconf b/mesonconf
index 3b5b5e9..2b0a1a6 100755
--- a/mesonconf
+++ b/mesonconf
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from meson import mconf
+from mesonbuild import mconf
 import sys
 
 sys.exit(mconf.run(sys.argv[1:]))
diff --git a/mesongui b/mesongui
index c1cd802..9e16b00 100755
--- a/mesongui
+++ b/mesongui
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from meson import mgui
+from mesonbuild import mgui
 import sys
 
 sys.exit(mgui.run(sys.argv))
diff --git a/mesonintrospect b/mesonintrospect
index 94c05ea..4d20548 100755
--- a/mesonintrospect
+++ b/mesonintrospect
@@ -14,7 +14,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-from meson import mintro
+from mesonbuild import mintro
 import sys
 
 sys.exit(mintro.run(sys.argv[1:]))
diff --git a/run_cross_test.py b/run_cross_test.py
index 3545cfd..a788850 100755
--- a/run_cross_test.py
+++ b/run_cross_test.py
@@ -23,7 +23,7 @@ Not part of the main test suite because of two reasons:
 Eventually migrate to something fancier.'''
 
 import os, subprocess, shutil, sys
-import meson.environment as environment
+import mesonbuild.environment as environment
 
 from run_tests import gather_tests
 
diff --git a/run_tests.py b/run_tests.py
index bf56ea8..2211949 100755
--- a/run_tests.py
+++ b/run_tests.py
@@ -18,16 +18,16 @@ from glob import glob
 import os, subprocess, shutil, sys, signal
 from io import StringIO
 import sys
-from meson import environment
-from meson import mesonlib
-from meson import mlog
-from meson import mesonmain
-from meson.scripts import meson_test, meson_benchmark
+from mesonbuild import environment
+from mesonbuild import mesonlib
+from mesonbuild import mlog
+from mesonbuild import mesonmain
+from mesonbuild.scripts import meson_test, meson_benchmark
 import argparse
 import xml.etree.ElementTree as ET
 import time
 
-from meson.mesonmain import backendlist
+from mesonbuild.mesonmain import backendlist
 
 class TestResult:
     def __init__(self, msg, stdo, stde, conftime=0, buildtime=0, testtime=0):
@@ -45,7 +45,7 @@ print_debug = 'MESON_PRINT_TEST_OUTPUT' in os.environ
 
 test_build_dir = 'work area'
 install_dir = os.path.join(os.path.split(os.path.abspath(__file__))[0], 'install dir')
-meson_command = os.path.join(os.getcwd(), 'meson.py')
+meson_command = os.path.join(os.getcwd(), 'meson')
 
 class StopException(Exception):
     def __init__(self):