To: vim_dev@googlegroups.com Subject: Patch 8.2.1017 Fcc: outbox From: Bram Moolenaar Mime-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit ------------ Patch 8.2.1017 Problem: Appveyor output doesn't show MinGW console features. Solution: List the features of the console build. Files: ci/appveyor.bat *** ../vim-8.2.1016/ci/appveyor.bat 2019-07-16 20:00:02.000000000 +0200 --- ci/appveyor.bat 2020-06-19 22:25:57.735614748 +0200 *************** *** 8,13 **** --- 8,14 ---- echo "Building MinGW 32bit console version" set PATH=c:\msys64\mingw32\bin;%PATH% mingw32-make.exe -f Make_ming.mak GUI=no OPTIMIZE=speed IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 + .\vim -u NONE -c "redir @a | ver |0put a | wq" ver_ming.txt :: Save vim.exe before Make clean, moved back below. copy vim.exe testdir mingw32-make.exe -f Make_ming.mak clean *************** *** 20,32 **** ) ELSE ( mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 ) ! .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_ming.txt :: 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% || exit 1 nmake -f Make_mvc2.mak clean :: build MSVC huge version with python and channel support --- 21,34 ---- ) ELSE ( mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 ) ! .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_ming_gui.txt :: 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% || exit 1 + :: The executable is not used nmake -f Make_mvc2.mak clean :: build MSVC huge version with python and channel support *************** *** 43,48 **** --- 45,52 ---- move /Y testdir\vim.exe . echo "version output MinGW" type ver_ming.txt + echo "version output MinGW GUI" + type ver_ming_gui.txt echo "version output MVC" type ver_msvc.txt cd .. *** ../vim-8.2.1016/src/version.c 2020-06-19 22:35:40.577992141 +0200 --- src/version.c 2020-06-19 22:36:46.689798329 +0200 *************** *** 756,757 **** --- 756,759 ---- { /* Add new patch number below this line */ + /**/ + 1017, /**/ -- Save the plankton - eat a whale. /// Bram Moolenaar -- Bram@Moolenaar.net -- http://www.Moolenaar.net \\\ /// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\ \\\ an exciting new programming language -- http://www.Zimbu.org /// \\\ help me help AIDS victims -- http://ICCF-Holland.org ///