cemu-project/vcpkg
1
0
Fork 0
mirror of https://github.com/cemu-project/vcpkg.git synced 2024-12-05 01:36:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Change parameter from std::string to package_spec

Browse Source
This commit is contained in:
Alexander Karatarakis 2017-02-13 16:23:21 -08:00
parent 6824cc9264
commit 430739c468
5 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
toolsrc/include/vcpkg_Commands.h
View File

@ -22,7 +22,7 @@ namespace vcpkg::Commands
};
const std::string& to_string(const BuildResult build_result);
std::string create_error_message(const BuildResult build_result, const std::string& package_id);
std::string create_error_message(const BuildResult build_result, const package_spec& spec);
std::string create_user_troubleshooting_message(const package_spec& spec);
BuildResult build_package(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db);

6
toolsrc/src/commands_build.cpp
View File

@ -95,9 +95,9 @@ namespace vcpkg::Commands::Build
}
}
std::string create_error_message(const BuildResult build_result, const std::string& package_id)
std::string create_error_message(const BuildResult build_result, const package_spec& spec)
{
return Strings::format("Error: Building package %s failed with: %s", package_id, Build::to_string(build_result));
return Strings::format("Error: Building package %s failed with: %s", spec.toString(), Build::to_string(build_result));
}
std::string create_user_troubleshooting_message(const package_spec& spec)
@ -167,7 +167,7 @@ namespace vcpkg::Commands::Build
if (result != BuildResult::SUCCEEDED)
{
System::println(System::color::error, Build::create_error_message(result, spec.toString()));
System::println(System::color::error, Build::create_error_message(result, spec));
System::println(Build::create_user_troubleshooting_message(spec));
exit(EXIT_FAILURE);
}

2
toolsrc/src/commands_build_external.cpp
View File

@ -26,7 +26,7 @@ namespace vcpkg::Commands::BuildExternal
const Build::BuildResult result = Commands::Build::build_package(*spgh, *spec, paths, port_dir, status_db);
if (result != Build::BuildResult::SUCCEEDED)
{
System::println(System::color::error, Build::create_error_message(result, spec->toString()));
System::println(System::color::error, Build::create_error_message(result, *spec));
System::println(Build::create_user_troubleshooting_message(*spec));
exit(EXIT_FAILURE);
}

2
toolsrc/src/commands_ci.cpp
View File

@ -58,7 +58,7 @@ namespace vcpkg::Commands::CI
results.push_back(result);
if (result != Build::BuildResult::SUCCEEDED)
{
System::println(System::color::error, Build::create_error_message(result, action.spec.toString()));
System::println(System::color::error, Build::create_error_message(result, action.spec));
continue;
}
const BinaryParagraph bpgh = try_load_cached_package(paths, action.spec).get_or_throw();

2
toolsrc/src/commands_install.cpp
View File

@ -217,7 +217,7 @@ namespace vcpkg::Commands::Install
const Build::BuildResult result = Commands::Build::build_package(*action.plan.source_pgh, action.spec, paths, paths.port_dir(action.spec), status_db);
if (result != Build::BuildResult::SUCCEEDED)
{
System::println(System::color::error, Build::create_error_message(result, action.spec.toString()));
System::println(System::color::error, Build::create_error_message(result, action.spec));
System::println(Build::create_user_troubleshooting_message(action.spec));
exit(EXIT_FAILURE);
}