mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2025-06-07 18:30:11 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

[vcpkg] Rewriting CmdLineBuilder/Command (3/n) (#15673)

Browse Source 
Rename CmdLineBuilder to Command, since it's no longer a builder but an actual data type
This commit is contained in:
nicole mazzuca 2021-01-15 18:32:04 -08:00 committed by GitHub
parent a2cc2b1735
commit b60f003ccf
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
25 changed files with 164 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

58
toolsrc/include/vcpkg/base/system.process.h
View File

@ -20,26 +20,26 @@ namespace vcpkg::System
std::string s; std::string s;
}; };
struct CmdLineBuilder struct Command
{ {
CmdLineBuilder() = default; Command() = default;
explicit CmdLineBuilder(const fs::path& p) { path_arg(p); } explicit Command(const fs::path& p) { path_arg(p); }
explicit CmdLineBuilder(StringView s) { string_arg(s); } explicit Command(StringView s) { string_arg(s); }
explicit CmdLineBuilder(const std::string& s) { string_arg(s); } explicit Command(const std::string& s) { string_arg(s); }
explicit CmdLineBuilder(const char* s) { string_arg({s, ::strlen(s)}); } explicit Command(const char* s) { string_arg({s, ::strlen(s)}); }
CmdLineBuilder& path_arg(const fs::path& p) & { return string_arg(fs::u8string(p)); } Command& path_arg(const fs::path& p) & { return string_arg(fs::u8string(p)); }
CmdLineBuilder& string_arg(StringView s) &; Command& string_arg(StringView s) &;
CmdLineBuilder& raw_arg(StringView s) & Command& raw_arg(StringView s) &
{ {
buf.push_back(' '); buf.push_back(' ');
buf.append(s.data(), s.size()); buf.append(s.data(), s.size());
return *this; return *this;
} }
CmdLineBuilder&& path_arg(const fs::path& p) && { return std::move(path_arg(p)); } Command&& path_arg(const fs::path& p) && { return std::move(path_arg(p)); }
CmdLineBuilder&& string_arg(StringView s) && { return std::move(string_arg(s)); }; Command&& string_arg(StringView s) && { return std::move(string_arg(s)); };
CmdLineBuilder&& raw_arg(StringView s) && { return std::move(raw_arg(s)); } Command&& raw_arg(StringView s) && { return std::move(raw_arg(s)); }
std::string&& extract() && { return std::move(buf); } std::string&& extract() && { return std::move(buf); }
StringView command_line() const { return buf; } StringView command_line() const { return buf; }
@ -51,17 +51,17 @@ namespace vcpkg::System
std::string buf; std::string buf;
}; };
struct CmdLineBuilderMapLess struct CommandLess
{ {
bool operator()(const CmdLineBuilder& lhs, const CmdLineBuilder& rhs) const bool operator()(const Command& lhs, const Command& rhs) const
{ {
return lhs.command_line() < rhs.command_line(); return lhs.command_line() < rhs.command_line();
} }
}; };
CmdLineBuilder make_basic_cmake_cmd(const fs::path& cmake_tool_path, Command make_basic_cmake_cmd(const fs::path& cmake_tool_path,
const fs::path& cmake_script, const fs::path& cmake_script,
const std::vector<CMakeVariable>& pass_variables); const std::vector<CMakeVariable>& pass_variables);
fs::path get_exe_path_of_current_process(); fs::path get_exe_path_of_current_process();
@ -87,48 +87,48 @@ namespace vcpkg::System
const fs::path& working_directory; const fs::path& working_directory;
}; };
int cmd_execute(const CmdLineBuilder& cmd_line, InWorkingDirectory wd, const Environment& env = {}); int cmd_execute(const Command& cmd_line, InWorkingDirectory wd, const Environment& env = {});
inline int cmd_execute(const CmdLineBuilder& cmd_line, const Environment& env = {}) inline int cmd_execute(const Command& cmd_line, const Environment& env = {})
{ {
return cmd_execute(cmd_line, InWorkingDirectory{fs::path()}, env); return cmd_execute(cmd_line, InWorkingDirectory{fs::path()}, env);
} }
int cmd_execute_clean(const CmdLineBuilder& cmd_line, InWorkingDirectory wd); int cmd_execute_clean(const Command& cmd_line, InWorkingDirectory wd);
inline int cmd_execute_clean(const CmdLineBuilder& cmd_line) inline int cmd_execute_clean(const Command& cmd_line)
{ {
return cmd_execute_clean(cmd_line, InWorkingDirectory{fs::path()}); return cmd_execute_clean(cmd_line, InWorkingDirectory{fs::path()});
} }
#if defined(_WIN32) #if defined(_WIN32)
Environment cmd_execute_modify_env(const CmdLineBuilder& cmd_line, const Environment& env = {}); Environment cmd_execute_modify_env(const Command& cmd_line, const Environment& env = {});
void cmd_execute_background(const CmdLineBuilder& cmd_line); void cmd_execute_background(const Command& cmd_line);
#endif #endif
ExitCodeAndOutput cmd_execute_and_capture_output(const CmdLineBuilder& cmd_line, ExitCodeAndOutput cmd_execute_and_capture_output(const Command& cmd_line,
InWorkingDirectory wd, InWorkingDirectory wd,
const Environment& env = {}); const Environment& env = {});
inline ExitCodeAndOutput cmd_execute_and_capture_output(const CmdLineBuilder& cmd_line, const Environment& env = {}) inline ExitCodeAndOutput cmd_execute_and_capture_output(const Command& cmd_line, const Environment& env = {})
{ {
return cmd_execute_and_capture_output(cmd_line, InWorkingDirectory{fs::path()}, env); return cmd_execute_and_capture_output(cmd_line, InWorkingDirectory{fs::path()}, env);
} }
int cmd_execute_and_stream_lines(const CmdLineBuilder& cmd_line, int cmd_execute_and_stream_lines(const Command& cmd_line,
InWorkingDirectory wd, InWorkingDirectory wd,
std::function<void(StringView)> per_line_cb, std::function<void(StringView)> per_line_cb,
const Environment& env = {}); const Environment& env = {});
inline int cmd_execute_and_stream_lines(const CmdLineBuilder& cmd_line, inline int cmd_execute_and_stream_lines(const Command& cmd_line,
std::function<void(StringView)> per_line_cb, std::function<void(StringView)> per_line_cb,
const Environment& env = {}) const Environment& env = {})
{ {
return cmd_execute_and_stream_lines(cmd_line, InWorkingDirectory{fs::path()}, std::move(per_line_cb), env); return cmd_execute_and_stream_lines(cmd_line, InWorkingDirectory{fs::path()}, std::move(per_line_cb), env);
} }
int cmd_execute_and_stream_data(const CmdLineBuilder& cmd_line, int cmd_execute_and_stream_data(const Command& cmd_line,
InWorkingDirectory wd, InWorkingDirectory wd,
std::function<void(StringView)> data_cb, std::function<void(StringView)> data_cb,
const Environment& env = {}); const Environment& env = {});
inline int cmd_execute_and_stream_data(const CmdLineBuilder& cmd_line, inline int cmd_execute_and_stream_data(const Command& cmd_line,
std::function<void(StringView)> data_cb, std::function<void(StringView)> data_cb,
const Environment& env = {}) const Environment& env = {})
{ {

4
toolsrc/include/vcpkg/build.h
View File

@ -232,7 +232,7 @@ namespace vcpkg::Build
const VcpkgPaths& m_paths; const VcpkgPaths& m_paths;
}; };
System::CmdLineBuilder make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset); System::Command make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset);
struct ExtendedBuildResult struct ExtendedBuildResult
{ {
@ -369,7 +369,7 @@ namespace vcpkg::Build
struct EnvMapEntry struct EnvMapEntry
{ {
std::unordered_map<std::string, std::string> env_map; std::unordered_map<std::string, std::string> env_map;
Cache<System::CmdLineBuilder, System::Environment, System::CmdLineBuilderMapLess> cmd_cache; Cache<System::Command, System::Environment, System::CommandLess> cmd_cache;
}; };
Cache<std::vector<std::string>, EnvMapEntry> envs; Cache<std::vector<std::string>, EnvMapEntry> envs;

6
toolsrc/include/vcpkg/buildenvironment.h
View File

@ -9,7 +9,7 @@
namespace vcpkg namespace vcpkg
{ {
System::CmdLineBuilder make_cmake_cmd(const VcpkgPaths& paths, System::Command make_cmake_cmd(const VcpkgPaths& paths,
const fs::path& cmake_script, const fs::path& cmake_script,
std::vector<System::CMakeVariable>&& pass_variables); std::vector<System::CMakeVariable>&& pass_variables);
} }

4
toolsrc/src/vcpkg-test/system.cpp
View File

@ -127,9 +127,9 @@ TEST_CASE ("guess_visual_studio_prompt", "[system]")
TEST_CASE ("cmdlinebuilder", "[system]") TEST_CASE ("cmdlinebuilder", "[system]")
{ {
using vcpkg::System::CmdLineBuilder; using vcpkg::System::Command;
CmdLineBuilder cmd; Command cmd;
cmd.path_arg(fs::u8path("relative/path.exe")); cmd.path_arg(fs::u8path("relative/path.exe"));
cmd.string_arg("abc"); cmd.string_arg("abc");
cmd.string_arg("hello world!"); cmd.string_arg("hello world!");

8
toolsrc/src/vcpkg/archives.cpp
View File

@ -44,7 +44,7 @@ namespace vcpkg::Archives
const std::string nugetid = match[1]; const std::string nugetid = match[1];
const std::string version = match[2]; const std::string version = match[2];
const auto code_and_output = System::cmd_execute_and_capture_output(System::CmdLineBuilder{nuget_exe} const auto code_and_output = System::cmd_execute_and_capture_output(System::Command{nuget_exe}
.string_arg("install") .string_arg("install")
.string_arg(nugetid) .string_arg(nugetid)
.string_arg("-Version") .string_arg("-Version")
@ -74,7 +74,7 @@ namespace vcpkg::Archives
recursion_limiter_sevenzip = true; recursion_limiter_sevenzip = true;
const auto seven_zip = paths.get_tool_exe(Tools::SEVEN_ZIP); const auto seven_zip = paths.get_tool_exe(Tools::SEVEN_ZIP);
const auto code_and_output = System::cmd_execute_and_capture_output( const auto code_and_output = System::cmd_execute_and_capture_output(
System::CmdLineBuilder{seven_zip} System::Command{seven_zip}
.string_arg("x") .string_arg("x")
.path_arg(archive) .path_arg(archive)
.string_arg(Strings::format("-o%s", fs::u8string(to_path_partial))) .string_arg(Strings::format("-o%s", fs::u8string(to_path_partial)))
@ -89,13 +89,13 @@ namespace vcpkg::Archives
#else #else
if (ext == ".gz" && ext.extension() != ".tar") if (ext == ".gz" && ext.extension() != ".tar")
{ {
const auto code = System::cmd_execute(System::CmdLineBuilder{"tar"}.string_arg("xzf").path_arg(archive), const auto code = System::cmd_execute(System::Command{"tar"}.string_arg("xzf").path_arg(archive),
System::InWorkingDirectory{to_path_partial}); System::InWorkingDirectory{to_path_partial});
Checks::check_exit(VCPKG_LINE_INFO, code == 0, "tar failed while extracting %s", fs::u8string(archive)); Checks::check_exit(VCPKG_LINE_INFO, code == 0, "tar failed while extracting %s", fs::u8string(archive));
} }
else if (ext == ".zip") else if (ext == ".zip")
{ {
const auto code = System::cmd_execute(System::CmdLineBuilder{"unzip"}.string_arg("-qqo").path_arg(archive), const auto code = System::cmd_execute(System::Command{"unzip"}.string_arg("-qqo").path_arg(archive),
System::InWorkingDirectory{to_path_partial}); System::InWorkingDirectory{to_path_partial});
Checks::check_exit(VCPKG_LINE_INFO, code == 0, "unzip failed while extracting %s", fs::u8string(archive)); Checks::check_exit(VCPKG_LINE_INFO, code == 0, "unzip failed while extracting %s", fs::u8string(archive));
} }

8
toolsrc/src/vcpkg/base/downloads.cpp
View File

@ -220,7 +220,7 @@ namespace vcpkg::Downloads
{ {
static constexpr StringLiteral guid_marker = "8a1db05f-a65d-419b-aa72-037fb4d0672e"; static constexpr StringLiteral guid_marker = "8a1db05f-a65d-419b-aa72-037fb4d0672e";
System::CmdLineBuilder cmd; System::Command cmd;
cmd.string_arg("curl") cmd.string_arg("curl")
.string_arg("--head") .string_arg("--head")
.string_arg("--location") .string_arg("--location")
@ -260,7 +260,7 @@ namespace vcpkg::Downloads
{ {
static constexpr StringLiteral guid_marker = "8a1db05f-a65d-419b-aa72-037fb4d0672e"; static constexpr StringLiteral guid_marker = "8a1db05f-a65d-419b-aa72-037fb4d0672e";
System::CmdLineBuilder cmd; System::Command cmd;
cmd.string_arg("curl") cmd.string_arg("curl")
.string_arg("--location") .string_arg("--location")
.string_arg("-w") .string_arg("-w")
@ -298,7 +298,7 @@ namespace vcpkg::Downloads
{ {
static constexpr StringLiteral guid_marker = "9a1db05f-a65d-419b-aa72-037fb4d0672e"; static constexpr StringLiteral guid_marker = "9a1db05f-a65d-419b-aa72-037fb4d0672e";
System::CmdLineBuilder cmd; System::Command cmd;
cmd.string_arg("curl").string_arg("-X").string_arg("PUT"); cmd.string_arg("curl").string_arg("-X").string_arg("PUT");
cmd.string_arg("-w").string_arg(Strings::concat("\\n", guid_marker, "%{http_code}")); cmd.string_arg("-w").string_arg(Strings::concat("\\n", guid_marker, "%{http_code}"));
cmd.string_arg(url); cmd.string_arg(url);
@ -443,7 +443,7 @@ namespace vcpkg::Downloads
} }
} }
#endif #endif
System::CmdLineBuilder cmd; System::Command cmd;
cmd.string_arg("curl") cmd.string_arg("curl")
.string_arg("--fail") .string_arg("--fail")
.string_arg("-L") .string_arg("-L")

28
toolsrc/src/vcpkg/base/system.process.cpp
View File

@ -184,11 +184,11 @@ namespace vcpkg
} }
System::CMakeVariable::CMakeVariable(std::string var) : s(std::move(var)) { } System::CMakeVariable::CMakeVariable(std::string var) : s(std::move(var)) { }
System::CmdLineBuilder System::make_basic_cmake_cmd(const fs::path& cmake_tool_path, System::Command System::make_basic_cmake_cmd(const fs::path& cmake_tool_path,
const fs::path& cmake_script, const fs::path& cmake_script,
const std::vector<CMakeVariable>& pass_variables) const std::vector<CMakeVariable>& pass_variables)
{ {
System::CmdLineBuilder cmd{cmake_tool_path}; System::Command cmd{cmake_tool_path};
for (auto&& var : pass_variables) for (auto&& var : pass_variables)
{ {
cmd.string_arg(var.s); cmd.string_arg(var.s);
@ -197,7 +197,7 @@ namespace vcpkg
return cmd; return cmd;
} }
System::CmdLineBuilder& System::CmdLineBuilder::string_arg(StringView s) & System::Command& System::Command::string_arg(StringView s) &
{ {
if (!buf.empty()) buf.push_back(' '); if (!buf.empty()) buf.push_back(' ');
if (Strings::find_first_of(s, " \t\n\r\"\\,;&`^|'") != s.end()) if (Strings::find_first_of(s, " \t\n\r\"\\,;&`^|'") != s.end())
@ -383,7 +383,7 @@ namespace vcpkg
return clean_env; return clean_env;
} }
int System::cmd_execute_clean(const CmdLineBuilder& cmd_line, InWorkingDirectory wd) int System::cmd_execute_clean(const Command& cmd_line, InWorkingDirectory wd)
{ {
return cmd_execute(cmd_line, wd, get_clean_environment()); return cmd_execute(cmd_line, wd, get_clean_environment());
} }
@ -564,7 +564,7 @@ namespace vcpkg
#endif #endif
#if defined(_WIN32) #if defined(_WIN32)
void System::cmd_execute_background(const CmdLineBuilder& cmd_line) void System::cmd_execute_background(const Command& cmd_line)
{ {
auto timer = Chrono::ElapsedTimer::create_started(); auto timer = Chrono::ElapsedTimer::create_started();
@ -581,7 +581,7 @@ namespace vcpkg
Debug::print("cmd_execute_background() took ", static_cast<int>(timer.microseconds()), " us\n"); Debug::print("cmd_execute_background() took ", static_cast<int>(timer.microseconds()), " us\n");
} }
Environment System::cmd_execute_modify_env(const CmdLineBuilder& cmd_line, const Environment& env) Environment System::cmd_execute_modify_env(const Command& cmd_line, const Environment& env)
{ {
static StringLiteral magic_string = "cdARN4xjKueKScMy9C6H"; static StringLiteral magic_string = "cdARN4xjKueKScMy9C6H";
@ -623,7 +623,7 @@ namespace vcpkg
} }
#endif #endif
int System::cmd_execute(const CmdLineBuilder& cmd_line, System::InWorkingDirectory wd, const Environment& env) int System::cmd_execute(const Command& cmd_line, System::InWorkingDirectory wd, const Environment& env)
{ {
auto timer = Chrono::ElapsedTimer::create_started(); auto timer = Chrono::ElapsedTimer::create_started();
#if defined(_WIN32) #if defined(_WIN32)
@ -651,7 +651,7 @@ namespace vcpkg
} }
else else
{ {
real_command_line = System::CmdLineBuilder("cd") real_command_line = System::Command("cd")
.path_arg(wd.working_directory) .path_arg(wd.working_directory)
.raw_arg("&&") .raw_arg("&&")
.raw_arg(cmd_line.command_line()) .raw_arg(cmd_line.command_line())
@ -667,7 +667,7 @@ namespace vcpkg
return exit_code; return exit_code;
} }
int System::cmd_execute_and_stream_lines(const CmdLineBuilder& cmd_line, int System::cmd_execute_and_stream_lines(const Command& cmd_line,
System::InWorkingDirectory wd, System::InWorkingDirectory wd,
std::function<void(StringView)> per_line_cb, std::function<void(StringView)> per_line_cb,
const Environment& env) const Environment& env)
@ -696,7 +696,7 @@ namespace vcpkg
return rc; return rc;
} }
int System::cmd_execute_and_stream_data(const CmdLineBuilder& cmd_line, int System::cmd_execute_and_stream_data(const Command& cmd_line,
System::InWorkingDirectory wd, System::InWorkingDirectory wd,
std::function<void(StringView)> data_cb, std::function<void(StringView)> data_cb,
const Environment& env) const Environment& env)
@ -724,7 +724,7 @@ namespace vcpkg
} }
else else
{ {
actual_cmd_line = System::CmdLineBuilder("cd") actual_cmd_line = System::Command("cd")
.path_arg(wd.working_directory) .path_arg(wd.working_directory)
.raw_arg("&&") .raw_arg("&&")
.raw_arg(cmd_line.command_line()) .raw_arg(cmd_line.command_line())
@ -763,7 +763,7 @@ namespace vcpkg
return exit_code; return exit_code;
} }
ExitCodeAndOutput System::cmd_execute_and_capture_output(const CmdLineBuilder& cmd_line, ExitCodeAndOutput System::cmd_execute_and_capture_output(const Command& cmd_line,
System::InWorkingDirectory wd, System::InWorkingDirectory wd,
const Environment& env) const Environment& env)
{ {

26
toolsrc/src/vcpkg/binarycaching.cpp
View File

@ -59,7 +59,7 @@ namespace
const fs::path& dst, const fs::path& dst,
const fs::path& archive_path) const fs::path& archive_path)
{ {
System::CmdLineBuilder cmd; System::Command cmd;
#if defined(_WIN32) #if defined(_WIN32)
auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP);
cmd.path_arg(seven_zip_exe) cmd.path_arg(seven_zip_exe)
@ -96,13 +96,11 @@ namespace
#if defined(_WIN32) #if defined(_WIN32)
auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP);
System::cmd_execute_and_capture_output(System::CmdLineBuilder{seven_zip_exe} System::cmd_execute_and_capture_output(
.string_arg("a") System::Command{seven_zip_exe}.string_arg("a").path_arg(destination).path_arg(source / fs::u8path("*")),
.path_arg(destination) System::get_clean_environment());
.path_arg(source / fs::u8path("*")),
System::get_clean_environment());
#else #else
System::cmd_execute_clean(System::CmdLineBuilder{"zip"} System::cmd_execute_clean(System::Command{"zip"}
.string_arg("--quiet") .string_arg("--quiet")
.string_arg("-y") .string_arg("-y")
.string_arg("-r") .string_arg("-r")
@ -420,7 +418,7 @@ namespace
{ {
} }
int run_nuget_commandline(const System::CmdLineBuilder& cmdline) int run_nuget_commandline(const System::Command& cmdline)
{ {
if (m_interactive) if (m_interactive)
{ {
@ -516,12 +514,12 @@ namespace
}; };
const auto& nuget_exe = paths.get_tool_exe("nuget"); const auto& nuget_exe = paths.get_tool_exe("nuget");
std::vector<System::CmdLineBuilder> cmdlines; std::vector<System::Command> cmdlines;
if (!m_read_sources.empty()) if (!m_read_sources.empty())
{ {
// First check using all sources // First check using all sources
System::CmdLineBuilder cmdline; System::Command cmdline;
#ifndef _WIN32 #ifndef _WIN32
cmdline.path_arg(paths.get_tool_exe(Tools::MONO)); cmdline.path_arg(paths.get_tool_exe(Tools::MONO));
#endif #endif
@ -551,7 +549,7 @@ namespace
for (auto&& cfg : m_read_configs) for (auto&& cfg : m_read_configs)
{ {
// Then check using each config // Then check using each config
System::CmdLineBuilder cmdline; System::Command cmdline;
#ifndef _WIN32 #ifndef _WIN32
cmdline.path_arg(paths.get_tool_exe(Tools::MONO)); cmdline.path_arg(paths.get_tool_exe(Tools::MONO));
#endif #endif
@ -642,7 +640,7 @@ namespace
nuspec_path, generate_nuspec(paths, action, nuget_ref), VCPKG_LINE_INFO); nuspec_path, generate_nuspec(paths, action, nuget_ref), VCPKG_LINE_INFO);
const auto& nuget_exe = paths.get_tool_exe("nuget"); const auto& nuget_exe = paths.get_tool_exe("nuget");
System::CmdLineBuilder cmdline; System::Command cmdline;
#ifndef _WIN32 #ifndef _WIN32
cmdline.path_arg(paths.get_tool_exe(Tools::MONO)); cmdline.path_arg(paths.get_tool_exe(Tools::MONO));
#endif #endif
@ -666,7 +664,7 @@ namespace
auto nupkg_path = paths.buildtrees / nuget_ref.nupkg_filename(); auto nupkg_path = paths.buildtrees / nuget_ref.nupkg_filename();
for (auto&& write_src : m_write_sources) for (auto&& write_src : m_write_sources)
{ {
System::CmdLineBuilder cmd; System::Command cmd;
#ifndef _WIN32 #ifndef _WIN32
cmd.path_arg(paths.get_tool_exe(Tools::MONO)); cmd.path_arg(paths.get_tool_exe(Tools::MONO));
#endif #endif
@ -695,7 +693,7 @@ namespace
} }
for (auto&& write_cfg : m_write_configs) for (auto&& write_cfg : m_write_configs)
{ {
System::CmdLineBuilder cmd; System::Command cmd;
#ifndef _WIN32 #ifndef _WIN32
cmd.path_arg(paths.get_tool_exe(Tools::MONO)); cmd.path_arg(paths.get_tool_exe(Tools::MONO));
#endif #endif

4
toolsrc/src/vcpkg/build.cpp
View File

@ -439,7 +439,7 @@ namespace vcpkg::Build
}); });
} }
System::CmdLineBuilder make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset) System::Command make_build_env_cmd(const PreBuildInfo& pre_build_info, const Toolset& toolset)
{ {
if (!pre_build_info.using_vcvars()) return {}; if (!pre_build_info.using_vcvars()) return {};
@ -452,7 +452,7 @@ namespace vcpkg::Build
const auto arch = to_vcvarsall_toolchain(pre_build_info.target_architecture, toolset); const auto arch = to_vcvarsall_toolchain(pre_build_info.target_architecture, toolset);
const auto target = to_vcvarsall_target(pre_build_info.cmake_system_name); const auto target = to_vcvarsall_target(pre_build_info.cmake_system_name);
return System::CmdLineBuilder{"cmd"}.string_arg("/c").raw_arg( return System::Command{"cmd"}.string_arg("/c").raw_arg(
Strings::format(R"("%s" %s %s %s %s 2>&1 <NUL)", Strings::format(R"("%s" %s %s %s %s 2>&1 <NUL)",
fs::u8string(toolset.vcvarsall), fs::u8string(toolset.vcvarsall),
Strings::join(" ", toolset.vcvarsall_options), Strings::join(" ", toolset.vcvarsall_options),

6
toolsrc/src/vcpkg/buildenvironment.cpp
View File

@ -4,9 +4,9 @@
namespace vcpkg namespace vcpkg
{ {
System::CmdLineBuilder make_cmake_cmd(const VcpkgPaths& paths, System::Command make_cmake_cmd(const VcpkgPaths& paths,
const fs::path& cmake_script, const fs::path& cmake_script,
std::vector<System::CMakeVariable>&& pass_variables) std::vector<System::CMakeVariable>&& pass_variables)
{ {
auto local_variables = std::move(pass_variables); auto local_variables = std::move(pass_variables);
local_variables.emplace_back("VCPKG_ROOT_DIR", paths.root); local_variables.emplace_back("VCPKG_ROOT_DIR", paths.root);

2
toolsrc/src/vcpkg/commands.contact.cpp
View File

@ -45,7 +45,7 @@ namespace vcpkg::Commands::Contact
} }
#if defined(_WIN32) #if defined(_WIN32)
System::cmd_execute(System::CmdLineBuilder("start").string_arg("https://aka.ms/NPS_vcpkg")); System::cmd_execute(System::Command("start").string_arg("https://aka.ms/NPS_vcpkg"));
System::print2("Default browser launched to https://aka.ms/NPS_vcpkg; thank you for your feedback!\n"); System::print2("Default browser launched to https://aka.ms/NPS_vcpkg; thank you for your feedback!\n");
#else #else
System::print2("Please navigate to https://aka.ms/NPS_vcpkg in your preferred browser. Thank you for your " System::print2("Please navigate to https://aka.ms/NPS_vcpkg in your preferred browser. Thank you for your "

10
toolsrc/src/vcpkg/commands.edit.cpp
View File

@ -219,14 +219,14 @@ namespace vcpkg::Commands::Edit
candidate_paths.push_back(fs::path{"/usr/share/code/bin/code"}); candidate_paths.push_back(fs::path{"/usr/share/code/bin/code"});
candidate_paths.push_back(fs::path{"/usr/bin/code"}); candidate_paths.push_back(fs::path{"/usr/bin/code"});
if (System::cmd_execute(System::CmdLineBuilder("command").string_arg("-v").string_arg("xdg-mime")) == 0) if (System::cmd_execute(System::Command("command").string_arg("-v").string_arg("xdg-mime")) == 0)
{ {
auto mime_qry = auto mime_qry =
System::CmdLineBuilder("xdg-mime").string_arg("query").string_arg("default").string_arg("text/plain"); System::Command("xdg-mime").string_arg("query").string_arg("default").string_arg("text/plain");
auto execute_result = System::cmd_execute_and_capture_output(mime_qry); auto execute_result = System::cmd_execute_and_capture_output(mime_qry);
if (execute_result.exit_code == 0 && !execute_result.output.empty()) if (execute_result.exit_code == 0 && !execute_result.output.empty())
{ {
mime_qry = System::CmdLineBuilder("command").string_arg("-v").string_arg( mime_qry = System::Command("command").string_arg("-v").string_arg(
execute_result.output.substr(0, execute_result.output.find('.'))); execute_result.output.substr(0, execute_result.output.find('.')));
execute_result = System::cmd_execute_and_capture_output(mime_qry); execute_result = System::cmd_execute_and_capture_output(mime_qry);
if (execute_result.exit_code == 0 && !execute_result.output.empty()) if (execute_result.exit_code == 0 && !execute_result.output.empty())
@ -255,7 +255,7 @@ namespace vcpkg::Commands::Edit
const fs::path env_editor = *it; const fs::path env_editor = *it;
const std::vector<std::string> arguments = create_editor_arguments(paths, options, ports); const std::vector<std::string> arguments = create_editor_arguments(paths, options, ports);
const auto args_as_string = Strings::join(" ", arguments); const auto args_as_string = Strings::join(" ", arguments);
auto cmd_line = System::CmdLineBuilder(env_editor).raw_arg(args_as_string).string_arg("-n"); auto cmd_line = System::Command(env_editor).raw_arg(args_as_string).string_arg("-n");
auto editor_exe = fs::u8string(env_editor.filename()); auto editor_exe = fs::u8string(env_editor.filename());
@ -264,7 +264,7 @@ namespace vcpkg::Commands::Edit
{ {
// note that we are invoking cmd silently but Code.exe is relaunched from there // note that we are invoking cmd silently but Code.exe is relaunched from there
System::cmd_execute_background( System::cmd_execute_background(
System::CmdLineBuilder("cmd").string_arg("/c").string_arg(cmd_line.command_line()).raw_arg("<NUL")); System::Command("cmd").string_arg("/c").string_arg(cmd_line.command_line()).raw_arg("<NUL"));
Checks::exit_success(VCPKG_LINE_INFO); Checks::exit_success(VCPKG_LINE_INFO);
} }
#endif #endif

2
toolsrc/src/vcpkg/commands.env.cpp
View File

@ -98,7 +98,7 @@ namespace vcpkg::Commands::Env
} }
}(); }();
System::CmdLineBuilder cmd("cmd"); System::Command cmd("cmd");
if (!args.command_arguments.empty()) if (!args.command_arguments.empty())
{ {
cmd.string_arg("/c").raw_arg(args.command_arguments.at(0)); cmd.string_arg("/c").raw_arg(args.command_arguments.at(0));

4
toolsrc/src/vcpkg/commands.integrate.cpp
View File

@ -379,7 +379,7 @@ CMake projects should use: "-DCMAKE_TOOLCHAIN_FILE=%s"
nuspec_file_path, create_nuspec_file_contents(paths.root, nuget_id, nupkg_version), VCPKG_LINE_INFO); nuspec_file_path, create_nuspec_file_contents(paths.root, nuget_id, nupkg_version), VCPKG_LINE_INFO);
// Using all forward slashes for the command line // Using all forward slashes for the command line
auto cmd_line = System::CmdLineBuilder(nuget_exe) auto cmd_line = System::Command(nuget_exe)
.string_arg("pack") .string_arg("pack")
.string_arg("-OutputDirectory") .string_arg("-OutputDirectory")
.path_arg(buildsystems_dir) .path_arg(buildsystems_dir)
@ -415,7 +415,7 @@ With a project open, go to Tools->NuGet Package Manager->Package Manager Console
const fs::path script_path = paths.scripts / "addPoshVcpkgToPowershellProfile.ps1"; const fs::path script_path = paths.scripts / "addPoshVcpkgToPowershellProfile.ps1";
const auto& ps = paths.get_tool_exe("powershell-core"); const auto& ps = paths.get_tool_exe("powershell-core");
auto cmd = System::CmdLineBuilder(ps) auto cmd = System::Command(ps)
.string_arg("-NoProfile") .string_arg("-NoProfile")
.string_arg("-ExecutionPolicy") .string_arg("-ExecutionPolicy")
.string_arg("Bypass") .string_arg("Bypass")

14
toolsrc/src/vcpkg/commands.porthistory.cpp
View File

@ -31,11 +31,11 @@ namespace vcpkg::Commands::PortHistory
const System::ExitCodeAndOutput run_git_command_inner(const VcpkgPaths& paths, const System::ExitCodeAndOutput run_git_command_inner(const VcpkgPaths& paths,
const fs::path& dot_git_directory, const fs::path& dot_git_directory,
const fs::path& working_directory, const fs::path& working_directory,
const System::CmdLineBuilder& cmd) const System::Command& cmd)
{ {
const fs::path& git_exe = paths.get_tool_exe(Tools::GIT); const fs::path& git_exe = paths.get_tool_exe(Tools::GIT);
auto full_cmd = System::CmdLineBuilder(git_exe) auto full_cmd = System::Command(git_exe)
.string_arg(Strings::concat("--git-dir=", fs::u8string(dot_git_directory))) .string_arg(Strings::concat("--git-dir=", fs::u8string(dot_git_directory)))
.string_arg(Strings::concat("--work-tree=", fs::u8string(working_directory))) .string_arg(Strings::concat("--work-tree=", fs::u8string(working_directory)))
.raw_arg(cmd.command_line()); .raw_arg(cmd.command_line());
@ -44,7 +44,7 @@ namespace vcpkg::Commands::PortHistory
return output; return output;
} }
const System::ExitCodeAndOutput run_git_command(const VcpkgPaths& paths, const System::CmdLineBuilder& cmd) const System::ExitCodeAndOutput run_git_command(const VcpkgPaths& paths, const System::Command& cmd)
{ {
const fs::path& work_dir = paths.root; const fs::path& work_dir = paths.root;
const fs::path dot_git_dir = paths.root / ".git"; const fs::path dot_git_dir = paths.root / ".git";
@ -89,7 +89,7 @@ namespace vcpkg::Commands::PortHistory
const std::string& port_name) const std::string& port_name)
{ {
auto rev_parse_cmd = auto rev_parse_cmd =
System::CmdLineBuilder("rev-parse").string_arg(Strings::concat(commit_id, ":ports/", port_name)); System::Command("rev-parse").string_arg(Strings::concat(commit_id, ":ports/", port_name));
auto rev_parse_output = run_git_command(paths, rev_parse_cmd); auto rev_parse_output = run_git_command(paths, rev_parse_cmd);
if (rev_parse_output.exit_code == 0) if (rev_parse_output.exit_code == 0)
{ {
@ -97,7 +97,7 @@ namespace vcpkg::Commands::PortHistory
const auto git_tree = Strings::trim(std::move(rev_parse_output.output)); const auto git_tree = Strings::trim(std::move(rev_parse_output.output));
// Do we have a manifest file? // Do we have a manifest file?
auto manifest_cmd = System::CmdLineBuilder("show").string_arg(Strings::concat(git_tree, ":vcpkg.json")); auto manifest_cmd = System::Command("show").string_arg(Strings::concat(git_tree, ":vcpkg.json"));
auto manifest_output = run_git_command(paths, manifest_cmd); auto manifest_output = run_git_command(paths, manifest_cmd);
if (manifest_output.exit_code == 0) if (manifest_output.exit_code == 0)
{ {
@ -105,7 +105,7 @@ namespace vcpkg::Commands::PortHistory
manifest_output.output, git_tree, commit_id, commit_date, port_name, true); manifest_output.output, git_tree, commit_id, commit_date, port_name, true);
} }
auto cmd = System::CmdLineBuilder("show").string_arg(Strings::concat(git_tree, ":CONTROL")); auto cmd = System::Command("show").string_arg(Strings::concat(git_tree, ":CONTROL"));
auto control_output = run_git_command(paths, cmd); auto control_output = run_git_command(paths, cmd);
if (control_output.exit_code == 0) if (control_output.exit_code == 0)
@ -121,7 +121,7 @@ namespace vcpkg::Commands::PortHistory
std::vector<HistoryVersion> read_versions_from_log(const VcpkgPaths& paths, const std::string& port_name) std::vector<HistoryVersion> read_versions_from_log(const VcpkgPaths& paths, const std::string& port_name)
{ {
// log --format="%H %cd" --date=short --left-only -- ports/{port_name}/. // log --format="%H %cd" --date=short --left-only -- ports/{port_name}/.
System::CmdLineBuilder builder; System::Command builder;
builder.string_arg("log"); builder.string_arg("log");
builder.string_arg("--format=%H %cd"); builder.string_arg("--format=%H %cd");
builder.string_arg("--date=short"); builder.string_arg("--date=short");

6
toolsrc/src/vcpkg/commands.portsdiff.cpp
View File

@ -91,7 +91,7 @@ namespace vcpkg::Commands::PortsDiff
const auto checkout_this_dir = const auto checkout_this_dir =
Strings::format(R"(.\%s)", ports_dir_name_as_string); // Must be relative to the root of the repository Strings::format(R"(.\%s)", ports_dir_name_as_string); // Must be relative to the root of the repository
auto cmd = System::CmdLineBuilder(git_exe) auto cmd = System::Command(git_exe)
.string_arg(Strings::format("--git-dir=%s", fs::u8string(dot_git_dir))) .string_arg(Strings::format("--git-dir=%s", fs::u8string(dot_git_dir)))
.string_arg(Strings::format("--work-tree=%s", fs::u8string(temp_checkout_path))) .string_arg(Strings::format("--work-tree=%s", fs::u8string(temp_checkout_path)))
.string_arg("checkout") .string_arg("checkout")
@ -102,7 +102,7 @@ namespace vcpkg::Commands::PortsDiff
.string_arg(checkout_this_dir) .string_arg(checkout_this_dir)
.string_arg(".vcpkg-root"); .string_arg(".vcpkg-root");
System::cmd_execute_and_capture_output(cmd, System::get_clean_environment()); System::cmd_execute_and_capture_output(cmd, System::get_clean_environment());
System::cmd_execute_and_capture_output(System::CmdLineBuilder(git_exe).string_arg("reset"), System::cmd_execute_and_capture_output(System::Command(git_exe).string_arg("reset"),
System::get_clean_environment()); System::get_clean_environment());
const auto ports_at_commit = const auto ports_at_commit =
Paragraphs::load_overlay_ports(paths, temp_checkout_path / ports_dir_name_as_string); Paragraphs::load_overlay_ports(paths, temp_checkout_path / ports_dir_name_as_string);
@ -120,7 +120,7 @@ namespace vcpkg::Commands::PortsDiff
{ {
static const std::string VALID_COMMIT_OUTPUT = "commit\n"; static const std::string VALID_COMMIT_OUTPUT = "commit\n";
auto cmd = System::CmdLineBuilder(git_exe).string_arg("cat-file").string_arg("-t").string_arg(git_commit_id); auto cmd = System::Command(git_exe).string_arg("cat-file").string_arg("-t").string_arg(git_commit_id);
const System::ExitCodeAndOutput output = System::cmd_execute_and_capture_output(cmd); const System::ExitCodeAndOutput output = System::cmd_execute_and_capture_output(cmd);
Checks::check_exit( Checks::check_exit(
VCPKG_LINE_INFO, output.output == VALID_COMMIT_OUTPUT, "Invalid commit id %s", git_commit_id); VCPKG_LINE_INFO, output.output == VALID_COMMIT_OUTPUT, "Invalid commit id %s", git_commit_id);

2
toolsrc/src/vcpkg/export.chocolatey.cpp
View File

@ -216,7 +216,7 @@ if (Test-Path $installedDir)
const fs::path chocolatey_uninstall_file_path = per_package_dir_path / "tools" / "chocolateyUninstall.ps1"; const fs::path chocolatey_uninstall_file_path = per_package_dir_path / "tools" / "chocolateyUninstall.ps1";
fs.write_contents(chocolatey_uninstall_file_path, chocolatey_uninstall_content, VCPKG_LINE_INFO); fs.write_contents(chocolatey_uninstall_file_path, chocolatey_uninstall_content, VCPKG_LINE_INFO);
auto cmd_line = System::CmdLineBuilder(nuget_exe) auto cmd_line = System::Command(nuget_exe)
.string_arg("pack") .string_arg("pack")
.string_arg("-OutputDirectory") .string_arg("-OutputDirectory")
.path_arg(exported_dir_path) .path_arg(exported_dir_path)

4
toolsrc/src/vcpkg/export.cpp
View File

@ -162,7 +162,7 @@ namespace vcpkg::Export
fs.write_contents(nuspec_file_path, nuspec_file_content, VCPKG_LINE_INFO); fs.write_contents(nuspec_file_path, nuspec_file_content, VCPKG_LINE_INFO);
// -NoDefaultExcludes is needed for ".vcpkg-root" // -NoDefaultExcludes is needed for ".vcpkg-root"
System::CmdLineBuilder cmd; System::Command cmd;
#ifndef _WIN32 #ifndef _WIN32
cmd.path_arg(paths.get_tool_exe(Tools::MONO)); cmd.path_arg(paths.get_tool_exe(Tools::MONO));
#endif #endif
@ -223,7 +223,7 @@ namespace vcpkg::Export
Strings::format("%s.%s", exported_dir_filename, format.extension()); Strings::format("%s.%s", exported_dir_filename, format.extension());
const fs::path exported_archive_path = (output_dir / exported_archive_filename); const fs::path exported_archive_path = (output_dir / exported_archive_filename);
System::CmdLineBuilder cmd; System::Command cmd;
cmd.path_arg(cmake_exe) cmd.path_arg(cmake_exe)
.string_arg("-E") .string_arg("-E")
.string_arg("tar") .string_arg("tar")

12
toolsrc/src/vcpkg/export.ifw.cpp
View File

@ -370,10 +370,8 @@ namespace vcpkg::Export::IFW
fs::generic_u8string(repository_dir), fs::generic_u8string(repository_dir),
failure_point.string()); failure_point.string());
auto cmd_line = System::CmdLineBuilder(repogen_exe) auto cmd_line =
.string_arg("--packages") System::Command(repogen_exe).string_arg("--packages").path_arg(packages_dir).path_arg(repository_dir);
.path_arg(packages_dir)
.path_arg(repository_dir);
const int exit_code = const int exit_code =
System::cmd_execute_and_capture_output(cmd_line, System::get_clean_environment()).exit_code; System::cmd_execute_and_capture_output(cmd_line, System::get_clean_environment()).exit_code;
@ -393,12 +391,12 @@ namespace vcpkg::Export::IFW
System::printf("Generating installer %s...\n", fs::generic_u8string(installer_file)); System::printf("Generating installer %s...\n", fs::generic_u8string(installer_file));
System::CmdLineBuilder cmd_line; System::Command cmd_line;
std::string ifw_repo_url = ifw_options.maybe_repository_url.value_or(""); std::string ifw_repo_url = ifw_options.maybe_repository_url.value_or("");
if (!ifw_repo_url.empty()) if (!ifw_repo_url.empty())
{ {
cmd_line = System::CmdLineBuilder(binarycreator_exe) cmd_line = System::Command(binarycreator_exe)
.string_arg("--online-only") .string_arg("--online-only")
.string_arg("--config") .string_arg("--config")
.path_arg(config_file) .path_arg(config_file)
@ -408,7 +406,7 @@ namespace vcpkg::Export::IFW
} }
else else
{ {
cmd_line = System::CmdLineBuilder(binarycreator_exe) cmd_line = System::Command(binarycreator_exe)
.string_arg("--config") .string_arg("--config")
.path_arg(config_file) .path_arg(config_file)
.string_arg("--packages") .string_arg("--packages")

12
toolsrc/src/vcpkg/export.prefab.cpp
View File

@ -206,14 +206,12 @@ namespace vcpkg::Export::Prefab
#if defined(_WIN32) #if defined(_WIN32)
auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP); auto&& seven_zip_exe = paths.get_tool_exe(Tools::SEVEN_ZIP);
System::cmd_execute_and_capture_output(System::CmdLineBuilder(seven_zip_exe) System::cmd_execute_and_capture_output(
.string_arg("a") System::Command(seven_zip_exe).string_arg("a").path_arg(destination).path_arg(source / fs::u8path("*")),
.path_arg(destination) System::get_clean_environment());
.path_arg(source / fs::u8path("*")),
System::get_clean_environment());
#else #else
System::cmd_execute_clean( System::cmd_execute_clean(
System::CmdLineBuilder{"zip"}.string_arg("--quiet").string_arg("-r").path_arg(destination).string_arg("*"), System::Command{"zip"}.string_arg("--quiet").string_arg("-r").path_arg(destination).string_arg("*"),
System::InWorkingDirectory{source}); System::InWorkingDirectory{source});
#endif #endif
} }
@ -224,7 +222,7 @@ namespace vcpkg::Export::Prefab
{ {
System::print2("\n[DEBUG] Installing POM and AAR file to ~/.m2\n\n"); System::print2("\n[DEBUG] Installing POM and AAR file to ~/.m2\n\n");
} }
auto cmd_line = System::CmdLineBuilder(Tools::MAVEN); auto cmd_line = System::Command(Tools::MAVEN);
if (!prefab_options.enable_debug) if (!prefab_options.enable_debug)
{ {
cmd_line.string_arg("-q"); cmd_line.string_arg("-q");

10
toolsrc/src/vcpkg/metrics.cpp
View File

@ -257,7 +257,7 @@ namespace vcpkg::Metrics
return "{}"; return "{}";
} }
auto getmac = System::cmd_execute_and_capture_output(System::CmdLineBuilder("getmac")); auto getmac = System::cmd_execute_and_capture_output(System::Command("getmac"));
if (getmac.exit_code != 0) return "0"; if (getmac.exit_code != 0) return "0";
@ -474,14 +474,14 @@ namespace vcpkg::Metrics
if (ec) return; if (ec) return;
#if defined(_WIN32) #if defined(_WIN32)
System::CmdLineBuilder builder; System::Command builder;
builder.path_arg(temp_folder_path_exe); builder.path_arg(temp_folder_path_exe);
builder.string_arg("x-upload-metrics"); builder.string_arg("x-upload-metrics");
builder.path_arg(vcpkg_metrics_txt_path); builder.path_arg(vcpkg_metrics_txt_path);
System::cmd_execute_background(builder); System::cmd_execute_background(builder);
#else #else
// TODO: convert to cmd_execute_background or something. // TODO: convert to cmd_execute_background or something.
auto curl = System::CmdLineBuilder("curl") auto curl = System::Command("curl")
.string_arg("https://dc.services.visualstudio.com/v2/track") .string_arg("https://dc.services.visualstudio.com/v2/track")
.string_arg("-H") .string_arg("-H")
.string_arg("Content-Type: application/json") .string_arg("Content-Type: application/json")
@ -492,8 +492,8 @@ namespace vcpkg::Metrics
.string_arg(Strings::concat("@", fs::u8string(vcpkg_metrics_txt_path))) .string_arg(Strings::concat("@", fs::u8string(vcpkg_metrics_txt_path)))
.raw_arg(">/dev/null") .raw_arg(">/dev/null")
.raw_arg("2>&1"); .raw_arg("2>&1");
auto remove = System::CmdLineBuilder("rm").path_arg(vcpkg_metrics_txt_path); auto remove = System::Command("rm").path_arg(vcpkg_metrics_txt_path);
System::CmdLineBuilder cmd_line; System::Command cmd_line;
cmd_line.raw_arg("(").raw_arg(curl.command_line()).raw_arg(";").raw_arg(remove.command_line()).raw_arg(") &"); cmd_line.raw_arg("(").raw_arg(curl.command_line()).raw_arg(";").raw_arg(remove.command_line()).raw_arg(") &");
System::cmd_execute_clean(cmd_line); System::cmd_execute_clean(cmd_line);
#endif #endif

8
toolsrc/src/vcpkg/postbuildlint.cpp
View File

@ -390,7 +390,7 @@ namespace vcpkg::PostBuildLint
std::vector<fs::path> dlls_with_no_exports; std::vector<fs::path> dlls_with_no_exports;
for (const fs::path& dll : dlls) for (const fs::path& dll : dlls)
{ {
auto cmd_line = System::CmdLineBuilder(dumpbin_exe).string_arg("/exports").path_arg(dll); auto cmd_line = System::Command(dumpbin_exe).string_arg("/exports").path_arg(dll);
System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line);
Checks::check_exit( Checks::check_exit(
VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line.command_line()); VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line.command_line());
@ -428,7 +428,7 @@ namespace vcpkg::PostBuildLint
std::vector<fs::path> dlls_with_improper_uwp_bit; std::vector<fs::path> dlls_with_improper_uwp_bit;
for (const fs::path& dll : dlls) for (const fs::path& dll : dlls)
{ {
auto cmd_line = System::CmdLineBuilder(dumpbin_exe).string_arg("/headers").path_arg(dll); auto cmd_line = System::Command(dumpbin_exe).string_arg("/headers").path_arg(dll);
System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line);
Checks::check_exit( Checks::check_exit(
VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line.command_line()); VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line.command_line());
@ -720,7 +720,7 @@ namespace vcpkg::PostBuildLint
for (const fs::path& lib : libs) for (const fs::path& lib : libs)
{ {
auto cmd_line = System::CmdLineBuilder(dumpbin_exe).string_arg("/directives").path_arg(lib); auto cmd_line = System::Command(dumpbin_exe).string_arg("/directives").path_arg(lib);
System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line);
Checks::check_exit(VCPKG_LINE_INFO, Checks::check_exit(VCPKG_LINE_INFO,
ec_data.exit_code == 0, ec_data.exit_code == 0,
@ -774,7 +774,7 @@ namespace vcpkg::PostBuildLint
for (const fs::path& dll : dlls) for (const fs::path& dll : dlls)
{ {
auto cmd_line = System::CmdLineBuilder(dumpbin_exe).string_arg("/dependents").path_arg(dll); auto cmd_line = System::Command(dumpbin_exe).string_arg("/dependents").path_arg(dll);
System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line); System::ExitCodeAndOutput ec_data = System::cmd_execute_and_capture_output(cmd_line);
Checks::check_exit( Checks::check_exit(
VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line.command_line()); VCPKG_LINE_INFO, ec_data.exit_code == 0, "Running command:\n %s\n failed", cmd_line.command_line());

16
toolsrc/src/vcpkg/tools.cpp
View File

@ -297,7 +297,7 @@ namespace vcpkg
} }
virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override
{ {
auto cmd = System::CmdLineBuilder(path_to_exe).string_arg("--version"); auto cmd = System::Command(path_to_exe).string_arg("--version");
auto rc = System::cmd_execute_and_capture_output(cmd); auto rc = System::cmd_execute_and_capture_output(cmd);
if (rc.exit_code != 0) if (rc.exit_code != 0)
{ {
@ -326,7 +326,7 @@ CMake suite maintained and supported by Kitware (kitware.com/cmake).
virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override
{ {
auto cmd = System::CmdLineBuilder(path_to_exe).string_arg("--version"); auto cmd = System::Command(path_to_exe).string_arg("--version");
auto rc = System::cmd_execute_and_capture_output(cmd); auto rc = System::cmd_execute_and_capture_output(cmd);
if (rc.exit_code != 0) if (rc.exit_code != 0)
{ {
@ -352,7 +352,7 @@ CMake suite maintained and supported by Kitware (kitware.com/cmake).
virtual ExpectedS<std::string> get_version(const VcpkgPaths& paths, const fs::path& path_to_exe) const override virtual ExpectedS<std::string> get_version(const VcpkgPaths& paths, const fs::path& path_to_exe) const override
{ {
System::CmdLineBuilder cmd; System::Command cmd;
#ifndef _WIN32 #ifndef _WIN32
cmd.path_arg(paths.get_tool_exe(Tools::MONO)); cmd.path_arg(paths.get_tool_exe(Tools::MONO));
#else #else
@ -414,7 +414,7 @@ Type 'NuGet help <command>' for help on a specific command.
virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override
{ {
auto cmd = System::CmdLineBuilder(path_to_exe).string_arg("--version"); auto cmd = System::Command(path_to_exe).string_arg("--version");
auto rc = System::cmd_execute_and_capture_output(cmd); auto rc = System::cmd_execute_and_capture_output(cmd);
if (rc.exit_code != 0) if (rc.exit_code != 0)
{ {
@ -443,8 +443,7 @@ git version 2.17.1.windows.2
virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override
{ {
auto rc = auto rc = System::cmd_execute_and_capture_output(System::Command(path_to_exe).string_arg("--version"));
System::cmd_execute_and_capture_output(System::CmdLineBuilder(path_to_exe).string_arg("--version"));
if (rc.exit_code != 0) if (rc.exit_code != 0)
{ {
return {Strings::concat( return {Strings::concat(
@ -485,7 +484,7 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50
virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override
{ {
auto cmd = System::CmdLineBuilder(path_to_exe).string_arg("--framework-version"); auto cmd = System::Command(path_to_exe).string_arg("--framework-version");
auto rc = System::cmd_execute_and_capture_output(cmd); auto rc = System::cmd_execute_and_capture_output(cmd);
if (rc.exit_code != 0) if (rc.exit_code != 0)
{ {
@ -512,8 +511,7 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50
virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override
{ {
auto rc = auto rc = System::cmd_execute_and_capture_output(System::Command(path_to_exe).string_arg("--version"));
System::cmd_execute_and_capture_output(System::CmdLineBuilder(path_to_exe).string_arg("--version"));
if (rc.exit_code != 0) if (rc.exit_code != 0)
{ {
return {Strings::concat( return {Strings::concat(

86
toolsrc/src/vcpkg/vcpkgpaths.cpp
View File

@ -70,11 +70,9 @@ namespace
return result; return result;
} }
System::CmdLineBuilder git_cmd_builder(const VcpkgPaths& paths, System::Command git_cmd_builder(const VcpkgPaths& paths, const fs::path& dot_git_dir, const fs::path& work_tree)
const fs::path& dot_git_dir,
const fs::path& work_tree)
{ {
return System::CmdLineBuilder() return System::Command()
.path_arg(paths.get_tool_exe(Tools::GIT)) .path_arg(paths.get_tool_exe(Tools::GIT))
.string_arg(Strings::concat("--git-dir=", fs::u8string(dot_git_dir))) .string_arg(Strings::concat("--git-dir=", fs::u8string(dot_git_dir)))
.string_arg(Strings::concat("--work-tree=", fs::u8string(work_tree))); .string_arg(Strings::concat("--work-tree=", fs::u8string(work_tree)));
@ -506,13 +504,13 @@ If you wish to silence this error and use classic mode, you can:
// All git commands are run with: --git-dir={dot_git_dir} --work-tree={work_tree_temp} // All git commands are run with: --git-dir={dot_git_dir} --work-tree={work_tree_temp}
// git clone --no-checkout --local --no-hardlinks {vcpkg_root} {dot_git_dir} // git clone --no-checkout --local --no-hardlinks {vcpkg_root} {dot_git_dir}
// note that `--no-hardlinks` is added because otherwise, git fails to clone in some cases // note that `--no-hardlinks` is added because otherwise, git fails to clone in some cases
System::CmdLineBuilder clone_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) System::Command clone_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree)
.string_arg("clone") .string_arg("clone")
.string_arg("--no-checkout") .string_arg("--no-checkout")
.string_arg("--local") .string_arg("--local")
.string_arg("--no-hardlinks") .string_arg("--no-hardlinks")
.path_arg(local_repo) .path_arg(local_repo)
.path_arg(dot_git_dir); .path_arg(dot_git_dir);
const auto clone_output = System::cmd_execute_and_capture_output(clone_cmd_builder); const auto clone_output = System::cmd_execute_and_capture_output(clone_cmd_builder);
Checks::check_exit(VCPKG_LINE_INFO, Checks::check_exit(VCPKG_LINE_INFO,
clone_output.exit_code == 0, clone_output.exit_code == 0,
@ -520,11 +518,11 @@ If you wish to silence this error and use classic mode, you can:
clone_output.output); clone_output.output);
// git checkout {commit-sha} -- {subpath} // git checkout {commit-sha} -- {subpath}
System::CmdLineBuilder checkout_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree) System::Command checkout_cmd_builder = git_cmd_builder(paths, dot_git_dir, work_tree)
.string_arg("checkout") .string_arg("checkout")
.string_arg(commit_sha) .string_arg(commit_sha)
.string_arg("--") .string_arg("--")
.path_arg(subpath); .path_arg(subpath);
const auto checkout_output = System::cmd_execute_and_capture_output(checkout_cmd_builder); const auto checkout_output = System::cmd_execute_and_capture_output(checkout_cmd_builder);
Checks::check_exit(VCPKG_LINE_INFO, Checks::check_exit(VCPKG_LINE_INFO,
checkout_output.exit_code == 0, checkout_output.exit_code == 0,
@ -585,7 +583,7 @@ If you wish to silence this error and use classic mode, you can:
{ {
// All git commands are run with: --git-dir={dot_git_dir} --work-tree={work_tree_temp} // All git commands are run with: --git-dir={dot_git_dir} --work-tree={work_tree_temp}
// git clone --no-checkout --local {vcpkg_root} {dot_git_dir} // git clone --no-checkout --local {vcpkg_root} {dot_git_dir}
System::CmdLineBuilder showcmd = System::Command showcmd =
git_cmd_builder(*this, dot_git_dir, dot_git_dir).string_arg("show").string_arg(treeish); git_cmd_builder(*this, dot_git_dir, dot_git_dir).string_arg("show").string_arg(treeish);
auto output = System::cmd_execute_and_capture_output(showcmd); auto output = System::cmd_execute_and_capture_output(showcmd);
@ -741,11 +739,11 @@ If you wish to silence this error and use classic mode, you can:
expected_right_tag}; expected_right_tag};
} }
System::CmdLineBuilder tar_cmd_builder = git_cmd_builder(*this, dot_git_dir, dot_git_dir) auto tar_cmd_builder = git_cmd_builder(*this, dot_git_dir, dot_git_dir)
.string_arg("archive") .string_arg("archive")
.string_arg(git_tree) .string_arg(git_tree)
.string_arg("-o") .string_arg("-o")
.path_arg(destination_tar); .path_arg(destination_tar);
const auto tar_output = System::cmd_execute_and_capture_output(tar_cmd_builder); const auto tar_output = System::cmd_execute_and_capture_output(tar_cmd_builder);
if (tar_output.exit_code != 0) if (tar_output.exit_code != 0)
{ {
@ -753,12 +751,11 @@ If you wish to silence this error and use classic mode, you can:
expected_right_tag}; expected_right_tag};
} }
System::CmdLineBuilder extract_cmd_builder; auto extract_cmd_builder = System::Command{this->get_tool_exe(Tools::CMAKE)}
extract_cmd_builder.path_arg(this->get_tool_exe(Tools::CMAKE)) .string_arg("-E")
.string_arg("-E") .string_arg("tar")
.string_arg("tar") .string_arg("xf")
.string_arg("xf") .path_arg(destination_tar);
.path_arg(destination_tar);
const auto extract_output = const auto extract_output =
System::cmd_execute_and_capture_output(extract_cmd_builder, System::InWorkingDirectory{destination_tmp}); System::cmd_execute_and_capture_output(extract_cmd_builder, System::InWorkingDirectory{destination_tmp});
@ -799,8 +796,7 @@ If you wish to silence this error and use classic mode, you can:
fs.create_directories(work_tree, VCPKG_LINE_INFO); fs.create_directories(work_tree, VCPKG_LINE_INFO);
auto dot_git_dir = m_pimpl->registries_dot_git_dir; auto dot_git_dir = m_pimpl->registries_dot_git_dir;
System::CmdLineBuilder init_registries_git_dir = System::Command init_registries_git_dir = git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("init");
git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("init");
auto init_output = System::cmd_execute_and_capture_output(init_registries_git_dir); auto init_output = System::cmd_execute_and_capture_output(init_registries_git_dir);
if (init_output.exit_code != 0) if (init_output.exit_code != 0)
{ {
@ -815,7 +811,7 @@ If you wish to silence this error and use classic mode, you can:
std::error_code ec; std::error_code ec;
Files::ExclusiveFileLock guard(Files::ExclusiveFileLock::Wait::Yes, fs, lock_file, ec); Files::ExclusiveFileLock guard(Files::ExclusiveFileLock::Wait::Yes, fs, lock_file, ec);
System::CmdLineBuilder fetch_git_ref = System::Command fetch_git_ref =
git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("fetch").string_arg("--").string_arg(repo); git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("fetch").string_arg("--").string_arg(repo);
if (treeish.size() != 0) if (treeish.size() != 0)
{ {
@ -833,7 +829,7 @@ If you wish to silence this error and use classic mode, you can:
expected_right_tag}; expected_right_tag};
} }
System::CmdLineBuilder get_fetch_head = System::Command get_fetch_head =
git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("rev-parse").string_arg("FETCH_HEAD"); git_cmd_builder(*this, dot_git_dir, work_tree).string_arg("rev-parse").string_arg("FETCH_HEAD");
auto fetch_head_output = System::cmd_execute_and_capture_output(get_fetch_head); auto fetch_head_output = System::cmd_execute_and_capture_output(get_fetch_head);
if (fetch_head_output.exit_code != 0) if (fetch_head_output.exit_code != 0)
@ -849,7 +845,7 @@ If you wish to silence this error and use classic mode, you can:
const fs::path& relative_path) const const fs::path& relative_path) const
{ {
auto revision = Strings::format("%s:%s", hash, fs::generic_u8string(relative_path)); auto revision = Strings::format("%s:%s", hash, fs::generic_u8string(relative_path));
System::CmdLineBuilder git_show = System::Command git_show =
git_cmd_builder(*this, m_pimpl->registries_dot_git_dir, m_pimpl->registries_work_tree_dir) git_cmd_builder(*this, m_pimpl->registries_dot_git_dir, m_pimpl->registries_work_tree_dir)
.string_arg("show") .string_arg("show")
.string_arg(revision); .string_arg(revision);
@ -865,7 +861,7 @@ If you wish to silence this error and use classic mode, you can:
const fs::path& relative_path) const const fs::path& relative_path) const
{ {
auto revision = Strings::format("%s:%s", hash, fs::generic_u8string(relative_path)); auto revision = Strings::format("%s:%s", hash, fs::generic_u8string(relative_path));
System::CmdLineBuilder git_rev_parse = System::Command git_rev_parse =
git_cmd_builder(*this, m_pimpl->registries_dot_git_dir, m_pimpl->registries_work_tree_dir) git_cmd_builder(*this, m_pimpl->registries_dot_git_dir, m_pimpl->registries_work_tree_dir)
.string_arg("rev-parse") .string_arg("rev-parse")
.string_arg(revision); .string_arg(revision);
@ -896,13 +892,13 @@ If you wish to silence this error and use classic mode, you can:
fs.create_directory(git_tree_temp, VCPKG_LINE_INFO); fs.create_directory(git_tree_temp, VCPKG_LINE_INFO);
auto dot_git_dir = m_pimpl->registries_dot_git_dir; auto dot_git_dir = m_pimpl->registries_dot_git_dir;
System::CmdLineBuilder git_archive = git_cmd_builder(*this, dot_git_dir, m_pimpl->registries_work_tree_dir) System::Command git_archive = git_cmd_builder(*this, dot_git_dir, m_pimpl->registries_work_tree_dir)
.string_arg("archive") .string_arg("archive")
.string_arg("--format") .string_arg("--format")
.string_arg("tar") .string_arg("tar")
.string_arg(object) .string_arg(object)
.string_arg("--output") .string_arg("--output")
.path_arg(git_tree_temp_tar); .path_arg(git_tree_temp_tar);
auto git_archive_output = System::cmd_execute_and_capture_output(git_archive); auto git_archive_output = System::cmd_execute_and_capture_output(git_archive);
if (git_archive_output.exit_code != 0) if (git_archive_output.exit_code != 0)
{ {
@ -910,11 +906,9 @@ If you wish to silence this error and use classic mode, you can:
expected_right_tag}; expected_right_tag};
} }
auto untar = System::CmdLineBuilder{get_tool_exe(Tools::CMAKE)} auto untar =
.string_arg("-E") System::Command{get_tool_exe(Tools::CMAKE)}.string_arg("-E").string_arg("tar").string_arg("xf").path_arg(
.string_arg("tar") git_tree_temp_tar);
.string_arg("xf")
.path_arg(git_tree_temp_tar);
auto untar_output = System::cmd_execute_and_capture_output(untar, System::InWorkingDirectory{git_tree_temp}); auto untar_output = System::cmd_execute_and_capture_output(untar, System::InWorkingDirectory{git_tree_temp});
if (untar_output.exit_code != 0) if (untar_output.exit_code != 0)

2
toolsrc/src/vcpkg/visualstudio.cpp
View File

@ -84,7 +84,7 @@ namespace vcpkg::VisualStudio
const fs::path vswhere_exe = program_files_32_bit / "Microsoft Visual Studio" / "Installer" / "vswhere.exe"; const fs::path vswhere_exe = program_files_32_bit / "Microsoft Visual Studio" / "Installer" / "vswhere.exe";
if (fs.exists(vswhere_exe)) if (fs.exists(vswhere_exe))
{ {
const auto code_and_output = System::cmd_execute_and_capture_output(System::CmdLineBuilder(vswhere_exe) const auto code_and_output = System::cmd_execute_and_capture_output(System::Command(vswhere_exe)
.string_arg("-all") .string_arg("-all")
.string_arg("-prerelease") .string_arg("-prerelease")
.string_arg("-legacy") .string_arg("-legacy")