mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-11-29 04:38:59 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
17,103 Commits 1 Branch 58 Tags 412 MiB
e97f053a90
Commit Graph

5 Commits

Author SHA1 Message Date
Billy O'Neal
4945d50e90
[capnproto] Remove vcpkg_fail_port_install. (#22730) 
* [capnproto] Remove vcpkg_fail_port_install.

The portfile and vcpkg.json disagreed.

```
vcpkg.json: !uwp & !((arm | arm64) & windows)
portfile:   !uwp & (!windows | !(arm | arm64))
```

If we demorgan the supports expression once they agree:

```
!uwp & (!(arm | arm64) | !windows)
```

Also, arm64 implies arm:

```
!uwp & (!arm | !windows)
```

In support of https://github.com/microsoft/vcpkg/pull/21502

* Put the supports expression into DNF as suggested by @strega-nil.
 2022-01-24 13:51:42 -08:00
autoantwort
e7e328cf9d
[many ports] call vcpkg_fixup_pkgconfig() (#20953) 
* [many ports] call vcpkg_fixup_pkgconfig()

The ports generate pc files, but don't call vcpkg_fixup_pkgconfig() so that there are absolute paths in the pc files

* Update port-version for armadillo and polyclipping.

* Update version database.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
 2021-10-27 15:19:28 -07:00
chausner
4f06d9d0b9
[capnproto] Update to 0.9.1 (#20436) 
* Update capnproto to 0.9.1

* Update CI baseline

* Fix indentation

* Update git-tree hash

Co-authored-by: chausner <chausner@users.noreply.github.com>
 2021-10-26 22:25:12 -07:00
Billy O'Neal
b295670e4b
Bulk convert control files. (#19986) 
```
function Convert-Control {
    Param($full)
    .\vcpkg.exe format-manifest $full
    $root = $full.Substring(0, $full.Length - 7) # CONTROL
    $new = $root + 'vcpkg.json'
    $content = Get-Content -Raw $new
    $asJson = ConvertFrom-Json $content -AsHashtable -Depth 100
    $oldVersion = $asJson['port-version']
    if ($null -eq $oldVersion) {
        $oldVersionFull = $asJson['version-string']
        Write-Host "Got version $oldVersionFull"
        $match = [System.Text.RegularExpressions.Regex]::Match($oldVersionFull, '^(.+)-(\d+)$')
        if ($match.Success -and -not [System.Text.RegularExpressions.Regex]::IsMatch($oldVersionFull, '^\d\d\d\d-\d\d-\d\d$')) {
            $newFullVersion = [string]$match.Groups[1].Value
            $oldVersion = [int]$match.Groups[2].Value
            Write-Host "newFullVersion $newFullVersion oldVersion $oldVersion"
            $newVersion = $oldVersion + 1
            $asJson['version-string'] = $newFullVersion
            Write-Host "Previous version for $full extracted from version field -- setting version-string $newFullVersion and port-version $newVersion"
        } else {
            Write-Host "No previous version for $full -- setting 1"
            $newVersion = 1
        }
    } else {
        $newVersion = [int]$oldVersion + 1
        Write-Host "New version for $full : $newVersion"
    }

    $asJson['port-version'] = $newVersion

    $content = ConvertTo-Json $asJson -Depth 100
    Set-Content -Path $new -Value $content
    .\vcpkg.exe format-manifest $new
}

Get-ChildItem ports\CONTROL -Recurse | Foreach-Object {
    Convert-Control $_.FullName
}

git commit -am "this message"
.\vcpkg.exe x-add-version -all
git commit -a --amend
```
 2021-09-09 01:24:04 -07:00
nicole mazzuca
68a74950d0
[vcpkg] Rename port_versions to versions (#15784) 2021-01-21 09:53:22 -08:00