To: vim_dev@googlegroups.com
Subject: Patch 8.2.2899
Fcc: outbox
From: Bram Moolenaar <Bram@moolenaar.net>
Mime-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
------------

Patch 8.2.2899
Problem:    Appveyor script does not detect nmake failure.
Solution:   Explicitly check for executable. (Ken Takata, closes #8281)
Files:      ci/appveyor.bat


*** ../vim-8.2.2898/ci/appveyor.bat	2020-07-29 16:31:59.495477647 +0200
--- ci/appveyor.bat	2021-05-29 12:39:40.216125224 +0200
***************
*** 11,17 ****
  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
  
  :: build MSVC huge version with python and channel support
  :: GUI needs to be last, so that testing works
--- 11,21 ----
  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%
! 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,36 ****
          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
  ) ELSE (
      nmake -f Make_mvc2.mak CPU=AMD64 ^
          OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
!         FEATURES=%FEATURE% || exit 1
  )
! .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt
  
  echo "version output MSVC console"
! .\vim --version
  echo "version output MSVC GUI"
! type ver_msvc.txt
  cd ..
--- 25,44 ----
          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%
  ) ELSE (
      nmake -f Make_mvc2.mak CPU=AMD64 ^
          OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
!         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 || exit 1
  
  echo "version output MSVC console"
! .\vim --version || exit 1
  echo "version output MSVC GUI"
! type ver_msvc.txt || exit 1
  cd ..
*** ../vim-8.2.2898/src/version.c	2021-05-29 12:21:54.948859803 +0200
--- src/version.c	2021-05-29 12:41:21.439979766 +0200
***************
*** 752,753 ****
--- 752,755 ----
  {   /* Add new patch number below this line */
+ /**/
+     2899,
  /**/

-- 
Did you ever stop to think...  and forget to start again?
                                  -- Steven Wright

 /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net   \\\
///                                                                      \\\
\\\        sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
 \\\            help me help AIDS victims -- http://ICCF-Holland.org    ///