Orange-OpenSource/hurl
1
1
Fork 0
mirror of https://github.com/Orange-OpenSource/hurl.git synced 2024-11-26 00:22:10 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert Use openssl3 for libcurl on windows

Browse Source
This commit is contained in:
fpinto 2022-12-28 22:42:27 +01:00
parent 51ecec615d
commit 89cc524d17
No known key found for this signature in database
GPG Key ID: F4F06B068FB00692
9 changed files with 21 additions and 76 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
.github/workflows/package.yml vendored
View File

@ -313,12 +313,12 @@ jobs:
uses: actions/checkout@v3
with:
ref: ${{ inputs.branch }}
- name: Cache
uses: actions/cache@v3
with:
path: C:\vcpkg\installed
key: ${{ runner.os }}-release-windows-x64-${{ github.sha }}
restore-keys: ${{ runner.os }}-release-windows-x64-
# - name: Cache
# uses: actions/cache@v3
# with:
# path: C:\vcpkg\installed
# key: ${{ runner.os }}-release-windows-x64-${{ github.sha }}
# restore-keys: ${{ runner.os }}-release-windows-x64-
- name: Install Rust
uses: actions-rs/toolchain@v1
with:

12
.github/workflows/test.yml vendored
View File

@ -283,12 +283,12 @@ jobs:
uses: actions/checkout@v3
with:
ref: ${{ inputs.branch }}
- name: Cache
uses: actions/cache@v3
with:
path: C:\vcpkg\installed
key: ${{ runner.os }}-test-windows-x64-${{ github.sha }}
restore-keys: ${{ runner.os }}-test-windows-x64-
# - name: Cache
# uses: actions/cache@v3
# with:
# path: C:\vcpkg\installed
# key: ${{ runner.os }}-test-windows-x64-${{ github.sha }}
# restore-keys: ${{ runner.os }}-test-windows-x64-
- name: Install Rust
uses: actions-rs/toolchain@v1
with:

42
Cargo.lock generated
View File

@ -423,21 +423,6 @@ version = "1.0.7"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1"
[[package]]
name = "foreign-types"
version = "0.3.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6f339eb8adc052cd2ca78910fda869aefa38d22d5cb648e6485e4d3fc06f3b1"
dependencies = [
"foreign-types-shared",
]
[[package]]
name = "foreign-types-shared"
version = "0.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "00b0228411908ca8685dba7fc2cdd70ec9990a6e753e89b6ac91a84c40fbaf4b"
[[package]]
name = "form_urlencoded"
version = "1.1.0"
@ -533,7 +518,6 @@ dependencies = [
"libflate",
"libxml",
"md5",
"openssl",
"percent-encoding",
"regex",
"serde",
@ -779,32 +763,6 @@ version = "1.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "86f0b0d4bf799edbc74508c1e8bf170ff5f41238e5f8225603ca7caaae2b7860"
[[package]]
name = "openssl"
version = "0.10.45"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b102428fd03bc5edf97f62620f7298614c45cedf287c271e7ed450bbaf83f2e1"
dependencies = [
"bitflags",
"cfg-if",
"foreign-types",
"libc",
"once_cell",
"openssl-macros",
"openssl-sys",
]
[[package]]
name = "openssl-macros"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b501e44f11665960c7e7fcf062c7d96a14ade4aa98116c004b2e37b5be7d736c"
dependencies = [
"proc-macro2",
"quote",
"syn",
]
[[package]]
name = "openssl-probe"
version = "0.1.5"

9
bin/install_prerequisites_windows.ps1
View File

@ -5,13 +5,15 @@ powershell write-host -foregroundcolor Cyan "----- install system prerequisites
# install libxml and libcurl[openssl]
$vcpkg_dir=(Get-command vcpkg).Source
if (Test-Path $vcpkg_dir\installed\x64-windows\bin\libssl-3-x64.dll) {echo "curl[openssl] already installed"} else {vcpkg install --recurse curl[openssl]:x64-windows}
if (Test-Path $vcpkg_dir\installed\x64-windows\lib\libcurl.lib) {echo "curl already installed"} else {vcpkg install curl:x64-windows}
if ($LASTEXITCODE) { Throw }
if (Test-Path $vcpkg_dir\installed\x64-windows\bin\libxml2.dll) {echo "libxml2 already installed"} else {vcpkg install --recurse libxml2:x64-windows}
if (Test-Path $vcpkg_dir\installed\x64-windows\lib\libxml2.lib) {echo "libxml2 already installed"} else {vcpkg install libxml2:x64-windows}
if ($LASTEXITCODE) { Throw }
vcpkg update
if ($LASTEXITCODE) { Throw }
vcpkg upgrade --no-dry-run
vcpkg upgrade
if ($LASTEXITCODE) { Throw }
vcpkg integrate install
if ($LASTEXITCODE) { Throw }
@ -19,3 +21,4 @@ if ($LASTEXITCODE) { Throw }
# update pip
python -m pip install --upgrade pip --quiet
if ($LASTEXITCODE) { Throw }

2
bin/release/release.ps1
View File

@ -14,7 +14,7 @@ if ($LASTEXITCODE) { Throw }
$release_dir="$project_root_path\target\release"
$package_dir="$project_root_path\target\win-package"
New-Item -ItemType Directory -Force -Path $package_dir
Get-ChildItem -Path $release_dir\build -Recurse -Include *.dll -File | Copy-Item -Destination "$package_dir"
Get-ChildItem -Path $release_dir -Recurse -Include *.dll -File | Copy-Item -Destination "$package_dir"
Get-ChildItem -Path $release_dir -Recurse -Include hurl*.exe -File | Copy-Item -Destination "$package_dir"
((& $package_dir\hurl --version) -Split " ")[1] > $package_dir\version.txt
Get-Content $package_dir\version.txt

2
bin/test/test_unit.ps1
View File

@ -12,7 +12,7 @@ $project_root_path=(Resolve-Path -LiteralPath $PSScriptRoot\..\..).path
$release_dir="$project_root_path\target\release"
$package_dir="$project_root_path\target\test-package"
New-Item -ItemType Directory -Force -Path "$package_dir"
Get-ChildItem -Path $release_dir\build -Recurse -Include *.dll -File | Copy-Item -Destination $package_dir
Get-ChildItem -Path $release_dir -Recurse -Include *.dll -File | Copy-Item -Destination $package_dir
Get-ChildItem -Path $release_dir -Recurse -Include hurl*.exe -File | Copy-Item -Destination $package_dir
# add hurl to PATH

15
bin/windows/hurl.nsi
View File

@ -119,21 +119,6 @@ SectionGroup "dlls"
SetOutPath $INSTDIR
File "libcurl.dll"
SectionEnd
Section "libssl-3-x64.dll"
SectionIn RO
SetOutPath $INSTDIR
File "libssl-3-x64.dll"
SectionEnd
Section "libcrypto-3-x64.dll"
SectionIn RO
SetOutPath $INSTDIR
File "libcrypto-3-x64.dll"
SectionEnd
Section "legacy.dll"
SectionIn RO
SetOutPath $INSTDIR
File "legacy.dll"
SectionEnd
SectionGroupEnd
SectionGroup "txt"

2
contrib/windows/README.md
View File

@ -46,7 +46,7 @@ git.exe clone https://github.com/Orange-OpenSource/hurl
cd c:\hurl
cargo build --release --verbose
New-Item -ItemType "Directory" -Path c:\hurl\target -Name "win-package"
Get-ChildItem -Path c:\hurl\target\release\build -Recurse -Include *.dll -File | Copy-Item -Destination "c:\hurl\target\win-package"
Get-ChildItem -Path c:\hurl\target\release -Recurse -Include *.dll -File | Copy-Item -Destination "c:\hurl\target\win-package"
Get-ChildItem -Path c:\hurl\target\release -Recurse -Include hurl*.exe -File | Copy-Item -Destination "c:\hurl\target\win-package"
((c:\hurl\target\win-package\hurl.exe --version) -Split " ")[1] > c:\hurl\target\win-package\version.txt
$oldpath = Get-ItemProperty -Path HKCU:\Environment -Name Path

1
packages/hurl/Cargo.toml
View File

@ -48,7 +48,6 @@ termion = "2.0.1"
[target.'cfg(windows)'.build-dependencies]
winres = "0.1.12"
openssl = "0.10.45"
[build-dependencies]
cc = "1.0.78"