patch 9.1.0659: MS-Windows: MSVC Makefile is a bit hard to read
Commit:
https://github.com/vim/vim/commit/2708afa640907ad8ace2351c35d5c5a411dc97da
Author: Ken Takata <ken...@csc.jp>
Date: Sun Aug 4 18:31:48 2024 +0200
patch 9.1.0659: MS-Windows: MSVC Makefile is a bit hard to read
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 <ken...@csc.jp>
Signed-off-by: Christian Brabandt <c...@256bit.org>
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 65a8798a9..296d49e8d 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 a1e9e538b..ef2f542e5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -704,6 +704,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
+/**/
+ 659,
/**/
658,
/**/
--
--
You received this message from the "vim_dev" maillist.
Do not top-post! Type your reply below the text you are replying to.
For more information, visit http://www.vim.org/maillist.php
---
You received this message because you are subscribed to the Google Groups
"vim_dev" group.
To unsubscribe from this group and stop receiving emails from it, send an email
to vim_dev+unsubscr...@googlegroups.com.
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1saeLz-00EqAu-Kg%40256bit.org.
