Mercurial > vim

comparison ci/appveyor.bat @ 17405:8292b2dde464 v8.1.1701

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1701: Appveyor build with MSVC fails puts progress bar in log commit https://github.com/vim/vim/commit/7ce2aa01c2e78f762f68c1c8df64649d790365e2 Author: Bram Moolenaar <Bram@vim.org> Date: Tue Jul 16 20:00:11 2019 +0200 patch 8.1.1701: Appveyor build with MSVC fails puts progress bar in log Problem: Appveyor build with MSVC fails puts progress bar in log. Solution: Adjust the sed command. (Ken Takata)
author Bram Moolenaar <Bram@vim.org>
date Tue, 16 Jul 2019 20:15:06 +0200
parents 859ac3df0b1f
children 2351948e193d
comparison
equal deleted inserted replaced
17404:d7fc487f259f 17405:8292b2dde464
20 ) ELSE ( 20 ) ELSE (
21 mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 21 mingw32-make.exe -f Make_ming.mak OPTIMIZE=speed GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
22 ) 22 )
23 .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_ming.txt 23 .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_ming.txt
24 24
25 :: Filter out the progress bar from the build log
26 sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
27
25 echo "Building MSVC 64bit console Version" 28 echo "Building MSVC 64bit console Version"
26 :: This doesn't work with @<< 29 nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=no IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
27 :: sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak 30 nmake -f Make_mvc2.mak clean
28 nmake -f Make_mvc.mak CPU=AMD64 OLE=no GUI=no IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
29 nmake -f Make_mvc.mak clean
30 31
31 :: build MSVC huge version with python and channel support 32 :: build MSVC huge version with python and channel support
32 :: GUI needs to be last, so that testing works 33 :: GUI needs to be last, so that testing works
33 echo "Building MSVC 64bit GUI Version" 34 echo "Building MSVC 64bit GUI Version"
34 if "%FEATURE%" == "HUGE" ( 35 if "%FEATURE%" == "HUGE" (
35 nmake -f Make_mvc.mak DIRECTX=yes CPU=AMD64 CHANNEL=yes OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 FEATURES=%FEATURE% || exit 1 36 nmake -f Make_mvc2.mak DIRECTX=yes CPU=AMD64 CHANNEL=yes OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no PYTHON_VER=27 DYNAMIC_PYTHON=yes PYTHON=C:\Python27-x64 PYTHON3_VER=35 DYNAMIC_PYTHON3=yes PYTHON3=C:\Python35-x64 FEATURES=%FEATURE% || exit 1
36 ) ELSE ( 37 ) ELSE (
37 nmake -f Make_mvc.mak CPU=AMD64 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 38 nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
38 ) 39 )
39 .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt 40 .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt
40 41
41 :: Restore vim.exe, tests will run with this. 42 :: Restore vim.exe, tests will run with this.
42 move /Y testdir\vim.exe . 43 move /Y testdir\vim.exe .