aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/commands_ci.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-04-10 13:11:36 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-04-10 13:11:36 -0700
commitc5557ba8cb284ea9b12fdaa6d7f6ae1114374a8c (patch)
treed8cf402efb6f9b0558ed0971916279065296c24f /toolsrc/src/commands_ci.cpp
parentca3d013c367945d3d72ed0bf8d267fcd0dec6806 (diff)
downloadvcpkg-c5557ba8cb284ea9b12fdaa6d7f6ae1114374a8c.tar.gz
vcpkg-c5557ba8cb284ea9b12fdaa6d7f6ae1114374a8c.zip
`ci` target_triplet -> triplet
Diffstat (limited to 'toolsrc/src/commands_ci.cpp')
-rw-r--r--toolsrc/src/commands_ci.cpp10
1 files changed, 5 insertions, 5 deletions
diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp
index 3f341580e..0e095d085 100644
--- a/toolsrc/src/commands_ci.cpp
+++ b/toolsrc/src/commands_ci.cpp
@@ -14,13 +14,13 @@ namespace vcpkg::Commands::CI
using Dependencies::InstallPlanType;
using Build::BuildResult;
- static std::vector<PackageSpec> load_all_package_specs(const fs::path& ports_directory, const Triplet& target_triplet)
+ static std::vector<PackageSpec> load_all_package_specs(const fs::path& ports_directory, const Triplet& triplet)
{
std::vector<SourceParagraph> ports = Paragraphs::load_all_ports(ports_directory);
std::vector<PackageSpec> specs;
for (const SourceParagraph& p : ports)
{
- specs.push_back(PackageSpec::from_name_and_triplet(p.name, target_triplet).value_or_exit(VCPKG_LINE_INFO));
+ specs.push_back(PackageSpec::from_name_and_triplet(p.name, triplet).value_or_exit(VCPKG_LINE_INFO));
}
return specs;
@@ -30,10 +30,10 @@ namespace vcpkg::Commands::CI
{
static const std::string example = Commands::Help::create_example_string("ci x64-windows");
args.check_max_arg_count(1, example);
- const Triplet target_triplet = args.command_arguments.size() == 1 ? Triplet::from_canonical_name(args.command_arguments.at(0)) : default_triplet;
- Input::check_triplet(target_triplet, paths);
+ const Triplet triplet = args.command_arguments.size() == 1 ? Triplet::from_canonical_name(args.command_arguments.at(0)) : default_triplet;
+ Input::check_triplet(triplet, paths);
args.check_and_get_optional_command_arguments({});
- const std::vector<PackageSpec> specs = load_all_package_specs(paths.ports, target_triplet);
+ const std::vector<PackageSpec> specs = load_all_package_specs(paths.ports, triplet);
StatusParagraphs status_db = database_load_check(paths);
const std::vector<PackageSpecWithInstallPlan> install_plan = Dependencies::create_install_plan(paths, specs, status_db);