diff options
| author | nicole mazzuca <mazzucan@outlook.com> | 2020-12-21 15:40:21 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-21 15:40:21 -0800 |
| commit | c898283a41af23135c048c50836f2bc2eccea819 (patch) | |
| tree | 72bba2c653f4972e3abd28e5cda3c8574fff317c /scripts/e2e_ports | |
| parent | 730187bfd9c314c29148495d2c2527797fad5d43 (diff) | |
| download | vcpkg-c898283a41af23135c048c50836f2bc2eccea819.tar.gz vcpkg-c898283a41af23135c048c50836f2bc2eccea819.zip | |
[vcpkg registries] support versions (#15114)
* [vcpkg registries] support versions
This PR merges the Registries changes and the versioning changes, so that one can use both at the same time.
There is one major difference between this PR and the RFC (#13590), which is that instead of version files looking like:
```json
[
...
]
```
version files look like:
```
{
"versions": [
...
]
}
```
this is to support interop between this PR and existing demos and the like;
fixing this, along with perhaps renaming `port_versions` to `port-versions` should be done after this is merged,
should be a trivial change.
Diffstat (limited to 'scripts/e2e_ports')
| -rw-r--r-- | scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake (renamed from scripts/e2e_ports/vcpkg-uses-test-cmake/portfile.cmake) | 0 | ||||
| -rw-r--r-- | scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json (renamed from scripts/e2e_ports/vcpkg-uses-test-cmake/vcpkg.json) | 0 | ||||
| -rw-r--r-- | scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake (renamed from scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/portfile.cmake) | 0 | ||||
| -rw-r--r-- | scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json (renamed from scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/vcpkg.json) | 0 | ||||
| -rw-r--r-- | scripts/e2e_ports/port_versions/baseline.json | 3 | ||||
| -rw-r--r-- | scripts/e2e_ports/port_versions/v-/vcpkg-internal-e2e-test-port.json | 8 | ||||
| -rw-r--r-- | scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake | 1 | ||||
| -rw-r--r-- | scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json | 4 |
8 files changed, 16 insertions, 0 deletions
diff --git a/scripts/e2e_ports/vcpkg-uses-test-cmake/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake index 571ae3b7a..571ae3b7a 100644 --- a/scripts/e2e_ports/vcpkg-uses-test-cmake/portfile.cmake +++ b/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/portfile.cmake diff --git a/scripts/e2e_ports/vcpkg-uses-test-cmake/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json index 9f34e058d..9f34e058d 100644 --- a/scripts/e2e_ports/vcpkg-uses-test-cmake/vcpkg.json +++ b/scripts/e2e_ports/overlays/vcpkg-uses-test-cmake/vcpkg.json diff --git a/scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/portfile.cmake b/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake index 9207d30b1..9207d30b1 100644 --- a/scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/portfile.cmake +++ b/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/portfile.cmake diff --git a/scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/vcpkg.json b/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json index 7c16ffe82..7c16ffe82 100644 --- a/scripts/e2e_ports/vcpkg-uses-vcpkg-common-functions/vcpkg.json +++ b/scripts/e2e_ports/overlays/vcpkg-uses-vcpkg-common-functions/vcpkg.json diff --git a/scripts/e2e_ports/port_versions/baseline.json b/scripts/e2e_ports/port_versions/baseline.json new file mode 100644 index 000000000..953e8752d --- /dev/null +++ b/scripts/e2e_ports/port_versions/baseline.json @@ -0,0 +1,3 @@ +{ + "vcpkg-internal-e2e-test-port": { "version-string": "1.0.0" } +} diff --git a/scripts/e2e_ports/port_versions/v-/vcpkg-internal-e2e-test-port.json b/scripts/e2e_ports/port_versions/v-/vcpkg-internal-e2e-test-port.json new file mode 100644 index 000000000..ce7698ebb --- /dev/null +++ b/scripts/e2e_ports/port_versions/v-/vcpkg-internal-e2e-test-port.json @@ -0,0 +1,8 @@ +{ + "versions": [ + { + "version-string": "1.0.0", + "git-tree": "1dc3e42a3c0cafe2884d379af4399273238b986e" + } + ] +} diff --git a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake new file mode 100644 index 000000000..065116c27 --- /dev/null +++ b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/portfile.cmake @@ -0,0 +1 @@ +set(VCPKG_POLICY_EMPTY_PACKAGE enabled) diff --git a/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json new file mode 100644 index 000000000..a25da6d23 --- /dev/null +++ b/scripts/e2e_ports/vcpkg-internal-e2e-test-port/vcpkg.json @@ -0,0 +1,4 @@ +{ + "name": "vcpkg-internal-e2e-test-port", + "version-string": "1.0.0" +} |