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

Add libcurl.dll to windows package

Browse Source
This commit is contained in:
lepapareil 2022-09-16 10:13:28 +02:00
parent e590b6eeda
commit a94c0197a7
No known key found for this signature in database
GPG Key ID: F4F06B068FB00692
4 changed files with 24 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/release.yml vendored
View File

@ -79,7 +79,11 @@ jobs:
run: | run: |
# vcpkg build prequisites # vcpkg build prequisites
(Get-Command vcpkg).Path (Get-Command vcpkg).Path
if (Test-Path C:\vcpkg\installed) {vcpkg update} else {vcpkg install libxml2:x64-windows} Get-ChildItem -Path C:\vcpkg\installed
if (Test-Path C:\vcpkg\installed\x64-windows\lib\libcurl.lib) {echo "curl already installed"} else {vcpkg install curl:x64-windows}
if (Test-Path C:\vcpkg\installed\x64-windows\lib\libxml2.lib) {echo "libxml2 already installed"} else {vcpkg install libxml2:x64-windows}
vcpkg update
vcpkg upgrade
vcpkg integrate install vcpkg integrate install
refreshenv refreshenv
# fix known win build bugs # fix known win build bugs

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

@ -252,8 +252,13 @@ jobs:
run: | run: |
# vcpkg build prequisites # vcpkg build prequisites
(Get-Command vcpkg).Path (Get-Command vcpkg).Path
if (Test-Path C:\vcpkg\installed) {vcpkg update} else {vcpkg install libxml2:x64-windows} Get-ChildItem -Path C:\vcpkg\installed
if (Test-Path C:\vcpkg\installed\x64-windows\lib\libcurl.lib) {echo "curl already installed"} else {vcpkg install curl:x64-windows}
if (Test-Path C:\vcpkg\installed\x64-windows\lib\libxml2.lib) {echo "libxml2 already installed"} else {vcpkg install libxml2:x64-windows}
vcpkg update
vcpkg upgrade
vcpkg integrate install vcpkg integrate install
refreshenv
# install proxy and server # install proxy and server
pip3 install --requirement bin/requirements-frozen.txt pip3 install --requirement bin/requirements-frozen.txt
- name: Run Tests units - name: Run Tests units

5
bin/windows/hurl.nsi
View File

@ -114,6 +114,11 @@ SectionGroup "dlls"
SetOutPath $INSTDIR SetOutPath $INSTDIR
File "zlib1.dll" File "zlib1.dll"
SectionEnd SectionEnd
Section "libcurl.dll"
SectionIn RO
SetOutPath $INSTDIR
File "libcurl.dll"
SectionEnd
SectionGroupEnd SectionGroupEnd
SectionGroup "txt" SectionGroup "txt"

2
contrib/windows/README.md
View File

@ -26,7 +26,7 @@ $oldpath = Get-ItemProperty -Path HKCU:\Environment -Name Path
$newpath = $oldpath.Path += ";c:\vcpkg" $newpath = $oldpath.Path += ";c:\vcpkg"
Set-ItemProperty -Path HKCU:\Environment -Name Path -Value $newpath Set-ItemProperty -Path HKCU:\Environment -Name Path -Value $newpath
$env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User") $env:Path = [System.Environment]::GetEnvironmentVariable("Path","Machine") + ";" + [System.Environment]::GetEnvironmentVariable("Path","User")
vcpkg install libxml2:x64-windows vcpkg install libxml2:x64-windows curl:x64-windows
vcpkg integrate install vcpkg integrate install
Set-ItemProperty -Path HKCU:\Environment -Name VCPKGRS_DYNAMIC -Value "1" Set-ItemProperty -Path HKCU:\Environment -Name VCPKGRS_DYNAMIC -Value "1"
$env:VCPKGRS_DYNAMIC = [System.Environment]::GetEnvironmentVariable("VCPKGRS_DYNAMIC","User") $env:VCPKGRS_DYNAMIC = [System.Environment]::GetEnvironmentVariable("VCPKGRS_DYNAMIC","User")