mirror of
https://github.com/microsoft/vcpkg.git
synced 2024-12-18 22:57:51 +08:00
38c7df18dc
2 Commits
| Author | SHA1 | Message | Date | |
|---|---|---|---|---|
Billy O'Neal
|
00358cc88d
|
[eathread] Remove vcpkg_fail_port_install. (#22742)
There was no supports expression, and there was ci.baseline.txt impact. The remaining ci.baseline.txt line item was x86-windows, so I tried building that. It results in: ``` C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(201): error C3861: '_InterlockedExchange64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(202): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(203): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(204): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(205): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(206): error C3861: '_InterlockedOr64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(207): error C3861: '_InterlockedAnd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(208): error C3861: '_InterlockedXor64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(209): error C3861: '_InterlockedExchange64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(216): error C3861: '_InterlockedExchange64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(217): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(218): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(219): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(220): error C3861: '_InterlockedExchangeAdd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(221): error C3861: '_InterlockedOr64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(222): error C3861: '_InterlockedAnd64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(223): error C3861: '_InterlockedXor64_INLINE': identifier not found C:\Dev\vcpkg2\buildtrees\eathread\src\f21f15bafd-3f7f4715f1.clean\include\eathread/internal/eathread_atomic_standalone_msvc.h(224): error C3861: '_InterlockedExchange64_INLINE': identifier not found ``` which is a build failure in the port, not a CI artifact, so I added that to "supports" as well. In support of https://github.com/microsoft/vcpkg/pull/21502 |
||
|
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
```
|