From e56d87c689ba4d8ac22b0b5840486790891e838c Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:01:09 -0700 Subject: [PATCH 01/33] Remove to_printf_args(PackageSpec) --- toolsrc/include/PackageSpec.h | 2 -- toolsrc/src/PackageSpec.cpp | 5 ----- toolsrc/src/commands_build.cpp | 2 +- toolsrc/src/commands_ci.cpp | 13 +++++++------ toolsrc/src/commands_install.cpp | 20 +++++++++++--------- 5 files changed, 19 insertions(+), 23 deletions(-) diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index 57fbefc0a..79068e638 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -26,8 +26,6 @@ namespace vcpkg Triplet m_target_triplet; }; - std::string to_printf_arg(const PackageSpec& spec); - bool operator==(const PackageSpec& left, const PackageSpec& right); std::ostream& operator<<(std::ostream& os, const PackageSpec& spec); diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index fab0cc8b6..2eb5c1f23 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -65,11 +65,6 @@ namespace vcpkg return this->display_name(); } - std::string to_printf_arg(const PackageSpec& spec) - { - return spec.to_string(); - } - bool operator==(const PackageSpec& left, const PackageSpec& right) { return left.name() == right.name() && left.target_triplet() == right.target_triplet(); diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index 9bf7eabcd..1794c8f79 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -141,7 +141,7 @@ namespace vcpkg::Commands::Build } const Expected maybe_spgh = Paragraphs::try_load_port(port_dir); - Checks::check_exit(VCPKG_LINE_INFO, !maybe_spgh.error_code(), "Could not find package named %s: %s", spec, maybe_spgh.error_code().message()); + Checks::check_exit(VCPKG_LINE_INFO, !maybe_spgh.error_code(), "Could not find package named %s: %s", spec.display_name(), maybe_spgh.error_code().message()); const SourceParagraph& spgh = *maybe_spgh.get(); StatusParagraphs status_db = database_load_check(paths); diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp index 72137f8bb..8972aa339 100644 --- a/toolsrc/src/commands_ci.cpp +++ b/toolsrc/src/commands_ci.cpp @@ -48,7 +48,8 @@ namespace vcpkg::Commands::CI { const ElapsedTime build_timer = ElapsedTime::create_started(); counter++; - System::println("Starting package %d/%d: %s", counter, package_count, action.spec.to_string()); + const std::string display_name = action.spec.display_name(); + System::println("Starting package %d/%d: %s", counter, package_count, display_name); timing.push_back(-1); results.push_back(BuildResult::NULLVALUE); @@ -58,7 +59,7 @@ namespace vcpkg::Commands::CI if (action.plan.plan_type == InstallPlanType::ALREADY_INSTALLED) { results.back() = BuildResult::SUCCEEDED; - System::println(System::Color::success, "Package %s is already installed", action.spec); + System::println(System::Color::success, "Package %s is already installed", display_name); } else if (action.plan.plan_type == InstallPlanType::BUILD_AND_INSTALL) { @@ -76,23 +77,23 @@ namespace vcpkg::Commands::CI } const BinaryParagraph bpgh = Paragraphs::try_load_cached_package(paths, action.spec).value_or_exit(VCPKG_LINE_INFO); Install::install_package(paths, bpgh, &status_db); - System::println(System::Color::success, "Package %s is installed", action.spec); + System::println(System::Color::success, "Package %s is installed", display_name); } else if (action.plan.plan_type == InstallPlanType::INSTALL) { results.back() = BuildResult::SUCCEEDED; Install::install_package(paths, action.plan.binary_pgh.value_or_exit(VCPKG_LINE_INFO), &status_db); - System::println(System::Color::success, "Package %s is installed from cache", action.spec); + System::println(System::Color::success, "Package %s is installed from cache", display_name); } else Checks::unreachable(VCPKG_LINE_INFO); } catch (const std::exception& e) { - System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec, e.what()); + System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec.display_name(), e.what()); results.back() = BuildResult::NULLVALUE; } - System::println("Elapsed time for package %s: %s", action.spec, build_timer.to_string()); + System::println("Elapsed time for package %s: %s", action.spec.display_name(), build_timer.to_string()); } System::println("Total time taken: %s", timer.to_string()); diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 2c57404de..1a8fccf9e 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -201,7 +201,7 @@ namespace vcpkg::Commands::Install const fs::path triplet_install_path = paths.installed / triplet.canonical_name(); System::println(System::Color::error, "The following files are already installed in %s and are in conflict with %s", triplet_install_path.generic_string(), - binary_paragraph.spec); + binary_paragraph.spec.display_name()); System::print("\n "); System::println(Strings::join("\n ", intersection)); System::println(""); @@ -281,16 +281,18 @@ namespace vcpkg::Commands::Install // execute the plan for (const PackageSpecWithInstallPlan& action : install_plan) { + const std::string display_name = action.spec.display_name(); + try { switch (action.plan.plan_type) { case InstallPlanType::ALREADY_INSTALLED: - System::println(System::Color::success, "Package %s is already installed", action.spec); + System::println(System::Color::success, "Package %s is already installed", action.spec.display_name()); break; case InstallPlanType::BUILD_AND_INSTALL: { - System::println("Building package %s... ", action.spec); + System::println("Building package %s... ", display_name); const Build::BuildResult result = Commands::Build::build_package(action.plan.source_pgh.value_or_exit(VCPKG_LINE_INFO), action.spec, paths, @@ -302,18 +304,18 @@ namespace vcpkg::Commands::Install System::println(Build::create_user_troubleshooting_message(action.spec)); Checks::exit_fail(VCPKG_LINE_INFO); } - System::println(System::Color::success, "Building package %s... done", action.spec); + 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... ", action.spec); + System::println("Installing package %s... ", display_name); install_package(paths, bpgh, &status_db); - System::println(System::Color::success, "Installing package %s... done", action.spec); + System::println(System::Color::success, "Installing package %s... done", display_name); break; } case InstallPlanType::INSTALL: - System::println("Installing package %s... ", action.spec); + System::println("Installing package %s... ", display_name); install_package(paths, action.plan.binary_pgh.value_or_exit(VCPKG_LINE_INFO), &status_db); - System::println(System::Color::success, "Installing package %s... done", action.spec); + System::println(System::Color::success, "Installing package %s... done", display_name); break; case InstallPlanType::UNKNOWN: default: @@ -322,7 +324,7 @@ namespace vcpkg::Commands::Install } catch (const std::exception& e) { - System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec, e.what()); + System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec.display_name(), e.what()); Checks::exit_fail(VCPKG_LINE_INFO); } } From d075c27949560f3e8e1b355b38f67e0ce1c9668e Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:08:23 -0700 Subject: [PATCH 02/33] `vcpkg ci` Use switch-case --- toolsrc/src/commands_ci.cpp | 60 +++++++++++++++++++------------------ 1 file changed, 31 insertions(+), 29 deletions(-) diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp index 8972aa339..36e0d7abc 100644 --- a/toolsrc/src/commands_ci.cpp +++ b/toolsrc/src/commands_ci.cpp @@ -56,37 +56,39 @@ namespace vcpkg::Commands::CI try { - if (action.plan.plan_type == InstallPlanType::ALREADY_INSTALLED) + switch (action.plan.plan_type) { - results.back() = BuildResult::SUCCEEDED; - System::println(System::Color::success, "Package %s is already installed", display_name); + case InstallPlanType::ALREADY_INSTALLED: + results.back() = BuildResult::SUCCEEDED; + System::println(System::Color::success, "Package %s is already installed", display_name); + break; + case InstallPlanType::BUILD_AND_INSTALL: + { + const BuildResult result = Commands::Build::build_package(action.plan.source_pgh.value_or_exit(VCPKG_LINE_INFO), + action.spec, + paths, + paths.port_dir(action.spec), + status_db); + timing.back() = build_timer.elapsed().count(); + results.back() = result; + if (result != BuildResult::SUCCEEDED) + { + System::println(System::Color::error, Build::create_error_message(result, action.spec)); + continue; + } + const BinaryParagraph bpgh = Paragraphs::try_load_cached_package(paths, action.spec).value_or_exit(VCPKG_LINE_INFO); + Install::install_package(paths, bpgh, &status_db); + System::println(System::Color::success, "Package %s is installed", display_name); + break; + } + case InstallPlanType::INSTALL: + results.back() = BuildResult::SUCCEEDED; + Install::install_package(paths, action.plan.binary_pgh.value_or_exit(VCPKG_LINE_INFO), &status_db); + System::println(System::Color::success, "Package %s is installed from cache", display_name); + break; + default: + Checks::unreachable(VCPKG_LINE_INFO); } - else if (action.plan.plan_type == InstallPlanType::BUILD_AND_INSTALL) - { - const BuildResult result = Commands::Build::build_package(action.plan.source_pgh.value_or_exit(VCPKG_LINE_INFO), - action.spec, - paths, - paths.port_dir(action.spec), - status_db); - timing.back() = build_timer.elapsed().count(); - results.back() = result; - if (result != BuildResult::SUCCEEDED) - { - System::println(System::Color::error, Build::create_error_message(result, action.spec)); - continue; - } - const BinaryParagraph bpgh = Paragraphs::try_load_cached_package(paths, action.spec).value_or_exit(VCPKG_LINE_INFO); - Install::install_package(paths, bpgh, &status_db); - System::println(System::Color::success, "Package %s is installed", display_name); - } - else if (action.plan.plan_type == InstallPlanType::INSTALL) - { - results.back() = BuildResult::SUCCEEDED; - Install::install_package(paths, action.plan.binary_pgh.value_or_exit(VCPKG_LINE_INFO), &status_db); - System::println(System::Color::success, "Package %s is installed from cache", display_name); - } - else - Checks::unreachable(VCPKG_LINE_INFO); } catch (const std::exception& e) { From 8b59a289f2acbd27e6f7202cb3cc36c3000cc585 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:08:32 -0700 Subject: [PATCH 03/33] Use existing variable --- toolsrc/src/commands_install.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 1a8fccf9e..884be598a 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -288,7 +288,7 @@ namespace vcpkg::Commands::Install switch (action.plan.plan_type) { case InstallPlanType::ALREADY_INSTALLED: - System::println(System::Color::success, "Package %s is already installed", action.spec.display_name()); + System::println(System::Color::success, "Package %s is already installed", display_name); break; case InstallPlanType::BUILD_AND_INSTALL: { From e8dbe3ec4c6b15030bbc8d79162a04c69e06482f Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:11:08 -0700 Subject: [PATCH 04/33] `vcpkg ci` Update strings, similarly to `vcpkg install` --- toolsrc/src/commands_ci.cpp | 9 +++++++-- 1 file changed, 7 insertions(+), 2 deletions(-) diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp index 36e0d7abc..c7aba439a 100644 --- a/toolsrc/src/commands_ci.cpp +++ b/toolsrc/src/commands_ci.cpp @@ -64,6 +64,7 @@ namespace vcpkg::Commands::CI break; case InstallPlanType::BUILD_AND_INSTALL: { + System::println("Building package %s... ", display_name); const BuildResult result = Commands::Build::build_package(action.plan.source_pgh.value_or_exit(VCPKG_LINE_INFO), action.spec, paths, @@ -76,15 +77,19 @@ namespace vcpkg::Commands::CI 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, "Package %s is installed", display_name); + 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.plan.binary_pgh.value_or_exit(VCPKG_LINE_INFO), &status_db); - System::println(System::Color::success, "Package %s is installed from cache", display_name); + System::println(System::Color::success, "Installing package %s... done", display_name); break; default: Checks::unreachable(VCPKG_LINE_INFO); From 285bbe0d8a1a14afc217b06790e1c99e1200a14b Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:13:08 -0700 Subject: [PATCH 05/33] Add to_printf_arg() for classes with to_string() --- toolsrc/include/vcpkg_Strings.h | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/toolsrc/include/vcpkg_Strings.h b/toolsrc/include/vcpkg_Strings.h index 03b16975e..7b031608c 100644 --- a/toolsrc/include/vcpkg_Strings.h +++ b/toolsrc/include/vcpkg_Strings.h @@ -5,6 +5,12 @@ namespace vcpkg::Strings::details { + template + auto to_printf_arg(const T& t) -> decltype(t.to_string()) + { + return t.to_string(); + } + inline const char* to_printf_arg(const std::string& s) { return s.c_str(); From 18fa18a07b97aa69826562738e498fbd2317e091 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:17:54 -0700 Subject: [PATCH 06/33] Remove PackageSpec.display_name() --- toolsrc/include/PackageSpec.h | 2 -- toolsrc/src/BinaryParagraph.cpp | 2 +- toolsrc/src/PackageSpec.cpp | 7 +------ toolsrc/src/commands_build.cpp | 2 +- toolsrc/src/commands_ci.cpp | 6 +++--- toolsrc/src/commands_install.cpp | 6 +++--- toolsrc/src/commands_remove.cpp | 2 +- toolsrc/src/commands_update.cpp | 2 +- 8 files changed, 11 insertions(+), 18 deletions(-) diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index 79068e638..b7b3b8e34 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -15,8 +15,6 @@ namespace vcpkg const Triplet& target_triplet() const; - std::string display_name() const; - std::string dir() const; std::string to_string() const; diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index 42ef0a77a..35351f153 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -55,7 +55,7 @@ namespace vcpkg std::string BinaryParagraph::displayname() const { - return this->spec.display_name(); + return this->spec.to_string(); } std::string BinaryParagraph::dir() const diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index 2eb5c1f23..cd68fab23 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -50,11 +50,6 @@ namespace vcpkg return this->m_target_triplet; } - std::string PackageSpec::display_name() const - { - return Strings::format("%s:%s", this->name(), this->target_triplet()); - } - std::string PackageSpec::dir() const { return Strings::format("%s_%s", this->m_name, this->m_target_triplet); @@ -62,7 +57,7 @@ namespace vcpkg std::string PackageSpec::to_string() const { - return this->display_name(); + return Strings::format("%s:%s", this->name(), this->target_triplet()); } bool operator==(const PackageSpec& left, const PackageSpec& right) diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index 1794c8f79..9bf7eabcd 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -141,7 +141,7 @@ namespace vcpkg::Commands::Build } const Expected maybe_spgh = Paragraphs::try_load_port(port_dir); - Checks::check_exit(VCPKG_LINE_INFO, !maybe_spgh.error_code(), "Could not find package named %s: %s", spec.display_name(), maybe_spgh.error_code().message()); + Checks::check_exit(VCPKG_LINE_INFO, !maybe_spgh.error_code(), "Could not find package named %s: %s", spec, maybe_spgh.error_code().message()); const SourceParagraph& spgh = *maybe_spgh.get(); StatusParagraphs status_db = database_load_check(paths); diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp index c7aba439a..d514d3360 100644 --- a/toolsrc/src/commands_ci.cpp +++ b/toolsrc/src/commands_ci.cpp @@ -48,7 +48,7 @@ namespace vcpkg::Commands::CI { const ElapsedTime build_timer = ElapsedTime::create_started(); counter++; - const std::string display_name = action.spec.display_name(); + const std::string display_name = action.spec.to_string(); System::println("Starting package %d/%d: %s", counter, package_count, display_name); timing.push_back(-1); @@ -97,10 +97,10 @@ namespace vcpkg::Commands::CI } catch (const std::exception& e) { - System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec.display_name(), e.what()); + System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec, e.what()); results.back() = BuildResult::NULLVALUE; } - System::println("Elapsed time for package %s: %s", action.spec.display_name(), build_timer.to_string()); + System::println("Elapsed time for package %s: %s", action.spec, build_timer.to_string()); } System::println("Total time taken: %s", timer.to_string()); diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 884be598a..38672da3a 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -201,7 +201,7 @@ namespace vcpkg::Commands::Install const fs::path triplet_install_path = paths.installed / triplet.canonical_name(); System::println(System::Color::error, "The following files are already installed in %s and are in conflict with %s", triplet_install_path.generic_string(), - binary_paragraph.spec.display_name()); + binary_paragraph.spec); System::print("\n "); System::println(Strings::join("\n ", intersection)); System::println(""); @@ -281,7 +281,7 @@ namespace vcpkg::Commands::Install // execute the plan for (const PackageSpecWithInstallPlan& action : install_plan) { - const std::string display_name = action.spec.display_name(); + const std::string display_name = action.spec.to_string(); try { @@ -324,7 +324,7 @@ namespace vcpkg::Commands::Install } catch (const std::exception& e) { - System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec.display_name(), e.what()); + System::println(System::Color::error, "Error: Could not install package %s: %s", action.spec, e.what()); Checks::exit_fail(VCPKG_LINE_INFO); } } diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index 8bf2c767b..7899980e5 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -200,7 +200,7 @@ namespace vcpkg::Commands::Remove for (const PackageSpecWithRemovePlan& action : remove_plan) { - const std::string display_name = action.spec.display_name(); + const std::string display_name = action.spec.to_string(); switch (action.plan.plan_type) { diff --git a/toolsrc/src/commands_update.cpp b/toolsrc/src/commands_update.cpp index 24dad34fe..fc03c0084 100644 --- a/toolsrc/src/commands_update.cpp +++ b/toolsrc/src/commands_update.cpp @@ -56,7 +56,7 @@ namespace vcpkg::Commands::Update System::println("The following packages differ from their port versions:"); for (auto&& package : outdated_packages) { - System::println(" %-32s %s", package.spec.display_name(), package.version_diff.to_string()); + System::println(" %-32s %s", package.spec, package.version_diff.to_string()); } System::println("\n" "To update these packages, run\n" From 41c9026875b3d05ee46ca83287aa6fca5b347165 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 16:20:24 -0700 Subject: [PATCH 07/33] Remove PackageSpec& operator<< overload --- toolsrc/include/PackageSpec.h | 2 -- toolsrc/src/PackageSpec.cpp | 5 ----- 2 files changed, 7 deletions(-) diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index b7b3b8e34..7c39eeaa4 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -25,8 +25,6 @@ namespace vcpkg }; bool operator==(const PackageSpec& left, const PackageSpec& right); - - std::ostream& operator<<(std::ostream& os, const PackageSpec& spec); } //namespace vcpkg namespace std diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index cd68fab23..a1b129b5c 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -64,9 +64,4 @@ namespace vcpkg { return left.name() == right.name() && left.target_triplet() == right.target_triplet(); } - - std::ostream& operator<<(std::ostream& os, const PackageSpec& spec) - { - return os << spec.to_string(); - } } From 9c2287d0e809020ab90157873e56670127441cc1 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 17:39:47 -0700 Subject: [PATCH 08/33] Remove unneeded to_string() calls --- toolsrc/src/commands_build.cpp | 6 +++--- toolsrc/src/commands_ci.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index 9bf7eabcd..c74e026ff 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -117,7 +117,7 @@ namespace vcpkg::Commands::Build std::string create_error_message(const BuildResult build_result, const PackageSpec& spec) { - return Strings::format("Error: Building package %s failed with: %s", spec.to_string(), Build::to_string(build_result)); + return Strings::format("Error: Building package %s failed with: %s", spec, Build::to_string(build_result)); } std::string create_user_troubleshooting_message(const PackageSpec& spec) @@ -128,7 +128,7 @@ namespace vcpkg::Commands::Build " Vcpkg version: %s\n" "\n" "Additionally, attach any relevant sections from the log files above." - , spec.to_string(), Version::version()); + , spec, Version::version()); } void perform_and_exit(const PackageSpec& spec, const fs::path& port_dir, const std::unordered_set& options, const VcpkgPaths& paths) @@ -162,7 +162,7 @@ namespace vcpkg::Commands::Build System::println(""); for (const PackageSpecWithInstallPlan& p : unmet_dependencies) { - System::println(" %s", p.spec.to_string()); + System::println(" %s", p.spec); } System::println(""); Checks::exit_fail(VCPKG_LINE_INFO); diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp index d514d3360..5071effde 100644 --- a/toolsrc/src/commands_ci.cpp +++ b/toolsrc/src/commands_ci.cpp @@ -107,7 +107,7 @@ namespace vcpkg::Commands::CI for (size_t i = 0; i < results.size(); i++) { - System::println("%s: %s: %dms", install_plan[i].spec.to_string(), Build::to_string(results[i]), timing[i]); + System::println("%s: %s: %dms", install_plan[i].spec, Build::to_string(results[i]), timing[i]); } std::map summary; From 13482879f82b15294ebdeb04b3084584a3b468a1 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 17:44:24 -0700 Subject: [PATCH 09/33] Triplet.to_string() --- toolsrc/include/triplet.h | 7 +------ toolsrc/src/triplet.cpp | 17 ++++++----------- 2 files changed, 7 insertions(+), 17 deletions(-) diff --git a/toolsrc/include/triplet.h b/toolsrc/include/triplet.h index 8cf2413b0..d0570e789 100644 --- a/toolsrc/include/triplet.h +++ b/toolsrc/include/triplet.h @@ -15,10 +15,9 @@ namespace vcpkg static const Triplet ARM_UWP; const std::string& canonical_name() const; - std::string architecture() const; - std::string system() const; + const std::string& to_string() const; private: std::string m_canonical_name; @@ -28,10 +27,6 @@ namespace vcpkg bool operator!=(const Triplet& left, const Triplet& right); - std::string to_string(const Triplet& spec); - - std::string to_printf_arg(const Triplet& spec); - std::ostream& operator<<(std::ostream& os, const Triplet& spec); } diff --git a/toolsrc/src/triplet.cpp b/toolsrc/src/triplet.cpp index 0aacec9a0..2831b5d02 100644 --- a/toolsrc/src/triplet.cpp +++ b/toolsrc/src/triplet.cpp @@ -11,16 +11,6 @@ namespace vcpkg const Triplet Triplet::X64_UWP = from_canonical_name("x64-uwp"); const Triplet Triplet::ARM_UWP = from_canonical_name("arm-uwp"); - std::string to_string(const Triplet& t) - { - return t.canonical_name(); - } - - std::string to_printf_arg(const Triplet& t) - { - return to_string(t); - } - bool operator==(const Triplet& left, const Triplet& right) { return left.canonical_name() == right.canonical_name(); @@ -33,7 +23,7 @@ namespace vcpkg std::ostream& operator<<(std::ostream& os, const Triplet& t) { - return os << to_string(t); + return os << t.to_string(); } Triplet Triplet::from_canonical_name(const std::string& triplet_as_string) @@ -63,4 +53,9 @@ namespace vcpkg auto it = std::find(this->m_canonical_name.cbegin(), this->m_canonical_name.cend(), '-'); return std::string(it + 1, this->m_canonical_name.cend()); } + + const std::string& Triplet::to_string() const + { + return this->m_canonical_name; + } } From 2069028b06181dab3c51b2dceb170594153c1204 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 17:45:17 -0700 Subject: [PATCH 10/33] Remove triplet operator<< overload --- toolsrc/include/triplet.h | 2 -- toolsrc/src/BinaryParagraph.cpp | 2 +- toolsrc/src/triplet.cpp | 5 ----- 3 files changed, 1 insertion(+), 8 deletions(-) diff --git a/toolsrc/include/triplet.h b/toolsrc/include/triplet.h index d0570e789..ea6808e05 100644 --- a/toolsrc/include/triplet.h +++ b/toolsrc/include/triplet.h @@ -26,8 +26,6 @@ namespace vcpkg bool operator==(const Triplet& left, const Triplet& right); bool operator!=(const Triplet& left, const Triplet& right); - - std::ostream& operator<<(std::ostream& os, const Triplet& spec); } namespace std diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index 35351f153..89f57e51b 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -85,7 +85,7 @@ namespace vcpkg os << "\n"; } - os << "Architecture: " << p.spec.target_triplet() << "\n"; + os << "Architecture: " << p.spec.target_triplet().to_string() << "\n"; os << "Multi-Arch: same\n"; if (!p.maintainer.empty()) os << "Maintainer: " << p.maintainer << "\n"; diff --git a/toolsrc/src/triplet.cpp b/toolsrc/src/triplet.cpp index 2831b5d02..cbdafb14c 100644 --- a/toolsrc/src/triplet.cpp +++ b/toolsrc/src/triplet.cpp @@ -21,11 +21,6 @@ namespace vcpkg return !(left == right); } - std::ostream& operator<<(std::ostream& os, const Triplet& t) - { - return os << t.to_string(); - } - Triplet Triplet::from_canonical_name(const std::string& triplet_as_string) { const std::string s(Strings::ascii_to_lowercase(triplet_as_string)); From 12f09d3151b44571ce64217ca4f6c5958d249cd6 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 17:53:57 -0700 Subject: [PATCH 11/33] Use Triplet.canonical_name() or .to_string() --- toolsrc/src/commands_install.cpp | 13 +++++++------ toolsrc/src/vcpkg_Input.cpp | 4 ++-- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 38672da3a..3b476add3 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -23,10 +23,11 @@ namespace vcpkg::Commands::Install const size_t prefix_length = package_prefix_path.native().size(); const Triplet& target_triplet = bpgh.spec.target_triplet(); - const std::string& target_triplet_as_string = target_triplet.canonical_name(); + const std::string& triplet_subfolder = target_triplet.canonical_name(); + const fs::path triplet_subfolder_path = paths.installed / triplet_subfolder; std::error_code ec; - fs::create_directory(paths.installed / target_triplet_as_string, ec); - output.push_back(Strings::format(R"(%s/)", target_triplet_as_string)); + fs::create_directory(triplet_subfolder_path, ec); + output.push_back(Strings::format(R"(%s/)", triplet_subfolder)); for (auto it = fs::recursive_directory_iterator(package_prefix_path); it != fs::recursive_directory_iterator(); ++it) { @@ -38,7 +39,7 @@ namespace vcpkg::Commands::Install } const std::string suffix = it->path().generic_u8string().substr(prefix_length + 1); - const fs::path target = paths.installed / target_triplet_as_string / suffix; + const fs::path target = triplet_subfolder_path / suffix; auto status = it->status(ec); if (ec) @@ -56,7 +57,7 @@ namespace vcpkg::Commands::Install } // Trailing backslash for directories - output.push_back(Strings::format(R"(%s/%s/)", target_triplet_as_string, suffix)); + output.push_back(Strings::format(R"(%s/%s/)", triplet_subfolder, suffix)); continue; } @@ -71,7 +72,7 @@ namespace vcpkg::Commands::Install { System::println(System::Color::error, "failed: %s: %s", target.u8string(), ec.message()); } - output.push_back(Strings::format(R"(%s/%s)", target_triplet_as_string, suffix)); + output.push_back(Strings::format(R"(%s/%s)", triplet_subfolder, suffix)); continue; } diff --git a/toolsrc/src/vcpkg_Input.cpp b/toolsrc/src/vcpkg_Input.cpp index d66065cc2..5cd889453 100644 --- a/toolsrc/src/vcpkg_Input.cpp +++ b/toolsrc/src/vcpkg_Input.cpp @@ -25,8 +25,8 @@ namespace vcpkg::Input { if (!paths.is_valid_triplet(t)) { - System::println(System::Color::error, "Error: invalid triplet: %s", t.canonical_name()); - Metrics::track_property("error", "invalid triplet: " + t.canonical_name()); + System::println(System::Color::error, "Error: invalid triplet: %s", t); + Metrics::track_property("error", "invalid triplet: " + t.to_string()); Commands::Help::help_topic_valid_triplet(paths); Checks::exit_fail(VCPKG_LINE_INFO); } From 599c22f2affc863ab4acebbc465c563c6fe11d8b Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Fri, 7 Apr 2017 17:56:26 -0700 Subject: [PATCH 12/33] VersionT: replace to_printf_arg() with .to_string() --- toolsrc/include/VersionT.cpp | 1 + toolsrc/include/VersionT.h | 3 ++- 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/toolsrc/include/VersionT.cpp b/toolsrc/include/VersionT.cpp index c51052b98..6ea5d3810 100644 --- a/toolsrc/include/VersionT.cpp +++ b/toolsrc/include/VersionT.cpp @@ -6,6 +6,7 @@ namespace vcpkg { VersionT::VersionT() : value("0.0.0") {} VersionT::VersionT(const std::string& value) : value(value) {} + std::string VersionT::to_string() const { return value; } bool operator==(const VersionT& left, const VersionT& right) { return left.value == right.value; } bool operator!=(const VersionT& left, const VersionT& right) { return left.value != right.value; } std::string to_printf_arg(const VersionT& version) { return version.value; } diff --git a/toolsrc/include/VersionT.h b/toolsrc/include/VersionT.h index aa2635855..36d050e08 100644 --- a/toolsrc/include/VersionT.h +++ b/toolsrc/include/VersionT.h @@ -8,12 +8,13 @@ namespace vcpkg VersionT(); VersionT(const std::string& value); + std::string to_string() const; + std::string value; }; bool operator ==(const VersionT& left, const VersionT& right); bool operator !=(const VersionT& left, const VersionT& right); - std::string to_printf_arg(const VersionT& version); struct VersionDiff { From eac027233e38e5973008e17fcd1ea0ec01dedf21 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sat, 8 Apr 2017 18:41:52 -0700 Subject: [PATCH 13/33] [xerces-c] Fix packaging to also deploy the built library --- ports/xerces-c/CONTROL | 2 +- ports/xerces-c/portfile.cmake | 22 ++++++++++++++++++---- 2 files changed, 19 insertions(+), 5 deletions(-) diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL index 822c50387..7958350c5 100644 --- a/ports/xerces-c/CONTROL +++ b/ports/xerces-c/CONTROL @@ -1,3 +1,3 @@ Source: xerces-c -Version: 3.1.4 +Version: 3.1.4-1 Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs. diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index 5543f80ed..67c917d55 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -7,6 +7,11 @@ # include(vcpkg_common_functions) +if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") + message(STATUS "Static linking not supported; building dynamic instead") + set(VCPKG_LIBRARY_LINKAGE ) +endif() + set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/xerces-c-3.1.4) @@ -17,18 +22,25 @@ vcpkg_download_distfile(ARCHIVE ) vcpkg_extract_source_archive(${ARCHIVE}) -if (TRIPLET_SYSTEM_ARCH MATCHES "x86") - set(BUILD_ARCH "Win32") +if (VCPKG_TARGET_ARCHITECTURE MATCHES "x86") + set(BUILD_ARCH "Win32") + set(OUTPUT_DIR "Win32") +elseif (VCPKG_TARGET_ARCHITECTURE MATCHES "x64") + set(BUILD_ARCH "x64") + set(OUTPUT_DIR "Win64") else() - set(BUILD_ARCH ${TRIPLET_SYSTEM_ARCH}) + message(FATAL_ERROR "Unsupported architecture: ${VCPKG_TARGET_ARCHITECTURE}") endif() - vcpkg_build_msbuild( #PROJECT_PATH ${SOURCE_PATH}/projects/Win32/VC14/xerces-all/xerces-all.sln PROJECT_PATH ${SOURCE_PATH}/projects/Win32/VC14/xerces-all/xercesLib/xercesLib.vcxproj PLATFORM ${BUILD_ARCH}) +file(COPY ${SOURCE_PATH}/Build/${OUTPUT_DIR}/VC14/Debug/xerces-c_3_1D.dll DESTINATION ${CURRENT_PACKAGES_DIR}/debug/bin) +file(COPY ${SOURCE_PATH}/Build/${OUTPUT_DIR}/VC14/Debug/xerces-c_3D.lib DESTINATION ${CURRENT_PACKAGES_DIR}/debug/lib) +file(COPY ${SOURCE_PATH}/Build/${OUTPUT_DIR}/VC14/Release/xerces-c_3_1.dll DESTINATION ${CURRENT_PACKAGES_DIR}/bin) +file(COPY ${SOURCE_PATH}/Build/${OUTPUT_DIR}/VC14/Release/xerces-c_3.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(COPY ${SOURCE_PATH}/src/xercesc DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.hpp) @@ -38,3 +50,5 @@ file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xercesc/util/MsgLoaders/ICU/ # Handle copyright file(COPY ${SOURCE_PATH}/LICENSE DESTINATION ${CURRENT_PACKAGES_DIR}/share/xerces-c) file(RENAME ${CURRENT_PACKAGES_DIR}/share/xerces-c/LICENSE ${CURRENT_PACKAGES_DIR}/share/xerces-c/copyright) + +vcpkg_copy_pdbs() \ No newline at end of file From cea5cb99b26b3a4bfd42eea8704004632ca7b9f4 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sat, 8 Apr 2017 18:43:08 -0700 Subject: [PATCH 14/33] [xerces-c] Fixup omission in previous commit -- handle CRT as well. --- ports/xerces-c/CONTROL | 2 +- ports/xerces-c/portfile.cmake | 8 ++++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL index 7958350c5..e60cb6d01 100644 --- a/ports/xerces-c/CONTROL +++ b/ports/xerces-c/CONTROL @@ -1,3 +1,3 @@ Source: xerces-c -Version: 3.1.4-1 +Version: 3.1.4-2 Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs. diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index 67c917d55..e940fe881 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -8,8 +8,12 @@ include(vcpkg_common_functions) if (VCPKG_LIBRARY_LINKAGE STREQUAL "static") - message(STATUS "Static linking not supported; building dynamic instead") - set(VCPKG_LIBRARY_LINKAGE ) + message(STATUS "Static libraries not supported; building dynamic instead") + set(VCPKG_LIBRARY_LINKAGE "dynamic") +endif() +if (VCPKG_CRT_LINKAGE STREQUAL "static") + message(STATUS "Static linking against the CRT not supported; building dynamic instead") + set(VCPKG_CRT_LINKAGE "dynamic") endif() From eb9b85c49db0102db6b584a84fa83e48ae7199c9 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Sat, 8 Apr 2017 18:53:39 -0700 Subject: [PATCH 15/33] [vcpkg] Switch several usages of -ExecutionPolicy Unrestricted to Bypass to avoid failures due to Mark Of The Web --- scripts/buildsystems/msbuild/vcpkg.targets | 4 ++-- scripts/cmake/vcpkg_copy_tool_dependencies.cmake | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index e36576846..65eacd5c9 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -64,13 +64,13 @@ File="$(TLogLocation)$(ProjectName).write.1u.tlog" Lines="^$(OutputPath)$(TargetName).$(OutputType);" Encoding="Unicode"/> diff --git a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake index 432e3c12a..f8af19230 100644 --- a/scripts/cmake/vcpkg_copy_tool_dependencies.cmake +++ b/scripts/cmake/vcpkg_copy_tool_dependencies.cmake @@ -4,7 +4,7 @@ function(vcpkg_copy_tool_dependencies TOOL_DIR) macro(search_for_dependencies PATH_TO_SEARCH) file(GLOB TOOLS ${TOOL_DIR}/*.exe ${TOOL_DIR}/*.dll) foreach(TOOL ${TOOLS}) - execute_process(COMMAND powershell -noprofile -executionpolicy UnRestricted -nologo + execute_process(COMMAND powershell -noprofile -executionpolicy Bypass -nologo -file ${VCPKG_ROOT_DIR}/scripts/buildsystems/msbuild/applocal.ps1 -targetBinary ${TOOL} -installedDir ${PATH_TO_SEARCH} From 0af686a9f79f6f6a4620c283cb8e0ba2a8db19e6 Mon Sep 17 00:00:00 2001 From: codicodi Date: Sun, 9 Apr 2017 11:15:32 +0200 Subject: [PATCH 16/33] [glib] update to 2.52.1 --- ports/glib/CMakeLists.txt | 6 +++--- ports/glib/CONTROL | 2 +- ports/glib/cmake/install_headers.cmake | 1 + ports/glib/portfile.cmake | 6 +++--- 4 files changed, 8 insertions(+), 7 deletions(-) diff --git a/ports/glib/CMakeLists.txt b/ports/glib/CMakeLists.txt index 67f0ba10f..40763e8cd 100644 --- a/ports/glib/CMakeLists.txt +++ b/ports/glib/CMakeLists.txt @@ -60,7 +60,7 @@ macro(extract_vcproj_sources VC_PROJECT OUT_VAR) endmacro() # main module -extract_vcproj_sources(build/win32/vs14/glib.vcxproj GLIB_SOURCES) +extract_vcproj_sources(win32/vs14/glib.vcxproj GLIB_SOURCES) list(APPEND GLIB_SOURCES glib/libcharset/localcharset.c) # modified internal version with prefixed symbols add_library(glib ${GLIB_SOURCES}) target_compile_definitions(glib PRIVATE USE_SYSTEM_PCRE ${GLIB_EXPORT_MACRO} GLIB_COMPILATION G_LOG_DOMAIN="GLib" LIBDIR) @@ -77,7 +77,7 @@ target_include_directories(gthread PRIVATE ${LIBINTL_INCLUDE_DIR}) list(APPEND GLIB_TARGETS gthread) # gobject -extract_vcproj_sources(build/win32/vs14/gobject.vcxproj GOBJECT_SOURCES) +extract_vcproj_sources(win32/vs14/gobject.vcxproj GOBJECT_SOURCES) add_library(gobject ${GOBJECT_SOURCES}) target_compile_definitions(gobject PRIVATE GOBJECT_COMPILATION ${GLIB_EXPORT_MACRO} G_LOG_DOMAIN="GLib-GObject") target_link_libraries(gobject gthread glib ${FFI_LIBRARY}) @@ -92,7 +92,7 @@ target_include_directories(gmodule PRIVATE ${LIBINTL_INCLUDE_DIR}) list(APPEND GLIB_TARGETS gmodule) # gio -extract_vcproj_sources(build/win32/vs14/gio.vcxproj GIO_SOURCES) +extract_vcproj_sources(win32/vs14/gio.vcxproj GIO_SOURCES) add_library(gio ${GIO_SOURCES}) target_compile_definitions(gio PRIVATE GIO_COMPILATION ${GLIB_EXPORT_MACRO} G_LOG_DOMAIN="GLib-GIO") target_link_libraries(gio glib gmodule gobject ws2_32 shlwapi dnsapi iphlpapi ${ZLIB_LIBRARIES}) diff --git a/ports/glib/CONTROL b/ports/glib/CONTROL index f34cb6c6b..99f98362c 100644 --- a/ports/glib/CONTROL +++ b/ports/glib/CONTROL @@ -1,4 +1,4 @@ Source: glib -Version: 2.50.3 +Version: 2.52.1 Description: Portable, general-purpose utility library. Build-Depends: zlib, pcre, libffi, gettext, libiconv diff --git a/ports/glib/cmake/install_headers.cmake b/ports/glib/cmake/install_headers.cmake index e94a12e49..0cfc207a4 100644 --- a/ports/glib/cmake/install_headers.cmake +++ b/ports/glib/cmake/install_headers.cmake @@ -76,6 +76,7 @@ install(FILES glib/gtypes.h DESTINATION include/glib) install(FILES glib/gunicode.h DESTINATION include/glib) install(FILES glib/gurifuncs.h DESTINATION include/glib) install(FILES glib/gutils.h DESTINATION include/glib) +install(FILES glib/guuid.h DESTINATION include/glib) install(FILES glib/gvarianttype.h DESTINATION include/glib) install(FILES glib/gvariant.h DESTINATION include/glib) install(FILES glib/gversion.h DESTINATION include/glib) diff --git a/ports/glib/portfile.cmake b/ports/glib/portfile.cmake index a3de1f33f..51f8b0b30 100644 --- a/ports/glib/portfile.cmake +++ b/ports/glib/portfile.cmake @@ -10,12 +10,12 @@ if (VCPKG_LIBRARY_LINKAGE STREQUAL static) endif() include(vcpkg_common_functions) -set(GLIB_VERSION 2.50.3) +set(GLIB_VERSION 2.52.1) set(SOURCE_PATH ${CURRENT_BUILDTREES_DIR}/src/glib-${GLIB_VERSION}) vcpkg_download_distfile(ARCHIVE - URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.50/glib-${GLIB_VERSION}.tar.xz" + URLS "https://ftp.gnome.org/pub/gnome/sources/glib/2.52/glib-${GLIB_VERSION}.tar.xz" FILENAME "glib-${GLIB_VERSION}.tar.xz" - SHA512 ef35806c15170b6608445f255136c0bebd2d433adf903c2af2865f6a57b4f2fcfc1e4a7cea1a0dac48ff5fe26248fbf7886dba4a8d209506f0a94160df8fb7af) + SHA512 6f0475b4ee1078867671a79b1751674926ba1caa872cec3896e2830c61c3cde67972afa9f2d606a2b6705e9846222462b003c6e966a9b63982f3fc3fb58c4d37) vcpkg_extract_source_archive(${ARCHIVE}) vcpkg_apply_patches( From 2d581484b4883d8319826fa081b8627ee27613a8 Mon Sep 17 00:00:00 2001 From: Jackie Ng Date: Sun, 9 Apr 2017 23:57:57 +1000 Subject: [PATCH 17/33] [xerces-c]: Certain headers include .c files, this commit ensures that such files are also copied across --- ports/xerces-c/CONTROL | 2 +- ports/xerces-c/portfile.cmake | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/ports/xerces-c/CONTROL b/ports/xerces-c/CONTROL index e60cb6d01..81a76c325 100644 --- a/ports/xerces-c/CONTROL +++ b/ports/xerces-c/CONTROL @@ -1,3 +1,3 @@ Source: xerces-c -Version: 3.1.4-2 +Version: 3.1.4-3 Description: Xerces-C++ is a XML parser, for parsing, generating, manipulating, and validating XML documents using the DOM, SAX, and SAX2 APIs. diff --git a/ports/xerces-c/portfile.cmake b/ports/xerces-c/portfile.cmake index e940fe881..1208c9787 100644 --- a/ports/xerces-c/portfile.cmake +++ b/ports/xerces-c/portfile.cmake @@ -47,6 +47,8 @@ file(COPY ${SOURCE_PATH}/Build/${OUTPUT_DIR}/VC14/Release/xerces-c_3_1.dll DESTI file(COPY ${SOURCE_PATH}/Build/${OUTPUT_DIR}/VC14/Release/xerces-c_3.lib DESTINATION ${CURRENT_PACKAGES_DIR}/lib) file(COPY ${SOURCE_PATH}/src/xercesc DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.hpp) +# Certain headers under xercesc/util include .c files, so we need these copied over as well +file(COPY ${SOURCE_PATH}/src/xercesc DESTINATION ${CURRENT_PACKAGES_DIR}/include FILES_MATCHING PATTERN *.c) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xercesc/NLS) file(REMOVE_RECURSE ${CURRENT_PACKAGES_DIR}/include/xercesc/util/MsgLoaders/ICU/resources) From f306e8770fac464db20e536eb847d90a2c85d8c0 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 12:58:19 -0700 Subject: [PATCH 18/33] Formatting --- toolsrc/src/commands_available_commands.cpp | 42 ++++++++++----------- 1 file changed, 21 insertions(+), 21 deletions(-) diff --git a/toolsrc/src/commands_available_commands.cpp b/toolsrc/src/commands_available_commands.cpp index 870831599..e4c5135c7 100644 --- a/toolsrc/src/commands_available_commands.cpp +++ b/toolsrc/src/commands_available_commands.cpp @@ -6,12 +6,12 @@ namespace vcpkg::Commands const std::vector>& get_available_commands_type_a() { static std::vector> t = { - {"install", &Install::perform_and_exit}, + { "install", &Install::perform_and_exit }, { "ci", &CI::perform_and_exit }, - {"remove", &Remove::perform_and_exit}, - {"build", &Build::perform_and_exit}, - {"env", &Env::perform_and_exit}, - {"build-external", &BuildExternal::perform_and_exit} + { "remove", &Remove::perform_and_exit }, + { "build", &Build::perform_and_exit }, + { "env", &Env::perform_and_exit }, + { "build-external", &BuildExternal::perform_and_exit } }; return t; } @@ -19,19 +19,19 @@ namespace vcpkg::Commands const std::vector>& get_available_commands_type_b() { static std::vector> t = { - {"/?", &Help::perform_and_exit}, - {"help", &Help::perform_and_exit}, - {"search", &Search::perform_and_exit}, - {"list", &List::perform_and_exit}, - {"integrate", &Integrate::perform_and_exit}, - {"owns", &Owns::perform_and_exit}, - {"update", &Update::perform_and_exit}, - {"depend-info", &DependInfo::perform_and_exit}, - {"edit", &Edit::perform_and_exit}, - {"create", &Create::perform_and_exit}, - {"import", &Import::perform_and_exit}, - {"cache", &Cache::perform_and_exit}, - {"portsdiff", &PortsDiff::perform_and_exit} + { "/?", &Help::perform_and_exit }, + { "help", &Help::perform_and_exit }, + { "search", &Search::perform_and_exit }, + { "list", &List::perform_and_exit }, + { "integrate", &Integrate::perform_and_exit }, + { "owns", &Owns::perform_and_exit }, + { "update", &Update::perform_and_exit }, + { "depend-info", &DependInfo::perform_and_exit }, + { "edit", &Edit::perform_and_exit }, + { "create", &Create::perform_and_exit }, + { "import", &Import::perform_and_exit }, + { "cache", &Cache::perform_and_exit }, + { "portsdiff", &PortsDiff::perform_and_exit } }; return t; } @@ -39,9 +39,9 @@ namespace vcpkg::Commands const std::vector>& get_available_commands_type_c() { static std::vector> t = { - {"version", &Version::perform_and_exit}, - {"contact", &Contact::perform_and_exit}, - {"hash", &Hash::perform_and_exit}, + { "version", &Version::perform_and_exit }, + { "contact", &Contact::perform_and_exit }, + { "hash", &Hash::perform_and_exit }, }; return t; } From cd0c8e1ca3fa99bfbb907eb06e0f58ce47972dda Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 12:51:11 -0700 Subject: [PATCH 19/33] Tweak `install` input parsing to match `remove` --- toolsrc/src/commands_install.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 3b476add3..f741d8608 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -238,12 +238,12 @@ namespace vcpkg::Commands::Install static const std::string example = Commands::Help::create_example_string("install zlib zlib:x64-windows curl boost"); args.check_min_arg_count(1, example); - auto specs = Util::fmap(args.command_arguments, [&](auto&& arg) + const std::vector specs = Util::fmap(args.command_arguments, [&](auto&& arg) { - auto spec = Input::check_and_get_package_spec(arg, default_target_triplet, example); - Input::check_triplet(spec.target_triplet(), paths); - return spec; + return Input::check_and_get_package_spec(arg, default_target_triplet, example); }); + for (auto&& spec : specs) + Input::check_triplet(spec.target_triplet(), paths); const std::unordered_set options = args.check_and_get_optional_command_arguments({ OPTION_DRY_RUN }); const bool dryRun = options.find(OPTION_DRY_RUN) != options.cend(); From 410aa5b43a5fa995d8684590b119bbb04353a139 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:00:33 -0700 Subject: [PATCH 20/33] default_target_triplet -> default_triplet --- toolsrc/include/PackageSpec.h | 2 +- toolsrc/include/vcpkg_Commands.h | 12 ++++++------ toolsrc/include/vcpkg_Input.h | 2 +- toolsrc/src/PackageSpec.cpp | 4 ++-- toolsrc/src/commands_build.cpp | 4 ++-- toolsrc/src/commands_build_external.cpp | 4 ++-- toolsrc/src/commands_ci.cpp | 4 ++-- toolsrc/src/commands_install.cpp | 4 ++-- toolsrc/src/commands_remove.cpp | 4 ++-- toolsrc/src/vcpkg.cpp | 12 ++++++------ toolsrc/src/vcpkg_Input.cpp | 4 ++-- 11 files changed, 28 insertions(+), 28 deletions(-) diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index 7c39eeaa4..110f74b51 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -7,7 +7,7 @@ namespace vcpkg { struct PackageSpec { - static Expected from_string(const std::string& spec_as_string, const Triplet& default_target_triplet); + static Expected from_string(const std::string& spec_as_string, const Triplet& default_triplet); static Expected from_name_and_triplet(const std::string& name, const Triplet& target_triplet); diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index db15a10fd..cc6437bf9 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -8,7 +8,7 @@ namespace vcpkg::Commands { - using CommandTypeA = void(*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet); + using CommandTypeA = void(*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); using CommandTypeB = void(*)(const VcpkgCmdArguments& args, const VcpkgPaths& paths); using CommandTypeC = void(*)(const VcpkgCmdArguments& args); @@ -33,28 +33,28 @@ namespace vcpkg::Commands BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const VcpkgPaths& paths, const fs::path& port_dir, const StatusParagraphs& status_db); void perform_and_exit(const PackageSpec& spec, const fs::path& port_dir, const std::unordered_set& options, const VcpkgPaths& paths); - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); } namespace BuildExternal { - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); } namespace Install { void install_package(const VcpkgPaths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs* status_db); - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); } namespace CI { - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); } namespace Remove { - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet); + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet); } namespace Update diff --git a/toolsrc/include/vcpkg_Input.h b/toolsrc/include/vcpkg_Input.h index fd549f278..97fb09e3d 100644 --- a/toolsrc/include/vcpkg_Input.h +++ b/toolsrc/include/vcpkg_Input.h @@ -7,7 +7,7 @@ namespace vcpkg::Input { PackageSpec check_and_get_package_spec( const std::string& package_spec_as_string, - const Triplet& default_target_triplet, + const Triplet& default_triplet, CStringView example_text); void check_triplet(const Triplet& t, const VcpkgPaths& paths); diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index a1b129b5c..c1ef9c56b 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -8,12 +8,12 @@ namespace vcpkg return (c == '-') || isdigit(c) || (isalpha(c) && islower(c)); } - Expected PackageSpec::from_string(const std::string& spec_as_string, const Triplet& default_target_triplet) + Expected PackageSpec::from_string(const std::string& spec_as_string, const Triplet& default_triplet) { auto pos = spec_as_string.find(':'); if (pos == std::string::npos) { - return from_name_and_triplet(spec_as_string, default_target_triplet); + return from_name_and_triplet(spec_as_string, default_triplet); } auto pos2 = spec_as_string.find(':', pos + 1); diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index c74e026ff..f8e346938 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -178,11 +178,11 @@ namespace vcpkg::Commands::Build Checks::exit_success(VCPKG_LINE_INFO); } - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet) + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet) { static const std::string example = Commands::Help::create_example_string("build zlib:x64-windows"); args.check_exact_arg_count(1, example); // Build only takes a single package and all dependencies must already be installed - const PackageSpec spec = Input::check_and_get_package_spec(args.command_arguments.at(0), default_target_triplet, example); + const PackageSpec spec = Input::check_and_get_package_spec(args.command_arguments.at(0), default_triplet, example); Input::check_triplet(spec.target_triplet(), paths); const std::unordered_set options = args.check_and_get_optional_command_arguments({ OPTION_CHECKS_ONLY }); perform_and_exit(spec, paths.port_dir(spec), options, paths); diff --git a/toolsrc/src/commands_build_external.cpp b/toolsrc/src/commands_build_external.cpp index 7b5a01025..ff0ae074c 100644 --- a/toolsrc/src/commands_build_external.cpp +++ b/toolsrc/src/commands_build_external.cpp @@ -5,11 +5,11 @@ namespace vcpkg::Commands::BuildExternal { - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet) + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet) { static const std::string example = Commands::Help::create_example_string(R"(build_external zlib2 C:\path\to\dir\with\controlfile\)"); args.check_exact_arg_count(2, example); - const PackageSpec spec = Input::check_and_get_package_spec(args.command_arguments.at(0), default_target_triplet, example); + const PackageSpec spec = Input::check_and_get_package_spec(args.command_arguments.at(0), default_triplet, example); Input::check_triplet(spec.target_triplet(), paths); const std::unordered_set options = args.check_and_get_optional_command_arguments({}); diff --git a/toolsrc/src/commands_ci.cpp b/toolsrc/src/commands_ci.cpp index 5071effde..3f341580e 100644 --- a/toolsrc/src/commands_ci.cpp +++ b/toolsrc/src/commands_ci.cpp @@ -26,11 +26,11 @@ namespace vcpkg::Commands::CI return specs; } - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet) + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet) { 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_target_triplet; + 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); args.check_and_get_optional_command_arguments({}); const std::vector specs = load_all_package_specs(paths.ports, target_triplet); diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index f741d8608..232c9af9f 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -230,7 +230,7 @@ namespace vcpkg::Commands::Install status_db->insert(std::make_unique(spgh)); } - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet) + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet) { static const std::string OPTION_DRY_RUN = "--dry-run"; @@ -240,7 +240,7 @@ namespace vcpkg::Commands::Install const std::vector specs = Util::fmap(args.command_arguments, [&](auto&& arg) { - return Input::check_and_get_package_spec(arg, default_target_triplet, example); + return Input::check_and_get_package_spec(arg, default_triplet, example); }); for (auto&& spec : specs) Input::check_triplet(spec.target_triplet(), paths); diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index 7899980e5..7f616dd95 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -136,7 +136,7 @@ namespace vcpkg::Commands::Remove } } - void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_target_triplet) + void perform_and_exit(const VcpkgCmdArguments& args, const VcpkgPaths& paths, const Triplet& default_triplet) { static const std::string OPTION_PURGE = "--purge"; static const std::string OPTION_NO_PURGE = "--no-purge"; @@ -156,7 +156,7 @@ namespace vcpkg::Commands::Remove else { args.check_min_arg_count(1, example); - specs = Util::fmap(args.command_arguments, [&](auto&& arg) { return Input::check_and_get_package_spec(arg, default_target_triplet, example); }); + specs = Util::fmap(args.command_arguments, [&](auto&& arg) { return Input::check_and_get_package_spec(arg, default_triplet, example); }); for (auto&& spec : specs) Input::check_triplet(spec.target_triplet(), paths); } diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index aa19df616..ffe325f6e 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -69,29 +69,29 @@ static void inner(const VcpkgCmdArguments& args) return command_function(args, paths); } - Triplet default_target_triplet; + Triplet default_triplet; if (args.target_triplet != nullptr) { - default_target_triplet = Triplet::from_canonical_name(*args.target_triplet); + default_triplet = Triplet::from_canonical_name(*args.target_triplet); } else { const Optional vcpkg_default_triplet_env = System::get_environmental_variable(L"VCPKG_DEFAULT_TRIPLET"); if (auto v = vcpkg_default_triplet_env.get()) { - default_target_triplet = Triplet::from_canonical_name(Strings::utf16_to_utf8(*v)); + default_triplet = Triplet::from_canonical_name(Strings::utf16_to_utf8(*v)); } else { - default_target_triplet = Triplet::X86_WINDOWS; + default_triplet = Triplet::X86_WINDOWS; } } - Input::check_triplet(default_target_triplet, paths); + Input::check_triplet(default_triplet, paths); if (auto command_function = Commands::find(args.command, Commands::get_available_commands_type_a())) { - return command_function(args, paths, default_target_triplet); + return command_function(args, paths, default_triplet); } return invalid_command(args.command); diff --git a/toolsrc/src/vcpkg_Input.cpp b/toolsrc/src/vcpkg_Input.cpp index 5cd889453..1e74f2e90 100644 --- a/toolsrc/src/vcpkg_Input.cpp +++ b/toolsrc/src/vcpkg_Input.cpp @@ -6,10 +6,10 @@ namespace vcpkg::Input { - PackageSpec check_and_get_package_spec(const std::string& package_spec_as_string, const Triplet& default_target_triplet, CStringView example_text) + PackageSpec check_and_get_package_spec(const std::string& package_spec_as_string, const Triplet& default_triplet, CStringView example_text) { const std::string as_lowercase = Strings::ascii_to_lowercase(package_spec_as_string); - Expected expected_spec = PackageSpec::from_string(as_lowercase, default_target_triplet); + Expected expected_spec = PackageSpec::from_string(as_lowercase, default_triplet); if (auto spec = expected_spec.get()) { return *spec; From 84e1a9d3e5b16f6e7e249dabc1bdf3bb27ab0da9 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:01:43 -0700 Subject: [PATCH 21/33] VcpkgCmdArguments.target_triplet -> ".triplet --- toolsrc/include/VcpkgCmdArguments.h | 2 +- toolsrc/src/VcpkgCmdArguments.cpp | 2 +- toolsrc/src/vcpkg.cpp | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/toolsrc/include/VcpkgCmdArguments.h b/toolsrc/include/VcpkgCmdArguments.h index 4a0809fff..3a915205e 100644 --- a/toolsrc/include/VcpkgCmdArguments.h +++ b/toolsrc/include/VcpkgCmdArguments.h @@ -13,7 +13,7 @@ namespace vcpkg static VcpkgCmdArguments create_from_arg_sequence(const std::string* arg_begin, const std::string* arg_end); std::unique_ptr vcpkg_root_dir; - std::unique_ptr target_triplet; + std::unique_ptr triplet; OptBoolT debug = OptBoolT::UNSPECIFIED; OptBoolT sendmetrics = OptBoolT::UNSPECIFIED; OptBoolT printmetrics = OptBoolT::UNSPECIFIED; diff --git a/toolsrc/src/VcpkgCmdArguments.cpp b/toolsrc/src/VcpkgCmdArguments.cpp index 99ca26877..b5f608840 100644 --- a/toolsrc/src/VcpkgCmdArguments.cpp +++ b/toolsrc/src/VcpkgCmdArguments.cpp @@ -88,7 +88,7 @@ namespace vcpkg if (arg == "--triplet") { ++arg_begin; - parse_value(arg_begin, arg_end, "--triplet", args.target_triplet); + parse_value(arg_begin, arg_end, "--triplet", args.triplet); continue; } if (arg == "--debug") diff --git a/toolsrc/src/vcpkg.cpp b/toolsrc/src/vcpkg.cpp index ffe325f6e..74e11c3d4 100644 --- a/toolsrc/src/vcpkg.cpp +++ b/toolsrc/src/vcpkg.cpp @@ -70,9 +70,9 @@ static void inner(const VcpkgCmdArguments& args) } Triplet default_triplet; - if (args.target_triplet != nullptr) + if (args.triplet != nullptr) { - default_triplet = Triplet::from_canonical_name(*args.target_triplet); + default_triplet = Triplet::from_canonical_name(*args.triplet); } else { From 3e94a8db42804a6ac0cc71e5b74483ebd5958f83 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:03:34 -0700 Subject: [PATCH 22/33] PackageSpec.target_triplet() -> ".triplet() --- toolsrc/include/PackageSpec.h | 4 ++-- toolsrc/include/StatusParagraphs.h | 4 ++-- toolsrc/src/BinaryParagraph.cpp | 4 ++-- toolsrc/src/PackageSpec.cpp | 6 +++--- toolsrc/src/PostBuildLint.cpp | 6 +++--- toolsrc/src/StatusParagraphs.cpp | 6 +++--- toolsrc/src/commands_build.cpp | 4 ++-- toolsrc/src/commands_build_external.cpp | 2 +- toolsrc/src/commands_install.cpp | 10 +++++----- toolsrc/src/commands_remove.cpp | 4 ++-- toolsrc/src/tests_paragraph.cpp | 6 +++--- toolsrc/src/vcpkg_Dependencies.cpp | 6 +++--- 12 files changed, 31 insertions(+), 31 deletions(-) diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index 110f74b51..fa6b2c5f5 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -13,7 +13,7 @@ namespace vcpkg const std::string& name() const; - const Triplet& target_triplet() const; + const Triplet& triplet() const; std::string dir() const; @@ -36,7 +36,7 @@ namespace std { size_t hash = 17; hash = hash * 31 + std::hash()(value.name()); - hash = hash * 31 + std::hash()(value.target_triplet()); + hash = hash * 31 + std::hash()(value.triplet()); return hash; } }; diff --git a/toolsrc/include/StatusParagraphs.h b/toolsrc/include/StatusParagraphs.h index 82d2a0d1f..9c7f443d0 100644 --- a/toolsrc/include/StatusParagraphs.h +++ b/toolsrc/include/StatusParagraphs.h @@ -16,14 +16,14 @@ namespace vcpkg const_iterator find(const PackageSpec& spec) const { - return find(spec.name(), spec.target_triplet()); + return find(spec.name(), spec.triplet()); } const_iterator find(const std::string& name, const Triplet& target_triplet) const; iterator find(const std::string& name, const Triplet& target_triplet); const_iterator find_installed(const PackageSpec& spec) const { - return find_installed(spec.name(), spec.target_triplet()); + return find_installed(spec.name(), spec.triplet()); } const_iterator find_installed(const std::string& name, const Triplet& target_triplet) const; diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index 89f57e51b..8e8d6a95b 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -65,7 +65,7 @@ namespace vcpkg std::string BinaryParagraph::fullstem() const { - return Strings::format("%s_%s_%s", this->spec.name(), this->version, this->spec.target_triplet()); + return Strings::format("%s_%s_%s", this->spec.name(), this->version, this->spec.triplet()); } std::ostream& operator<<(std::ostream& os, const BinaryParagraph& p) @@ -85,7 +85,7 @@ namespace vcpkg os << "\n"; } - os << "Architecture: " << p.spec.target_triplet().to_string() << "\n"; + os << "Architecture: " << p.spec.triplet().to_string() << "\n"; os << "Multi-Arch: same\n"; if (!p.maintainer.empty()) os << "Maintainer: " << p.maintainer << "\n"; diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index c1ef9c56b..14da9db6c 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -45,7 +45,7 @@ namespace vcpkg return this->m_name; } - const Triplet& PackageSpec::target_triplet() const + const Triplet& PackageSpec::triplet() const { return this->m_target_triplet; } @@ -57,11 +57,11 @@ namespace vcpkg std::string PackageSpec::to_string() const { - return Strings::format("%s:%s", this->name(), this->target_triplet()); + return Strings::format("%s:%s", this->name(), this->triplet()); } bool operator==(const PackageSpec& left, const PackageSpec& right) { - return left.name() == right.name() && left.target_triplet() == right.target_triplet(); + return left.name() == right.name() && left.triplet() == right.triplet(); } } diff --git a/toolsrc/src/PostBuildLint.cpp b/toolsrc/src/PostBuildLint.cpp index 90aa99f55..ace4918da 100644 --- a/toolsrc/src/PostBuildLint.cpp +++ b/toolsrc/src/PostBuildLint.cpp @@ -658,7 +658,7 @@ namespace vcpkg::PostBuildLint libs.insert(libs.cend(), debug_libs.cbegin(), debug_libs.cend()); libs.insert(libs.cend(), release_libs.cbegin(), release_libs.cend()); - error_count += check_lib_architecture(spec.target_triplet().architecture(), libs); + error_count += check_lib_architecture(spec.triplet().architecture(), libs); switch (build_info.library_linkage) { @@ -677,8 +677,8 @@ namespace vcpkg::PostBuildLint dlls.insert(dlls.cend(), release_dlls.cbegin(), release_dlls.cend()); error_count += check_exports_of_dlls(dlls, toolset.dumpbin); - error_count += check_uwp_bit_of_dlls(spec.target_triplet().system(), dlls, toolset.dumpbin); - error_count += check_dll_architecture(spec.target_triplet().architecture(), dlls); + error_count += check_uwp_bit_of_dlls(spec.triplet().system(), dlls, toolset.dumpbin); + error_count += check_dll_architecture(spec.triplet().architecture(), dlls); error_count += check_outdated_crt_linkage_of_dlls(dlls, toolset.dumpbin); break; diff --git a/toolsrc/src/StatusParagraphs.cpp b/toolsrc/src/StatusParagraphs.cpp index ecaf7b745..a24a8208f 100644 --- a/toolsrc/src/StatusParagraphs.cpp +++ b/toolsrc/src/StatusParagraphs.cpp @@ -16,7 +16,7 @@ namespace vcpkg return std::find_if(begin(), end(), [&](const std::unique_ptr& pgh) { const PackageSpec& spec = pgh->package.spec; - return spec.name() == name && spec.target_triplet() == target_triplet; + return spec.name() == name && spec.triplet() == target_triplet; }); } @@ -25,7 +25,7 @@ namespace vcpkg return std::find_if(begin(), end(), [&](const std::unique_ptr& pgh) { const PackageSpec& spec = pgh->package.spec; - return spec.name() == name && spec.target_triplet() == target_triplet; + return spec.name() == name && spec.triplet() == target_triplet; }); } @@ -44,7 +44,7 @@ namespace vcpkg { Checks::check_exit(VCPKG_LINE_INFO, pgh != nullptr, "Inserted null paragraph"); const PackageSpec& spec = pgh->package.spec; - auto ptr = find(spec.name(), spec.target_triplet()); + auto ptr = find(spec.name(), spec.triplet()); if (ptr == end()) { paragraphs.push_back(std::move(pgh)); diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index f8e346938..50c534598 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -40,7 +40,7 @@ namespace vcpkg::Commands::Build { Checks::check_exit(VCPKG_LINE_INFO, spec.name() == source_paragraph.name, "inconsistent arguments to build_package()"); - const Triplet& target_triplet = spec.target_triplet(); + const Triplet& target_triplet = spec.triplet(); for (auto&& dep : filter_dependencies(source_paragraph.depends, target_triplet)) { if (status_db.find_installed(dep, target_triplet) == status_db.end()) @@ -183,7 +183,7 @@ namespace vcpkg::Commands::Build static const std::string example = Commands::Help::create_example_string("build zlib:x64-windows"); args.check_exact_arg_count(1, example); // Build only takes a single package and all dependencies must already be installed const PackageSpec spec = Input::check_and_get_package_spec(args.command_arguments.at(0), default_triplet, example); - Input::check_triplet(spec.target_triplet(), paths); + Input::check_triplet(spec.triplet(), paths); const std::unordered_set options = args.check_and_get_optional_command_arguments({ OPTION_CHECKS_ONLY }); perform_and_exit(spec, paths.port_dir(spec), options, paths); } diff --git a/toolsrc/src/commands_build_external.cpp b/toolsrc/src/commands_build_external.cpp index ff0ae074c..d0dbf1d24 100644 --- a/toolsrc/src/commands_build_external.cpp +++ b/toolsrc/src/commands_build_external.cpp @@ -10,7 +10,7 @@ namespace vcpkg::Commands::BuildExternal static const std::string example = Commands::Help::create_example_string(R"(build_external zlib2 C:\path\to\dir\with\controlfile\)"); args.check_exact_arg_count(2, example); const PackageSpec spec = Input::check_and_get_package_spec(args.command_arguments.at(0), default_triplet, example); - Input::check_triplet(spec.target_triplet(), paths); + Input::check_triplet(spec.triplet(), paths); const std::unordered_set options = args.check_and_get_optional_command_arguments({}); const fs::path port_dir = args.command_arguments.at(1); diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index 232c9af9f..a0e2b40ad 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -22,7 +22,7 @@ namespace vcpkg::Commands::Install const fs::path package_prefix_path = paths.package_dir(bpgh.spec); const size_t prefix_length = package_prefix_path.native().size(); - const Triplet& target_triplet = bpgh.spec.target_triplet(); + const Triplet& target_triplet = bpgh.spec.triplet(); const std::string& triplet_subfolder = target_triplet.canonical_name(); const fs::path triplet_subfolder_path = paths.installed / triplet_subfolder; std::error_code ec; @@ -103,7 +103,7 @@ namespace vcpkg::Commands::Install std::vector output; for (const StatusParagraphAndAssociatedFiles& t : pgh_and_files) { - if (t.pgh.package.spec.target_triplet() != triplet) + if (t.pgh.package.spec.triplet() != triplet) { continue; } @@ -186,7 +186,7 @@ namespace vcpkg::Commands::Install void install_package(const VcpkgPaths& paths, const BinaryParagraph& binary_paragraph, StatusParagraphs* status_db) { const fs::path package_dir = paths.package_dir(binary_paragraph.spec); - const Triplet& triplet = binary_paragraph.spec.target_triplet(); + const Triplet& triplet = binary_paragraph.spec.triplet(); const std::vector pgh_and_files = get_installed_files(paths, *status_db); const SortedVector package_files = build_list_of_package_files(package_dir); @@ -215,7 +215,7 @@ namespace vcpkg::Commands::Install spgh.state = InstallState::HALF_INSTALLED; for (auto&& dep : spgh.package.depends) { - if (status_db->find_installed(dep, spgh.package.spec.target_triplet()) == status_db->end()) + if (status_db->find_installed(dep, spgh.package.spec.triplet()) == status_db->end()) { Checks::unreachable(VCPKG_LINE_INFO); } @@ -243,7 +243,7 @@ namespace vcpkg::Commands::Install return Input::check_and_get_package_spec(arg, default_triplet, example); }); for (auto&& spec : specs) - Input::check_triplet(spec.target_triplet(), paths); + Input::check_triplet(spec.triplet(), paths); const std::unordered_set options = args.check_and_get_optional_command_arguments({ OPTION_DRY_RUN }); const bool dryRun = options.find(OPTION_DRY_RUN) != options.cend(); diff --git a/toolsrc/src/commands_remove.cpp b/toolsrc/src/commands_remove.cpp index 7f616dd95..b26fec36f 100644 --- a/toolsrc/src/commands_remove.cpp +++ b/toolsrc/src/commands_remove.cpp @@ -29,7 +29,7 @@ namespace vcpkg::Commands::Remove static void remove_package(const VcpkgPaths& paths, const PackageSpec& spec, StatusParagraphs* status_db) { - StatusParagraph& pkg = **status_db->find(spec.name(), spec.target_triplet()); + StatusParagraph& pkg = **status_db->find(spec.name(), spec.triplet()); pkg.want = Want::PURGE; pkg.state = InstallState::HALF_INSTALLED; @@ -158,7 +158,7 @@ namespace vcpkg::Commands::Remove args.check_min_arg_count(1, example); specs = Util::fmap(args.command_arguments, [&](auto&& arg) { return Input::check_and_get_package_spec(arg, default_triplet, example); }); for (auto&& spec : specs) - Input::check_triplet(spec.target_triplet(), paths); + Input::check_triplet(spec.triplet(), paths); } const bool alsoRemoveFolderFromPackages = options.find(OPTION_NO_PURGE) == options.end(); diff --git a/toolsrc/src/tests_paragraph.cpp b/toolsrc/src/tests_paragraph.cpp index 10a84b703..58e4121a8 100644 --- a/toolsrc/src/tests_paragraph.cpp +++ b/toolsrc/src/tests_paragraph.cpp @@ -111,7 +111,7 @@ namespace UnitTest1 Assert::AreEqual("1.2.8", pgh.version.c_str()); Assert::AreEqual("", pgh.maintainer.c_str()); Assert::AreEqual("", pgh.description.c_str()); - Assert::AreEqual("x86-windows", pgh.spec.target_triplet().canonical_name().c_str()); + Assert::AreEqual("x86-windows", pgh.spec.triplet().canonical_name().c_str()); Assert::AreEqual(size_t(0), pgh.depends.size()); } @@ -363,7 +363,7 @@ namespace UnitTest1 vcpkg::Expected spec = vcpkg::PackageSpec::from_string("zlib", vcpkg::Triplet::X86_WINDOWS); Assert::AreEqual(vcpkg::PackageSpecParseResult::SUCCESS, vcpkg::to_package_spec_parse_result(spec.error_code())); Assert::AreEqual("zlib", spec.get()->name().c_str()); - Assert::AreEqual(vcpkg::Triplet::X86_WINDOWS.canonical_name(), spec.get()->target_triplet().canonical_name()); + Assert::AreEqual(vcpkg::Triplet::X86_WINDOWS.canonical_name(), spec.get()->triplet().canonical_name()); } TEST_METHOD(package_spec_parse_with_arch) @@ -371,7 +371,7 @@ namespace UnitTest1 vcpkg::Expected spec = vcpkg::PackageSpec::from_string("zlib:x64-uwp", vcpkg::Triplet::X86_WINDOWS); Assert::AreEqual(vcpkg::PackageSpecParseResult::SUCCESS, vcpkg::to_package_spec_parse_result(spec.error_code())); Assert::AreEqual("zlib", spec.get()->name().c_str()); - Assert::AreEqual(vcpkg::Triplet::X64_UWP.canonical_name(), spec.get()->target_triplet().canonical_name()); + Assert::AreEqual(vcpkg::Triplet::X64_UWP.canonical_name(), spec.get()->triplet().canonical_name()); } TEST_METHOD(package_spec_parse_with_multiple_colon) diff --git a/toolsrc/src/vcpkg_Dependencies.cpp b/toolsrc/src/vcpkg_Dependencies.cpp index f3caea600..67c2c45a9 100644 --- a/toolsrc/src/vcpkg_Dependencies.cpp +++ b/toolsrc/src/vcpkg_Dependencies.cpp @@ -69,7 +69,7 @@ namespace vcpkg::Dependencies { for (const std::string& dep_as_string : dependencies_as_string) { - const PackageSpec current_dep = PackageSpec::from_name_and_triplet(dep_as_string, spec.target_triplet()).value_or_exit(VCPKG_LINE_INFO); + const PackageSpec current_dep = PackageSpec::from_name_and_triplet(dep_as_string, spec.triplet()).value_or_exit(VCPKG_LINE_INFO); auto it = status_db.find_installed(current_dep); if (it != status_db.end()) { @@ -103,7 +103,7 @@ namespace vcpkg::Dependencies Expected maybe_spgh = Paragraphs::try_load_port(paths.port_dir(spec)); if (auto spgh = maybe_spgh.get()) { - process_dependencies(filter_dependencies(spgh->depends, spec.target_triplet())); + process_dependencies(filter_dependencies(spgh->depends, spec.triplet())); was_examined.emplace(spec, InstallPlanAction{ InstallPlanType::BUILD_AND_INSTALL, request_type, nullopt, std::move(*spgh) }); } else @@ -152,7 +152,7 @@ namespace vcpkg::Dependencies { if (an_installed_package->want != Want::INSTALL) continue; - if (an_installed_package->package.spec.target_triplet() != spec.target_triplet()) + if (an_installed_package->package.spec.triplet() != spec.triplet()) continue; const std::vector& deps = an_installed_package->package.depends; From 6699737c6d1b9e33c4448080c006317333b1e969 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:04:34 -0700 Subject: [PATCH 23/33] [PackageSpec] target_triplet -> triplet --- toolsrc/include/PackageSpec.h | 4 ++-- toolsrc/src/PackageSpec.cpp | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/toolsrc/include/PackageSpec.h b/toolsrc/include/PackageSpec.h index fa6b2c5f5..4c3b47365 100644 --- a/toolsrc/include/PackageSpec.h +++ b/toolsrc/include/PackageSpec.h @@ -9,7 +9,7 @@ namespace vcpkg { static Expected from_string(const std::string& spec_as_string, const Triplet& default_triplet); - static Expected from_name_and_triplet(const std::string& name, const Triplet& target_triplet); + static Expected from_name_and_triplet(const std::string& name, const Triplet& triplet); const std::string& name() const; @@ -21,7 +21,7 @@ namespace vcpkg private: std::string m_name; - Triplet m_target_triplet; + Triplet m_triplet; }; bool operator==(const PackageSpec& left, const PackageSpec& right); diff --git a/toolsrc/src/PackageSpec.cpp b/toolsrc/src/PackageSpec.cpp index 14da9db6c..bf1c7380c 100644 --- a/toolsrc/src/PackageSpec.cpp +++ b/toolsrc/src/PackageSpec.cpp @@ -23,11 +23,11 @@ namespace vcpkg } const std::string name = spec_as_string.substr(0, pos); - const Triplet target_triplet = Triplet::from_canonical_name(spec_as_string.substr(pos + 1)); - return from_name_and_triplet(name, target_triplet); + const Triplet triplet = Triplet::from_canonical_name(spec_as_string.substr(pos + 1)); + return from_name_and_triplet(name, triplet); } - Expected PackageSpec::from_name_and_triplet(const std::string& name, const Triplet& target_triplet) + Expected PackageSpec::from_name_and_triplet(const std::string& name, const Triplet& triplet) { if (std::find_if_not(name.cbegin(), name.cend(), is_valid_package_spec_char) != name.end()) { @@ -36,7 +36,7 @@ namespace vcpkg PackageSpec p; p.m_name = name; - p.m_target_triplet = target_triplet; + p.m_triplet = triplet; return p; } @@ -47,12 +47,12 @@ namespace vcpkg const Triplet& PackageSpec::triplet() const { - return this->m_target_triplet; + return this->m_triplet; } std::string PackageSpec::dir() const { - return Strings::format("%s_%s", this->m_name, this->m_target_triplet); + return Strings::format("%s_%s", this->m_name, this->m_triplet); } std::string PackageSpec::to_string() const From 0f54ec446d63923a99524fd98657010816e06cb5 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:06:44 -0700 Subject: [PATCH 24/33] [BinaryParagraph] target_triplet -> triplet --- toolsrc/include/BinaryParagraph.h | 2 +- toolsrc/src/BinaryParagraph.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/toolsrc/include/BinaryParagraph.h b/toolsrc/include/BinaryParagraph.h index d92ae7e6d..e29e0f51b 100644 --- a/toolsrc/include/BinaryParagraph.h +++ b/toolsrc/include/BinaryParagraph.h @@ -10,7 +10,7 @@ namespace vcpkg { BinaryParagraph(); explicit BinaryParagraph(std::unordered_map fields); - BinaryParagraph(const SourceParagraph& spgh, const Triplet& target_triplet); + BinaryParagraph(const SourceParagraph& spgh, const Triplet& triplet); std::string displayname() const; diff --git a/toolsrc/src/BinaryParagraph.cpp b/toolsrc/src/BinaryParagraph.cpp index 8e8d6a95b..499ef54f7 100644 --- a/toolsrc/src/BinaryParagraph.cpp +++ b/toolsrc/src/BinaryParagraph.cpp @@ -29,9 +29,9 @@ namespace vcpkg { const std::string name = details::remove_required_field(&fields, BinaryParagraphRequiredField::PACKAGE); const std::string architecture = details::remove_required_field(&fields, BinaryParagraphRequiredField::ARCHITECTURE); - const Triplet target_triplet = Triplet::from_canonical_name(architecture); + const Triplet triplet = Triplet::from_canonical_name(architecture); - this->spec = PackageSpec::from_name_and_triplet(name, target_triplet).value_or_exit(VCPKG_LINE_INFO); + this->spec = PackageSpec::from_name_and_triplet(name, triplet).value_or_exit(VCPKG_LINE_INFO); this->version = details::remove_required_field(&fields, BinaryParagraphRequiredField::VERSION); this->description = details::remove_optional_field(&fields, BinaryParagraphOptionalField::DESCRIPTION); @@ -44,13 +44,13 @@ namespace vcpkg this->depends = parse_depends(deps); } - BinaryParagraph::BinaryParagraph(const SourceParagraph& spgh, const Triplet& target_triplet) + BinaryParagraph::BinaryParagraph(const SourceParagraph& spgh, const Triplet& triplet) { - this->spec = PackageSpec::from_name_and_triplet(spgh.name, target_triplet).value_or_exit(VCPKG_LINE_INFO); + this->spec = PackageSpec::from_name_and_triplet(spgh.name, triplet).value_or_exit(VCPKG_LINE_INFO); this->version = spgh.version; this->description = spgh.description; this->maintainer = spgh.maintainer; - this->depends = filter_dependencies(spgh.depends, target_triplet); + this->depends = filter_dependencies(spgh.depends, triplet); } std::string BinaryParagraph::displayname() const From cb679871e061cf2af460e53b57a56441b0eed575 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:08:47 -0700 Subject: [PATCH 25/33] [StatusParagraph] target_triplet -> triplet --- toolsrc/include/StatusParagraphs.h | 6 +++--- toolsrc/src/StatusParagraphs.cpp | 15 +++++++++------ 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/toolsrc/include/StatusParagraphs.h b/toolsrc/include/StatusParagraphs.h index 9c7f443d0..c5ece9616 100644 --- a/toolsrc/include/StatusParagraphs.h +++ b/toolsrc/include/StatusParagraphs.h @@ -18,14 +18,14 @@ namespace vcpkg { return find(spec.name(), spec.triplet()); } - const_iterator find(const std::string& name, const Triplet& target_triplet) const; - iterator find(const std::string& name, const Triplet& target_triplet); + const_iterator find(const std::string& name, const Triplet& triplet) const; + iterator find(const std::string& name, const Triplet& triplet); const_iterator find_installed(const PackageSpec& spec) const { return find_installed(spec.name(), spec.triplet()); } - const_iterator find_installed(const std::string& name, const Triplet& target_triplet) const; + const_iterator find_installed(const std::string& name, const Triplet& triplet) const; iterator insert(std::unique_ptr); diff --git a/toolsrc/src/StatusParagraphs.cpp b/toolsrc/src/StatusParagraphs.cpp index a24a8208f..59e6ee331 100644 --- a/toolsrc/src/StatusParagraphs.cpp +++ b/toolsrc/src/StatusParagraphs.cpp @@ -1,6 +1,9 @@ #include "pch.h" #include "StatusParagraphs.h" #include "vcpkg_Checks.h" +#include +#include +#include namespace vcpkg { @@ -11,27 +14,27 @@ namespace vcpkg { }; - StatusParagraphs::const_iterator StatusParagraphs::find(const std::string& name, const Triplet& target_triplet) const + StatusParagraphs::const_iterator StatusParagraphs::find(const std::string& name, const Triplet& triplet) const { return std::find_if(begin(), end(), [&](const std::unique_ptr& pgh) { const PackageSpec& spec = pgh->package.spec; - return spec.name() == name && spec.triplet() == target_triplet; + return spec.name() == name && spec.triplet() == triplet; }); } - StatusParagraphs::iterator StatusParagraphs::find(const std::string& name, const Triplet& target_triplet) + StatusParagraphs::iterator StatusParagraphs::find(const std::string& name, const Triplet& triplet) { return std::find_if(begin(), end(), [&](const std::unique_ptr& pgh) { const PackageSpec& spec = pgh->package.spec; - return spec.name() == name && spec.triplet() == target_triplet; + return spec.name() == name && spec.triplet() == triplet; }); } - StatusParagraphs::const_iterator StatusParagraphs::find_installed(const std::string& name, const Triplet& target_triplet) const + StatusParagraphs::const_iterator StatusParagraphs::find_installed(const std::string& name, const Triplet& triplet) const { - const const_iterator it = find(name, target_triplet); + const const_iterator it = find(name, triplet); if (it != end() && (*it)->want == Want::INSTALL && (*it)->state == InstallState::INSTALLED) { return it; From ca3d013c367945d3d72ed0bf8d267fcd0dec6806 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:10:11 -0700 Subject: [PATCH 26/33] `build` target_triplet -> triplet --- toolsrc/src/commands_build.cpp | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/toolsrc/src/commands_build.cpp b/toolsrc/src/commands_build.cpp index 50c534598..96b0b0346 100644 --- a/toolsrc/src/commands_build.cpp +++ b/toolsrc/src/commands_build.cpp @@ -18,14 +18,14 @@ namespace vcpkg::Commands::Build static const std::string OPTION_CHECKS_ONLY = "--checks-only"; - static void create_binary_control_file(const VcpkgPaths& paths, const SourceParagraph& source_paragraph, const Triplet& target_triplet) + static void create_binary_control_file(const VcpkgPaths& paths, const SourceParagraph& source_paragraph, const Triplet& triplet) { - const BinaryParagraph bpgh = BinaryParagraph(source_paragraph, target_triplet); + const BinaryParagraph bpgh = BinaryParagraph(source_paragraph, triplet); const fs::path binary_control_file = paths.packages / bpgh.dir() / "CONTROL"; std::ofstream(binary_control_file) << bpgh; } - std::wstring make_build_env_cmd(const Triplet& target_triplet, const Toolset& toolset) + std::wstring make_build_env_cmd(const Triplet& triplet, const Toolset& toolset) { const wchar_t * tonull = L" >nul"; if (g_debugging) @@ -33,17 +33,17 @@ namespace vcpkg::Commands::Build tonull = L""; } - return Strings::wformat(LR"("%s" %s %s 2>&1)", toolset.vcvarsall.native(), Strings::utf8_to_utf16(target_triplet.architecture()), tonull); + return Strings::wformat(LR"("%s" %s %s 2>&1)", toolset.vcvarsall.native(), Strings::utf8_to_utf16(triplet.architecture()), tonull); } BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const VcpkgPaths& paths, const fs::path& port_dir, const StatusParagraphs& status_db) { Checks::check_exit(VCPKG_LINE_INFO, spec.name() == source_paragraph.name, "inconsistent arguments to build_package()"); - const Triplet& target_triplet = spec.triplet(); - for (auto&& dep : filter_dependencies(source_paragraph.depends, target_triplet)) + const Triplet& triplet = spec.triplet(); + for (auto&& dep : filter_dependencies(source_paragraph.depends, triplet)) { - if (status_db.find_installed(dep, target_triplet) == status_db.end()) + if (status_db.find_installed(dep, triplet) == status_db.end()) { return BuildResult::CASCADED_DUE_TO_MISSING_DEPENDENCIES; } @@ -54,14 +54,14 @@ namespace vcpkg::Commands::Build const fs::path ports_cmake_script_path = paths.ports_cmake; const Toolset& toolset = paths.get_toolset(); - const auto cmd_set_environment = make_build_env_cmd(target_triplet, toolset); + const auto cmd_set_environment = make_build_env_cmd(triplet, toolset); const std::wstring cmd_launch_cmake = make_cmake_cmd(cmake_exe_path, ports_cmake_script_path, { { L"CMD", L"BUILD" }, { L"PORT", source_paragraph.name }, { L"CURRENT_PORT_DIR", port_dir / "/." }, - { L"TARGET_TRIPLET", target_triplet.canonical_name() }, + { L"TARGET_TRIPLET", triplet.canonical_name() }, { L"VCPKG_PLATFORM_TOOLSET", toolset.version }, { L"GIT", git_exe_path } }); @@ -88,7 +88,7 @@ namespace vcpkg::Commands::Build return BuildResult::POST_BUILD_CHECKS_FAILED; } - create_binary_control_file(paths, source_paragraph, target_triplet); + create_binary_control_file(paths, source_paragraph, triplet); // const fs::path port_buildtrees_dir = paths.buildtrees / spec.name; // delete_directory(port_buildtrees_dir); From c5557ba8cb284ea9b12fdaa6d7f6ae1114374a8c Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:11:36 -0700 Subject: [PATCH 27/33] `ci` target_triplet -> triplet --- toolsrc/src/commands_ci.cpp | 10 +++++----- 1 file 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 load_all_package_specs(const fs::path& ports_directory, const Triplet& target_triplet) + static std::vector load_all_package_specs(const fs::path& ports_directory, const Triplet& triplet) { std::vector ports = Paragraphs::load_all_ports(ports_directory); std::vector 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 specs = load_all_package_specs(paths.ports, target_triplet); + const std::vector specs = load_all_package_specs(paths.ports, triplet); StatusParagraphs status_db = database_load_check(paths); const std::vector install_plan = Dependencies::create_install_plan(paths, specs, status_db); From 60090703b3149d0f04140b62b05ead3819124a2f Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:12:49 -0700 Subject: [PATCH 28/33] `install` target_triplet -> triplet --- toolsrc/src/commands_install.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/toolsrc/src/commands_install.cpp b/toolsrc/src/commands_install.cpp index a0e2b40ad..f3da36fa0 100644 --- a/toolsrc/src/commands_install.cpp +++ b/toolsrc/src/commands_install.cpp @@ -22,8 +22,8 @@ namespace vcpkg::Commands::Install const fs::path package_prefix_path = paths.package_dir(bpgh.spec); const size_t prefix_length = package_prefix_path.native().size(); - const Triplet& target_triplet = bpgh.spec.triplet(); - const std::string& triplet_subfolder = target_triplet.canonical_name(); + const Triplet& triplet = bpgh.spec.triplet(); + const std::string& triplet_subfolder = triplet.canonical_name(); const fs::path triplet_subfolder_path = paths.installed / triplet_subfolder; std::error_code ec; fs::create_directory(triplet_subfolder_path, ec); From d9ba36c7ebaf8a417ec7e0bce9338524ab2337b4 Mon Sep 17 00:00:00 2001 From: Alexander Karatarakis Date: Mon, 10 Apr 2017 13:13:07 -0700 Subject: [PATCH 29/33] Remaining target_triplet -> triplet --- toolsrc/include/vcpkg_Commands.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/toolsrc/include/vcpkg_Commands.h b/toolsrc/include/vcpkg_Commands.h index cc6437bf9..bb25812ac 100644 --- a/toolsrc/include/vcpkg_Commands.h +++ b/toolsrc/include/vcpkg_Commands.h @@ -29,7 +29,7 @@ namespace vcpkg::Commands std::string create_error_message(const BuildResult build_result, const PackageSpec& spec); std::string create_user_troubleshooting_message(const PackageSpec& spec); - std::wstring make_build_env_cmd(const Triplet& target_triplet, const Toolset& toolset); + std::wstring make_build_env_cmd(const Triplet& triplet, const Toolset& toolset); BuildResult build_package(const SourceParagraph& source_paragraph, const PackageSpec& spec, const VcpkgPaths& paths, const fs::path& port_dir, const StatusParagraphs& status_db); void perform_and_exit(const PackageSpec& spec, const fs::path& port_dir, const std::unordered_set& options, const VcpkgPaths& paths); From af455f6d1063bce5e057cd5fee1a329e9f3c4bce Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Mon, 10 Apr 2017 14:49:34 -0700 Subject: [PATCH 30/33] [README] Add CI badge --- README.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/README.md b/README.md index 271f2375d..ac005db15 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ -# Vcpkg - +# Vcpkg ![](https://devdiv.visualstudio.com/_apis/public/build/definitions/0bdbc590-a062-4c3f-b0f6-9383f67865ee/5261/badge) + ## Overview Vcpkg helps you get C and C++ libraries on Windows. This tool and ecosystem are currently in a preview state; your involvement is vital to its success. From 889573b0695bd203e6b13b3d902efaf8f3d67bdf Mon Sep 17 00:00:00 2001 From: Mikhail Paulyshka Date: Tue, 11 Apr 2017 03:18:11 +0300 Subject: [PATCH 31/33] [mpg123] install missing headers --- ports/mpg123/portfile.cmake | 2 ++ 1 file changed, 2 insertions(+) diff --git a/ports/mpg123/portfile.cmake b/ports/mpg123/portfile.cmake index 1ff9b658b..cac518cb2 100644 --- a/ports/mpg123/portfile.cmake +++ b/ports/mpg123/portfile.cmake @@ -72,6 +72,8 @@ file(INSTALL ) file(INSTALL ${SOURCE_PATH}/ports/MSVC++/mpg123.h + ${SOURCE_PATH}/src/libmpg123/fmt123.h + ${SOURCE_PATH}/src/libmpg123/mpg123.h.in DESTINATION ${CURRENT_PACKAGES_DIR}/include ) From 1513062f0bfba77baf7efd51de6e9d865bee70b7 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 11 Apr 2017 14:41:57 -0700 Subject: [PATCH 32/33] [vcpkg-scripts] Improve verbose logging in findAnyMSBuildWithCppPlatformToolset. --- scripts/findAnyMSBuildWithCppPlatformToolset.ps1 | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 index f1ef1ae6b..f72491e5d 100644 --- a/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 +++ b/scripts/findAnyMSBuildWithCppPlatformToolset.ps1 @@ -91,11 +91,11 @@ foreach ($pair in $registryPairs) try { $VS14InstallDir = $(gp $vsEntry InstallDir -erroraction Stop | % { $_.InstallDir }) - Write-Verbose "$vsEntry - Found" + Write-Verbose "$vsEntry\InstallDir - Found" } catch { - Write-Verbose "$vsEntry - Not Found" + Write-Verbose "$vsEntry\InstallDir - Not Found" continue } @@ -118,11 +118,11 @@ foreach ($pair in $registryPairs) try { $MSBuild14 = $(gp $msbuildEntry MSBuildToolsPath -erroraction Stop | % { $_.MSBuildToolsPath }) - Write-Verbose "$msbuildEntry - Found" + Write-Verbose "$msbuildEntry\MSBuildToolsPath - Found" } catch { - Write-Verbose "$msbuildEntry - Not Found" + Write-Verbose "$msbuildEntry\MSBuildToolsPath - Not Found" continue } From 92c0a91d3fdd9a9df5d3feae611981ea170703f5 Mon Sep 17 00:00:00 2001 From: Robert Schumacher Date: Tue, 11 Apr 2017 16:11:28 -0700 Subject: [PATCH 33/33] [vcpkg-msbuild] Fix line wrapping bug on Win7. On Win7, calling powershell via MSBuild results in normal output lines being split based on the ConHost system-wide default line length settings. The fix is to first write all the lines to a file, then load that file as into an MSBuild ItemGroup. This avoids all interaction with ConHost. --- scripts/buildsystems/msbuild/applocal.ps1 | 4 ++-- scripts/buildsystems/msbuild/vcpkg.targets | 17 ++++++++++------- 2 files changed, 12 insertions(+), 9 deletions(-) diff --git a/scripts/buildsystems/msbuild/applocal.ps1 b/scripts/buildsystems/msbuild/applocal.ps1 index 21e42d479..425c34961 100644 --- a/scripts/buildsystems/msbuild/applocal.ps1 +++ b/scripts/buildsystems/msbuild/applocal.ps1 @@ -1,5 +1,5 @@ [cmdletbinding()] -param([string]$targetBinary, [string]$installedDir, [string]$tlogFile) +param([string]$targetBinary, [string]$installedDir, [string]$tlogFile, [string]$copiedFilesLog) $g_searched = @{} # Note: installedDir is actually the bin\ directory. @@ -14,7 +14,7 @@ function deployBinary([string]$targetBinaryDir, [string]$SourceDir, [string]$tar Write-Verbose " ${targetBinaryName}: Copying $SourceDir\$targetBinaryName" Copy-Item "$SourceDir\$targetBinaryName" $targetBinaryDir } - "$targetBinaryDir\$targetBinaryName" + if ($copiedFilesLog) { Add-Content $copiedFilesLog "$targetBinaryDir\$targetBinaryName" } if ($tlogFile) { Add-Content $tlogFile "$targetBinaryDir\$targetBinaryName" } } diff --git a/scripts/buildsystems/msbuild/vcpkg.targets b/scripts/buildsystems/msbuild/vcpkg.targets index 65eacd5c9..5c24d755a 100644 --- a/scripts/buildsystems/msbuild/vcpkg.targets +++ b/scripts/buildsystems/msbuild/vcpkg.targets @@ -62,18 +62,21 @@ + Lines="^$(TargetPath);$([System.IO.Path]::Combine($(ProjectDir),$(IntDir)))vcpkg.applocal.log" Encoding="Unicode"/> - - + + + + + + +