diff --git a/appveyor.sh b/appveyor.sh index 72ecba7bd2..ee4deaf5cb 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -87,13 +87,7 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then fi echo 'curl_config.h'; grep -F '#define' _bld/lib/curl_config.h | sort || true # shellcheck disable=SC2086 - if ! time cmake --build _bld --config "${PRJ_CFG}" --parallel 2 -- ${BUILD_OPT:-}; then - if [ "${PRJ_GEN}" = 'Visual Studio 9 2008' ]; then - find . -name BuildLog.htm -exec dos2unix '{}' + - find . -name BuildLog.htm -exec cat '{}' + - fi - false - fi + time cmake --build _bld --config "${PRJ_CFG}" --parallel 2 -- ${BUILD_OPT:-} [ "${SHARED}" = 'ON' ] && PATH="$PWD/_bld/lib/${PRJ_CFG}:$PATH" [ "${OPENSSL}" = 'ON' ] && { PATH="${openssl_root}:$PATH"; cp "${openssl_root}"/*.dll "_bld/src/${PRJ_CFG}"; } curl="_bld/src/${PRJ_CFG}/curl.exe" diff --git a/appveyor.yml b/appveyor.yml index 5c1df2fac3..634b777340 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -61,21 +61,13 @@ environment: SCHANNEL: 'ON' DEBUG: 'OFF' CURLDEBUG: 'ON' - - job_name: 'CMake, VS2008, Debug, x86, OpenSSL 1.0.2 + Schannel, Shared, Build-tests & examples' - APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015' - PRJ_GEN: 'Visual Studio 9 2008' - TARGET: '-A Win32' - PRJ_CFG: Debug - OPENSSL: 'ON' - SCHANNEL: 'ON' - SHARED: 'ON' - EXAMPLES: 'ON' - - job_name: 'CMake, VS2010, Debug, x64, Schannel, Shared, Build-tests & examples' + - job_name: 'CMake, VS2010, Debug, x64, OpenSSL 1.0.2 + Schannel, Shared, Build-tests & examples' APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2013' PRJ_GEN: 'Visual Studio 10 2010' TARGET: '-A x64' WINTARGET: 0x0501 # Windows XP PRJ_CFG: Debug + OPENSSL: 'ON' SCHANNEL: 'ON' SHARED: 'ON' EXAMPLES: 'ON'