Don't change manifest root when manifest isn't enabled.#12191
Merged
strega-nil merged 3 commits intomicrosoft:masterfrom Jul 1, 2020
Merged
Don't change manifest root when manifest isn't enabled.#12191strega-nil merged 3 commits intomicrosoft:masterfrom
strega-nil merged 3 commits intomicrosoft:masterfrom
Conversation
Contributor
|
/azp run |
|
Azure Pipelines successfully started running 1 pipeline(s). |
Contributor
|
Thanks for fixing my mistake! |
strega-nil
referenced
this pull request
Jul 1, 2020
==== Changes Related to manifests ====
* Add the `manifests` feature flag
* This only says whether we look for a `vcpkg.json` in the cwd, not
whether we support parsing manifests (for ports, for example)
* Changes to the manifests RFC
* `"authors"` -> `"maintainers"`
* `--x-classic-mode` -> `-manifests` \in `vcpkg_feature_flags`
* reserve `"core"` in addition to `"default"`, since that's already
reserved for features
* Add a small helper note about what identifiers must look like
* `<license-string>`: SPDX v3.8 -> v3.9
* `"feature"."description"` is allowed to be an array of strings as well
* `"version"` -> `"version-string"` for forward-compat with versions
RFC
* Add the `--feature-flags` option
* Add the ability to turn off feature flags via passing
`-<feature-flag>` to `VCPKG_FEATURE_FLAGS` or `--feature-flags`
* Add CMake toolchain support for manifests
* Requires either:
* a feature flag of `manifests` in either `Env{VCPKG_FEATURE_FLAGS}`
or `VCPKG_FEATURE_FLAGS`
* Passing the `VCPKG_ENABLE_MANIFESTS` option
* The toolchain will install your packages to
`${VCPKG_MANIFEST_DIR}/vcpkg_installed`.
* Add MSBuild `vcpkg integrate install` support for manifests
* Requires `VcpkgEnableManifest` to be true
* `vcpkg create` creates a port that has a `vcpkg.json` instead of a
`CONTROL`
* argparse, abseil, 3fd, and avisynthplus ports switched to manifest
from CONTROL
* Add support for `--x-manifest-root`, as well as code for finding it if
not passed
* Add support for parsing manifests!
* Add a filesystem lock!
==== Important Changes which are somewhat unrelated to manifests ====
* Rename `logicexpression.{h,cpp}` to `platform-expression.{h,cpp}`
* Add `PlatformExpression` type which takes the place of the old logic
expression
* Split the parsing of platform expressions from checking whether
they're true or not
* Eagerly parse PlatformExpressions as opposed to leaving them as
strings
* Add checking for feature flag consistency
* i.e., if `-binarycaching` is passed, you shouldn't be passing
`--binarysource`
* Add the `Json::Reader` type which, with the help of user-defined
visitors, converts JSON to your internal type
* VcpkgArgParser: place the switch names into a constant as opposed to
using magic constants
* In general update the parsing code so that this ^ works
* Add `Port-Version` fields to CONTROL files
* This replaces the existing practice of
`Version: <my-version>-<port-version>`
==== Smaller changes ====
* small drive-by cleanups to some CMake
* `${_VCPKG_INSTALLED_DIR}/${VCPKG_TARGET_TRIPLET}` ->
`${CURRENT_INSTALLED_DIR}`
* Remove `-analyze` when compiling with clang-cl, since that's not a
supported flag (vcpkg's build system)
* Add a message about which compiler is detected by vcpkg's build
system machinery
* Fix `Expected::then`
* Convert `""` to `{}` for `std::string` and `fs::path`, to avoid a
`strlen` (additionally, `.empty()` instead of `== ""`, and `.clear()`)
* Add `Strings::strto` which converts strings to numeric types
* Support built-in arrays and `StringView` for `Strings::join`
* Add `operator<` and friends to `StringView`
* Add `substr` to `StringView`
* SourceParagraphParser gets some new errors
strega-nil
reviewed
Jul 1, 2020
dada2048
commented
Jul 1, 2020
Contributor
Author
dada2048
left a comment
dada2048
left a comment
There was a problem hiding this comment.
Doesn't that go back to the original problem?
(maybe you meant != '' instead...?)
Contributor
|
Yes. Yes I did. This is why you do not code before coffee. |
strega-nil
reviewed
Jul 1, 2020
BillyONeal
approved these changes
Jul 1, 2020
E452003
added a commit
to E452003/vcpkg
that referenced
this pull request
Jul 6, 2020
* 'master' of https://github.com/microsoft/vcpkg: (1418 commits) [vcpkg integrate] Clean up vcpkg.target file (microsoft#4608) [vcpkg_from_sourceforge] Add retry mirror function (2/2) (microsoft#12018) [pcre2] Restore the https://ftp.pcre.org/ mirror in addition to the SourceForge mirrors. (microsoft#12233) [xercesc] rename feature from xmlch_wchar to xmlch-wchar (microsoft#12205) [safeint] Update to 3.24 (microsoft#12217) [vcpkg] Remove the tombstones and 'ignore' baseline concepts. (microsoft#12197) [msbuild] Revert the importance to Normal (microsoft#12212) [vtk] Added opengl feature. (microsoft#11399) [span-lite] Update to 0.7.0 (microsoft#12206) [cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers (microsoft#12196) [azure-iot-sdk-c] Fix feature name and enable to build (microsoft#12209) [vcpkg] Improve performance of compiler tracking by suppressing aspects of CMake's compiler detection. (microsoft#12203) [vcpkg] Remove all uses of Foo::Foo() noexcept = default; to fix microsoft#9955 (microsoft#12201) [sqlite3] update to 3.32.3 to deal with security issues (microsoft#12185) [infoware] Bump version to 0.5.4 (microsoft#12167) [imgui] Update to 1.77 (microsoft#12155) [vcpkg] Update message in bootstrap.ps1 (microsoft#12145) [vcpkg] Enable NuGet-based binary caching via mono (microsoft#12170) Don't change manifest root when manifest isn't enabled. (microsoft#12191) Fix sourceparagraph:BooleanField (microsoft#12192) ...
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.This suggestion is invalid because no changes were made to the code.Suggestions cannot be applied while the pull request is closed.Suggestions cannot be applied while viewing a subset of changes.Only one suggestion per line can be applied in a batch.Add this suggestion to a batch that can be applied as a single commit.Applying suggestions on deleted lines is not supported.You must change the existing code in this line in order to create a valid suggestion.Outdated suggestions cannot be applied.This suggestion has been applied or marked resolved.Suggestions cannot be applied from pending reviews.Suggestions cannot be applied on multi-line comments.Suggestions cannot be applied while the pull request is queued to merge.Suggestion cannot be applied right now. Please check back later.
A few paths get a trailing \ appended if they don't already have one. This is fine for most of them because they are never empty.
However, VcpkgManifestRoot can be empty if the feature isn't enabled. Adding the \ causes a spurious warning message later (at line 86).