From 895678db8f8bfc3c1988a118b3bb5a13ea4d5248 Mon Sep 17 00:00:00 2001 From: nicole mazzuca Date: Mon, 10 Aug 2020 12:32:34 -0700 Subject: [vcpkg] Rewrite CMake build system to be more target-based (#12698) * Change to using more target-focused cmake * Add vcpkg_target_add_warning_options * targetify the rest * move the globs together * Force-include pch.h on non-windows * Rename VCPKGLIB_NON_PCH_* to VCPKGLIB_* in globs * Remove `include "pch.h"`s * missed a few lines * fix build * fix CMAKE_CURRENT_SOURCE_DIR * try to fix VCPKG_REQUIRE_LINK_CXXFS * change msvc-stl logic * fix build * CR * clang-format * Apply suggestions from code review Thanks @ras0219! Co-authored-by: JackBoosY Co-authored-by: ras0219 <533828+ras0219@users.noreply.github.com> --- toolsrc/src/pch.cpp | 3 +- toolsrc/src/vcpkg/archives.cpp | 2 - toolsrc/src/vcpkg/base/checks.cpp | 2 - toolsrc/src/vcpkg/base/chrono.cpp | 2 - toolsrc/src/vcpkg/base/cofffilereader.cpp | 2 - toolsrc/src/vcpkg/base/downloads.cpp | 2 - toolsrc/src/vcpkg/base/enums.cpp | 2 - toolsrc/src/vcpkg/base/files.cpp | 2 - toolsrc/src/vcpkg/base/hash.cpp | 2 - toolsrc/src/vcpkg/base/json.cpp | 2 - toolsrc/src/vcpkg/base/machinetype.cpp | 2 - toolsrc/src/vcpkg/base/parse.cpp | 2 - toolsrc/src/vcpkg/base/strings.cpp | 2 - toolsrc/src/vcpkg/base/stringview.cpp | 2 - toolsrc/src/vcpkg/base/system.cpp | 2 - toolsrc/src/vcpkg/base/system.print.cpp | 2 - toolsrc/src/vcpkg/base/system.process.cpp | 2 - toolsrc/src/vcpkg/base/unicode.cpp | 2 - toolsrc/src/vcpkg/binarycaching.cpp | 2 - toolsrc/src/vcpkg/binaryparagraph.cpp | 2 - toolsrc/src/vcpkg/build.cpp | 2 - toolsrc/src/vcpkg/buildenvironment.cpp | 2 - toolsrc/src/vcpkg/cmakevars.cpp | 2 - toolsrc/src/vcpkg/commands.autocomplete.cpp | 2 - toolsrc/src/vcpkg/commands.buildexternal.cpp | 2 - toolsrc/src/vcpkg/commands.cache.cpp | 2 - toolsrc/src/vcpkg/commands.ci.cpp | 2 - toolsrc/src/vcpkg/commands.ciclean.cpp | 2 - toolsrc/src/vcpkg/commands.contact.cpp | 2 - toolsrc/src/vcpkg/commands.cpp | 2 - toolsrc/src/vcpkg/commands.create.cpp | 2 - toolsrc/src/vcpkg/commands.dependinfo.cpp | 2 - toolsrc/src/vcpkg/commands.edit.cpp | 2 - toolsrc/src/vcpkg/commands.env.cpp | 2 - toolsrc/src/vcpkg/commands.fetch.cpp | 2 - toolsrc/src/vcpkg/commands.format-manifest.cpp | 2 - toolsrc/src/vcpkg/commands.hash.cpp | 2 - toolsrc/src/vcpkg/commands.integrate.cpp | 2 - toolsrc/src/vcpkg/commands.list.cpp | 2 - toolsrc/src/vcpkg/commands.owns.cpp | 2 - toolsrc/src/vcpkg/commands.porthistory.cpp | 2 - toolsrc/src/vcpkg/commands.portsdiff.cpp | 2 - toolsrc/src/vcpkg/commands.search.cpp | 2 - toolsrc/src/vcpkg/commands.setinstalled.cpp | 2 - toolsrc/src/vcpkg/commands.upgrade.cpp | 2 - toolsrc/src/vcpkg/commands.version.cpp | 2 - toolsrc/src/vcpkg/commands.xvsinstances.cpp | 2 - toolsrc/src/vcpkg/dependencies.cpp | 2 - toolsrc/src/vcpkg/export.chocolatey.cpp | 150 ++++++++++++------------- toolsrc/src/vcpkg/export.cpp | 2 - toolsrc/src/vcpkg/export.ifw.cpp | 2 - toolsrc/src/vcpkg/export.prefab.cpp | 2 - toolsrc/src/vcpkg/globalstate.cpp | 2 - toolsrc/src/vcpkg/help.cpp | 2 - toolsrc/src/vcpkg/input.cpp | 2 - toolsrc/src/vcpkg/install.cpp | 2 - toolsrc/src/vcpkg/metrics.cpp | 2 - toolsrc/src/vcpkg/packagespec.cpp | 2 - toolsrc/src/vcpkg/paragraphparseresult.cpp | 2 - toolsrc/src/vcpkg/paragraphs.cpp | 2 - toolsrc/src/vcpkg/platform-expression.cpp | 2 - toolsrc/src/vcpkg/portfileprovider.cpp | 2 - toolsrc/src/vcpkg/postbuildlint.buildtype.cpp | 2 - toolsrc/src/vcpkg/postbuildlint.cpp | 2 - toolsrc/src/vcpkg/remove.cpp | 2 - toolsrc/src/vcpkg/sourceparagraph.cpp | 2 - toolsrc/src/vcpkg/statusparagraph.cpp | 2 - toolsrc/src/vcpkg/statusparagraphs.cpp | 2 - toolsrc/src/vcpkg/tools.cpp | 2 - toolsrc/src/vcpkg/triplet.cpp | 2 - toolsrc/src/vcpkg/update.cpp | 2 - toolsrc/src/vcpkg/userconfig.cpp | 2 - toolsrc/src/vcpkg/vcpkgcmdarguments.cpp | 2 - toolsrc/src/vcpkg/vcpkglib.cpp | 2 - toolsrc/src/vcpkg/vcpkgpaths.cpp | 2 - toolsrc/src/vcpkg/versiont.cpp | 2 - toolsrc/src/vcpkg/visualstudio.cpp | 2 - 77 files changed, 76 insertions(+), 227 deletions(-) (limited to 'toolsrc/src') diff --git a/toolsrc/src/pch.cpp b/toolsrc/src/pch.cpp index 17305716a..ebc3d8904 100644 --- a/toolsrc/src/pch.cpp +++ b/toolsrc/src/pch.cpp @@ -1 +1,2 @@ -#include "pch.h" \ No newline at end of file +// This file intentionally left blank. It exists to be a target for pch compilation, +// but `#include "pch.h"` is already injected by the compiler. \ No newline at end of file diff --git a/toolsrc/src/vcpkg/archives.cpp b/toolsrc/src/vcpkg/archives.cpp index ca82b3100..35e6427be 100644 --- a/toolsrc/src/vcpkg/archives.cpp +++ b/toolsrc/src/vcpkg/archives.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/base/checks.cpp b/toolsrc/src/vcpkg/base/checks.cpp index 42e0835c6..c0075e33f 100644 --- a/toolsrc/src/vcpkg/base/checks.cpp +++ b/toolsrc/src/vcpkg/base/checks.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/base/chrono.cpp b/toolsrc/src/vcpkg/base/chrono.cpp index 86dc590f8..971d5f37e 100644 --- a/toolsrc/src/vcpkg/base/chrono.cpp +++ b/toolsrc/src/vcpkg/base/chrono.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/base/cofffilereader.cpp b/toolsrc/src/vcpkg/base/cofffilereader.cpp index cb75e0847..30e0f8588 100644 --- a/toolsrc/src/vcpkg/base/cofffilereader.cpp +++ b/toolsrc/src/vcpkg/base/cofffilereader.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/base/downloads.cpp b/toolsrc/src/vcpkg/base/downloads.cpp index 051e8306f..596697499 100644 --- a/toolsrc/src/vcpkg/base/downloads.cpp +++ b/toolsrc/src/vcpkg/base/downloads.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/base/enums.cpp b/toolsrc/src/vcpkg/base/enums.cpp index aa124f3aa..8b99ddf7b 100644 --- a/toolsrc/src/vcpkg/base/enums.cpp +++ b/toolsrc/src/vcpkg/base/enums.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/base/files.cpp b/toolsrc/src/vcpkg/base/files.cpp index 59931603b..e4c821eae 100644 --- a/toolsrc/src/vcpkg/base/files.cpp +++ b/toolsrc/src/vcpkg/base/files.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/base/hash.cpp b/toolsrc/src/vcpkg/base/hash.cpp index 58e17e1ad..0070a5f72 100644 --- a/toolsrc/src/vcpkg/base/hash.cpp +++ b/toolsrc/src/vcpkg/base/hash.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/base/json.cpp b/toolsrc/src/vcpkg/base/json.cpp index 440bc6745..7536e09df 100644 --- a/toolsrc/src/vcpkg/base/json.cpp +++ b/toolsrc/src/vcpkg/base/json.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/base/machinetype.cpp b/toolsrc/src/vcpkg/base/machinetype.cpp index 237e1eb8b..243fa7086 100644 --- a/toolsrc/src/vcpkg/base/machinetype.cpp +++ b/toolsrc/src/vcpkg/base/machinetype.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/base/parse.cpp b/toolsrc/src/vcpkg/base/parse.cpp index 7d6576f41..cd82f3212 100644 --- a/toolsrc/src/vcpkg/base/parse.cpp +++ b/toolsrc/src/vcpkg/base/parse.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/base/strings.cpp b/toolsrc/src/vcpkg/base/strings.cpp index 19b9384e6..8e1bbdc22 100644 --- a/toolsrc/src/vcpkg/base/strings.cpp +++ b/toolsrc/src/vcpkg/base/strings.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/base/stringview.cpp b/toolsrc/src/vcpkg/base/stringview.cpp index 8ab114a5e..6e03ba543 100644 --- a/toolsrc/src/vcpkg/base/stringview.cpp +++ b/toolsrc/src/vcpkg/base/stringview.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/base/system.cpp b/toolsrc/src/vcpkg/base/system.cpp index d06e338be..800a0a23b 100644 --- a/toolsrc/src/vcpkg/base/system.cpp +++ b/toolsrc/src/vcpkg/base/system.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/base/system.print.cpp b/toolsrc/src/vcpkg/base/system.print.cpp index fc8e4184c..885269eef 100644 --- a/toolsrc/src/vcpkg/base/system.print.cpp +++ b/toolsrc/src/vcpkg/base/system.print.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/base/system.process.cpp b/toolsrc/src/vcpkg/base/system.process.cpp index 300e318df..ee2dd1b3f 100644 --- a/toolsrc/src/vcpkg/base/system.process.cpp +++ b/toolsrc/src/vcpkg/base/system.process.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/base/unicode.cpp b/toolsrc/src/vcpkg/base/unicode.cpp index 149bad20f..92b964ed8 100644 --- a/toolsrc/src/vcpkg/base/unicode.cpp +++ b/toolsrc/src/vcpkg/base/unicode.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/binarycaching.cpp b/toolsrc/src/vcpkg/binarycaching.cpp index 75701d7ee..743ce919a 100644 --- a/toolsrc/src/vcpkg/binarycaching.cpp +++ b/toolsrc/src/vcpkg/binarycaching.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/binaryparagraph.cpp b/toolsrc/src/vcpkg/binaryparagraph.cpp index 0b0819fd7..4d3bcbc97 100644 --- a/toolsrc/src/vcpkg/binaryparagraph.cpp +++ b/toolsrc/src/vcpkg/binaryparagraph.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/build.cpp b/toolsrc/src/vcpkg/build.cpp index cfba94b9f..67015fba5 100644 --- a/toolsrc/src/vcpkg/build.cpp +++ b/toolsrc/src/vcpkg/build.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/buildenvironment.cpp b/toolsrc/src/vcpkg/buildenvironment.cpp index 9ef330e66..cab2bf551 100644 --- a/toolsrc/src/vcpkg/buildenvironment.cpp +++ b/toolsrc/src/vcpkg/buildenvironment.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include namespace vcpkg diff --git a/toolsrc/src/vcpkg/cmakevars.cpp b/toolsrc/src/vcpkg/cmakevars.cpp index ee718d408..7c5078d3b 100644 --- a/toolsrc/src/vcpkg/cmakevars.cpp +++ b/toolsrc/src/vcpkg/cmakevars.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/commands.autocomplete.cpp b/toolsrc/src/vcpkg/commands.autocomplete.cpp index b035aa3dd..ae01302cb 100644 --- a/toolsrc/src/vcpkg/commands.autocomplete.cpp +++ b/toolsrc/src/vcpkg/commands.autocomplete.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/commands.buildexternal.cpp b/toolsrc/src/vcpkg/commands.buildexternal.cpp index 5f2e707c4..028619182 100644 --- a/toolsrc/src/vcpkg/commands.buildexternal.cpp +++ b/toolsrc/src/vcpkg/commands.buildexternal.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/commands.cache.cpp b/toolsrc/src/vcpkg/commands.cache.cpp index 5c2de88b3..555b70859 100644 --- a/toolsrc/src/vcpkg/commands.cache.cpp +++ b/toolsrc/src/vcpkg/commands.cache.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/commands.ci.cpp b/toolsrc/src/vcpkg/commands.ci.cpp index 04633903d..4dffcfd3c 100644 --- a/toolsrc/src/vcpkg/commands.ci.cpp +++ b/toolsrc/src/vcpkg/commands.ci.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/commands.ciclean.cpp b/toolsrc/src/vcpkg/commands.ciclean.cpp index 107c8119f..21ae756ed 100644 --- a/toolsrc/src/vcpkg/commands.ciclean.cpp +++ b/toolsrc/src/vcpkg/commands.ciclean.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/commands.contact.cpp b/toolsrc/src/vcpkg/commands.contact.cpp index b7ed9a941..2c8c7b1b2 100644 --- a/toolsrc/src/vcpkg/commands.contact.cpp +++ b/toolsrc/src/vcpkg/commands.contact.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/commands.cpp b/toolsrc/src/vcpkg/commands.cpp index 9c8950a9b..a455867ed 100644 --- a/toolsrc/src/vcpkg/commands.cpp +++ b/toolsrc/src/vcpkg/commands.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/commands.create.cpp b/toolsrc/src/vcpkg/commands.create.cpp index 8843a509d..a7cfbc931 100644 --- a/toolsrc/src/vcpkg/commands.create.cpp +++ b/toolsrc/src/vcpkg/commands.create.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/commands.dependinfo.cpp b/toolsrc/src/vcpkg/commands.dependinfo.cpp index 77a8c6c4e..0f1e431e5 100644 --- a/toolsrc/src/vcpkg/commands.dependinfo.cpp +++ b/toolsrc/src/vcpkg/commands.dependinfo.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/commands.edit.cpp b/toolsrc/src/vcpkg/commands.edit.cpp index fb3b66883..b66e8c680 100644 --- a/toolsrc/src/vcpkg/commands.edit.cpp +++ b/toolsrc/src/vcpkg/commands.edit.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/commands.env.cpp b/toolsrc/src/vcpkg/commands.env.cpp index f1d84571f..a82523060 100644 --- a/toolsrc/src/vcpkg/commands.env.cpp +++ b/toolsrc/src/vcpkg/commands.env.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/commands.fetch.cpp b/toolsrc/src/vcpkg/commands.fetch.cpp index 6de20c0b0..ee809bb13 100644 --- a/toolsrc/src/vcpkg/commands.fetch.cpp +++ b/toolsrc/src/vcpkg/commands.fetch.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include namespace vcpkg::Commands::Fetch diff --git a/toolsrc/src/vcpkg/commands.format-manifest.cpp b/toolsrc/src/vcpkg/commands.format-manifest.cpp index d0eced7ea..656e17996 100644 --- a/toolsrc/src/vcpkg/commands.format-manifest.cpp +++ b/toolsrc/src/vcpkg/commands.format-manifest.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/commands.hash.cpp b/toolsrc/src/vcpkg/commands.hash.cpp index 12ad1554d..d18173335 100644 --- a/toolsrc/src/vcpkg/commands.hash.cpp +++ b/toolsrc/src/vcpkg/commands.hash.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/commands.integrate.cpp b/toolsrc/src/vcpkg/commands.integrate.cpp index 0bb30cb85..17f3aa350 100644 --- a/toolsrc/src/vcpkg/commands.integrate.cpp +++ b/toolsrc/src/vcpkg/commands.integrate.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/commands.list.cpp b/toolsrc/src/vcpkg/commands.list.cpp index b271841f4..9385e4423 100644 --- a/toolsrc/src/vcpkg/commands.list.cpp +++ b/toolsrc/src/vcpkg/commands.list.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/commands.owns.cpp b/toolsrc/src/vcpkg/commands.owns.cpp index 0850b14c9..29cfe3a23 100644 --- a/toolsrc/src/vcpkg/commands.owns.cpp +++ b/toolsrc/src/vcpkg/commands.owns.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/commands.porthistory.cpp b/toolsrc/src/vcpkg/commands.porthistory.cpp index c06517f3c..6b6217732 100644 --- a/toolsrc/src/vcpkg/commands.porthistory.cpp +++ b/toolsrc/src/vcpkg/commands.porthistory.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/commands.portsdiff.cpp b/toolsrc/src/vcpkg/commands.portsdiff.cpp index c4d1d2b1e..97e903769 100644 --- a/toolsrc/src/vcpkg/commands.portsdiff.cpp +++ b/toolsrc/src/vcpkg/commands.portsdiff.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/commands.search.cpp b/toolsrc/src/vcpkg/commands.search.cpp index 1a483a6e1..836acfffe 100644 --- a/toolsrc/src/vcpkg/commands.search.cpp +++ b/toolsrc/src/vcpkg/commands.search.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/commands.setinstalled.cpp b/toolsrc/src/vcpkg/commands.setinstalled.cpp index a99c3af4a..6ef5099dc 100644 --- a/toolsrc/src/vcpkg/commands.setinstalled.cpp +++ b/toolsrc/src/vcpkg/commands.setinstalled.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/commands.upgrade.cpp b/toolsrc/src/vcpkg/commands.upgrade.cpp index f3324f961..391192038 100644 --- a/toolsrc/src/vcpkg/commands.upgrade.cpp +++ b/toolsrc/src/vcpkg/commands.upgrade.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/commands.version.cpp b/toolsrc/src/vcpkg/commands.version.cpp index 2630a18dd..d366a42b8 100644 --- a/toolsrc/src/vcpkg/commands.version.cpp +++ b/toolsrc/src/vcpkg/commands.version.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/commands.xvsinstances.cpp b/toolsrc/src/vcpkg/commands.xvsinstances.cpp index 589ea73e7..4ad9744c9 100644 --- a/toolsrc/src/vcpkg/commands.xvsinstances.cpp +++ b/toolsrc/src/vcpkg/commands.xvsinstances.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/dependencies.cpp b/toolsrc/src/vcpkg/dependencies.cpp index d4757cfcc..7774424de 100644 --- a/toolsrc/src/vcpkg/dependencies.cpp +++ b/toolsrc/src/vcpkg/dependencies.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/export.chocolatey.cpp b/toolsrc/src/vcpkg/export.chocolatey.cpp index 40564ae13..096c99d89 100644 --- a/toolsrc/src/vcpkg/export.chocolatey.cpp +++ b/toolsrc/src/vcpkg/export.chocolatey.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include @@ -39,24 +37,24 @@ namespace vcpkg::Export::Chocolatey const std::map& packages_version, const Options& chocolatey_options) { - static constexpr auto CONTENT_TEMPLATE = R"( - - - @PACKAGE_ID@ - @PACKAGE_VERSION@ - @PACKAGE_MAINTAINER@ - - - @PACKAGE_DEPENDENCIES@ - - - - - - - + static constexpr auto CONTENT_TEMPLATE = R"( + + + @PACKAGE_ID@ + @PACKAGE_VERSION@ + @PACKAGE_MAINTAINER@ + + + @PACKAGE_DEPENDENCIES@ + + + + + + + )"; auto package_version = packages_version.find(binary_paragraph.spec.name()); if (package_version == packages_version.end()) @@ -81,68 +79,68 @@ namespace vcpkg::Export::Chocolatey static std::string create_chocolatey_install_contents() { - static constexpr auto CONTENT_TEMPLATE = R"###( -$ErrorActionPreference = 'Stop'; - -$packageName= $env:ChocolateyPackageName -$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" -$rootDir = "$(Split-Path -parent $toolsDir)" -$installedDir = Join-Path $rootDir 'installed' - -$whereToInstall = (pwd).path -$whereToInstallCache = Join-Path $rootDir 'install.txt' -Set-Content -Path $whereToInstallCache -Value $whereToInstall -Copy-Item $installedDir -destination $whereToInstall -recurse -force + static constexpr auto CONTENT_TEMPLATE = R"###( +$ErrorActionPreference = 'Stop'; + +$packageName= $env:ChocolateyPackageName +$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" +$rootDir = "$(Split-Path -parent $toolsDir)" +$installedDir = Join-Path $rootDir 'installed' + +$whereToInstall = (pwd).path +$whereToInstallCache = Join-Path $rootDir 'install.txt' +Set-Content -Path $whereToInstallCache -Value $whereToInstall +Copy-Item $installedDir -destination $whereToInstall -recurse -force )###"; return CONTENT_TEMPLATE; } static std::string create_chocolatey_uninstall_contents(const BinaryParagraph& binary_paragraph) { - static constexpr auto CONTENT_TEMPLATE = R"###( -$ErrorActionPreference = 'Stop'; - -$packageName= $env:ChocolateyPackageName -$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" -$rootDir = "$(Split-Path -parent $toolsDir)" -$listFile = Join-Path $rootDir 'installed\vcpkg\info\@PACKAGE_FULLSTEM@.list' - -$whereToInstall = $null -$whereToInstallCache = Join-Path $rootDir 'install.txt' -Get-Content $whereToInstallCache | Foreach-Object { - $whereToInstall = $_ -} - -$installedDir = Join-Path $whereToInstall 'installed' -Get-Content $listFile | Foreach-Object { - $fileToRemove = Join-Path $installedDir $_ - if (Test-Path $fileToRemove -PathType Leaf) { - Remove-Item $fileToRemove - } -} - -Get-Content $listFile | Foreach-Object { - $fileToRemove = Join-Path $installedDir $_ - if (Test-Path $fileToRemove -PathType Container) { - $folderToDelete = Join-Path $fileToRemove * - if (-Not (Test-Path $folderToDelete)) - { - Remove-Item $fileToRemove - } - } -} - -$listFileToRemove = Join-Path $whereToInstall 'installed\vcpkg\info\@PACKAGE_FULLSTEM@.list' -Remove-Item $listFileToRemove - -if (Test-Path $installedDir) -{ - while ( - $empties = Get-ChildItem $installedDir -recurse -Directory | Where-Object { - $_.GetFiles().Count -eq 0 -and $_.GetDirectories().Count -eq 0 - } - ) { $empties | Remove-Item } -} + static constexpr auto CONTENT_TEMPLATE = R"###( +$ErrorActionPreference = 'Stop'; + +$packageName= $env:ChocolateyPackageName +$toolsDir = "$(Split-Path -parent $MyInvocation.MyCommand.Definition)" +$rootDir = "$(Split-Path -parent $toolsDir)" +$listFile = Join-Path $rootDir 'installed\vcpkg\info\@PACKAGE_FULLSTEM@.list' + +$whereToInstall = $null +$whereToInstallCache = Join-Path $rootDir 'install.txt' +Get-Content $whereToInstallCache | Foreach-Object { + $whereToInstall = $_ +} + +$installedDir = Join-Path $whereToInstall 'installed' +Get-Content $listFile | Foreach-Object { + $fileToRemove = Join-Path $installedDir $_ + if (Test-Path $fileToRemove -PathType Leaf) { + Remove-Item $fileToRemove + } +} + +Get-Content $listFile | Foreach-Object { + $fileToRemove = Join-Path $installedDir $_ + if (Test-Path $fileToRemove -PathType Container) { + $folderToDelete = Join-Path $fileToRemove * + if (-Not (Test-Path $folderToDelete)) + { + Remove-Item $fileToRemove + } + } +} + +$listFileToRemove = Join-Path $whereToInstall 'installed\vcpkg\info\@PACKAGE_FULLSTEM@.list' +Remove-Item $listFileToRemove + +if (Test-Path $installedDir) +{ + while ( + $empties = Get-ChildItem $installedDir -recurse -Directory | Where-Object { + $_.GetFiles().Count -eq 0 -and $_.GetDirectories().Count -eq 0 + } + ) { $empties | Remove-Item } +} )###"; std::string chocolatey_uninstall_content = Strings::replace_all(CONTENT_TEMPLATE, "@PACKAGE_FULLSTEM@", binary_paragraph.fullstem()); diff --git a/toolsrc/src/vcpkg/export.cpp b/toolsrc/src/vcpkg/export.cpp index a124345a7..39cb9328f 100644 --- a/toolsrc/src/vcpkg/export.cpp +++ b/toolsrc/src/vcpkg/export.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/export.ifw.cpp b/toolsrc/src/vcpkg/export.ifw.cpp index 8356313cf..512e119b0 100644 --- a/toolsrc/src/vcpkg/export.ifw.cpp +++ b/toolsrc/src/vcpkg/export.ifw.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/export.prefab.cpp b/toolsrc/src/vcpkg/export.prefab.cpp index 7dd516ac5..630e20f72 100644 --- a/toolsrc/src/vcpkg/export.prefab.cpp +++ b/toolsrc/src/vcpkg/export.prefab.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/globalstate.cpp b/toolsrc/src/vcpkg/globalstate.cpp index 037232f11..b07690bbd 100644 --- a/toolsrc/src/vcpkg/globalstate.cpp +++ b/toolsrc/src/vcpkg/globalstate.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include namespace vcpkg diff --git a/toolsrc/src/vcpkg/help.cpp b/toolsrc/src/vcpkg/help.cpp index 856ea5623..1719e5f6c 100644 --- a/toolsrc/src/vcpkg/help.cpp +++ b/toolsrc/src/vcpkg/help.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/input.cpp b/toolsrc/src/vcpkg/input.cpp index f9184983c..b82dc44fb 100644 --- a/toolsrc/src/vcpkg/input.cpp +++ b/toolsrc/src/vcpkg/input.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/install.cpp b/toolsrc/src/vcpkg/install.cpp index 5cadbd786..ba0285e20 100644 --- a/toolsrc/src/vcpkg/install.cpp +++ b/toolsrc/src/vcpkg/install.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/metrics.cpp b/toolsrc/src/vcpkg/metrics.cpp index 49c4f0d0c..79a33a0d7 100644 --- a/toolsrc/src/vcpkg/metrics.cpp +++ b/toolsrc/src/vcpkg/metrics.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/packagespec.cpp b/toolsrc/src/vcpkg/packagespec.cpp index c9b6091b8..0feb8412a 100644 --- a/toolsrc/src/vcpkg/packagespec.cpp +++ b/toolsrc/src/vcpkg/packagespec.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/paragraphparseresult.cpp b/toolsrc/src/vcpkg/paragraphparseresult.cpp index 8bd5c0d7a..1565cbe6a 100644 --- a/toolsrc/src/vcpkg/paragraphparseresult.cpp +++ b/toolsrc/src/vcpkg/paragraphparseresult.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/paragraphs.cpp b/toolsrc/src/vcpkg/paragraphs.cpp index 20a82ee0c..414c464d0 100644 --- a/toolsrc/src/vcpkg/paragraphs.cpp +++ b/toolsrc/src/vcpkg/paragraphs.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/platform-expression.cpp b/toolsrc/src/vcpkg/platform-expression.cpp index 03bc81367..3490dbbe2 100644 --- a/toolsrc/src/vcpkg/platform-expression.cpp +++ b/toolsrc/src/vcpkg/platform-expression.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/portfileprovider.cpp b/toolsrc/src/vcpkg/portfileprovider.cpp index c0538fdb8..a5806eb83 100644 --- a/toolsrc/src/vcpkg/portfileprovider.cpp +++ b/toolsrc/src/vcpkg/portfileprovider.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/postbuildlint.buildtype.cpp b/toolsrc/src/vcpkg/postbuildlint.buildtype.cpp index e9215ed8c..182625b78 100644 --- a/toolsrc/src/vcpkg/postbuildlint.buildtype.cpp +++ b/toolsrc/src/vcpkg/postbuildlint.buildtype.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/postbuildlint.cpp b/toolsrc/src/vcpkg/postbuildlint.cpp index f70876c2e..a384cea0a 100644 --- a/toolsrc/src/vcpkg/postbuildlint.cpp +++ b/toolsrc/src/vcpkg/postbuildlint.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/remove.cpp b/toolsrc/src/vcpkg/remove.cpp index 8f6a99262..0d5b84280 100644 --- a/toolsrc/src/vcpkg/remove.cpp +++ b/toolsrc/src/vcpkg/remove.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/sourceparagraph.cpp b/toolsrc/src/vcpkg/sourceparagraph.cpp index 7bd560c8a..a336db7d1 100644 --- a/toolsrc/src/vcpkg/sourceparagraph.cpp +++ b/toolsrc/src/vcpkg/sourceparagraph.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/statusparagraph.cpp b/toolsrc/src/vcpkg/statusparagraph.cpp index 398129a04..ba4b6f9bd 100644 --- a/toolsrc/src/vcpkg/statusparagraph.cpp +++ b/toolsrc/src/vcpkg/statusparagraph.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/statusparagraphs.cpp b/toolsrc/src/vcpkg/statusparagraphs.cpp index d282a5ccb..d42174289 100644 --- a/toolsrc/src/vcpkg/statusparagraphs.cpp +++ b/toolsrc/src/vcpkg/statusparagraphs.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/tools.cpp b/toolsrc/src/vcpkg/tools.cpp index 0d3f61757..1d5a682c6 100644 --- a/toolsrc/src/vcpkg/tools.cpp +++ b/toolsrc/src/vcpkg/tools.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/triplet.cpp b/toolsrc/src/vcpkg/triplet.cpp index f9438c00a..789943237 100644 --- a/toolsrc/src/vcpkg/triplet.cpp +++ b/toolsrc/src/vcpkg/triplet.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/update.cpp b/toolsrc/src/vcpkg/update.cpp index 4c99c6f48..48471e26c 100644 --- a/toolsrc/src/vcpkg/update.cpp +++ b/toolsrc/src/vcpkg/update.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/userconfig.cpp b/toolsrc/src/vcpkg/userconfig.cpp index 32588b2bb..5236a3c3b 100644 --- a/toolsrc/src/vcpkg/userconfig.cpp +++ b/toolsrc/src/vcpkg/userconfig.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp index e1cc3e741..7354dbae2 100644 --- a/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp +++ b/toolsrc/src/vcpkg/vcpkgcmdarguments.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/vcpkglib.cpp b/toolsrc/src/vcpkg/vcpkglib.cpp index ce9c62734..801e39541 100644 --- a/toolsrc/src/vcpkg/vcpkglib.cpp +++ b/toolsrc/src/vcpkg/vcpkglib.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/vcpkgpaths.cpp b/toolsrc/src/vcpkg/vcpkgpaths.cpp index 4837c4b71..2448d525d 100644 --- a/toolsrc/src/vcpkg/vcpkgpaths.cpp +++ b/toolsrc/src/vcpkg/vcpkgpaths.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include #include diff --git a/toolsrc/src/vcpkg/versiont.cpp b/toolsrc/src/vcpkg/versiont.cpp index b3e5b2590..c419745c2 100644 --- a/toolsrc/src/vcpkg/versiont.cpp +++ b/toolsrc/src/vcpkg/versiont.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #include #include diff --git a/toolsrc/src/vcpkg/visualstudio.cpp b/toolsrc/src/vcpkg/visualstudio.cpp index a9a5d5565..023844d0b 100644 --- a/toolsrc/src/vcpkg/visualstudio.cpp +++ b/toolsrc/src/vcpkg/visualstudio.cpp @@ -1,5 +1,3 @@ -#include "pch.h" - #if defined(_WIN32) #include -- cgit v1.2.3