summaryrefslogtreecommitdiff
path: root/mesonbuild/msubprojects.py
diff options
context:
space:
mode:
authorRafael Silva <perigoso@riseup.net>2023-07-07 04:07:15 +0100
committerJussi Pakkanen <jpakkane@gmail.com>2023-07-10 17:52:42 +0300
commit6cb7ef1f3b780bd11730d5779485073217d09d88 (patch)
treee43b807e6fe34e6f8d68bbdaa41363d71291eabc /mesonbuild/msubprojects.py
parent7fa09ecd1c7029ed6b05b190662b6a1051bf8d7a (diff)
downloadmeson-6cb7ef1f3b780bd11730d5779485073217d09d88.tar.gz
rename msubprojects src_dir to source_dir
source_dir seems to be the most common name across the code base with 400+ hits
Diffstat (limited to 'mesonbuild/msubprojects.py')
-rwxr-xr-xmesonbuild/msubprojects.py13
1 files changed, 6 insertions, 7 deletions
diff --git a/mesonbuild/msubprojects.py b/mesonbuild/msubprojects.py
index db9db8585..622f1a53e 100755
--- a/mesonbuild/msubprojects.py
+++ b/mesonbuild/msubprojects.py
@@ -685,15 +685,14 @@ def add_arguments(parser: argparse.ArgumentParser) -> None:
p.set_defaults(subprojects_func=Runner.packagefiles)
def run(options: 'Arguments') -> int:
- src_dir = os.path.relpath(os.path.realpath(options.sourcedir))
- if not os.path.isfile(os.path.join(src_dir, 'meson.build')):
- mlog.error('Directory', mlog.bold(src_dir), 'does not seem to be a Meson source directory.')
+ source_dir = os.path.relpath(os.path.realpath(options.sourcedir))
+ if not os.path.isfile(os.path.join(source_dir, 'meson.build')):
+ mlog.error('Directory', mlog.bold(source_dir), 'does not seem to be a Meson source directory.')
return 1
- subprojects_dir = os.path.join(src_dir, 'subprojects')
- if not os.path.isdir(subprojects_dir):
- mlog.log('Directory', mlog.bold(src_dir), 'does not seem to have subprojects.')
+ if not os.path.isdir(os.path.join(source_dir, 'subprojects')):
+ mlog.log('Directory', mlog.bold(source_dir), 'does not seem to have subprojects.')
return 0
- r = Resolver(src_dir, 'subprojects', wrap_frontend=True, allow_insecure=options.allow_insecure, silent=True)
+ r = Resolver(source_dir, 'subprojects', wrap_frontend=True, allow_insecure=options.allow_insecure, silent=True)
if options.subprojects:
wraps = [wrap for name, wrap in r.wraps.items() if name in options.subprojects]
else: