aboutsummaryrefslogtreecommitdiff
path: root/toolsrc/src/commands_ci.cpp
diff options
context:
space:
mode:
authorAlexander Karatarakis <alkarata@microsoft.com>2017-04-27 18:08:52 -0700
committerAlexander Karatarakis <alkarata@microsoft.com>2017-04-27 18:59:57 -0700
commit1e9471a1489156720362ef12e1ec6849ea9b45b6 (patch)
tree46f0f35093ecd18034c9f9463d6f8b7aa590ade0 /toolsrc/src/commands_ci.cpp
parent75e8752cb90eb8bc7717518d9d6a5c68f27f2b0f (diff)
downloadvcpkg-1e9471a1489156720362ef12e1ec6849ea9b45b6.tar.gz
vcpkg-1e9471a1489156720362ef12e1ec6849ea9b45b6.zip
Run clang-format over the cpp files
Diffstat (limited to 'toolsrc/src/commands_ci.cpp')
-rw-r--r--toolsrc/src/commands_ci.cpp69
1 files changed, 36 insertions, 33 deletions
diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp
index b7fc9e1c0..91d1ff01a 100644
--- a/toolsrc/src/commands_ci.cpp
+++ b/toolsrc/src/commands_ci.cpp
@@ -1,12 +1,13 @@
#include "pch.h"
+
+#include "Paragraphs.h"
+#include "vcpkg_Chrono.h"
#include "vcpkg_Commands.h"
-#include "vcpkglib.h"
-#include "vcpkg_Files.h"
-#include "vcpkg_System.h"
#include "vcpkg_Dependencies.h"
+#include "vcpkg_Files.h"
#include "vcpkg_Input.h"
-#include "vcpkg_Chrono.h"
-#include "Paragraphs.h"
+#include "vcpkg_System.h"
+#include "vcpkglib.h"
namespace vcpkg::Commands::CI
{
@@ -14,7 +15,9 @@ namespace vcpkg::Commands::CI
using Dependencies::InstallPlanType;
using Build::BuildResult;
- static std::vector<PackageSpec> load_all_package_specs(Files::Filesystem& fs, const fs::path& ports_directory, const Triplet& triplet)
+ static std::vector<PackageSpec> load_all_package_specs(Files::Filesystem& fs,
+ const fs::path& ports_directory,
+ const Triplet& triplet)
{
std::vector<SourceParagraph> ports = Paragraphs::load_all_ports(fs, ports_directory);
std::vector<PackageSpec> specs;
@@ -30,7 +33,9 @@ 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 triplet = args.command_arguments.size() == 1 ? Triplet::from_canonical_name(args.command_arguments.at(0)) : default_triplet;
+ 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.get_filesystem(), paths.ports, triplet);
@@ -63,39 +68,37 @@ namespace vcpkg::Commands::CI
System::println(System::Color::success, "Package %s is already installed", display_name);
break;
case InstallPlanType::BUILD_AND_INSTALL:
+ {
+ System::println("Building package %s... ", display_name);
+ auto&& source_paragraph = action.any_paragraph.source_paragraph.value_or_exit(VCPKG_LINE_INFO);
+ const auto result_ex = Commands::Build::build_package(
+ source_paragraph, action.spec, paths, paths.port_dir(action.spec), status_db);
+ const auto result = result_ex.code;
+
+ timing.back() = build_timer.to_string();
+ results.back() = result;
+ if (result != BuildResult::SUCCEEDED)
{
- System::println("Building package %s... ", display_name);
- auto&& source_paragraph = action.any_paragraph.source_paragraph.value_or_exit(VCPKG_LINE_INFO);
- const auto result_ex = Commands::Build::build_package(source_paragraph,
- action.spec,
- paths,
- paths.port_dir(action.spec),
- status_db);
- const auto result = result_ex.code;
-
- timing.back() = build_timer.to_string();
- results.back() = result;
- if (result != BuildResult::SUCCEEDED)
- {
- System::println(System::Color::error, Build::create_error_message(result, action.spec));
- continue;
- }
- System::println(System::Color::success, "Building package %s... done", display_name);
-
- const BinaryParagraph bpgh = Paragraphs::try_load_cached_package(paths, action.spec).value_or_exit(VCPKG_LINE_INFO);
- System::println("Installing package %s... ", display_name);
- Install::install_package(paths, bpgh, &status_db);
- System::println(System::Color::success, "Installing package %s... done", display_name);
- break;
+ System::println(System::Color::error, Build::create_error_message(result, action.spec));
+ continue;
}
+ System::println(System::Color::success, "Building package %s... done", display_name);
+
+ const BinaryParagraph bpgh =
+ Paragraphs::try_load_cached_package(paths, action.spec).value_or_exit(VCPKG_LINE_INFO);
+ System::println("Installing package %s... ", display_name);
+ Install::install_package(paths, bpgh, &status_db);
+ System::println(System::Color::success, "Installing package %s... done", display_name);
+ break;
+ }
case InstallPlanType::INSTALL:
results.back() = BuildResult::SUCCEEDED;
System::println("Installing package %s... ", display_name);
- Install::install_package(paths, action.any_paragraph.binary_paragraph.value_or_exit(VCPKG_LINE_INFO), &status_db);
+ Install::install_package(
+ paths, action.any_paragraph.binary_paragraph.value_or_exit(VCPKG_LINE_INFO), &status_db);
System::println(System::Color::success, "Installing package %s... done", display_name);
break;
- default:
- Checks::unreachable(VCPKG_LINE_INFO);
+ default: Checks::unreachable(VCPKG_LINE_INFO);
}
}
catch (const std::exception& e)