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

19
bin/windows/hurl.nsi
View File

@ -63,7 +63,7 @@ SectionGroup "executables"
SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000 SendMessage ${HWND_BROADCAST} ${WM_WININICHANGE} 0 "STR:Environment" /TIMEOUT=5000
; Write the uninstall ; Write the uninstall
WriteUninstaller "$INSTDIR\uninstall.exe" WriteUninstaller "$INSTDIR\uninstall.exe"
; Write windows uninstall panel informations ; Write windows uninstall panel informations
${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2 ${GetSize} "$INSTDIR" "/S=0K" $0 $1 $2
IntFmt $0 "0x%08X" $0 IntFmt $0 "0x%08X" $0
WriteRegStr HKLM "${UNINSTALLPANELKEY}" "DisplayName" "Hurl" WriteRegStr HKLM "${UNINSTALLPANELKEY}" "DisplayName" "Hurl"
@ -78,14 +78,14 @@ SectionGroup "executables"
WriteRegStr HKLM "${UNINSTALLPANELKEY}" "NoModify" 1 WriteRegStr HKLM "${UNINSTALLPANELKEY}" "NoModify" 1
WriteRegStr HKLM "${UNINSTALLPANELKEY}" "NoRepair" 1 WriteRegStr HKLM "${UNINSTALLPANELKEY}" "NoRepair" 1
WriteRegStr HKLM "${UNINSTALLPANELKEY}" "InstallLocation" "$INSTDIR" WriteRegStr HKLM "${UNINSTALLPANELKEY}" "InstallLocation" "$INSTDIR"
WriteRegStr HKLM "${UNINSTALLPANELKEY}" "Publisher" "Orange-OpenSource" WriteRegStr HKLM "${UNINSTALLPANELKEY}" "Publisher" "Orange-OpenSource"
WriteRegDWORD HKLM "${UNINSTALLPANELKEY}" "EstimatedSize" "$0" WriteRegDWORD HKLM "${UNINSTALLPANELKEY}" "EstimatedSize" "$0"
SectionEnd SectionEnd
Section "hurlfmt.exe" Section "hurlfmt.exe"
SectionIn RO SectionIn RO
SetOutPath $INSTDIR SetOutPath $INSTDIR
File "hurlfmt.exe" File "hurlfmt.exe"
SectionEnd SectionEnd
SectionGroupEnd SectionGroupEnd
SectionGroup "dlls" SectionGroup "dlls"
@ -113,7 +113,12 @@ SectionGroup "dlls"
SectionIn RO SectionIn RO
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"
@ -131,16 +136,16 @@ SectionGroup "txt"
SectionIn 3 SectionIn 3
SetOutPath $INSTDIR SetOutPath $INSTDIR
File "..\..\CHANGELOG.md" File "..\..\CHANGELOG.md"
SectionEnd SectionEnd
Section "LICENSE" Section "LICENSE"
SectionIn 3 SectionIn 3
SetOutPath $INSTDIR SetOutPath $INSTDIR
File "..\..\LICENSE" File "..\..\LICENSE"
SectionEnd SectionEnd
SectionGroupEnd SectionGroupEnd
; Uninstaller ; Uninstaller
Section "Uninstall" Section "Uninstall"
; Remove installed files ; Remove installed files
Delete $INSTDIR\* Delete $INSTDIR\*
RMDir "$INSTDIR" RMDir "$INSTDIR"

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")