From f89be8de14cc9055d12f7b0f2c270a5bc09fc86c Mon Sep 17 00:00:00 2001
From: "K.Takata" <kentkt@csc.jp>
Date: Sat, 29 May 2021 12:42:47 +0200
Subject: patch 8.2.2899: Appveyor script does not detect nmake failure

Problem:    Appveyor script does not detect nmake failure.
Solution:   Explicitly check for executable. (Ken Takata, closes #8281)
---
 ci/appveyor.bat | 20 ++++++++++++++------
 src/version.c   |  2 ++
 2 files changed, 16 insertions(+), 6 deletions(-)

diff --git a/ci/appveyor.bat b/ci/appveyor.bat
index 164d7bcc2..5d5a9f182 100644
--- a/ci/appveyor.bat
+++ b/ci/appveyor.bat
@@ -11,7 +11,11 @@ sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
 echo "Building MSVC 64bit console Version"
 nmake -f Make_mvc2.mak CPU=AMD64 ^
     OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^
-    FEATURES=%FEATURE% || exit 1
+    FEATURES=%FEATURE%
+if not exist vim.exe (
+    echo Build failure.
+    exit 1
+)
 
 :: build MSVC huge version with python and channel support
 :: GUI needs to be last, so that testing works
@@ -21,16 +25,20 @@ if "%FEATURE%" == "HUGE" (
         OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
         PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
         PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^
-        FEATURES=%FEATURE% || exit 1
+        FEATURES=%FEATURE%
 ) ELSE (
     nmake -f Make_mvc2.mak CPU=AMD64 ^
         OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
-        FEATURES=%FEATURE% || exit 1
+        FEATURES=%FEATURE%
+)
+if not exist gvim.exe (
+    echo Build failure.
+    exit 1
 )
-.\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt
+.\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt || exit 1
 
 echo "version output MSVC console"
-.\vim --version
+.\vim --version || exit 1
 echo "version output MSVC GUI"
-type ver_msvc.txt
+type ver_msvc.txt || exit 1
 cd ..
diff --git a/src/version.c b/src/version.c
index 4b1a7aec9..9e3ba0fa3 100644
--- a/src/version.c
+++ b/src/version.c
@@ -750,6 +750,8 @@ static char *(features[]) =
 
 static int included_patches[] =
 {   /* Add new patch number below this line */
+/**/
+    2899,
 /**/
     2898,
 /**/
-- 
cgit v1.2.1