diff options
| author | K.Takata <kentkt@csc.jp> | 2021-05-29 12:42:47 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2021-05-29 12:42:47 +0200 |
| commit | f89be8de14cc9055d12f7b0f2c270a5bc09fc86c (patch) | |
| tree | f673d4ab8ad1f4f1647f97d91e1cb20caf46da80 | |
| parent | 3552e742898cd57adaf9b8ce32a9056271eab8d2 (diff) | |
| download | vim-git-f89be8de14cc9055d12f7b0f2c270a5bc09fc86c.tar.gz | |
patch 8.2.2899: Appveyor script does not detect nmake failurev8.2.2899
Problem: Appveyor script does not detect nmake failure.
Solution: Explicitly check for executable. (Ken Takata, closes #8281)
| -rw-r--r-- | ci/appveyor.bat | 20 | ||||
| -rw-r--r-- | 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 @@ -751,6 +751,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 2899, +/**/ 2898, /**/ 2897, |