Skip to content

Commit 7ce2aa0

Browse files
committed
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)
1 parent 250e311 commit 7ce2aa0

2 files changed

Lines changed: 9 additions & 6 deletions

File tree

ci/appveyor.bat

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

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+
2528
echo "Building MSVC 64bit console Version"
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
29+
nmake -f Make_mvc2.mak CPU=AMD64 OLE=no GUI=no IME=yes ICONV=yes DEBUG=no FEATURES=%FEATURE% || exit 1
30+
nmake -f Make_mvc2.mak clean
3031

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

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+
1701,
780782
/**/
781783
1700,
782784
/**/

0 commit comments

Comments
 (0)