summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2019-10-25 12:20:45 +0200
committerDaniel Stenberg <daniel@haxx.se>2019-10-25 12:20:45 +0200
commit0454afb9086c7b57a471bc8b5388f84965e0ccee (patch)
tree68882a8fe65f9726fc56dd73d6a5a52a8c83be96
parentdc3d1f0c14352be86b592c9ed7c99533b0019a1d (diff)
downloadcurl-bagder/winbuild-release.tar.gz
fixup path on info on what path to use for the curl executablebagder/winbuild-release
-rw-r--r--appveyor.yml8
1 files changed, 6 insertions, 2 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 75c045d26..53e66aa94 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -114,18 +114,22 @@ environment:
- APPVEYOR_BUILD_WORKER_IMAGE: "Visual Studio 2015"
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: 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
@@ -177,14 +181,14 @@ build_script:
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=14 "SSL_PATH=C:\OpenSSL-v111-Win64" WITH_SSL=dll MACHINE=x64 DEBUG=%DEBUG% &&
- ..\builds\libcurl-vc14-x64-debug-dll-ssl-dll-ipv6-sspi\bin\curl.exe -V
+ ..\builds\libcurl-vc14-x64-%PATHPART%-dll-ssl-dll-ipv6-sspi\bin\curl.exe -V
) else (
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 DEBUG=%DEBUG% &&
- ..\builds\libcurl-vc15-x64-release-dll-ssl-dll-ipv6-sspi\bin\curl.exe -V
+ ..\builds\libcurl-vc15-x64-%PATHPART%-dll-ssl-dll-ipv6-sspi\bin\curl.exe -V
))))
test_script: