[vcpkg manifest] Manifest Implementation by strega-nil · Pull Request #11757 · microsoft/vcpkg

strega-nil · 2020-06-03T20:41:07Z

This is going to be quite large! Based on the RFC in #11203

Still to do:

add tests!
write docs! [vcpkg README] Add #include<C++> channel #11750
x-format-manifest
- check manifest formatting in CI: will be done in [vcpkg] Format the C++ in CI #11655
Add the ability to turn off feature flags to VCPKG_FEATURE_FLAGS and --feature-flags
Finish the commands support
Add msbuild support
CMake toolchain: include recursion detection logic for vcpkg_install_packages.

MVoz · 2020-06-04T07:25:37Z

Port-Version ? call a spade a spade? Patch-Version: 4

Major.Minor.Patch[-Suffix]

strega-nil · 2020-06-04T07:51:04Z

@voskrese that's not what this is, port-version is the version of the port, separate from the version of the package; i.e., LLVM might be at version 10.0.1, but we've had 3 updates to the port, so this is the 3rd port which is for LLVM 10.0.1.

MVoz · 2020-06-04T08:03:14Z

NuGet 4.3.0+ supports SemVer 2.0.0, which supports pre-release numbers with dot notation, as in 1.0.1-build.23

Pre-release versions

Technically speaking, package creators can use any string as a suffix to denote a pre-release version, as NuGet treats any such version as pre-release and makes no other interpretation. That is, NuGet displays the full version string in whatever UI is involved, leaving any interpretation of the suffix's meaning to the consumer.

That said, package developers generally follow recognized naming conventions:
-alpha: Alpha release, typically used for work-in-progress and experimentation.
-beta: Beta release, typically one that is feature complete for the next planned release, but may contain known bugs.
-rc: Release candidate, typically a release that's potentially final (stable) unless significant bugs emerge.

Any of the package's dependency version ranges has a minimum or maximum version that is SemVer v2.0.0 compliant but not SemVer v1.0.0 compliant, defined above; for example, [1.0.0-alpha.1, ).

ok

Pre-release: 4
LLVM might be at version 10.0.1-alpha.4 ?

https://docs.microsoft.com/en-us/nuget/create-packages/prerelease-packages

MVoz · 2020-06-04T08:13:49Z

would like to follow the standards so that it is easier to import / export packages from repositories

scripts/Generate-SpdxLicenseList.ps1

scripts/buildsystems/vcpkg.cmake

toolsrc/src/vcpkg/sourceparagraph.cpp

toolsrc/src/vcpkg/vcpkgpaths.cpp

ports/cmocka/vcpkg-cmake-wrapper.cmake

scripts/Generate-SpdxLicenseList.ps1

scripts/buildsystems/vcpkg.cmake

toolsrc/src/vcpkg/vcpkgpaths.cpp

toolsrc/src/vcpkg/commands.setinstalled.cpp

BillyONeal · 2020-06-12T22:30:10Z

I'm mostly 'request changes' over the

~~canonical call in vcpkgpaths.cpp since I think that's a bug~~ discussed offline
the 'doing lots of work in main'/'global'
missing tests (It's hard to evaluate correctness of parsers in code reviews, so I kinda lean on the presence of tests to indicate correctness)

I'd really like to see us not add another global but would not block over that.

docs/specifications/manifests.md

ports/cmocka/vcpkg-cmake-wrapper.cmake

scripts/buildsystems/vcpkg.cmake

toolsrc/src/vcpkg/binaryparagraph.cpp

toolsrc/src/vcpkg/install.cpp

toolsrc/src/vcpkg/portfileprovider.cpp

toolsrc/src/vcpkg/sourceparagraph.cpp

toolsrc/src/vcpkg/vcpkgcmdarguments.cpp

ports/3fd/vcpkg.json

ports/abseil/vcpkg.json

scripts/buildsystems/msbuild/vcpkg-general.xml

scripts/buildsystems/vcpkg.cmake

ports/3fd/vcpkg.json

ports/avisynthplus/vcpkg.json

scripts/buildsystems/msbuild/vcpkg-general.xml

scripts/buildsystems/msbuild/vcpkg.targets

toolsrc/src/vcpkg/commands.buildexternal.cpp

toolsrc/src/vcpkg/vcpkgpaths.cpp

toolsrc/src/vcpkg/vcpkgcmdarguments.cpp

strega-nil · 2020-06-25T21:03:10Z

I've fuzzed for >3M execs the new platform expression parser. There were two crashes, both stack overflow.

strega-nil · 2020-06-26T22:32:13Z

Lots of merges which broke my PR :P

toolsrc/include/vcpkg/base/files.h

toolsrc/src/vcpkg/paragraphs.cpp

==== 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 marked this pull request as draft June 3, 2020 20:41

NancyLi1013 assigned NancyLi1013 and PhoebeHui Jun 4, 2020

strega-nil force-pushed the manifest branch from 381020c to ebf5106 Compare June 4, 2020 19:57

traversaro mentioned this pull request Jun 5, 2020

Vcpkg's manifest file? #8010

Closed

BillyONeal reviewed Jun 6, 2020

View reviewed changes

strega-nil added info:internal category:vcpkg-feature The issue is a new capability of the tool that doesn’t already exist and we haven’t committed labels Jun 11, 2020

strega-nil requested a review from BillyONeal June 12, 2020 01:16

strega-nil marked this pull request as ready for review June 12, 2020 01:18

strega-nil requested a review from ras0219-msft June 12, 2020 01:18

vicroms reviewed Jun 12, 2020

View reviewed changes

ports/cmocka/vcpkg-cmake-wrapper.cmake Outdated Show resolved Hide resolved

BillyONeal requested changes Jun 12, 2020

View reviewed changes

BillyONeal reviewed Jun 12, 2020

View reviewed changes

toolsrc/src/vcpkg/commands.setinstalled.cpp Outdated Show resolved Hide resolved

ras0219-msft reviewed Jun 15, 2020

View reviewed changes

strega-nil force-pushed the manifest branch 2 times, most recently from 8ddad03 to 64df636 Compare June 17, 2020 00:06

strega-nil requested review from BillyONeal, ras0219-msft and vicroms June 18, 2020 18:50

dan-shaw reviewed Jun 18, 2020

View reviewed changes

ports/3fd/vcpkg.json Outdated Show resolved Hide resolved

ports/abseil/vcpkg.json Outdated Show resolved Hide resolved

scripts/buildsystems/msbuild/vcpkg-general.xml Outdated Show resolved Hide resolved

scripts/buildsystems/vcpkg.cmake Outdated Show resolved Hide resolved

strega-nil force-pushed the manifest branch from 0d2cf27 to c1cbecb Compare June 19, 2020 01:50

BillyONeal approved these changes Jun 19, 2020

View reviewed changes

strega-nil mentioned this pull request Jun 23, 2020

[vcpkg] Manifest Files #11206

Closed

6 tasks

strega-nil force-pushed the manifest branch 5 times, most recently from b06dda6 to 6cc1768 Compare June 26, 2020 22:31

BillyONeal approved these changes Jun 26, 2020

View reviewed changes

toolsrc/include/vcpkg/base/files.h Outdated Show resolved Hide resolved

toolsrc/src/vcpkg/paragraphs.cpp Outdated Show resolved Hide resolved

strega-nil force-pushed the manifest branch from f090c45 to c1d6b41 Compare June 26, 2020 23:26

strega-nil force-pushed the manifest branch from d554e70 to cff4f8b Compare June 29, 2020 18:30

paraview currently doesn't work

0c01eca

strega-nil force-pushed the manifest branch from 982b414 to 0c01eca Compare June 29, 2020 19:05

strega-nil added 2 commits June 29, 2020 16:21

fix msbuild

157f4ba

skip paraview

8e56334

strega-nil force-pushed the manifest branch from ac713ef to 8e56334 Compare June 30, 2020 04:11

Merge branch 'master' into manifest

6f71ad4

strega-nil merged commit 1d8f0ac into microsoft:master Jun 30, 2020

strega-nil deleted the manifest branch July 1, 2020 15:57

strega-nil mentioned this pull request Jul 1, 2020

[cmocka libarchive libiconv libpq libxml2 plibsys] fix drive-by error in vcpkg-cmake-wrappers #12196

Merged

yamcenutzer mentioned this pull request Jul 2, 2020

bootstrap-vcpkg.bat broken on vc2015 AGAIN!!! #12220

Closed

AlexAltea mentioned this pull request Jul 6, 2020

Failed to take the filesystem lock on .vcpkg-root #12286

Closed

Neumann-A mentioned this pull request Oct 8, 2021

[gtk] Update to 4.0 #7212

Closed

dg0yt mentioned this pull request Jan 21, 2022

[vcpkg] Fix termination of vcpkg root search #22694

Merged

Conversation

strega-nil commented Jun 3, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MVoz commented Jun 4, 2020

Uh oh!

strega-nil commented Jun 4, 2020

Uh oh!

MVoz commented Jun 4, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

MVoz commented Jun 4, 2020

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

BillyONeal commented Jun 12, 2020 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

strega-nil commented Jun 25, 2020

Uh oh!

strega-nil commented Jun 26, 2020

Uh oh!

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

9 participants

strega-nil commented Jun 3, 2020 •

edited

Loading

MVoz commented Jun 4, 2020 •

edited

Loading

BillyONeal commented Jun 12, 2020 •

edited

Loading