Mercurial > vim
comparison ci/appveyor.bat @ 24721:8a3659f78064 v8.2.2899
patch 8.2.2899: Appveyor script does not detect nmake failure
Commit: https://github.com/vim/vim/commit/f89be8de14cc9055d12f7b0f2c270a5bc09fc86c
Author: K.Takata <kentkt@csc.jp>
Date: Sat May 29 12:42:47 2021 +0200
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 https://github.com/vim/vim/issues/8281)
author | Bram Moolenaar <Bram@vim.org> |
---|---|
date | Sat, 29 May 2021 12:45:02 +0200 |
parents | 69a59cc69519 |
children | 83bd6e25d0b6 |
comparison
equal
deleted
inserted
replaced
24720:d9eba0e42630 | 24721:8a3659f78064 |
---|---|
9 sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak | 9 sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak |
10 | 10 |
11 echo "Building MSVC 64bit console Version" | 11 echo "Building MSVC 64bit console Version" |
12 nmake -f Make_mvc2.mak CPU=AMD64 ^ | 12 nmake -f Make_mvc2.mak CPU=AMD64 ^ |
13 OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^ | 13 OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^ |
14 FEATURES=%FEATURE% || exit 1 | 14 FEATURES=%FEATURE% |
15 if not exist vim.exe ( | |
16 echo Build failure. | |
17 exit 1 | |
18 ) | |
15 | 19 |
16 :: build MSVC huge version with python and channel support | 20 :: build MSVC huge version with python and channel support |
17 :: GUI needs to be last, so that testing works | 21 :: GUI needs to be last, so that testing works |
18 echo "Building MSVC 64bit GUI Version" | 22 echo "Building MSVC 64bit GUI Version" |
19 if "%FEATURE%" == "HUGE" ( | 23 if "%FEATURE%" == "HUGE" ( |
20 nmake -f Make_mvc2.mak CPU=AMD64 ^ | 24 nmake -f Make_mvc2.mak CPU=AMD64 ^ |
21 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^ | 25 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^ |
22 PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^ | 26 PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^ |
23 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^ | 27 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^ |
24 FEATURES=%FEATURE% || exit 1 | 28 FEATURES=%FEATURE% |
25 ) ELSE ( | 29 ) ELSE ( |
26 nmake -f Make_mvc2.mak CPU=AMD64 ^ | 30 nmake -f Make_mvc2.mak CPU=AMD64 ^ |
27 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^ | 31 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^ |
28 FEATURES=%FEATURE% || exit 1 | 32 FEATURES=%FEATURE% |
29 ) | 33 ) |
30 .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt | 34 if not exist gvim.exe ( |
35 echo Build failure. | |
36 exit 1 | |
37 ) | |
38 .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt || exit 1 | |
31 | 39 |
32 echo "version output MSVC console" | 40 echo "version output MSVC console" |
33 .\vim --version | 41 .\vim --version || exit 1 |
34 echo "version output MSVC GUI" | 42 echo "version output MSVC GUI" |
35 type ver_msvc.txt | 43 type ver_msvc.txt || exit 1 |
36 cd .. | 44 cd .. |