From d596fda993ae44fa8fb6d45bcc3b8ead6699a815 Mon Sep 17 00:00:00 2001 From: "Christoph M. Becker" Date: Tue, 1 Oct 2019 10:01:34 +0200 Subject: Fix AppVeyor setup wrt. changed OpenSSL default config path --- appveyor/test_task.bat | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) (limited to 'appveyor') diff --git a/appveyor/test_task.bat b/appveyor/test_task.bat index ba6a862f22..0578170a97 100644 --- a/appveyor/test_task.bat +++ b/appveyor/test_task.bat @@ -49,11 +49,16 @@ set PDOTEST_DSN=odbc:%ODBC_TEST_DSN% rem prepare for ext/openssl if "%APPVEYOR%" equ "True" rmdir /s /q C:\OpenSSL-Win32 >NUL 2>NUL if "%APPVEYOR%" equ "True" rmdir /s /q C:\OpenSSL-Win64 >NUL 2>NUL -mkdir c:\usr\local\ssl +if "%PLATFORM%" == "x64" ( + set OPENSSLDIR="C:\Program Files\Common Files\SSL" +) else ( + set OPENSSLDIR="C:\Program Files (x86)\Common Files\SSL" +) +mkdir %OPENSSLDIR% if %errorlevel% neq 0 exit /b 3 -copy %DEPS_DIR%\template\ssl\openssl.cnf c:\usr\local\ssl +copy %DEPS_DIR%\template\ssl\openssl.cnf %OPENSSLDIR% if %errorlevel% neq 0 exit /b 3 -set OPENSSL_CONF=c:\usr\local\ssl\openssl.cnf +set OPENSSL_CONF=%OPENSSLDIR%\openssl.cnf rem set OPENSSL_CONF= rem set SSLEAY_CONF= -- cgit v1.2.1