Commit Graph

3 Commits

Author SHA1 Message Date
nicole mazzuca
0fec1340eb
[vcpkg manifest] Add documentation! (#13488)
* [vcpkg docs] add docs for manifest files

These are just for the maintainer docs,
not user docs.

* [vcpkg] EBNF-ify platform expression parsing

this modifies nothing about what strings are accepted or rejected,
it just moves stuff around.

also adds tests.

* [vcpkg docs] add manifest mode example

* [wip] docs for augustin

also fix tabs

* [vcpkg manifest] switch to using maps for features

* Apply suggestions from code review

* un-experimentize format-manifest

* flesh out the user manifest mode docs

* CRs

* billy CRs

* final personal pass-thru
2020-09-14 15:07:02 -07:00
nicole mazzuca
1c2af99415
[vcpkg format-manifest] Add convert-control flag (#12471)
* [vcpkg format-manifest] initial convert-control attempt

TODO: manifest comments! we should keep $directives

* Finalize x-format-manifest

First, fix Json::parse -- "\c", for any c, was incorrectly parsed.
It would emit the escaped character, and then parse the character, so
that `\b` would give you { '\b', 'b' }.

Second, canonicalize source paragraphs as we're parsing them. This found
an error in qt5 -- The `declarative` feature was listed twice, and we
now catch it, so I removed the second paragraph.

Add PlatformExpression::complexity to allow ordering platform
expressions in a somewhat reasonable way.

Notes:
  - We allow `all_modules` as a feature name for back-compat with
    paraview
  - In order to actually convert CONTROL to vcpkg.json, we'd need to
    rename the qt5 `default` feature.
  - We need to add support for $directives in x-format-manifest

* fix qt5 port

* format

* fix compile

* fix tests for canonicalization

* Clean up code

* add error message for nothing to format

* add extra_info field

* add `const X&` overloads for `Object::insert[_or_replace]`

* fix compile

* simple CRs

* add tests

* format

* Fix mosquitto port file

also unmerge a line

* fail the tests on malformed manifest

* fix format_all

* fix coroutine port-version

* format manifests
2020-08-02 10:08:07 -07:00
Charles Karney
e554608135
[geographiclib] Update to 1.50.1 (#12379)
* Upgrade geographiclib to version 1.50.1

* Tinker with sourceforge download

* Strip verbiage at top of geographiclib/portfile.cmake

* geographiclib: fix for windows build

* geographiclib: minimize size of patch file

* add missing manifest

* A stab at fixing uwp build error.  But I'm working in the dark!

* Back out of previous commit.  It didn't help.

* Call cmake_minimum_required first

* geographiclib: remove tools from build -- incompatible with uwp

* geographiclib: remove stray reference to TOOLS

* geographiclib: try installing executables into tools

* geographiclib: Do not build tools for uwp

* geographiclib: fix up build of tools

* geographiclib: Minor clean up

* geographiclib: handle uwp vs tools more elegantly

* geographiclib: reformation vcpkg,json

* geographiclib: don't build tools by default

* geographiclib: Don't register the tools as targets; this causes problems if they are moved

Co-authored-by: Charles Karney <charles.karney@sri.com>
2020-07-14 08:44:21 -07:00