Commit Graph

6 Commits

Author SHA1 Message Date
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
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
Xing Ji
eea00aaa91
[flatbuffers] upgrade the flatbuffers to v2.0.0 (#18897)
* upgrade the flatbuffers's version

* run `vcpkg x-add-version`

* upgrade flatbuffers to v2.0.0 for mnn

* add new port-version of `mnn` after upgrade the flatbuffers

* fix the port-version of `mnn`

* Update ports/mnn/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Update ports/flatbuffers/CONTROL

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* run `vcpkg x-add-version flatbuffers --overwrite-version`

* run `vcpkg x-add-version mnn --overwrite-version`

* regenerate code files by flatc before build

* run `vcpkg x-add-version mnn --overwrite-version`

* add `flatbuffers` in dependencies

* run `vcpkg x-add-version mnn --overwrite-version`

* new port version for mnn

* run `vcpkg x-add-version mnn --overwrite-version` to rebuild

* Update versions/m-/mnn.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* Update ports/mnn/vcpkg.json

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>

* run `vcpkg x-add-version mnn --overwrite-version`

* Add missing quotes.

Co-authored-by: JonLiu1993 <63675417+JonLiu1993@users.noreply.github.com>
Co-authored-by: Billy Robert ONeal III <bion@microsoft.com>
2021-07-22 15:31:44 -07:00
Park DongHa
e37bd3f12f
[flatbuffers] support iOS triplets (#16843)
* [flatbuffers] exclude 'flatc' for ios triplets

* building flatc requires BUNDLE DESTINATION
* increase port version

* [flatbuffers] increase port version

* [flatbuffers] fix git-tree SHA
2021-03-24 12:45:42 -07:00
Park DongHa
b35f1edc23
[mnn,flatbuffers] add a new port and patch (#15717)
* [mnn] add a new port

* create a patch, embed copyright
* touching install options

* [mnn] fix windows install

* feature cuda reqires cudnn

* [flatbuffers] add patch for TableKeyComparator

* update port SHA

* [mnn] disable arm support

* [mnn] update port SHA

* patch creates version config.cmake
* run vcpkg_copy_tools for 'tools' feature

* [mnn] remove bin when non-Windows

* make PREFER_NINJA optional for 'cuda' feature

* [mnn] fix wrong macro

* [mnn] rename install path to lowercase

* [mnn] make 'metal' feature optional

* update port SHA

* [mnn] apply PR feedback

* Move build options into vcpkg_check_features
* Download Apache-2.0 licence instead of local file

* [mnn] remove code patch for Windows

* this will break `mnn[tools]` for `windows` triplet

* [mnn] remove code changes in the patch

* [mnn] remove version.cmake generation

* possibly break osx build with the chnage

* Update ports/mnn/portfile.cmake

* Update versions/m-/mnn.json

* [mnn] apply PR feedback

* find_package(CUDNN) in patch
* use vcpkg_download_distfile
* ONLY_STATIC_LIBRARY for Windows

* [mnn] create share folder and move copyright

* [mnn] update git-tree SHA

* Update ports/mnn/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* [mnn] update git-tree SHA

Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-03-23 14:38:59 -07:00
nicole mazzuca
68a74950d0
[vcpkg] Rename port_versions to versions (#15784) 2021-01-21 09:53:22 -08:00