diff --git a/appveyor.sh b/appveyor.sh index 58b12ec60a..729d8b355d 100644 --- a/appveyor.sh +++ b/appveyor.sh @@ -50,12 +50,12 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then for _chkprefill in '' ${CHKPREFILL:-}; do options='' [ "${_chkprefill}" = '_chkprefill' ] && options+=' -D_CURL_PREFILL=OFF' - [[ "${TARGET}" = *'ARM64'* ]] && SKIP_RUN='ARM64 architecture' + [[ "${TARGET:-}" = *'ARM64'* ]] && SKIP_RUN='ARM64 architecture' [ -n "${TOOLSET:-}" ] && options+=" -T ${TOOLSET}" [ "${OPENSSL}" = 'ON' ] && options+=" -DOPENSSL_ROOT_DIR=${openssl_root_win}" [ -n "${CURLDEBUG:-}" ] && options+=" -DENABLE_CURLDEBUG=${CURLDEBUG}" # shellcheck disable=SC2086 - cmake -B "_bld${_chkprefill}" -G "${PRJ_GEN}" ${TARGET} \ + cmake -B "_bld${_chkprefill}" -G "${PRJ_GEN}" ${TARGET:-} \ -DCMAKE_VS_GLOBALS=TrackFileAccess=false \ -DCMAKE_UNITY_BUILD="${UNITY}" -DCURL_TEST_BUNDLES=ON \ -DCURL_WERROR=ON \ @@ -77,7 +77,7 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then echo 'curl_config.h'; grep -F '#define' _bld/lib/curl_config.h | sort || true # shellcheck disable=SC2086 if ! cmake --build _bld --config "${PRJ_CFG}" --parallel 2 -- ${BUILD_OPT:-}; then - if [ "${PRJ_GEN}" = 'Visual Studio 9 2008' ]; then + if [[ "${PRJ_GEN}" = 'Visual Studio 9 2008'* ]]; then find . -name BuildLog.htm -exec dos2unix '{}' + find . -name BuildLog.htm -exec cat '{}' + fi diff --git a/appveyor.yml b/appveyor.yml index b0d98069c1..ed5ca088ec 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -70,6 +70,14 @@ environment: SCHANNEL: 'ON' SHARED: 'ON' EXAMPLES: 'OFF' + - job_name: 'CMake, VS2008, Debug, x64, OpenSSL 1.0.2 + Schannel, Shared, Build-tests & examples' + APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2013' + PRJ_GEN: 'Visual Studio 9 2008 Win64' + PRJ_CFG: Debug + OPENSSL: 'ON' + SCHANNEL: 'ON' + SHARED: 'ON' + EXAMPLES: 'OFF' - job_name: 'CMake, VS2010, Debug, x64, Schannel, Shared, Build-tests & examples' APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015' PRJ_GEN: 'Visual Studio 10 2010'