mirror of
https://github.com/cemu-project/vcpkg.git
synced 2025-02-25 20:13:32 +01:00
1d8f0acc9c
==== 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
74 lines
2.4 KiB
C++
74 lines
2.4 KiB
C++
#pragma once
|
|
|
|
#include <string>
|
|
#include <unordered_map>
|
|
#include <vcpkg/base/expected.h>
|
|
#include <vcpkg/base/stringview.h>
|
|
|
|
namespace vcpkg::PlatformExpression
|
|
{
|
|
// map of cmake variables and their values.
|
|
using Context = std::unordered_map<std::string, std::string>;
|
|
|
|
namespace detail
|
|
{
|
|
struct ExprImpl;
|
|
}
|
|
struct Expr
|
|
{
|
|
static Expr Identifier(StringView id);
|
|
static Expr Not(Expr&& e);
|
|
static Expr And(std::vector<Expr>&& exprs);
|
|
static Expr Or(std::vector<Expr>&& exprs);
|
|
|
|
// The empty expression is always true
|
|
static Expr Empty() { return Expr(); }
|
|
|
|
// since ExprImpl is not yet defined, we need to define the ctor and dtor in the C++ file
|
|
Expr();
|
|
Expr(const Expr&);
|
|
Expr(Expr&&);
|
|
Expr& operator=(const Expr& e);
|
|
Expr& operator=(Expr&&);
|
|
|
|
explicit Expr(std::unique_ptr<detail::ExprImpl>&& e);
|
|
~Expr();
|
|
|
|
bool evaluate(const Context& context) const;
|
|
bool is_empty() const { return !static_cast<bool>(underlying_); }
|
|
|
|
private:
|
|
std::unique_ptr<detail::ExprImpl> underlying_;
|
|
};
|
|
|
|
// Note: for backwards compatibility, in CONTROL files,
|
|
// multiple binary operators are allowed to be next to one another; i.e.
|
|
// (windows & arm) = (windows && arm) = (windows &&& arm), etc.
|
|
enum class MultipleBinaryOperators
|
|
{
|
|
Deny,
|
|
Allow,
|
|
};
|
|
|
|
// platform expression parses the following :
|
|
// <platform-expression>:
|
|
// <platform-expression.not>
|
|
// <platform-expression.and>
|
|
// <platform-expression.or>
|
|
// <platform-expression.simple>:
|
|
// ( <platform-expression> )
|
|
// <platform-expression.identifier>
|
|
// <platform-expression.identifier>:
|
|
// A lowercase alpha-numeric string
|
|
// <platform-expression.not>:
|
|
// <platform-expression.simple>
|
|
// ! <platform-expression.simple>
|
|
// <platform-expression.and>
|
|
// <platform-expression.not>
|
|
// <platform-expression.and> & <platform-expression.not>
|
|
// <platform-expression.or>
|
|
// <platform-expression.not>
|
|
// <platform-expression.or> | <platform-expression.not>
|
|
ExpectedS<Expr> parse_platform_expression(StringView expression, MultipleBinaryOperators multiple_binary_operators);
|
|
}
|