mirror/vcpkg
1
0
Fork 0
mirror of https://github.com/microsoft/vcpkg.git synced 2024-12-15 01:29:05 +08:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity
23,790 Commits 1 Branch 58 Tags 412 MiB
068d45478f
Commit Graph

13 Commits

Author SHA1 Message Date
Kai Pastor
47633daa65
[vcpkg-scripts] Catch use of ambiguous cmake vars (#34546) 
Avoid wrong use of popular but ambiguous variables (`WIN32` etc.) in
scripts and portfiles by detection in CI.

Sometimes the variables are used wrongly, and sometimes this isn't
caught in PR review. This PR tries to catch those variables (when in the
active code path in script mode). [This can happen to every
contributor](https://github.com/microsoft/vcpkg/pull/34356#discussion_r1360074122),
even if he/she knows the rules ... vcpkg is raising the bar higher than
usual, having to deal with targets and hosts even in script mode.

(`b2-options.cmake` (boost fragment) shows where we get if we don't pay
attention: the same code being used in script mode (`WIN32` meaning
host) and in project mode (`WIN32` meaning target).)

The new check doesn't break any user builds because it relies on command
line options. However it changes the ABI hashes.
 2024-06-14 11:40:01 -07:00
autoantwort
522c29c421
[magnum-plugins] fix build of features (#35246) 2023-11-29 01:05:51 -08:00
Cheney Wang
3f8513efb0
[vcpkg baseline][magnum-plugins] Fix corrade-rc not found (#33930) 
* [vcpkg baseline][magnum-plugins] Fix corrade-rc not found

* code clean up
 2023-09-22 11:27:59 -07:00
autoantwort
28e440beea
[magnum-plugins] fix SHA512 (#30123) 2023-03-13 11:53:14 -07:00
Cheney Wang
74a4c99417
[magnum-*] Remove accidentally generated parameter and optimized portfile.cmake (#27608) 
* [magnum-*] Remove accidentally generated parameter and optimized portfile.cmake

* x-add-version

* Use vcpkg_check_features

* x-add-version
 2022-11-04 14:18:54 -07:00
pezcode
b9ca38893e
[magnum-plugins] Update head features and bundled dependency (#21307) 
* [magnum-plugins] Update head features and bundled dependency

* [magnum-plugins] Format vcpkg.json

* [magnum-plugins] Use vcpkg_extract_source_archive

* [magnum-plugins] Formatting

* [magnum-plugins] Replace deprecated functions

* [magnum-plugins] add zstd dependency to basisimageconverter and basisimporter

* [magnum-plugins] Update version
 2021-11-18 20:13:14 -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
Jonathan Hale
8655bfd4b3
[corrade/magnum/-plugins] Fix build, minor cleanup and minor warning fix in vcpkg CMake scripts (#19435) 
* [magnum/-plugins] Remove obsolete patches that no longer apply

Signed-off-by: Squareys <squareys@googlemail.com>

* [corrade] Make feature to flag translation consistent to fix warning

Consistent with magnum & magnum-plugins

Signed-off-by: Squareys <squareys@googlemail.com>

* Fix warning message for dlls without matching pdbs always displayed

Signed-off-by: Squareys <squareys@googlemail.com>

* Fix the baseline version

* Revert the changes in vcpkg_copy_pdbs.cmake

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
 2021-09-02 13:24:33 -07:00
Jonathan Hale
70610f4494
[magnum,-plugins] Fix deprecated use of vcpkg_check_features (#17016) 
Signed-off-by: Squareys <squareys@googlemail.com>
 2021-04-29 13:49:04 -07:00
Francisco Facioni
37df512335
[magnum/magnum-plugins] fix all magnum dependencies being built (#16657) 2021-03-16 11:51:57 -07:00
Jonathan Hale
e7377f7992
[magnum,-plugins] Fix deployment of plugin types and incorrect removal of plugin lib dir on unix (#16245) 
* [magnum] Correctly deploy shaderconverter and sceneconverter plugins

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Only remove plugin lib dirs for Windows platforms

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Clean up deletion of plugin libs and clarify in comment

Signed-off-by: Squareys <squareys@googlemail.com>

* Update versions

Co-authored-by: PhoebeHui <20694052+PhoebeHui@users.noreply.github.com>
 2021-02-18 13:02:27 -08:00
Jonathan Hale
795588570a
[magnum,magnum-plugins] Add vulkan and shaderconverter features (#15163) 
* [magnum,magnum-plugins] Add vulkan and shaderconverter features

Signed-off-by: Squareys <squareys@googlemail.com>

* [magnum,-plugins] Add warning for features unavailable in non-head version

Signed-off-by: Squareys <squareys@googlemail.com>

* update version record

Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
 2021-01-26 15:03:54 -08:00
nicole mazzuca
68a74950d0
[vcpkg] Rename port_versions to versions (#15784) 2021-01-21 09:53:22 -08:00