Patch 8.2.4222
Problem: MS-Windows: clumsy way to suppress progress on CI.
Solution: Check for "$CI" in the Makefile itself. (Ken Takata, closes #9631)
Files: .github/workflows/ci.yml, ci/appveyor.bat, src/Make_mvc.mak
*** ../vim-8.2.4221/.github/workflows/ci.yml 2022-01-15 13:37:09.666956582
+0000
--- .github/workflows/ci.yml 2022-01-26 16:16:49.543014137 +0000
***************
*** 472,488 ****
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 ^
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 ^
FEATURES=${{ matrix.features }} ^
GUI=yes IME=yes ICONV=yes VIMDLL=yes
)
--- 472,486 ----
run: |
call "%VCVARSALL%" ${{ matrix.vcarch }}
cd src
if "${{ matrix.features }}"=="HUGE" (
! 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_mvc.mak ^
FEATURES=${{ matrix.features }} ^
GUI=yes IME=yes ICONV=yes VIMDLL=yes
)
*** ../vim-8.2.4221/ci/appveyor.bat 2021-05-29 11:42:43.983850833 +0100
--- ci/appveyor.bat 2022-01-26 16:16:49.543014137 +0000
***************
*** 5,15 ****
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 ^
OLE=no GUI=no IME=yes ICONV=yes DEBUG=no ^
FEATURES=%FEATURE%
if not exist vim.exe (
--- 5,13 ----
cd %APPVEYOR_BUILD_FOLDER%
cd src
echo "Building MSVC 64bit console Version"
! 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,33 ****
:: 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 ^
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 ^
OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
FEATURES=%FEATURE%
)
--- 19,31 ----
:: GUI needs to be last, so that testing works
echo "Building MSVC 64bit GUI Version"
if "%FEATURE%" == "HUGE" (
! 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_mvc.mak CPU=AMD64 ^
OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no ^
FEATURES=%FEATURE%
)
*** ../vim-8.2.4221/src/Make_mvc.mak 2022-01-26 11:16:48.659593594 +0000
--- src/Make_mvc.mak 2022-01-26 16:16:49.543014137 +0000
***************
*** 1279,1288 ****
$(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.
!ifdef NODEBUG
! if "$(OPTIMIZE)" != "SPACE"
LINKARGS1 = $(LINKARGS1) /LTCG:STATUS
! endif
!endif
--- 1279,1294 ----
$(LUA_LIB) $(MZSCHEME_LIB) $(PERL_LIB) $(PYTHON_LIB)
$(PYTHON3_LIB) $(RUBY_LIB) \
$(TCL_LIB) $(SOUND_LIB) $(NETBEANS_LIB) $(XPM_LIB) $(SOD_LIB)
$(LINK_PDB)
! # 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
*** ../vim-8.2.4221/src/version.c 2022-01-26 12:14:10.678341271 +0000
--- src/version.c 2022-01-26 16:19:08.560493539 +0000
***************
*** 752,753 ****
--- 752,755 ----
{ /* Add new patch number below this line */
+ /**/
+ 4222,
/**/
--
FROG: How you English say: I one more time, mac, I unclog my nose towards
you, sons of a window-dresser, so, you think you could out-clever us
French fellows with your silly knees-bent creeping about advancing
behaviour. (blows a raspberry) I wave my private parts at your aunties,
you brightly-coloured, mealy-templed, cranberry-smelling, electric
donkey-bottom biters.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD
/// Bram Moolenaar -- [email protected] -- http://www.Moolenaar.net \\\
/// \\\
\\\ sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/20220126162056.1633B1C091E%40moolenaar.net.
