mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-11-24 14:29:06 +08:00
ca9155913c
4 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
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
```
|
||
|
Alexander Neumann
|
3bffe1c049
|
[qt5] update qt to 5.15 and make ports depend on qt5-base[core]. (#11596)
* [qt5] update qt to 5.15 and make ports depend on qt5-base[core]. * [qt5] update and remove patches * [baseline] skip qt5-canvas3d due to deprecation * [qwt] update to 6.1.4 and fix build issues * [qt5-webengine] remove old patches * [qwt] fix static patch * [qt5-location] add a message that the port has a sprious failure * [qt5-webengine] fix filename of patch * [qt5-webengine] add build.patch (ci is probably fast than me in checking for more errors) * [qt5-winextras] depend on qt5-base[core] Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> * [qt5-base] update latest feature (latest=core) * [baseline] remove qt5-webengine for nonstatic windows since CI can handle it now * [qt5-base] make qt5-base fail to get logs. * [angle] include missing egl sources. * [qt5-base] patch egl detection logic. * [baseline] remove qt-x11extras:x64-linux=fail * [qt5-base] need to be explicit about xcb to build qt5-x11extras * [CI] add necessary system libraries to linux CI * [qt5-base] remove comment to retry on linux * [qt5-base] add static_init patch for MSVC * [qt5-base] refined workaround to not regress linux and osx due to * [paraview] remove unnecessary patches with newer qt versions * [vcpkg/baseline] add webengine back to skip * [vtk] fix missing include regression using patch from upstream * [vtk] fix patch * [qt5-base] replace with patch from upstream * [paraview] use hdf5 1.10 api. * [paraview] bump control * Add more packages to Linux machines. * [qt5-base] forgot to add the patch * Delete 6943.diff Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com> Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com> |
||
|
Alexander Neumann
|
d682bd79d1
|
[qt5] fix wrong versions in some CONTROL files (#11026) | ||
|
Alexander Neumann
|
bb7ccc4b90
|
[Qt[latest]] Update to 5.14.2 (#10644)
* make qt5 all features and add the missing qt modules * fix control * qt5 webengine enviromnent setup * copy qtminimal plugin to tools * add opengles3 option for testing * [qt5-imageformats] freeglut is not a dependency on osx * [qt5-base] fontconfig can require iconv on linux and osx * include the jasper fix to get CI coverage? * trying to get ci coverage for qt on osx * Revert "trying to get ci coverage for qt on osx" This reverts commit |