diff options
| -rw-r--r-- | mesonbuild/interpreter/type_checking.py | 23 | ||||
| -rw-r--r-- | mesonbuild/linkers/detect.py | 2 | ||||
| -rw-r--r-- | mesonbuild/modules/cmake.py | 3 | ||||
| -rw-r--r-- | mesonbuild/modules/i18n.py | 2 |
4 files changed, 16 insertions, 14 deletions
diff --git a/mesonbuild/interpreter/type_checking.py b/mesonbuild/interpreter/type_checking.py index 54ccddd..46910dd 100644 --- a/mesonbuild/interpreter/type_checking.py +++ b/mesonbuild/interpreter/type_checking.py @@ -44,40 +44,39 @@ def _install_mode_validator(mode: T.List[T.Union[str, bool, int]]) -> T.Optional This is a rather odd thing, it's a scalar, or an array of 3 values in the form: [(str | False), (str | int | False) = False, (str | int | False) = False] - Where the second and third arguments are not required, and are considered to - default to False. + where the second and third components are not required and default to False. """ if not mode: return None if True in mode: - return 'can only be a string or false, not true' + return 'components can only be permission strings, numbers, or False' if len(mode) > 3: return 'may have at most 3 elements' perms = mode[0] if not isinstance(perms, (str, bool)): - return 'permissions part must be a string or false' + return 'first component must be a permissions string or False' if isinstance(perms, str): if not len(perms) == 9: - return (f'permissions string must be exactly 9 characters, got "{len(perms)}" ' - 'in the form rwxr-xr-x') + return ('permissions string must be exactly 9 characters in the form rwxr-xr-x,' + f' got {len(perms)}') for i in [0, 3, 6]: if perms[i] not in {'-', 'r'}: - return f'bit {i} must be "-" or "r", not {perms[i]}' + return f'permissions character {i+1} must be "-" or "r", not {perms[i]}' for i in [1, 4, 7]: if perms[i] not in {'-', 'w'}: - return f'bit {i} must be "-" or "w", not {perms[i]}' + return f'permissions character {i+1} must be "-" or "w", not {perms[i]}' for i in [2, 5]: if perms[i] not in {'-', 'x', 's', 'S'}: - return f'bit {i} must be "-", "s", "S", or "x", not {perms[i]}' + return f'permissions character {i+1} must be "-", "s", "S", or "x", not {perms[i]}' if perms[8] not in {'-', 'x', 't', 'T'}: - return f'bit 8 must be "-", "t", "T", or "x", not {perms[8]}' + return f'permission character 9 must be "-", "t", "T", or "x", not {perms[8]}' if len(mode) >= 2 and not isinstance(mode[1], (int, str, bool)): - return 'second componenent must be a string, number, or False if provided' + return 'second componenent can only be a string, number, or False' if len(mode) >= 3 and not isinstance(mode[2], (int, str, bool)): - return 'third componenent must be a string, number, or False if provided' + return 'third componenent can only be a string, number, or False' return None diff --git a/mesonbuild/linkers/detect.py b/mesonbuild/linkers/detect.py index b85acc6..183e4e8 100644 --- a/mesonbuild/linkers/detect.py +++ b/mesonbuild/linkers/detect.py @@ -118,7 +118,7 @@ def guess_win_linker(env: 'Environment', compiler: T.List[str], comp_class: T.Ty import shutil fullpath = shutil.which(compiler[0]) raise EnvironmentException( - f"Found GNU link.exe instead of MSVC link.exe in {fullpath}\.n" + f"Found GNU link.exe instead of MSVC link.exe in {fullpath}.\n" "This link.exe is not a linker.\n" "You may need to reorder entries to your %PATH% variable to resolve this.") __failed_to_detect_linker(compiler, check_args, o, e) diff --git a/mesonbuild/modules/cmake.py b/mesonbuild/modules/cmake.py index 53beded..94f90fa 100644 --- a/mesonbuild/modules/cmake.py +++ b/mesonbuild/modules/cmake.py @@ -238,6 +238,9 @@ class CmakeModule(ExtensionModule): return True cmakebin = ExternalProgram('cmake', silent=False) + if not cmakebin.found(): + return False + p, stdout, stderr = mesonlib.Popen_safe(cmakebin.get_command() + ['--system-information', '-G', 'Ninja'])[0:3] if p.returncode != 0: mlog.log(f'error retrieving cmake information: returnCode={p.returncode} stdout={stdout} stderr={stderr}') diff --git a/mesonbuild/modules/i18n.py b/mesonbuild/modules/i18n.py index 63e4218..1457874 100644 --- a/mesonbuild/modules/i18n.py +++ b/mesonbuild/modules/i18n.py @@ -245,7 +245,7 @@ class I18nModule(ExtensionModule): potargs = state.environment.get_build_command() + ['--internal', 'gettext', 'pot', pkg_arg] if datadirs: - potargs.append(_datadirs) + potargs.append(datadirs) if extra_arg: potargs.append(extra_arg) pottarget = build.RunTarget(packagename + '-pot', potargs, [], state.subdir, state.subproject) |