diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-06-30 10:40:18 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-06-30 10:40:18 -0700 |
| commit | 1d8f0acc9c3085d18152a3f639077a28109196b6 (patch) | |
| tree | 1daa4780e0d5f51844217dc61dbf275433153abf /toolsrc/src/vcpkg-fuzz | |
| parent | 67ab6130b64cce6701c5a95ca3b9bdc4d949cb8a (diff) | |
| download | vcpkg-1d8f0acc9c3085d18152a3f639077a28109196b6.tar.gz vcpkg-1d8f0acc9c3085d18152a3f639077a28109196b6.zip | |
[vcpkg manifest] Manifest Implementation (#11757)
==== 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
Diffstat (limited to 'toolsrc/src/vcpkg-fuzz')
| -rw-r--r-- | toolsrc/src/vcpkg-fuzz/main.cpp | 60 |
1 files changed, 52 insertions, 8 deletions
diff --git a/toolsrc/src/vcpkg-fuzz/main.cpp b/toolsrc/src/vcpkg-fuzz/main.cpp index 881577654..bbff0d98d 100644 --- a/toolsrc/src/vcpkg-fuzz/main.cpp +++ b/toolsrc/src/vcpkg-fuzz/main.cpp @@ -2,6 +2,9 @@ #include <vcpkg/base/json.h> #include <vcpkg/base/stringview.h> #include <vcpkg/base/system.print.h> +#include <vcpkg/base/unicode.h> + +#include <vcpkg/platform-expression.h> #include <iostream> #include <sstream> @@ -17,6 +20,7 @@ namespace None, Utf8Decoder, JsonParser, + PlatformExpr, }; struct FuzzArgs @@ -57,10 +61,14 @@ namespace { kind = FuzzKind::Utf8Decoder; } + else if (value == "platform-expr") + { + kind = FuzzKind::PlatformExpr; + } else { System::print2(System::Color::error, "Invalid kind: ", value, "\n"); - System::print2(System::Color::error, " Expected one of: utf-8, json\n\n"); + System::print2(System::Color::error, " Expected one of: utf-8, json, platform-expr\n\n"); print_help_and_exit(true); } } @@ -120,6 +128,44 @@ Options: return std::move(ss).str(); } + [[noreturn]] void fuzz_json_and_exit(StringView text) + { + auto res = Json::parse(text); + if (!res) + { + Checks::exit_with_message(VCPKG_LINE_INFO, res.error()->format()); + } + + Checks::exit_success(VCPKG_LINE_INFO); + } + + [[noreturn]] void fuzz_utf8_and_exit(StringView text) + { + auto res = Unicode::Utf8Decoder(text.begin(), text.end()); + for (auto ch : res) + { + (void)ch; + } + + Checks::exit_success(VCPKG_LINE_INFO); + } + + [[noreturn]] void fuzz_platform_expr_and_exit(StringView text) + { + auto res1 = PlatformExpression::parse_platform_expression(text, PlatformExpression::MultipleBinaryOperators::Deny); + auto res2 = PlatformExpression::parse_platform_expression(text, PlatformExpression::MultipleBinaryOperators::Allow); + + if (!res1) + { + Checks::exit_with_message(VCPKG_LINE_INFO, res1.error()); + } + if (!res2) + { + Checks::exit_with_message(VCPKG_LINE_INFO, res2.error()); + } + + Checks::exit_success(VCPKG_LINE_INFO); + } } int main(int argc, char** argv) @@ -132,13 +178,11 @@ int main(int argc, char** argv) } auto text = read_all_of_stdin(); - auto res = Json::parse(text); - if (!res) - { - System::print2(System::Color::error, res.error()->format()); - } - else + switch (args.kind) { - System::print2(System::Color::success, "success!"); + case FuzzKind::JsonParser: fuzz_json_and_exit(text); + case FuzzKind::Utf8Decoder: fuzz_utf8_and_exit(text); + case FuzzKind::PlatformExpr: fuzz_platform_expr_and_exit(text); + default: Checks::exit_fail(VCPKG_LINE_INFO); } } |
