From 5a44f4a233ab2ccb6b9b0e17b2971044860d067e Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Thu, 16 Dec 2021 11:35:38 +0000 Subject: [PATCH] appveyor: use VS2015 to build post-ARM64 --- appveyor.yml | 2 ++ tools/build.bat | 20 ++++++++++++++++++-- 2 files changed, 20 insertions(+), 2 deletions(-) diff --git a/appveyor.yml b/appveyor.yml index f3353fa6..c539ab4d 100644 --- a/appveyor.yml +++ b/appveyor.yml @@ -46,6 +46,8 @@ build_script: #- C:\cygwin64\bin\bash --login -c "make -C '%CD%\opt\cygfuse' dist" #- C:\cygwin\setup-x86.exe -qnNd -P cygport #- C:\cygwin\bin\bash --login -c "make -C '%CD%\opt\cygfuse' dist" +# remove ARM64 project configurations to build in VS2015 +- tools\gensrc\remove-all-arm64.bat # build winfsp - tools\build.bat %CONFIGURATION% diff --git a/tools/build.bat b/tools/build.bat index fdd83377..9fbe474d 100755 --- a/tools/build.bat +++ b/tools/build.bat @@ -24,6 +24,13 @@ if X%~nx0==Xbuild-choco.bat ( goto :choco ) +set BuildArm64=yes +if "%APPVEYOR_BUILD_WORKER_IMAGE%"=="Visual Studio 2015" ( + echo WARNING: APPVEYOR BUILD ON UNSUPPORTED VERSION OF VISUAL STUDIO. + echo: + set BuildArm64=no +) + call "%~dp0vcvarsall.bat" x64 if not X%SignedPackage%==X ( @@ -44,12 +51,21 @@ if X%SignedPackage%==X ( if exist "%%d" rmdir /s/q "%%d" ) - devenv winfsp.sln /build "%Configuration%|ARM64" - if errorlevel 1 goto fail + if X%BuildArm64%==Xyes ( + devenv winfsp.sln /build "%Configuration%|ARM64" + if errorlevel 1 goto fail + ) devenv winfsp.sln /build "%Configuration%|x64" if errorlevel 1 goto fail devenv winfsp.sln /build "%Configuration%|x86" if errorlevel 1 goto fail + if X%BuildArm64%==Xno ( + echo: + echo WARNING: APPVEYOR BUILD ON UNSUPPORTED VERSION OF VISUAL STUDIO. + echo WARNING: ARM64 BUILD PRODUCTS ARE COPIES OF X64 BUILD PRODUCTS. + echo: + copy build\%Configuration%\*-x64.* build\%Configuration%\*-a64.* >nul + ) for %%f in (build\%Configuration%\%MyProductFileName%-a64.sys build\%Configuration%\%MyProductFileName%-x64.sys build\%Configuration%\%MyProductFileName%-x86.sys) do ( signtool sign /ac %CrossCert% /i %Issuer% /n %Subject% /fd sha1 /t http://timestamp.digicert.com %%f