Commit Graph

6 Commits

Author SHA1 Message Date
Ahmed Yarub Hani Al Nuaimi
8b4ff54ecd
Fix aws-sdk-cpp and OpenSSL cross-platform builds ()
* Fix Aws Crypto Abstraction Layer and S2N builds

* Fix aws-c-cal build

* Revert changes

* [s2n] update to 1.1.0

* Do not build tests for any of AWS SDK for C++ dependencies
Remove unused flags from OpenSSL and AWS SDK for C++ builds

* Update versions

* Fix indentation

* Fix indentation

* Remove redundant flags

* Remove redundant options

* Update ports/aws-c-auth/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-c-cal/002-no-exe-no-tests.patch

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-c-cal/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-c-cal/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-c-compression/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-crt-cpp/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-checksums/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-c-event-stream/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-c-s3/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-c-http/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-c-io/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-c-mqtt/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Simplify patch
Restore PREFER_NINJA for OpenSSL build

* Update versions

* Replace deprecated methods

* Update versions

* Fix dependencies of OpenSSL

* Fix dependencies of OpenSSL

* Update ports/aws-c-cal/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-c-io/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update ports/aws-c-io/portfile.cmake

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Fix versions

* Revert quotation mark change

* Revert quotation mark change

* Revert quotation mark change

* Patch AWS CRT for C++ for iOS build
Do not copy sha256_profile tool when building aws-c-cal

* Remove redundant flags

* Fix indentation

* Update versions

* Update versions

* Fix aws-c-cal build
Update versions

* Update versions

* Update versions

* Update versions

* Update versions

* Update versions

* Fix library paths for Windows shared builds

* Revert compiler check

* Update versions

* Fix indentation
Revert OS check

* Update versions

* Fix indentation

* Fix indentation

* Fix indentation

* Update versions/o-/openssl.json

Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>

* Update versions

* Update versions

* Update versions

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: Charles-Auguste Marois <cmarois@coveo.com>
Co-authored-by: NancyLi1013 <46708020+NancyLi1013@users.noreply.github.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-11-22 14:18:07 -08:00
Charles-Auguste Marois
92af1ff59a
[aws-sdk-cpp] update to 1.9.96 ()
* [aws-c-common] Update to 0.6.9

* [aws-checksums] Update to 0.1.11

* [aws-c-event-stream] Upgrade to 0.2.7

* Add aws-c-cal port

* Add s2n port

* Add port aws-c-io

* [aws-c-event-stream] Update port to 0.2.7

* Update aws-sdk-cpp port

* Add aws-c-compression port

* Add aws-c-auth port

* Add aws-c-http port

* Add aws-c-mqtt port

* Add aws-c-s3 port

* Add aws-crt-cpp port

* [aws-sdk-cpp] Update port to 1.9.91 version

* Fix port issues.

* Upgrade aws-sdk-cpp to 1.9.96
Upgrade aws-crt-cpp to 0.15.1

* Support x64-windows

* Fix format issues

* Specify supported triplets for aws libs

* Specify platforms for more aws libs

* Support x64-windows-static triplet.

* Fix format issue for aws-c-common

* Update port versions file

* Use new vcpkg cmake methods and format

* Use new vcpkg cmake methods and format

* update version

* Fix s2n port typo

* Fix s2n port typo

Co-authored-by: Jonliu1993 <13720414433@163.com>
Co-authored-by: Billy Robert O'Neal III <bion@microsoft.com>
2021-09-14 19:06:34 -07:00
Billy O'Neal
b295670e4b
Bulk convert control files. ()
```
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
Ahmed Yarub Hani Al Nuaimi
c1c253fabc
[aws-sdk-cpp] [openssl] Fix iOS build ()
* Add curl try_compile parameters
Don't set compiler when compiling for iOS

* Update OpenSSL and AWS SDK for C++ port versions

* [vcpkg baseline][marble] Disable find I18n

* update version record

* Update versions/a-/aws-sdk-cpp.json

* Update versions/o-/openssl.json

* Fix port-versions after merging master branch

* Update versions/a-/aws-sdk-cpp.json

* Update versions/o-/openssl.json

* Fix merge conflicts

* Merge master branch

* Refactor OpenSSL's build script

* Refactor OpenSSL's build script

* Fix version

* Fix WASM build

* Fix version

* Fix disabled flags

* Disable treating warnings as errors

* Disable treating warnings as errors

* Fix hashes

* fix indentation

* [aws-sdk-cpp] use the powershell file to generate

* Fix versions after merging

* Fix versions after merging

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: nicole mazzuca <mazzucan@outlook.com>
2021-06-07 12:05:29 -07:00
Ahmed Yarub Hani Al Nuaimi
f519430b0f
[openssl] [aws-c-common] Fix AWS SDK for C++ build on WASM32 and Android ()
* Add curl try_compile parameters
Don't set compiler when compiling for iOS

* Update OpenSSL and AWS SDK for C++ port versions

* [vcpkg baseline][marble] Disable find I18n

* update version record

* Fix AWS C Common build for WASM32

* Fix OpenSSL build for WASM32

* Update AWS C Common and OpenSSL versions

* Update versions/a-/aws-sdk-cpp.json

* Update versions/o-/openssl.json

* Fix port-versions after merging master branch

* Fix port-versions after merging master branch

* Update versions/o-/openssl.json

* Update versions/a-/aws-sdk-cpp.json

* Update versions/o-/openssl.json

* Fix merge conflicts

* Fix merge conflicts

* Update ports/aws-c-common/portfile.cmake

Co-authored-by: Robert Schumacher <roschuma@microsoft.com>

* Update versions/a-/aws-c-common.json

* Update versions/o-/openssl.json

* Update versions/o-/openssl.json

* Update versions/o-/openssl.json

* Update ports/openssl/CONTROL

* Merge master branch and resolve merge conflicts

* Disable -moutline-atomics in Android also

* Revert line ending change

* Fix version info

Co-authored-by: Ahmed Yarub Hani Al Nuaimi <ahmed.alnuaimi@zwift.com>
Co-authored-by: JackBoosY <yuzaiyang@beyondsoft.com>
Co-authored-by: Jack·Boos·Yu <47264268+JackBoosY@users.noreply.github.com>
Co-authored-by: Robert Schumacher <roschuma@microsoft.com>
2021-05-26 14:03:32 -07:00
nicole mazzuca
68a74950d0
[vcpkg] Rename port_versions to versions () 2021-01-21 09:53:22 -08:00