aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-10-24 16:23:45 +0200
committerDaniel Stenberg <daniel@haxx.se>2019-10-25 13:03:15 +0200
commita030d483553f5486e84d8b454f11e78871fe401a (patch)
tree8185622904002f916d5c7abeefeaaaf6a3cebf9c
parent8986df802db9b5338d9d50a54232ebae4dbcf6dd (diff)
appveyor: make winbuilds with DEBUG=no/yes and VS 2015/2017
... and invoke "curl -V" once done Co-Authored-By: Jay Satiro Closes #4523
-rw-r--r--appveyor.yml32
1 files changed, 22 insertions, 10 deletions
diff --git a/appveyor.yml b/appveyor.yml
index e8d6e2521..53e66aa94 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -112,14 +112,24 @@ environment:
MSYS2_ARG_CONV_EXCL: "/*"
BUILD_OPT: -k
- APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
- BUILD_SYSTEM: winbuild
- OPENSSL: ON
- WINSSL: OFF
+ BUILD_SYSTEM: winbuild_vs2015
+ DEBUG: yes
+ PATHPART: debug
+ TESTING: OFF
+ - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
+ BUILD_SYSTEM: winbuild_vs2015
+ DEBUG: no
+ PATHPART: release
TESTING: OFF
- APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
- BUILD_SYSTEM: winbuild17
- OPENSSL: ON
- WINSSL: OFF
+ BUILD_SYSTEM: winbuild_vs2017
+ DEBUG: yes
+ PATHPART: debug
+ TESTING: OFF
+ - APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
+ BUILD_SYSTEM: winbuild_vs2017
+ DEBUG: no
+ PATHPART: release
TESTING: OFF
- APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2017"
BUILD_SYSTEM: VisualStudioSolution
@@ -165,18 +175,20 @@ build_script:
cd projects &&
.\\generate.bat %VC_VERSION% &&
msbuild.exe /p:Configuration="%PRJ_CFG%" "Windows\\%VC_VERSION%\\curl-all.sln" ) else (
- if %BUILD_SYSTEM%==winbuild (
+ if %BUILD_SYSTEM%==winbuild_vs2015 (
call buildconf.bat &&
cd winbuild &&
call "C:\Program Files\Microsoft SDKs\Windows\v7.1\Bin\SetEnv.cmd" /x64 &&
call "C:\Program Files (x86)\Microsoft Visual Studio 14.0\VC\vcvarsall.bat" x86_amd64 &&
- nmake /f Makefile.vc mode=dll VC=15 "SSL_PATH=C:\OpenSSL-v111-Win64" WITH_SSL=dll MACHINE=x64
+ nmake /f Makefile.vc mode=dll VC=14 "SSL_PATH=C:\OpenSSL-v111-Win64" WITH_SSL=dll MACHINE=x64 DEBUG=%DEBUG% &&
+ ..\builds\libcurl-vc14-x64-%PATHPART%-dll-ssl-dll-ipv6-sspi\bin\curl.exe -V
) else (
- if %BUILD_SYSTEM%==winbuild17 (
+ if %BUILD_SYSTEM%==winbuild_vs2017 (
call buildconf.bat &&
cd winbuild &&
call "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvars64.bat" &&
- nmake /f Makefile.vc mode=dll VC=15 "SSL_PATH=C:\OpenSSL-v111-Win64" WITH_SSL=dll MACHINE=x64
+ nmake /f Makefile.vc mode=dll VC=15 "SSL_PATH=C:\OpenSSL-v111-Win64" WITH_SSL=dll MACHINE=x64 DEBUG=%DEBUG% &&
+ ..\builds\libcurl-vc15-x64-%PATHPART%-dll-ssl-dll-ipv6-sspi\bin\curl.exe -V
))))
test_script: