diff options
| author | Ken Takata <kentkt@csc.jp> | 2024-08-04 18:31:48 +0200 |
|---|---|---|
| committer | Christian Brabandt <cb@256bit.org> | 2024-08-04 18:31:48 +0200 |
| commit | 2708afa640907ad8ace2351c35d5c5a411dc97da (patch) | |
| tree | 3b3884ed5b626de7c7777f4f6418b4f1573d4de6 | |
| parent | 947f752a47b107529b5d591e4e24b51237c20497 (diff) | |
patch 9.1.0659: MS-Windows: MSVC Makefile is a bit hard to readv9.1.0659
Problem: MS-Windows: MSVC Makefile is a bit hard to read
(after v9.1.0657)
Solution: indent the if/else statements to improve readability
(Ken Takata)
closes: #15428
Signed-off-by: Ken Takata <kentkt@csc.jp>
Signed-off-by: Christian Brabandt <cb@256bit.org>
| -rw-r--r-- | src/Make_mvc.mak | 21 | ||||
| -rw-r--r-- | src/version.c | 2 |
2 files changed, 16 insertions, 7 deletions
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak index 65a8798a99..296d49e8d3 100644 --- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -166,8 +166,11 @@ RM = del /f /q # Read MAJOR and MINOR from version.h. !IF ![for /f "tokens=2,3" %I in (version.h) do \ - @if "%I"=="VIM_VERSION_MAJOR" ( echo MAJOR=%J>.\major.tmp ) \ - else if "%I"=="VIM_VERSION_MINOR" ( echo MINOR=%J>.\minor.tmp )] + @if "%I"=="VIM_VERSION_MAJOR" ( \ + echo MAJOR=%J> .\major.tmp \ + ) else if "%I"=="VIM_VERSION_MINOR" ( \ + echo MINOR=%J> .\minor.tmp && exit \ + )] !ENDIF !IF EXIST(.\major.tmp) @@ -189,11 +192,15 @@ MINOR = 1 !ENDIF # Read PATCHLEVEL from version.c. -!IF ![cmd.exe /V:ON /C "echo off && set LINE=0&& set FIND=0&& \ - for /f "tokens=1,3 delims=,[ " %I in (version.c) do \ - ( set /A LINE+=1 > NUL && \ - if "%J"=="included_patches" ( set /A FIND=LINE+3 > NUL ) \ - else if "!LINE!"=="!FIND!" ( echo PATCHLEVEL=%I>.\patchlvl.tmp && exit ) )"] +!IF ![cmd.exe /V:ON /Q /C "set LINE=0&& set FIND=0&& \ + for /f "tokens=1,3 delims=, " %I in (version.c) do ( \ + set /A LINE+=1 > NUL && \ + if "%J"=="included_patches[^]" ( \ + set /A FIND=LINE+3 > NUL \ + ) else if "!LINE!"=="!FIND!" ( \ + echo PATCHLEVEL=%I> .\patchlvl.tmp && exit \ + ) \ + )"] !ENDIF !IF EXIST(.\patchlvl.tmp) ! INCLUDE .\patchlvl.tmp diff --git a/src/version.c b/src/version.c index a1e9e538b5..ef2f542e51 100644 --- a/src/version.c +++ b/src/version.c @@ -705,6 +705,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 659, +/**/ 658, /**/ 657, |