aboutsummaryrefslogtreecommitdiff
path: root/mesonbuild/mesonmain.py
diff options
context:
space:
mode:
authorJussi Pakkanen <jpakkane@gmail.com>2018-01-01 02:12:13 +0200
committerJussi Pakkanen <jpakkane@gmail.com>2018-01-01 02:12:13 +0200
commitd4985d981fea5ec026745efb41be88f25d41bb32 (patch)
treeff7c86a54be37250f3452a5a586d5e7aaf7e67ef /mesonbuild/mesonmain.py
parentf2b33b8dcba7e8d948982cfb682e003d57e0f696 (diff)
parent4a189cf8c53e22b747521cae93c18cac3a45cc5a (diff)
downloadmeson-d4985d981fea5ec026745efb41be88f25d41bb32.zip
meson-d4985d981fea5ec026745efb41be88f25d41bb32.tar.gz
meson-d4985d981fea5ec026745efb41be88f25d41bb32.tar.bz2
Merged init branch.
Diffstat (limited to 'mesonbuild/mesonmain.py')
-rw-r--r--mesonbuild/mesonmain.py4
1 files changed, 3 insertions, 1 deletions
diff --git a/mesonbuild/mesonmain.py b/mesonbuild/mesonmain.py
index 20ec304..12bbd69 100644
--- a/mesonbuild/mesonmain.py
+++ b/mesonbuild/mesonmain.py
@@ -17,7 +17,7 @@ import time, datetime
import os.path
from . import environment, interpreter, mesonlib
from . import build
-from . import mconf, mintro, mtest, rewriter
+from . import mconf, mintro, mtest, rewriter, minit
import platform
from . import mlog, coredata
from .mesonlib import MesonException
@@ -308,6 +308,8 @@ def run(original_args, mainfile=None):
sys.exit(1)
elif cmd_name == 'wrap':
return wraptool.run(remaining_args)
+ elif cmd_name == 'init':
+ return minit.run(remaining_args)
elif cmd_name == 'runpython':
import runpy
script_file = remaining_args[0]