Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

AppVeyor: install and include OpenSSL #1457

Merged
merged 2 commits into from
Jan 24, 2022
Merged

AppVeyor: install and include OpenSSL #1457

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
0f26fff
AppVeyor: install and include OpenSSL
theGreatWhiteShark Jan 14, 2022
dc0e421
Merge branch 'master' into phil-fix-windows-ssl-support
theGreatWhiteShark Jan 24, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 17 additions & 0 deletions .appveyor.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -62,6 +62,10 @@ environment:
CMAKE_FLAGS: "-DWANT_DEBUG:BOOL=OFF -DWIN64:BOOL=ON"
appveyor_build_worker_image: Visual Studio 2019
LIBJACK: libjack64.dll
OPENSSL_DIR: OpenSSL-Win64
LIBSSL: libssl-1_1-x64.dll
LIBCRYPTO: libcrypto-1_1-x64.dll

CHOCO_ARCH:
PROGRAM_FILES: "Program Files"

Expand All @@ -73,6 +77,10 @@ environment:
CMAKE_FLAGS: "-DWANT_DEBUG:BOOL=OFF -DWIN64:BOOL=OFF"
appveyor_build_worker_image: Visual Studio 2019
LIBJACK: libjack.dll
OPENSSL_DIR: OpenSSL-Win32
LIBSSL: libssl-1_1.dll
LIBCRYPTO: libcrypto-1_1.dll

CHOCO_ARCH: --x86
PROGRAM_FILES: "Program Files (x86)"

Expand Down Expand Up @@ -284,6 +292,13 @@ for:
dir "c:\%PROGRAM_FILES%\JACK2"
dir "c:\%PROGRAM_FILES%\JACK2\lib"

REM *** Results are ignored since a dependency was not properly installed in 32 bit Windows. But the .dll files required are installed regardless, so we don't care.***

choco install %CHOCO_ARCH% -y openssl --version=1.1.1.1300 || cmd /c "exit /b 0"

echo "C:\%OPENSSL_DIR%"
dir "C:\%OPENSSL_DIR%"

REM *** Install dependencies ***
c:\msys64\usr\bin\pacman --noconfirm -S -q %MSYS_REPO%-libarchive
c:\msys64\usr\bin\pacman --noconfirm -S -q %MSYS_REPO%-libsndfile
Expand Down Expand Up @@ -340,6 +355,8 @@ for:
REM copy_third_party_libs.py thinks it's a system lib and
REM won't copy it.
copy c:\Windows\%LIBJACK% %APPVEYOR_BUILD_FOLDER%\build\windows\extralibs
copy c:\%OPENSSL_DIR%\%LIBSSL% %APPVEYOR_BUILD_FOLDER%\build\windows\extralibs
copy c:\%OPENSSL_DIR%\%LIBCRYPTO% %APPVEYOR_BUILD_FOLDER%\build\windows\extralibs

REM *** Build installer ***
cpack -G NSIS -v
Expand Down