Renamed meson package to mesonbuild so that we can have a script named meson in the same toplevel dir.

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:]))

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)
 

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:

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

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()

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:]))

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))

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:]))

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
 

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 mesonbuild import environment
-from meson import mesonlib
+from mesonbuild import mesonlib
-from meson import mlog
+from mesonbuild import mlog
-from meson import mesonmain
+from mesonbuild import mesonmain
-from meson.scripts import meson_test, meson_benchmark
+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):