Commit Graph

9 Commits

Author SHA1 Message Date
autoantwort
78ab7763bd
[curlpp] no absolute paths (#21712) 2021-11-29 17:22:25 -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
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
Billy O'Neal
09a647a526
Delete use of vcpkg_test_cmake and vcpkg_common_functions. (#13065) 2020-10-28 14:18:07 -07:00
Lily
4b8ad78657
[curlpp] Fix target "curlpp" link "ZLIB::ZLIB" error (#10535)
* [curl] Add zlib to default feature

* [curl] Fix line alignment

* [curlpp] Fix target "curlpp" link "ZLIB::ZLIB" error

* [curlpp] Fix target "curlpp" link "ZLIB::ZLIB" error
2020-04-16 11:48:33 -07:00
Stefano Sinigardi
e3488c9cf8 [curlpp] restore installing vcpkg-cmake-wrapper scriptù (#9065) 2019-11-22 11:54:36 -08:00
Stefano Sinigardi
d9b08b2243 [curlpp] fix regression introduced in #7331, commit 7358190c3b 2019-10-09 17:07:36 +02:00
past-due
67a9305c75 [curl] Update to 7.66.0 (#7331)
* [curl] Update to 7.65.3

* [curl] Remove USAGE

(Use auto-generated message about exported config.)

* Add wrapper

* [curl] Update to 7.66.0

* Add wrapper to curl

* drop parent_scope

* add change that didn't make it

* Populate CURL_LIBRARY

* Fix transitive dependency

* try to actually set LIBRARIES

* get .libs

* fix curlpp and dynamic builds on linux

* add @cenit's suggestion and fix typo in curlpp

* modify PDAL patch
2019-09-26 21:31:33 -07:00
myd7349
63265da777 [curlpp] Add new port to fix #5352 (#5381) 2019-02-22 12:10:29 -08:00