diff --git a/appveyor.yml b/appveyor.yml index 69220368ab26572557da3c5a4678589eec679aa9..847b5fb75d5efc8569d95b60b8a02bbb0e2cad13 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -14,7 +14,7 @@ install: - git clone -q https://github.com/xiph/ogg.git ogg - msbuild opus\win32\VS2015\opus.vcxproj /p:Configuration=%CONFIGURATION:-NoHTTP=%;Platform=%PLATFORM% /m /v:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" - msbuild ogg\win32\VS2015\libogg_static.sln /p:Configuration=%CONFIGURATION:-NoHTTP=%;Platform=%PLATFORM% /m /v:minimal /logger:"C:\Program Files\AppVeyor\BuildAgent\Appveyor.MSBuildLogger.dll" -- git clone -q --branch=OpenSSL_1_0_2-stable https://github.com/openssl/openssl.git openssl +- if %CONFIGURATION:-NoHTTP=%==%CONFIGURATION% git clone -q --branch=OpenSSL_1_0_2-stable https://github.com/openssl/openssl.git openssl - ps: >- If ($env:Platform -Match "Win32") { $env:VCVARS_PLATFORM="x86" @@ -25,15 +25,15 @@ install: $env:OPENSSL_TARGET="VC-WIN64A" $env:DO="do_win64a" } -- call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM% -- cd openssl +- if %CONFIGURATION:-NoHTTP=%==%CONFIGURATION% call "%VS140COMNTOOLS%\..\..\VC\vcvarsall.bat" %VCVARS_PLATFORM% +- if %CONFIGURATION:-NoHTTP=%==%CONFIGURATION% cd openssl # without prefix, libs end up in out32 for both 32 and 64-bit -- perl Configure %OPENSSL_TARGET% no-asm --prefix=%CD%\%PLATFORM%\Release -- call ms\%DO% -- nmake /f ms\nt.mak -- nmake /f ms\nt.mak install +- if %CONFIGURATION:-NoHTTP=%==%CONFIGURATION% perl Configure %OPENSSL_TARGET% no-asm --prefix=%CD%\%PLATFORM%\Release +- if %CONFIGURATION:-NoHTTP=%==%CONFIGURATION% call ms\%DO% +- if %CONFIGURATION:-NoHTTP=%==%CONFIGURATION% nmake /f ms\nt.mak +- if %CONFIGURATION:-NoHTTP=%==%CONFIGURATION% nmake /f ms\nt.mak install # prevents warning 4099 on linking -- copy /B tmp32\lib.pdb %CD%\%PLATFORM%\Release\lib\lib.pdb +- if %CONFIGURATION:-NoHTTP=%==%CONFIGURATION% copy /B tmp32\lib.pdb %CD%\%PLATFORM%\Release\lib\lib.pdb - cd %APPVEYOR_BUILD_FOLDER% build: