Skip to content

Commit 5d68445

Browse files
committed
patch 8.1.1698: Appveyor build with MSVC fails
Problem: Appveyor build with MSVC fails. Solution: Remove the sed command
1 parent c9afd15 commit 5d68445

2 files changed

Lines changed: 8 additions & 5 deletions

File tree

ci/appveyor.bat

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -23,17 +23,18 @@ if "%FEATURE%" == "HUGE" (
2323
.\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_ming.txt
2424

2525
echo "Building MSVC 64bit console Version"
26-
sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
27-
nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=no IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
28-
nmake -f Make_mvc2.mak clean
26+
:: This doesn't work with @<<
27+
:: sed -e "s/\$(LINKARGS2)/\$(LINKARGS2) | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
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
2930

3031
:: build MSVC huge version with python and channel support
3132
:: GUI needs to be last, so that testing works
3233
echo "Building MSVC 64bit GUI Version"
3334
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
3536
) 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
3738
)
3839
.\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_msvc.txt
3940

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -777,6 +777,8 @@ static char *(features[]) =
777777

778778
static int included_patches[] =
779779
{ /* Add new patch number below this line */
780+
/**/
781+
1698,
780782
/**/
781783
1697,
782784
/**/

0 commit comments

Comments
 (0)