Mercurial > vim

comparison ci/appveyor.bat @ 17399:859ac3df0b1f v8.1.1698

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
patch 8.1.1698: Appveyor build with MSVC fails commit https://github.com/vim/vim/commit/5d6844566a5dcb506c6d146f7e46f7e7d09220ae Author: Bram Moolenaar <Bram@vim.org> Date: Mon Jul 15 22:03:40 2019 +0200 patch 8.1.1698: Appveyor build with MSVC fails Problem: Appveyor build with MSVC fails. Solution: Remove the sed command
author Bram Moolenaar <Bram@vim.org>
date Mon, 15 Jul 2019 22:15:04 +0200
parents bec05be6858a
children 8292b2dde464
comparison
equal deleted inserted replaced
17398:2e62ba6069ff 17399:859ac3df0b1f
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 echo "Building MSVC 64bit console Version" 25 echo "Building MSVC 64bit console Version"
26 sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak 26 :: This doesn't work with @<<
27 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
28 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
29 30
30 :: build MSVC huge version with python and channel support 31 :: build MSVC huge version with python and channel support
31 :: GUI needs to be last, so that testing works 32 :: GUI needs to be last, so that testing works
32 echo "Building MSVC 64bit GUI Version" 33 echo "Building MSVC 64bit GUI Version"
33 if "%FEATURE%" == "HUGE" ( 34 if "%FEATURE%" == "HUGE" (
34 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 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
35 ) ELSE ( 36 ) ELSE (
36 nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 37 nmake -f Make_mvc.mak CPU=AMD64 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
37 ) 38 )
38 .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt 39 .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt
39 40
40 :: Restore vim.exe, tests will run with this. 41 :: Restore vim.exe, tests will run with this.
41 move /Y testdir\vim.exe . 42 move /Y testdir\vim.exe .