From 23b98cd6e66c6ae0f070e28e0f8b1566c0b5e585 Mon Sep 17 00:00:00 2001 From: Jussi Pakkanen Date: Sat, 16 Jan 2016 17:35:29 +0200 Subject: [PATCH] Renamed meson package to mesonbuild so that we can have a script named meson in the same toplevel dir. --- meson.py => meson | 4 ++-- {meson => mesonbuild}/__init__.py | 0 {meson => mesonbuild}/backends.py | 0 {meson => mesonbuild}/build.py | 0 {meson => mesonbuild}/compilers.py | 0 {meson => mesonbuild}/coredata.py | 0 {meson => mesonbuild}/dependencies.py | 0 {meson => mesonbuild}/environment.py | 0 {meson => mesonbuild}/interpreter.py | 2 +- {meson => mesonbuild}/mconf.py | 0 {meson => mesonbuild}/mesonlib.py | 0 {meson => mesonbuild}/mesonmain.py | 21 +++++++++---------- {meson => mesonbuild}/mesonmain.ui | 0 {meson => mesonbuild}/mesonrunner.ui | 0 {meson => mesonbuild}/mesonstart.ui | 0 {meson => mesonbuild}/mgui.py | 0 {meson => mesonbuild}/mintro.py | 0 {meson => mesonbuild}/mlog.py | 0 {meson => mesonbuild}/modules/gnome.py | 0 {meson => mesonbuild}/modules/modtest.py | 0 {meson => mesonbuild}/modules/pkgconfig.py | 0 {meson => mesonbuild}/modules/qt4.py | 0 {meson => mesonbuild}/modules/qt5.py | 0 {meson => mesonbuild}/modules/rpm.py | 0 {meson => mesonbuild}/modules/windows.py | 0 {meson => mesonbuild}/mparser.py | 0 {meson => mesonbuild}/ninjabackend.py | 0 {meson => mesonbuild}/optinterpreter.py | 0 .../scripts/commandrunner.py | 0 .../scripts/delwithsuffix.py | 0 {meson => mesonbuild}/scripts/depfixer.py | 0 {meson => mesonbuild}/scripts/dirchanger.py | 0 {meson => mesonbuild}/scripts/gtkdochelper.py | 0 .../scripts/meson_benchmark.py | 0 .../scripts/meson_install.py | 0 {meson => mesonbuild}/scripts/meson_test.py | 2 +- .../scripts/regen_checker.py | 0 .../scripts/symbolextractor.py | 2 +- {meson => mesonbuild}/scripts/vcstagger.py | 0 {meson => mesonbuild}/vs2010backend.py | 0 {meson => mesonbuild}/wrap/wrap.py | 0 {meson => mesonbuild}/wrap/wraptool.py | 0 {meson => mesonbuild}/xcodebackend.py | 0 mesonconf | 2 +- mesongui | 2 +- mesonintrospect | 2 +- run_cross_test.py | 2 +- run_tests.py | 14 ++++++------- 48 files changed, 26 insertions(+), 27 deletions(-) rename meson.py => meson (87%) rename {meson => mesonbuild}/__init__.py (100%) rename {meson => mesonbuild}/backends.py (100%) rename {meson => mesonbuild}/build.py (100%) rename {meson => mesonbuild}/compilers.py (100%) rename {meson => mesonbuild}/coredata.py (100%) rename {meson => mesonbuild}/dependencies.py (100%) rename {meson => mesonbuild}/environment.py (100%) rename {meson => mesonbuild}/interpreter.py (99%) rename {meson => mesonbuild}/mconf.py (100%) rename {meson => mesonbuild}/mesonlib.py (100%) rename {meson => mesonbuild}/mesonmain.py (95%) rename {meson => mesonbuild}/mesonmain.ui (100%) rename {meson => mesonbuild}/mesonrunner.ui (100%) rename {meson => mesonbuild}/mesonstart.ui (100%) rename {meson => mesonbuild}/mgui.py (100%) rename {meson => mesonbuild}/mintro.py (100%) rename {meson => mesonbuild}/mlog.py (100%) rename {meson => mesonbuild}/modules/gnome.py (100%) rename {meson => mesonbuild}/modules/modtest.py (100%) rename {meson => mesonbuild}/modules/pkgconfig.py (100%) rename {meson => mesonbuild}/modules/qt4.py (100%) rename {meson => mesonbuild}/modules/qt5.py (100%) rename {meson => mesonbuild}/modules/rpm.py (100%) rename {meson => mesonbuild}/modules/windows.py (100%) rename {meson => mesonbuild}/mparser.py (100%) rename {meson => mesonbuild}/ninjabackend.py (100%) rename {meson => mesonbuild}/optinterpreter.py (100%) rename {meson => mesonbuild}/scripts/commandrunner.py (100%) rename {meson => mesonbuild}/scripts/delwithsuffix.py (100%) rename {meson => mesonbuild}/scripts/depfixer.py (100%) rename {meson => mesonbuild}/scripts/dirchanger.py (100%) rename {meson => mesonbuild}/scripts/gtkdochelper.py (100%) rename {meson => mesonbuild}/scripts/meson_benchmark.py (100%) rename {meson => mesonbuild}/scripts/meson_install.py (100%) rename {meson => mesonbuild}/scripts/meson_test.py (99%) rename {meson => mesonbuild}/scripts/regen_checker.py (100%) rename {meson => mesonbuild}/scripts/symbolextractor.py (99%) rename {meson => mesonbuild}/scripts/vcstagger.py (100%) rename {meson => mesonbuild}/vs2010backend.py (100%) rename {meson => mesonbuild}/wrap/wrap.py (100%) rename {meson => mesonbuild}/wrap/wraptool.py (100%) rename {meson => mesonbuild}/xcodebackend.py (100%) diff --git a/meson.py b/meson similarity index 87% rename from meson.py rename to meson index ab8db7250..b9773687b 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 similarity index 100% rename from meson/__init__.py rename to mesonbuild/__init__.py diff --git a/meson/backends.py b/mesonbuild/backends.py similarity index 100% rename from meson/backends.py rename to mesonbuild/backends.py diff --git a/meson/build.py b/mesonbuild/build.py similarity index 100% rename from meson/build.py rename to mesonbuild/build.py diff --git a/meson/compilers.py b/mesonbuild/compilers.py similarity index 100% rename from meson/compilers.py rename to mesonbuild/compilers.py diff --git a/meson/coredata.py b/mesonbuild/coredata.py similarity index 100% rename from meson/coredata.py rename to mesonbuild/coredata.py diff --git a/meson/dependencies.py b/mesonbuild/dependencies.py similarity index 100% rename from meson/dependencies.py rename to mesonbuild/dependencies.py diff --git a/meson/environment.py b/mesonbuild/environment.py similarity index 100% rename from meson/environment.py rename to mesonbuild/environment.py diff --git a/meson/interpreter.py b/mesonbuild/interpreter.py similarity index 99% rename from meson/interpreter.py rename to mesonbuild/interpreter.py index 1a32998cc..4894ac726 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 similarity index 100% rename from meson/mconf.py rename to mesonbuild/mconf.py diff --git a/meson/mesonlib.py b/mesonbuild/mesonlib.py similarity index 100% rename from meson/mesonlib.py rename to mesonbuild/mesonlib.py diff --git a/meson/mesonmain.py b/mesonbuild/mesonmain.py similarity index 95% rename from meson/mesonmain.py rename to mesonbuild/mesonmain.py index 7b4f2c261..82f30fe03 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 similarity index 100% rename from meson/mesonmain.ui rename to mesonbuild/mesonmain.ui diff --git a/meson/mesonrunner.ui b/mesonbuild/mesonrunner.ui similarity index 100% rename from meson/mesonrunner.ui rename to mesonbuild/mesonrunner.ui diff --git a/meson/mesonstart.ui b/mesonbuild/mesonstart.ui similarity index 100% rename from meson/mesonstart.ui rename to mesonbuild/mesonstart.ui diff --git a/meson/mgui.py b/mesonbuild/mgui.py similarity index 100% rename from meson/mgui.py rename to mesonbuild/mgui.py diff --git a/meson/mintro.py b/mesonbuild/mintro.py similarity index 100% rename from meson/mintro.py rename to mesonbuild/mintro.py diff --git a/meson/mlog.py b/mesonbuild/mlog.py similarity index 100% rename from meson/mlog.py rename to mesonbuild/mlog.py diff --git a/meson/modules/gnome.py b/mesonbuild/modules/gnome.py similarity index 100% rename from meson/modules/gnome.py rename to mesonbuild/modules/gnome.py diff --git a/meson/modules/modtest.py b/mesonbuild/modules/modtest.py similarity index 100% rename from meson/modules/modtest.py rename to mesonbuild/modules/modtest.py diff --git a/meson/modules/pkgconfig.py b/mesonbuild/modules/pkgconfig.py similarity index 100% rename from meson/modules/pkgconfig.py rename to mesonbuild/modules/pkgconfig.py diff --git a/meson/modules/qt4.py b/mesonbuild/modules/qt4.py similarity index 100% rename from meson/modules/qt4.py rename to mesonbuild/modules/qt4.py diff --git a/meson/modules/qt5.py b/mesonbuild/modules/qt5.py similarity index 100% rename from meson/modules/qt5.py rename to mesonbuild/modules/qt5.py diff --git a/meson/modules/rpm.py b/mesonbuild/modules/rpm.py similarity index 100% rename from meson/modules/rpm.py rename to mesonbuild/modules/rpm.py diff --git a/meson/modules/windows.py b/mesonbuild/modules/windows.py similarity index 100% rename from meson/modules/windows.py rename to mesonbuild/modules/windows.py diff --git a/meson/mparser.py b/mesonbuild/mparser.py similarity index 100% rename from meson/mparser.py rename to mesonbuild/mparser.py diff --git a/meson/ninjabackend.py b/mesonbuild/ninjabackend.py similarity index 100% rename from meson/ninjabackend.py rename to mesonbuild/ninjabackend.py diff --git a/meson/optinterpreter.py b/mesonbuild/optinterpreter.py similarity index 100% rename from meson/optinterpreter.py rename to mesonbuild/optinterpreter.py diff --git a/meson/scripts/commandrunner.py b/mesonbuild/scripts/commandrunner.py similarity index 100% rename from meson/scripts/commandrunner.py rename to mesonbuild/scripts/commandrunner.py diff --git a/meson/scripts/delwithsuffix.py b/mesonbuild/scripts/delwithsuffix.py similarity index 100% rename from meson/scripts/delwithsuffix.py rename to mesonbuild/scripts/delwithsuffix.py diff --git a/meson/scripts/depfixer.py b/mesonbuild/scripts/depfixer.py similarity index 100% rename from meson/scripts/depfixer.py rename to mesonbuild/scripts/depfixer.py diff --git a/meson/scripts/dirchanger.py b/mesonbuild/scripts/dirchanger.py similarity index 100% rename from meson/scripts/dirchanger.py rename to mesonbuild/scripts/dirchanger.py diff --git a/meson/scripts/gtkdochelper.py b/mesonbuild/scripts/gtkdochelper.py similarity index 100% rename from meson/scripts/gtkdochelper.py rename to mesonbuild/scripts/gtkdochelper.py diff --git a/meson/scripts/meson_benchmark.py b/mesonbuild/scripts/meson_benchmark.py similarity index 100% rename from meson/scripts/meson_benchmark.py rename to mesonbuild/scripts/meson_benchmark.py diff --git a/meson/scripts/meson_install.py b/mesonbuild/scripts/meson_install.py similarity index 100% rename from meson/scripts/meson_install.py rename to mesonbuild/scripts/meson_install.py diff --git a/meson/scripts/meson_test.py b/mesonbuild/scripts/meson_test.py similarity index 99% rename from meson/scripts/meson_test.py rename to mesonbuild/scripts/meson_test.py index c5814ef32..03fd07322 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 similarity index 100% rename from meson/scripts/regen_checker.py rename to mesonbuild/scripts/regen_checker.py diff --git a/meson/scripts/symbolextractor.py b/mesonbuild/scripts/symbolextractor.py similarity index 99% rename from meson/scripts/symbolextractor.py rename to mesonbuild/scripts/symbolextractor.py index 9607466d0..79c126420 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 similarity index 100% rename from meson/scripts/vcstagger.py rename to mesonbuild/scripts/vcstagger.py diff --git a/meson/vs2010backend.py b/mesonbuild/vs2010backend.py similarity index 100% rename from meson/vs2010backend.py rename to mesonbuild/vs2010backend.py diff --git a/meson/wrap/wrap.py b/mesonbuild/wrap/wrap.py similarity index 100% rename from meson/wrap/wrap.py rename to mesonbuild/wrap/wrap.py diff --git a/meson/wrap/wraptool.py b/mesonbuild/wrap/wraptool.py similarity index 100% rename from meson/wrap/wraptool.py rename to mesonbuild/wrap/wraptool.py diff --git a/meson/xcodebackend.py b/mesonbuild/xcodebackend.py similarity index 100% rename from meson/xcodebackend.py rename to mesonbuild/xcodebackend.py diff --git a/mesonconf b/mesonconf index 3b5b5e966..2b0a1a61f 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 c1cd8027a..9e16b001c 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 94c05eaeb..4d20548b1 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 3545cfd64..a7888507a 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 bf56ea86d..221194993 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):