]> granicus.if.org Git - php/commitdiff
Fix AppVeyor setup wrt. changed OpenSSL default config path
authorChristoph M. Becker <cmbecker69@gmx.de>
Tue, 1 Oct 2019 08:01:34 +0000 (10:01 +0200)
committerChristoph M. Becker <cmbecker69@gmx.de>
Tue, 1 Oct 2019 08:01:34 +0000 (10:01 +0200)
appveyor/test_task.bat

index ba6a862f22abe17c5c2234f454e8be8b6a7fe3e9..0578170a97ca754a4a5ba11d0f0da60f0b3ea5f7 100644 (file)
@@ -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=