Unsupported platform added for env (fixes #29559) (#891)

* Unsupported platform added for env (fixes #29559)

* Unsupported platform added for env (fixes #29559)

* Revert error on linux, for testing CI

* Ignore error on linux

* Revert settings change

* Localized message
This commit is contained in:
soroshsabz 2023-02-13 22:45:38 +03:30 коммит произвёл GitHub
Родитель 0d4f2fb8dd
Коммит 07984253f6
Не найден ключ, соответствующий данной подписи
Идентификатор ключа GPG: 4AEE18F83AFDEB23
5 изменённых файлов: 12 добавлений и 2 удалений

Просмотреть файл

@ -2,4 +2,6 @@
$env:VCPKG_DOWNLOADS = Join-Path $TestingRoot 'empty downloads'
Run-Vcpkg env --bin --tools --python set
Throw-IfFailed
if ($IsWindows) {
Throw-IfFailed
}

Просмотреть файл

@ -1100,6 +1100,7 @@ namespace vcpkg
"{value} is the invalid value of an environment variable",
"{env_var} is {value}, must be > 0");
DECLARE_MESSAGE(EnvStrFailedToExtract, (), "", "could not expand the environment string:");
DECLARE_MESSAGE(EnvPlatformNotSupported, (), "", "Build environment commands are not supported on this platform");
DECLARE_MESSAGE(ErrorDetectingCompilerInfo,
(msg::path),
"",

Просмотреть файл

@ -389,6 +389,7 @@
"EnvInvalidMaxConcurrency": "{env_var} is {value}, must be > 0",
"_EnvInvalidMaxConcurrency.comment": "{value} is the invalid value of an environment variable An example of {env_var} is VCPKG_DEFAULT_TRIPLET.",
"EnvStrFailedToExtract": "could not expand the environment string:",
"EnvPlatformNotSupported": "Build environment commands are not supported on this platform",
"ErrorDetectingCompilerInfo": "while detecting compiler information:\nThe log file content at \"{path}\" is:",
"_ErrorDetectingCompilerInfo.comment": "An example of {path} is /foo/bar.",
"ErrorIndividualPackagesUnsupported": "In manifest mode, `vcpkg install` does not support individual package arguments.\nTo install additional packages, edit vcpkg.json and then run `vcpkg install` without any package arguments.",

Просмотреть файл

@ -663,6 +663,7 @@ namespace vcpkg
REGISTER_MESSAGE(EndOfStringInCodeUnit);
REGISTER_MESSAGE(EnvInvalidMaxConcurrency);
REGISTER_MESSAGE(EnvStrFailedToExtract);
REGISTER_MESSAGE(EnvPlatformNotSupported);
REGISTER_MESSAGE(ErrorDetectingCompilerInfo);
REGISTER_MESSAGE(ErrorIndividualPackagesUnsupported);
REGISTER_MESSAGE(ErrorInvalidClassicModeOption);

Просмотреть файл

@ -101,11 +101,16 @@ namespace vcpkg::Commands::Env
#if defined(_WIN32)
env = cmd_execute_and_capture_environment(build_env_cmd, env);
#else // ^^^ _WIN32 / !_WIN32 vvv
Checks::exit_with_message(VCPKG_LINE_INFO, "Build environment commands are not supported on this platform");
Checks::msg_exit_with_message(VCPKG_LINE_INFO, msgEnvPlatformNotSupported);
#endif // ^^^ !_WIN32
}
#if defined(_WIN32)
Command cmd("cmd");
#else // ^^^ _WIN32 / !_WIN32 vvv
Command cmd("");
Checks::msg_exit_with_message(VCPKG_LINE_INFO, msgEnvPlatformNotSupported);
#endif // ^^^ !_WIN32
if (!args.command_arguments.empty())
{
cmd.string_arg("/c").raw_arg(args.command_arguments[0]);