Mercurial > vim
changeset 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 | 5d68d22a0d53 |
| children | 145e96da3f39 |
| files | .github/workflows/ci.yml ci/appveyor.bat src/Make_mvc.mak src/version.c |
| diffstat | 4 files changed, 14 insertions(+), 10 deletions(-) [+] |
line wrap: on
line diff
--- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -472,17 +472,15 @@ jobs: run: | call "%VCVARSALL%" ${{ matrix.vcarch }} 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" ( - nmake -nologo -f Make_mvc2.mak ^ + nmake -nologo -f Make_mvc.mak ^ FEATURES=${{ matrix.features }} ^ GUI=yes IME=yes ICONV=yes VIMDLL=yes ^ DYNAMIC_LUA=yes LUA=%LUA_DIR% ^ DYNAMIC_PYTHON=yes PYTHON=%PYTHON_DIR% ^ DYNAMIC_PYTHON3=yes PYTHON3=%PYTHON3_DIR% ) else ( - nmake -nologo -f Make_mvc2.mak ^ + nmake -nologo -f Make_mvc.mak ^ FEATURES=${{ matrix.features }} ^ GUI=yes IME=yes ICONV=yes VIMDLL=yes )
--- a/ci/appveyor.bat +++ b/ci/appveyor.bat @@ -5,11 +5,9 @@ setlocal ENABLEDELAYEDEXPANSION cd %APPVEYOR_BUILD_FOLDER% 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" -nmake -f Make_mvc2.mak CPU=AMD64 ^ +nmake -f Make_mvc.mak CPU=AMD64 ^ OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^ FEATURES=%FEATURE% if not exist vim.exe ( @@ -21,13 +19,13 @@ if not exist vim.exe ( :: GUI needs to be last, so that testing works echo "Building MSVC 64bit GUI Version" 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 ^ 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 ^ + nmake -f Make_mvc.mak CPU=AMD64 ^ OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^ FEATURES=%FEATURE% )
--- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -1279,10 +1279,16 @@ LINKARGS2 = $(CON_LIB) $(GUI_LIB) $(NODE $(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB) $(PYTHON3_LIB) $(RUBY_LIB) \ $(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 ! 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 +! endif ! endif !endif