Skip to content

Commit 142fd1c

Browse files
committed
appveyor: add VS2010 x86 Release VS project job and switch VS2013 to x64
To have a test case for VS2010 after bumping to minimum Vista. Ref: curl#18009 Closes curl#19570
1 parent ea10570 commit 142fd1c

2 files changed

Lines changed: 13 additions & 4 deletions

File tree

appveyor.sh

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ if [ "${BUILD_SYSTEM}" = 'CMake' ]; then
7575
-DCURL_USE_OPENSSL="${OPENSSL}" \
7676
-DCURL_USE_LIBPSL=OFF \
7777
${options} \
78-
|| { cat ${root}/_bld/CMakeFiles/CMake* 2>/dev/null; false; }
78+
|| { cat "${root}"/_bld/CMakeFiles/CMake* 2>/dev/null; false; }
7979
[ "${APPVEYOR_BUILD_WORKER_IMAGE}" = 'Visual Studio 2013' ] && cd ..
8080
done
8181
if [ -d _bld_chkprefill ] && ! diff -u _bld/lib/curl_config.h _bld_chkprefill/lib/curl_config.h; then
@@ -92,9 +92,11 @@ elif [ "${BUILD_SYSTEM}" = 'VisualStudioSolution' ]; then
9292
(
9393
cd projects
9494
./generate.bat "${VC_VERSION}"
95-
msbuild.exe -maxcpucount "-property:Configuration=${PRJ_CFG}" "Windows/${VC_VERSION}/curl-all.sln"
95+
msbuild.exe -maxcpucount "-property:Configuration=${PRJ_CFG}" "-property:Platform=${PLAT}" "Windows/${VC_VERSION}/curl-all.sln"
9696
)
97-
curl="build/Win32/${VC_VERSION}/${PRJ_CFG}/curld.exe"
97+
[ "${PLAT}" = 'x64' ] && platdir='Win64' || platdir='Win32'
98+
[[ "${PRJ_CFG}" = *'Debug'* ]] && binsuffix='d' || binsuffix=''
99+
curl="build/${platdir}/${VC_VERSION}/${PRJ_CFG}/curl${binsuffix}.exe"
98100
fi
99101

100102
find . \( -name '*.exe' -o -name '*.dll' -o -name '*.lib' -o -name '*.pdb' \) -exec file -- '{}' \;

appveyor.yml

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,10 +148,17 @@ environment:
148148

149149
# generated VisualStudioSolution-based builds
150150

151-
- job_name: 'VisualStudioSolution VS2013, Debug, x86, Schannel, Build-only'
151+
- job_name: 'VisualStudioSolution VS2010, Release, x86, Schannel, Build-only'
152+
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2013'
153+
BUILD_SYSTEM: VisualStudioSolution
154+
PRJ_CFG: 'DLL Release - DLL Windows SSPI - DLL WinIDN'
155+
PLAT: 'Win32'
156+
VC_VERSION: VC10
157+
- job_name: 'VisualStudioSolution VS2013, Debug, x64, Schannel, Build-only'
152158
APPVEYOR_BUILD_WORKER_IMAGE: 'Visual Studio 2015'
153159
BUILD_SYSTEM: VisualStudioSolution
154160
PRJ_CFG: 'DLL Debug - DLL Windows SSPI - DLL WinIDN'
161+
PLAT: 'x64'
155162
VC_VERSION: VC12
156163

157164
install:

0 commit comments

Comments
 (0)