diff options
| author | Bram Moolenaar <Bram@vim.org> | 2019-07-15 22:03:40 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2019-07-15 22:03:40 +0200 |
| commit | 5d6844566a5dcb506c6d146f7e46f7e7d09220ae (patch) | |
| tree | 6b41418b3c901fa2bd166746e13cd5418221bc12 | |
| parent | c9afd15bc8c123e9066258e6edf2f806855d230b (diff) | |
| download | vim-git-5d6844566a5dcb506c6d146f7e46f7e7d09220ae.tar.gz | |
patch 8.1.1698: Appveyor build with MSVC failsv8.1.1698
Problem: Appveyor build with MSVC fails.
Solution: Remove the sed command
| -rw-r--r-- | ci/appveyor.bat | 11 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 8 insertions, 5 deletions
diff --git a/ci/appveyor.bat b/ci/appveyor.bat index f64a05ef2..5e86c4f2c 100644 --- a/ci/appveyor.bat +++ b/ci/appveyor.bat @@ -23,17 +23,18 @@ if "%FEATURE%" == "HUGE" ( .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_ming.txt echo "Building MSVC 64bit console Version" -sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak -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 +:: This doesn't work with @<< +:: sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak +nmake -f Make_mvc.mak CPU=AMD64 OLE=no GUI=no IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 +nmake -f Make_mvc.mak clean :: build MSVC huge version with python and channel support :: GUI needs to be last, so that testing works echo "Building MSVC 64bit GUI Version" if "%FEATURE%" == "HUGE" ( - 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 + 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 ) ELSE ( - nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 + nmake -f Make_mvc.mak CPU=AMD64 OLE=no GUI=yes IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1 ) .\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt diff --git a/src/version.c b/src/version.c index 7d8f70092..f6fed499b 100644 --- a/src/version.c +++ b/src/version.c @@ -778,6 +778,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1698, +/**/ 1697, /**/ 1696, |