comparison ci/appveyor.bat @ 27388:83bd6e25d0b6 v8.2.4222

patch 8.2.4222: MS-Windows: clumsy way to suppress progress on CI Commit: https://github.com/vim/vim/commit/47d1666d605998a97d3827eca4d467ad0930b284 Author: K.Takata <kentkt@csc.jp> Date: Wed Jan 26 16:20:21 2022 +0000 patch 8.2.4222: MS-Windows: clumsy way to suppress progress on CI Problem: MS-Windows: clumsy way to suppress progress on CI. Solution: Check for "$CI" in the Makefile itself. (Ken Takata, closes https://github.com/vim/vim/issues/9631)
author Bram Moolenaar <Bram@vim.org>
date Wed, 26 Jan 2022 17:30:04 +0100
parents 8a3659f78064
children 52232e3ff22f
comparison
equal deleted inserted replaced
27387:5d68d22a0d53 27388:83bd6e25d0b6
3 3
4 setlocal ENABLEDELAYEDEXPANSION 4 setlocal ENABLEDELAYEDEXPANSION
5 cd %APPVEYOR_BUILD_FOLDER% 5 cd %APPVEYOR_BUILD_FOLDER%
6 6
7 cd src 7 cd src
8 :: Filter out the progress bar from the build log
9 sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
10 8
11 echo "Building MSVC 64bit console Version" 9 echo "Building MSVC 64bit console Version"
12 nmake -f Make_mvc2.mak CPU=AMD64 ^ 10 nmake -f Make_mvc.mak CPU=AMD64 ^
13 OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^ 11 OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^
14 FEATURES=%FEATURE% 12 FEATURES=%FEATURE%
15 if not exist vim.exe ( 13 if not exist vim.exe (
16 echo Build failure. 14 echo Build failure.
17 exit 1 15 exit 1
19 17
20 :: build MSVC huge version with python and channel support 18 :: build MSVC huge version with python and channel support
21 :: GUI needs to be last, so that testing works 19 :: GUI needs to be last, so that testing works
22 echo "Building MSVC 64bit GUI Version" 20 echo "Building MSVC 64bit GUI Version"
23 if "%FEATURE%" == "HUGE" ( 21 if "%FEATURE%" == "HUGE" (
24 nmake -f Make_mvc2.mak CPU=AMD64 ^ 22 nmake -f Make_mvc.mak CPU=AMD64 ^
25 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^ 23 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
26 PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^ 24 PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
27 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^ 25 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^
28 FEATURES=%FEATURE% 26 FEATURES=%FEATURE%
29 ) ELSE ( 27 ) ELSE (
30 nmake -f Make_mvc2.mak CPU=AMD64 ^ 28 nmake -f Make_mvc.mak CPU=AMD64 ^
31 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^ 29 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
32 FEATURES=%FEATURE% 30 FEATURES=%FEATURE%
33 ) 31 )
34 if not exist gvim.exe ( 32 if not exist gvim.exe (
35 echo Build failure. 33 echo Build failure.