GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 01:01:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 8.2.4222: MS-Windows: clumsy way to suppress progress on CI

Browse Source 
Problem:    MS-Windows: clumsy way to suppress progress on CI.
Solution:   Check for "$CI" in the Makefile itself. (Ken Takata, closes #9631)
This commit is contained in:
K.Takata
2022-01-26 16:20:21 +00:00
committed by Bram Moolenaar
parent a827bf3ea8
commit 47d1666d60
4 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
.github/workflows/ci.yml vendored
View File

@ -472,17 +472,15 @@ jobs:
run: | run: |
call "%VCVARSALL%" ${{ matrix.vcarch }} call "%VCVARSALL%" ${{ matrix.vcarch }}
cd src cd src
:: Filter out the progress bar from the build log
sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
if "${{ matrix.features }}"=="HUGE" ( if "${{ matrix.features }}"=="HUGE" (
nmake -nologo -f Make_mvc2.mak ^ nmake -nologo -f Make_mvc.mak ^
FEATURES=${{ matrix.features }} ^ FEATURES=${{ matrix.features }} ^
GUI=yes IME=yes ICONV=yes VIMDLL=yes ^ GUI=yes IME=yes ICONV=yes VIMDLL=yes ^
DYNAMIC_LUA=yes LUA=%LUA_DIR% ^ DYNAMIC_LUA=yes LUA=%LUA_DIR% ^
DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^ DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^
DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR%
) else ( ) else (
nmake -nologo -f Make_mvc2.mak ^ nmake -nologo -f Make_mvc.mak ^
FEATURES=${{ matrix.features }} ^ FEATURES=${{ matrix.features }} ^
GUI=yes IME=yes ICONV=yes VIMDLL=yes GUI=yes IME=yes ICONV=yes VIMDLL=yes
) )

8
ci/appveyor.bat
View File

@ -5,11 +5,9 @@ setlocal ENABLEDELAYEDEXPANSION
cd %APPVEYOR_BUILD_FOLDER% cd %APPVEYOR_BUILD_FOLDER%
cd src cd src
:: Filter out the progress bar from the build log
sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
echo "Building MSVC 64bit console Version" echo "Building MSVC 64bit console Version"
nmake -f Make_mvc2.mak CPU=AMD64 ^ nmake -f Make_mvc.mak CPU=AMD64 ^
OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^ OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^
FEATURES=%FEATURE% FEATURES=%FEATURE%
if not exist vim.exe ( if not exist vim.exe (
@ -21,13 +19,13 @@ if not exist vim.exe (
:: GUI needs to be last, so that testing works :: GUI needs to be last, so that testing works
echo "Building MSVC 64bit GUI Version" echo "Building MSVC 64bit GUI Version"
if "%FEATURE%" == "HUGE" ( if "%FEATURE%" == "HUGE" (
nmake -f Make_mvc2.mak CPU=AMD64 ^ nmake -f Make_mvc.mak CPU=AMD64 ^
OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^ OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no POSTSCRIPT=yes ^
PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^ PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 ^
PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^ PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 ^
FEATURES=%FEATURE% FEATURES=%FEATURE%
) ELSE ( ) ELSE (
nmake -f Make_mvc2.mak CPU=AMD64 ^ nmake -f Make_mvc.mak CPU=AMD64 ^
OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^ OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
FEATURES=%FEATURE% FEATURES=%FEATURE%
) )

8
src/Make_mvc.mak
View File

@ -1279,10 +1279,16 @@ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODEFAULTLIB) $(LIBC) $(OLE_LIB) \
$(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \ $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \
$(TCL_LIB) $(SOUND_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(SOD_LIB) $(LINK_PDB) $(TCL_LIB) $(SOUND_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(SOD_LIB) $(LINK_PDB)
# Report link time code generation progress if used. # Enable link time code generation if needed.
!ifdef NODEBUG !ifdef NODEBUG
! if "$(OPTIMIZE)" != "SPACE" ! if "$(OPTIMIZE)" != "SPACE"
! if "$(CI)" == "true" || "$(CI)" == "True"
# Enable link time code generation, but do not show the progress.
LINKARGS1 = $(LINKARGS1) /LTCG
! else
# Report link time code generation progress.
LINKARGS1 = $(LINKARGS1) /LTCG:STATUS LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
! endif
! endif ! endif
!endif !endif

2
src/version.c
View File

@ -750,6 +750,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
4222,
/**/ /**/
4221, 4221,
/**/ /**/