diff options
| author | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-13 14:01:27 -0800 |
|---|---|---|
| committer | Alexander Karatarakis <alkarata@microsoft.com> | 2017-02-15 18:06:06 -0800 |
| commit | c60c9de6e2371b31a79c58719df1d344b564111c (patch) | |
| tree | 5620d19c1f277c409311bb7af95837faa75882cf /toolsrc/include | |
| parent | cc1692f304ed5c2514e69a12c4ed974b0d7b679e (diff) | |
| download | vcpkg-c60c9de6e2371b31a79c58719df1d344b564111c.tar.gz vcpkg-c60c9de6e2371b31a79c58719df1d344b564111c.zip | |
Restore dependency check in build_package()
Diffstat (limited to 'toolsrc/include')
| -rw-r--r-- | toolsrc/include/vcpkg_Commands.h | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index 86c77a8bf..c3cda3d87 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -12,22 +12,19 @@ namespace vcpkg::Commands namespace Build { - enum class DependencyStatus - { - ALL_DEPENDENCIES_INSTALLED, - MISSING_DEPENDENCIES - }; - enum class BuildResult { BUILD_NOT_STARTED = 0, - SUCCESS, + SUCCEEDED, BUILD_FAILED, POST_BUILD_CHECKS_FAILED, + CASCADED_DUE_TO_MISSING_DEPENDENCIES }; - DependencyStatus check_dependencies(const SourceParagraph& source_paragraph, const package_spec& spec, const StatusParagraphs& status_db); - BuildResult build_package(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const DependencyStatus& dependency_status); + const std::string& to_string(const BuildResult build_result); + std::string create_error_message(const std::string& package_id, const BuildResult build_result); + + BuildResult build_package(const SourceParagraph& source_paragraph, const package_spec& spec, const vcpkg_paths& paths, const fs::path& port_dir, const StatusParagraphs& status_db); void perform_and_exit(const vcpkg_cmd_arguments& args, const vcpkg_paths& paths, const triplet& default_target_triplet); } |
