Patch 8.1.1698

[Bram Moolenaar]

Patch 8.1.1698
Problem: Appveyor build with MSVC fails.
Solution: Remove the sed command
Files: ci/appveyor.bat


*** ../vim-8.1.1697/ci/appveyor.bat 2019-02-03 13:12:20.344668681 +0100
--- ci/appveyor.bat 2019-07-15 22:01:29.703277155 +0200
***************
*** 23,39 ****
.\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

:: 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
) ELSE (
! nmake -f Make_mvc2.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

--- 23,40 ----
.\gvim -u NONE -c "redir @a | ver |0put a | wq" ver_ming.txt

echo "Building MSVC 64bit console Version"
! :: 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_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_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

*** ../vim-8.1.1697/src/version.c 2019-07-15 21:15:02.218999423 +0200
--- src/version.c 2019-07-15 22:02:53.466912558 +0200
***************
*** 779,780 ****
--- 779,782 ----
{ /* Add new patch number below this line */
+ /**/
+ 1698,
/**/

--
Shaw's Principle: Build a system that even a fool can use, and
only a fool will want to use it.

/// Bram Moolenaar -- Br...@Moolenaar.net -- http://www.Moolenaar.net \\\
/// sponsor Vim, vote for features -- http://www.Vim.org/sponsor/ \\\
\\\ an exciting new programming language -- http://www.Zimbu.org ///
\\\ help me help AIDS victims -- http://ICCF-Holland.org ///

[Bram Moolenaar]

I wrote:

> Patch 8.1.1698
> Problem: Appveyor build with MSVC fails.
> Solution: Remove the sed command
> Files: ci/appveyor.bat

This solved the problem, but now we have the ugly progress bar output
back. Can this be disabled somehow?

--
"When I die, I want a tombstone that says "GAME OVER" - Ton Richters

[Christian Brabandt]

On Mo, 15 Jul 2019, Bram Moolenaar wrote:

>
> I wrote:
>
> > Patch 8.1.1698
> > Problem: Appveyor build with MSVC fails.
> > Solution: Remove the sed command
> > Files: ci/appveyor.bat
>
> This solved the problem, but now we have the ugly progress bar output
> back. Can this be disabled somehow?

Pipe the linker output to the sed command, something like this:

sed -e '/^<</s/.*/&|sed -e "s#.\\\\r.*##"/' Make_mvc.mak > Make_mvc2.mak

However Ken just mentioned, that the sed workaround isn't needed
anymore, so I am confused whether this is still a problem?

https://github.com/vim/vim-win32-installer/pull/139/commits/7212b47f60a58531b80b2edd6c146dc1f4b9bba7

Best,
Christian
--
Der Zuschauer ist nur eine begrenzte Zeit verarschbar.
-- Oliver Kalkofe

[Ken Takata]

Hi,

2019/7/16 Tue 15:27:48 UTC+9 Christian Brabandt wrote:
> On Mo, 15 Jul 2019, Bram Moolenaar wrote:
>
> >
> > I wrote:
> >
> > > Patch 8.1.1698
> > > Problem: Appveyor build with MSVC fails.
> > > Solution: Remove the sed command
> > > Files: ci/appveyor.bat
> >
> > This solved the problem, but now we have the ugly progress bar output
> > back. Can this be disabled somehow?
>
> Pipe the linker output to the sed command, something like this:
>
> sed -e '/^<</s/.*/&|sed -e "s#.\\\\r.*##"/' Make_mvc.mak > Make_mvc2.mak

I suggest the following instead:

sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak

The sed workaround should be added just after "link @<<".

> However Ken just mentioned, that the sed workaround isn't needed
> anymore, so I am confused whether this is still a problem?
>
> https://github.com/vim/vim-win32-installer/pull/139/commits/7212b47f60a58531b80b2edd6c146dc1f4b9bba7

The progress counter is not shown on the AppVeyor's Web interface, but it
remains in the log file downloaded from AppVeyor.

Regards,
Ken Takata

[Ken Takata]

Hi,

I created a PR for this to see if this actually works:
https://github.com/vim/vim/pull/4684

Regards,
Ken Takata

[Bram Moolenaar]

Ken Takata wrote:

> 2019/7/16 Tue 15:27:48 UTC+9 Christian Brabandt wrote:
> > On Mo, 15 Jul 2019, Bram Moolenaar wrote:
> >
> > >
> > > I wrote:
> > >
> > > > Patch 8.1.1698
> > > > Problem: Appveyor build with MSVC fails.
> > > > Solution: Remove the sed command
> > > > Files: ci/appveyor.bat
> > >
> > > This solved the problem, but now we have the ugly progress bar output
> > > back. Can this be disabled somehow?
> >
> > Pipe the linker output to the sed command, something like this:
> >
> > sed -e '/^<</s/.*/&|sed -e "s#.\\\\r.*##"/' Make_mvc.mak > Make_mvc2.mak
>
> I suggest the following instead:
>
> sed -e "s/@<<$/@<< | sed -e 's#.*\\\\r.*##'/" Make_mvc.mak > Make_mvc2.mak
>
> The sed workaround should be added just after "link @<<".

Ah, that's the part I was missing.

The "link" command is supposed to only show progress with the /verbose
flag, but apparently it happens anyway and I don't see a flags for "not
verbose".

--
VOICE OVER: As the horrendous Black Beast lunged forward, escape for Arthur
and his knights seemed hopeless, when, suddenly ... the animator
suffered a fatal heart attack.
ANIMATOR: Aaaaagh!
VOICE OVER: The cartoon peril was no more ... The Quest for Holy Grail could
continue.
"Monty Python and the Holy Grail" PYTHON (MONTY) PICTURES LTD