Skip to content

Commit e62d136

Browse files
Rastabancbezaultvicromsras0219-msft
authored
[vcpkg] Add Supports: field. Use contents of triplets instead of names for dependency resolution. (#8601)
* remove unfinished "supports" tag * extract "supports" from control files But do nothing with the value * Start `Supports` documentation * Use Supports in a bunch of control files I only tried matching the already existing logic in the portfile.cmake. * Cmake var provider (#8) * Cmake var provider (#9) * fix windows build (#10) * Add missing files to build * Fix test (#11) * adding hooks for cmake variables in expressions * Adding hooks for 'supports' in CI test * Fix test (#12) * Add overrides to evaluation environment * use "supported" tag in CI testing * cleanup comment * Fix issues with PR * [var_provider] Get library linkage variables from triplet * Fix compilation errors in tests * Add unimplemented functions * Fix unit tests part 1 * Fix issue when buildtrees dir does not exist * Change binary output hash * Fix handling of * feature * Add core feature when using * * Do not add Default-Features when installing 'core' * [vcpkg] WIP. 6 failing tests. * [vcpkg] WIP. 1 failing tests. * [vcpkg] WIP. 0 failing tests. * [vcpkg] Removed 'remove_graph'. 0 failing tests. * [vcpkg] Removed 'install_graph'. 0 failing tests. * [vcpkg] Remove AnyAction; replace with ActionPlan * [vcpkg] Minor cleanup. * [vcpkg][z3][qt5-connectivity][qt5-purchasing] Improve error messages while parsing. Fix a few trivial port issues. * [vcpkg] Work around ICE with MSVC v140 * [vcpkg] Add purge on fail to decompress for CI * [vcpkg] Fix parsing of nested parentheses in qualifiers * [vcpkg] Fix Linux builds (explicit qualification in declaration) * [vcpkg] Fix Build-Depends implying default features. Fix qualified dependencies regression. * [mmx] Add to skip list and full rebuild -- mmx causes problems by installing 'sched.h' * [libpqxx][mqtt-cpp] Prevent installing include/CMakeLists.txt * [cppitertools] Fix installed include namespace (should be include/cppitertools) * [libsoundio] Move headers into soundio/ subdirectory as per original cmake * [ci.baseline] Temporarily skip charls due to conflict with dcmtk * [vcpkg] Add restricted include files post build check -- bump global abi version * [libsoundio] Hotfix stray line in portfile * [vcpkg] Fix regression: CMake information was not being displayed for build-and-install actions * [jsonnet] Fix installation of internal headers; use system nlohmann-json * [grpc][upb] Teach grpc to use packaged upb. Add find_package(upb). Remove inappropriate upb features. * [zfp] Move problematic 'include/bitstream.h' to 'include/zfp/bitstream.h' * [x265] Bump control version to trigger rebuild after zfp conflict * [akali] Disable parallel configure * [dirent][dlfcn-win32][getopt-win32][pthreads] Grandfather into VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [ci.baseline] Update baseline for improved upb support * [tgui] Disable parallel configure * [libiconv] Enable VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [aws-sdk-cpp] Disable parallel configure * [vcpkg] Implement policy VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [aws-sdk-cpp] Fix amount of escaping semicolons -- Note: I do not know the root cause requiring this change * [libodb-sqlite] Fix configuring into source directory * [gettext] Grandfather into VCPKG_POLICY_ALLOW_RESTRICTED_HEADERS * [libodb] DISABLE_PARALLEL_CONFIGURE * [vcpkg] Add 'config.h' and 'local.h' to restricted header list * [mcpp] Remove unused and problematic include 'config.h' from installed files * [teemo] Move installed headers into subdirectory to prevent conflicts with x265 * [ci.baseline] Update current OSX. Skip libmesh on all platforms due to heavy conflicts. * [vcpkg] Add 'slice.h' as a restricted header * [osg] Improve accuracy of dependencies (disable some, add some to Depends) * [vcpkg] Skip invoking a subprocess for 0 specs in load_tag_vars * [ci.baseline] Skip mongo-c-driver on osx due to flakiness * [teemo] Fix incorrect include file read * [osg] Fix dependency typo: glut -> freeglut * [vcpkg] Recover some lost performance with the addition of vcpkg_get_tags. A huge performance cost was loading the triplet files over and over; instead, we splice the sources into a macro and load it once, then just call that macro for each port. Remove use of hashing because we aren't cross-process-safe anyway (global static will do instead). * [vcpkg] Change Supports atom 'windows' to include UWP. Improve Supports field documentation. * [vcpkg] Add docs for VCPKG_ENV_PASSTHROUGH and VCPKG_DEP_INFO_OVERRIDE_VARS * Fix typo Co-authored-by: Curtis J Bezault <curtbezault@gmail.com> Co-authored-by: Victor Romero <romerosanchezv@gmail.com> Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
1 parent 586bee9 commit e62d136

233 files changed

Lines changed: 3513 additions & 2431 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

docs/maintainers/control-files.md

Lines changed: 43 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ Field names are case-sensitive and start the line without leading whitespace. P
88

99
## Source Paragraph
1010

11-
The first paragraph in a `CONTROL` file is the Source paragraph. It must have a `Source`, `Version`, and `Description` field. It can optionally have a `Build-Depends` and `Default-Features` field.
11+
The first paragraph in a `CONTROL` file is the Source paragraph. It must have a `Source`, `Version`, and `Description` field. The full set of fields is documented below.
1212

1313
### Examples:
1414
```no-highlight
@@ -58,7 +58,7 @@ For example, given:
5858

5959
Then if you update the source version today, you should give it version `2019-06-01`. If you need to make a change which doesn't adjust the source version, you should give it version `2019-02-14-2`.
6060

61-
Example:
61+
##### Examples:
6262
```no-highlight
6363
Version: 1.0.5-2
6464
```
@@ -71,7 +71,7 @@ A description of the library.
7171

7272
By convention the first line of the description is a summary of the library. An optional detailed description follows. The detailed description can be multiple lines, all starting with whitespace.
7373

74-
Example:
74+
##### Examples:
7575
```no-highlight
7676
Description: C++ header-only JSON library
7777
```
@@ -96,28 +96,60 @@ Vcpkg does not distinguish between build-only dependencies and runtime dependenc
9696

9797
*For example: websocketpp is a header only library, and thus does not require any dependencies at install time. However, downstream users need boost and openssl to make use of the library. Therefore, websocketpp lists boost and openssl as dependencies*
9898

99-
Example:
100-
```no-highlight
101-
Build-Depends: zlib, libpng, libjpeg-turbo, tiff
102-
```
103-
If the port is dependent on optional features of another library those can be specified using the `portname[featurelist]` syntax.
99+
If the port is dependent on optional features of another library those can be specified using the `portname[featurelist]` syntax. If the port does not require any features from the dependency, this should be specifed as `portname[core]`.
104100

105-
Dependencies can be filtered based on the target triplet to support different requirements on Windows Desktop versus the Universal Windows Platform. Currently, the string inside parentheses is substring-compared against the triplet name. There must be a space between the name of the port and the filter. __This will change in a future version to not depend on the triplet name.__
101+
Dependencies can be filtered based on the target triplet to support differing requirements. These filters use the same syntax as the Supports field below and are surrounded in parentheses following the portname and feature list.
106102

107-
Example:
103+
##### Example:
108104
```no-highlight
109-
Build-Depends: curl[openssl] (!windows&!osx), curl[winssl] (windows), curl[darwinssl] (osx)
105+
Build-Depends: rapidjson, curl[core,openssl] (!windows), curl[core,winssl] (windows)
110106
```
111107

112108
#### Default-Features
113109
Comma separated list of optional port features to install by default.
114110

115111
This field is optional.
116112

113+
##### Example:
117114
```no-highlight
118115
Default-Features: dynamodb, s3, kinesis
119116
```
120117

118+
<a name="Supports"></a>
119+
#### Supports
120+
Expression that evaluates to true when the port is expected to build successfully for a triplet.
121+
122+
Currently, this field is only used in the CI testing to skip ports. In the future, this mechanism is intended to warn users in advance that a given install tree is not expected to succeed. Therefore, this field should be used optimistically; in cases where a port is expected to succeed 10% of the time, it should still be marked "supported".
123+
124+
The grammar for the supports expression uses standard operators:
125+
- `!expr` - negation
126+
- `expr|expr` - or (`||` is also supported)
127+
- `expr&expr` - and (`&&` is also supported)
128+
- `(expr)` - grouping/precedence
129+
130+
The predefined expressions are computed from standard triplet settings:
131+
- `x64` - `VCPKG_TARGET_ARCHITECTURE` == `"x64"`
132+
- `x86` - `VCPKG_TARGET_ARCHITECTURE` == `"x86"`
133+
- `arm` - `VCPKG_TARGET_ARCHITECTURE` == `"arm"` or `VCPKG_TARGET_ARCHITECTURE` == `"arm64"`
134+
- `arm64` - `VCPKG_TARGET_ARCHITECTURE` == `"arm64"`
135+
- `windows` - `VCPKG_CMAKE_SYSTEM_NAME` == `""` or `VCPKG_CMAKE_SYSTEM_NAME` == `"WindowsStore"`
136+
- `uwp` - `VCPKG_CMAKE_SYSTEM_NAME` == `"WindowsStore"`
137+
- `linux` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Linux"`
138+
- `osx` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Darwin"`
139+
- `android` - `VCPKG_CMAKE_SYSTEM_NAME` == `"Android"`
140+
- `static` - `VCPKG_LIBRARY_LINKAGE` == `"static"`
141+
142+
These predefined expressions can be overridden in the triplet file via the [`VCPKG_DEP_INFO_OVERRIDE_VARS`](../users/triplets.md) option.
143+
144+
This field is optional and defaults to true.
145+
146+
> Implementers' Note: these terms are computed from the triplet via the `vcpkg_get_dep_info` mechanism.
147+
148+
##### Example:
149+
```no-highlight
150+
Supports: !(uwp|arm)
151+
```
152+
121153
## Feature Paragraphs
122154

123155
Multiple optional features can be specified in the `CONTROL` files. It must have a `Feature` and `Description` field. It can optionally have a `Build-Depends` field. It must be separated from other paragraphs by one or more empty lines.

docs/users/triplets.md

Lines changed: 25 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -2,28 +2,25 @@
22

33
Triplet is a standard term used in cross compiling as a way to completely capture the target environment (cpu, os, compiler, runtime, etc) in a single convenient name.
44

5-
In Vcpkg, we use triplets to describe self-consistent builds of library sets. This means every library will be built using the same target cpu, OS, and compiler toolchain, but also CRT linkage and preferred library type.
5+
In Vcpkg, we use triplets to describe an imaginary "target configuration set" for every library. Within a triplet, libraries are generally built with the same configuration, but it is not a requirement. For example, you could have one triplet that builds `openssl` statically and `zlib` dynamically, one that builds them both statically, and one that builds them both dynamically (all for the same target OS and architecture). A single build will consume files from a single triplet.
66

77
We currently provide many triplets by default (run `vcpkg help triplet`). However, you can easily add your own by creating a new file in the `triplets\` directory. The new triplet will immediately be available for use in commands, such as `vcpkg install boost:x86-windows-custom`.
88

99
To change the triplet used by your project, such as to enable static linking, see our [Integration Document](integration.md#triplet-selection).
1010

11-
1211
## Community triplets
1312

14-
Triplets contained in the `triplets\community` folder are not tested by continuous integration.
15-
16-
These triplets contain configurations commonly requested by the community, but for which we lack the resources to properly test.
13+
Triplets contained in the `triplets\community` folder are not tested by continuous integration, but are commonly requested by the community.
1714

18-
Port updates may break compatibility with community triplets, such regressions won't get caught by our testing pipelines. Because of this, community involvement is paramount!
15+
Because we do not have continuous coverage, port updates may break compatibility with community triplets. Because of this, community involvement is paramount!
1916

2017
We will gladly accept and review contributions that aim to solve issues with these triplets.
2118

2219
### Usage
2320

2421
Community Triplets are enabled by default, when using a community triplet a message like the following one will be printed during a package install:
2522

26-
```bash
23+
```no-highlight
2724
-- Using community triplet x86-uwp. This triplet configuration is not guaranteed to succeed.
2825
-- [COMMUNITY] Loading triplet configuration from: D:\src\viromer\vcpkg\triplets\community\x86-uwp.cmake
2926
```
@@ -78,8 +75,29 @@ This option also has forms for configuration-specific and C flags:
7875
- `VCPKG_C_FLAGS_DEBUG`
7976
- `VCPKG_C_FLAGS_RELEASE`
8077

78+
<a name="VCPKG_DEP_INFO_OVERRIDE_VARS"></a>
79+
### VCPKG_DEP_INFO_OVERRIDE_VARS
80+
Replaces the default computed list of triplet "Supports" terms.
81+
82+
This option (if set) will override the default set of terms used for qualified dependency resolution and "Supports" field evaluation.
83+
84+
See the [`Supports`](../maintainers/control-files.md#Supports) control file field documentation for more details.
85+
86+
> Implementers' Note: this list is extracted via the `vcpkg_get_dep_info` mechanism.
87+
8188
## Windows Variables
8289

90+
### VCPKG_ENV_PASSTHROUGH
91+
Instructs vcpkg to allow additional environment variables into the build process.
92+
93+
On Windows, vcpkg builds packages in a special clean environment that is isolated from the current command prompt to ensure build reliability and consistency.
94+
95+
This triplet option can be set to a list of additional environment variables that will be added to the clean environment.
96+
97+
See also the `vcpkg env` command for how you can inspect the precise environment that will be used.
98+
99+
> Implementers' Note: this list is extracted via the `vcpkg_get_tags` mechanism.
100+
83101
<a name="VCPKG_VISUAL_STUDIO_PATH"></a>
84102
### VCPKG_VISUAL_STUDIO_PATH
85103
Specifies the Visual Studio installation to use.

ports/abseil/CONTROL

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,3 +5,4 @@ Description: an open-source collection designed to augment the C++ standard libr
55
Abseil is an open-source collection of C++ library code designed to augment the C++ standard library. The Abseil library code is collected from Google's own C++ code base, has been extensively tested and used in production, and is the same code we depend on in our daily coding lives.
66
In some cases, Abseil provides pieces missing from the C++ standard; in others, Abseil provides alternatives to the standard for special needs we've found through usage in the Google code base. We denote those cases clearly within the library code we provide you.
77
Abseil is not meant to be a competitor to the standard library; we've just found that many of these utilities serve a purpose within our code base, and we now want to provide those resources to the C++ community as a whole.
8+
Supports: !uwp

ports/ace/CONTROL

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Source: ace
22
Version: 6.5.7-1
33
Homepage: https://www.dre.vanderbilt.edu/~schmidt/ACE.html
44
Description: The ADAPTIVE Communication Environment
5+
Supports: !uwp
56

67
Feature: wchar
78
Description: Enable extra wide char functions in ACE

ports/activemq-cpp/CONTROL

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ Source: activemq-cpp
22
Version: 3.9.5-1
33
Build-Depends: apr
44
Description: Apache ActiveMQ is the most popular and powerful open source messaging and Integration Patterns server.
5+
Supports: !uwp

ports/akali/portfile.cmake

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ string(COMPARE EQUAL "${VCPKG_LIBRARY_LINKAGE}" "static" AKALI_STATIC)
1212

1313
vcpkg_configure_cmake(
1414
SOURCE_PATH ${SOURCE_PATH}
15-
PREFER_NINJA
15+
DISABLE_PARALLEL_CONFIGURE
16+
PREFER_NINJA
1617
OPTIONS
1718
-DAKALI_STATIC:BOOL=${AKALI_STATIC}
1819
-DBUILD_TESTS:BOOL=OFF

ports/alac/CONTROL

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ Source: alac
22
Version: 2017-11-03-c38887c5-1
33
Homepage: https://github.com/macosforge/alac
44
Description: The Apple Lossless Audio Codec (ALAC) is a lossless audio codec developed by Apple and deployed on all of its platforms and devices.
5+
Supports: !uwp

ports/aliyun-oss-c-sdk/CONTROL

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,3 +2,4 @@ Source: aliyun-oss-c-sdk
22
Version: 3.7.1-1
33
Description: Alibaba Cloud Object Storage Service (OSS) is a cloud storage service provided by Alibaba Cloud, featuring massive capacity, security, a low cost, and high reliability.
44
Build-Depends: curl, apr-util
5+
Supports: !uwp

ports/ampl-mp/CONTROL

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
11
Source: ampl-mp
22
Version: 2019-03-21-1
33
Description: An open-source library for mathematical programming
4+
Supports: !uwp

ports/apr/CONTROL

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ Source: apr
22
Version: 1.6.5-3
33
Homepage: https://apr.apache.org/
44
Description: The Apache Portable Runtime (APR) is a C library that forms a system portability layer that covers many operating systems.
5+
Supports: !uwp
56

67
Feature: private-headers
78
Description: Install non-standard files required for building Apache httpd

0 commit comments

Comments
 (0)