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

[tools] support gsutil #19

Merged
merged 2 commits into from
Mar 15, 2021
Merged

[tools] support gsutil #19

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9887f0c
feat: support gsutil in `vcpkg fetch`
coryan Feb 28, 2021
ed21ffa
Fix formatting
coryan Feb 28, 2021
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
1 change: 1 addition & 0 deletions include/vcpkg/tools.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@ namespace vcpkg
static const std::string MAVEN = "mvn";
static const std::string CMAKE = "cmake";
static const std::string GIT = "git";
static const std::string GSUTIL = "gsutil";
static const std::string MONO = "mono";
static const std::string NINJA = "ninja";
static const std::string POWERSHELL_CORE = "powershell-core";
Expand Down
45 changes: 43 additions & 2 deletions src/vcpkg/tools.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ namespace vcpkg

static Optional<std::array<int, 3>> parse_version_string(const std::string& version_as_string)
{
static const std::regex RE(R"###((\d+)\.(\d+)\.(\d+))###");
static const std::regex RE(R"###((\d+)\.(\d+)(\.(\d+))?)###");

std::match_results<std::string::const_iterator> match;
const auto found = std::regex_search(version_as_string, match, RE);
Expand All @@ -38,7 +38,10 @@ namespace vcpkg

const int d1 = atoi(match[1].str().c_str());
const int d2 = atoi(match[2].str().c_str());
const int d3 = atoi(match[3].str().c_str());
const int d3 = [&] {
if (match[4].str().empty()) return 0;
return atoi(match[5].str().c_str());
}();
const std::array<int, 3> result = {d1, d2, d3};
return result;
}
Expand Down Expand Up @@ -460,6 +463,36 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50
}
};

struct GsutilProvider : ToolProvider
{
std::string m_exe = "gsutil";

virtual const std::string& tool_data_name() const override { return m_exe; }
virtual const std::string& exe_stem() const override { return m_exe; }
virtual std::array<int, 3> default_min_version() const override { return {4, 56, 0}; }

virtual ExpectedS<std::string> get_version(const VcpkgPaths&, const fs::path& path_to_exe) const override
{
auto cmd = System::Command(path_to_exe).string_arg("version");
auto rc = System::cmd_execute_and_capture_output(cmd);
if (rc.exit_code != 0)
{
return {Strings::concat(
std::move(rc.output), "\n\nFailed to get version of ", fs::u8string(path_to_exe), "\n"),
expected_right_tag};
}

/* Sample output:
gsutil version: 4.58
*/

const auto idx = rc.output.find("gsutil version: ");
Checks::check_exit(
VCPKG_LINE_INFO, idx != std::string::npos, "Unexpected format of gsutil version string: %s", rc.output);
return {rc.output.substr(idx), expected_left_tag};
}
};

struct IfwInstallerBaseProvider : ToolProvider
{
std::string m_exe;
Expand Down Expand Up @@ -589,6 +622,14 @@ Mono JIT compiler version 6.8.0.105 (Debian 6.8.0.105+dfsg-2 Wed Feb 26 23:23:50
if (tool == Tools::NUGET) return get_path(paths, NuGetProvider());
if (tool == Tools::IFW_INSTALLER_BASE) return get_path(paths, IfwInstallerBaseProvider());
if (tool == Tools::MONO) return get_path(paths, MonoProvider());
if (tool == Tools::GSUTIL)
{
if (System::get_environment_variable("VCPKG_FORCE_SYSTEM_BINARIES").has_value())
{
return {"gsutil", "0"};
}
return get_path(paths, GsutilProvider());
}

// For other tools, we simply always auto-download them.
auto maybe_tool_data = parse_tool_data_from_xml(paths, tool);
Expand Down