Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[VS] allow installations without the english language pack #339

Merged
merged 3 commits into from
Feb 10, 2022
Merged

[VS] allow installations without the english language pack #339

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5972ec7
[VS] allow installations without the english language pack
strega-nil Feb 2, 2022
b71019b
remove "excluded_toolsets" that's now unused
strega-nil Feb 2, 2022
30c2faf
format
strega-nil Feb 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions src/vcpkg/base/system.process.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -386,6 +386,9 @@ namespace vcpkg
new_path += Strings::format(";%s", extra_env.find("PATH")->second);
env_cstr.append(Strings::to_utf16(new_path));
env_cstr.push_back(L'\0');
// NOTE: we support VS's without the english language pack,
// but we still want to default to english just in case your specific
// non-standard build system doesn't support non-english
env_cstr.append(L"VSLANG=1033");
env_cstr.push_back(L'\0');
env_cstr.append(L"VSCMD_SKIP_SENDTELEMETRY=1");
Expand Down
14 changes: 0 additions & 14 deletions src/vcpkg/visualstudio.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -306,13 +306,6 @@ namespace vcpkg::VisualStudio
toolset_version_full.to_string(),
supported_architectures};

const auto english_language_pack = dumpbin_dir / "1033";
if (!fs.exists(english_language_pack, IgnoreErrors{}))
{
excluded_toolsets.push_back(std::move(toolset));
continue;
}

found_toolsets.push_back(std::move(toolset));
if (v140_is_available)
{
Expand Down Expand Up @@ -368,13 +361,6 @@ namespace vcpkg::VisualStudio
major_version,
supported_architectures};

const auto english_language_pack = vs_dumpbin_dir / "1033";
if (!fs.exists(english_language_pack, IgnoreErrors{}))
{
excluded_toolsets.push_back(toolset);
break;
}

found_toolsets.push_back(toolset);
}
}
Expand Down