Commit Graph

3 Commits

Author SHA1 Message Date
Stefano Sinigardi
eff88baadc
[x64-windows-release] add a single config community triplet based on x64-windows and make it work on some ports (#15983)
* add a single config community triplet based on x64-windows

* add a failed port, otherwise mechanism does not support empty list

* add failures to baseline

* remove duplicate entry

* second round of failures added to baseline

* third round of regressions added to CI

* [ade] fix single-config builds

* [ade] update refs

* remove duplicate entries

* [unix2dos] restore eol in script file

* add even more ports now failing in singleConfig...

* [libjpeg-turbo] remove unnecessary check

* [libjpeg-turbo] fix references

* [baseline] restore check for ports that were added recently

* [libmodplug] enable single config triplets

* [tensorflow-common] enable single config triplets

* update baseline

* fix references

* remove wrong check for single config triplets

* fix references

* [ogre] fix single config builds

* [ogre] fix references

* [untested] force x64-windows-release as host triplet when testing x64-windows-release in CI

* fix

* [x264] fix for single config

* [x264] update refs

* [libffi] enable single config builds

* [libffi] update refs

* remove cli broken arguments

* [calceph] enable single-config builds

* [calceph] fix references

* [kf5config] enable single-config builds

* [kf5config] fix references

* [detours] enable single-config builds

* [detours] fix references

* [kf5*] enable single-config builds

* [kf5*] fix references

* fix

* kf5config fix reference

* trying again to force host triplet in CI

* [boost] fix for single-config builds

* [boost] update references

* fix

* [boost] update refs

* disable host triplet in ci because it's not necessary

* retrigger a build for ports previously failing

* remove host triplet in ci, not necessary anymore?

* make PR dry

* [tensorflow-common] bump version

* [tensorflow-common] fix references

* Fix version database for boost-modular-build-helper.

* fix references

* restore CRLF on some ports

* bump versions

* fix references

* bump port versions

* fix references

* boost-modular-build-helper: Reverted due to no changes.

detours, kf5config, kf5holidays, libbacktrace: Reverted due to only whitespace changes.
libffi: bumped port-version
libmodplug: reverted due to no functional changes
ogre, ogre-next: reverted due to incorrect case of "Debug" vs. "Release" already fixed in master.

And rebuilt version database.

Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-12-20 10:50:45 -05: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
Kai Pastor
c759b997ba
[libjpeg-turbo] Update wrapper to correctly find debug/release variant (#19319)
* Format manifest

* Fix cmake wrapper

* Drop windows debug lib renaming

* Fix build warnings

* x-add-version

* Consolidate azure-kinect-sensor-sdk patches

* Fix jpegturbo dependency

* x-add-version

* Fix wrapper message

* x-add-version
2021-09-08 15:28:41 -07:00