Commit Graph

15 Commits

Author SHA1 Message Date
autoantwort
c85581f9cc
[apr-util] no absolute paths (#21453) 2021-11-18 20:42:56 -08: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
janholt
5c3733770a
[apr-util] use find_package(expat) (#13663)
Co-authored-by: janholt <janholt@gmail.com>
2020-09-24 11:41:43 -07:00
NancyLi1013
d6285bc24b
[expat] Update the version to 2.2.9 (add support for uwp) (#9146)
* [expat] Update the version to 2.2.9(support uwp)

* [readosm] Fix expat.lib cannot be found

* Remove expat:arm-uwp and expat:x64-uwp from fail list in ci.baseline.txt

* [apr-util,io2d,skia] Fix expat cannot be found and also update expat

* [many ports] Add supports and fix the regressions

* Fix new regressions

* Fix typo

* [io2d] Update expat patch

* [io2d,libkml,skia] Fix expat cannot find and also fix typo

* [expat] Remove usage

* [libkml,vtk] Update expat patch and fix static build

* [wxwidgets] Fix static build caused by expat cannot found

* Update as review suggestion

* Add Port-Version

* Remove evpp:x64-osx=fail from ci.baseline.txt

* [wxwidgest] Remove unnecessary spaces

* [itk] Fix expat cannot be found

* fix cmake test port

* [wxwidgets] Update Port-Version

Co-authored-by: Nicole Mazzuca <mazzucan@outlook.com>
2020-08-17 08:33:44 -07:00
Jack·Boos·Yu
b271aeffa2
[VCPKG baseline] Fix many ports (#11559) 2020-05-25 11:52:48 -07:00
Stephen Webb
9614c6a962
[apr apr-util] Apr and apr-util for non windows systems (#8579)
* Allow the apr port to be used on non-windows systems

* Allow the apr-util port to be used on non-windows systems

* Allow the apr-util port to be used on non-windows systems

* Allow the apr-util port to be used on non-windows systems

* [log4cxx] add new port

* Add aarch64 cross compilation support

* Allow apr and apr-util ports to used with a cross compiling tool chain

* @PhoebeHui requested changes

* Remove files that leaked from 'add-log4cxx-port' branch

* @PhoebeHui requested changes

* Move apr-util-unix and apr-util-windows portfile.cmake content back into apr-util/portfile.cmake

* Use the same released archive for unix and windows

* Use the same released archive for unix and windows (1.6.1)

* Update APR version to the latest

* Prevent unrelated CI failures

* Prevent CI failure for arm64 on x86 CI machine

* Prevent CI failure for arm64 on x86 CI machine

* Use vcpkg_configure_make and vcpkg_install_make instead of vcpkg_execute_required_process

* Remove shared libraries if a static build

* Revert "Remove shared libraries if a static build"

This reverts commit 540e158e1fbfe53b889bef8b928bc8feb62775c2.

* Prevent CI failures due to static build installing apr-1-config into bin

* @PhoebeHui requested changes

Co-authored-by: Stephen Webb <stephen.webb@sabreautonomous.com.au>
2020-05-06 13:20:49 -07:00
Stefano Sinigardi
726c111481 [vcpkg] fatal_error when patch fails to apply (#8087)
vcpkg will now fail on failure to apply patches except when using `--head`.
2019-10-07 10:35:13 -07:00
pravic
18b029a5e3 [WIP] Add a Homepage URL entry for vcpkg ports (#2933)
* [vcpkg] Add "Homepage" field to the CONTROL files.
2019-06-15 16:54:47 -07:00
Alexander Neumann
12a0106d03 [apr-util] Fix logic error. If find_library call is used testing for existance is strange. (#6609)
Especially if APR_LIBRARIES can contain a list. Testing against NOTFOUND is better.
2019-05-24 10:36:10 -07:00
JackBoosY
f1164a2591 [apr-util]Fix static library usage bug. (#5769)
* [apr-util]Fix static library usage bug.

* [apr-util]Fix macro error.
2019-03-25 14:06:55 -07:00
Alexander Karatarakis
26516fe485 vcpkg_configure_cmake (and _meson) now embed debug symbols within static libs (/Z7) 2017-09-09 00:12:54 -07:00
atkawa7
afbe116fb7 [apr-util] use find_library 2017-07-10 20:45:34 -07:00
atkawa7
7b5563f5f8 Build static fixed 2017-06-27 22:50:49 -07:00
atkawa7
7590bd0c15 created a patch but static build still failing 2017-06-27 20:31:49 -07:00
atkawa7
bbb7f8f265 [apr-util] init #1016 2017-06-27 17:34:09 -07:00