patch 9.1.0637: MS-Windows: Style issues in MSVC Makefile
Commit:
https://github.com/vim/vim/commit/81a65000c5b478cbf88397f0ffd7f8833a9babe1
Author: Ken Takata <[email protected]>
Date: Mon Jul 29 19:52:03 2024 +0200
patch 9.1.0637: MS-Windows: Style issues in MSVC Makefile
Problem: MS-Windows: Style issues in MSVC Makefile
Solution: Fix style issues, simplify logic
(Ken Takata)
* Add space around the operators for consistency.
* Remove unnecessary ren command. Use the /Fe option to create
install.exe directly.
* Remove unnecessary mkdir auto command. src/auto should always exist.
closes: #15389
Signed-off-by: Ken Takata <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/src/Make_mvc.mak b/src/Make_mvc.mak
index 3454a20fc..c90ec4baa 100644
--- a/src/Make_mvc.mak
+++ b/src/Make_mvc.mak
@@ -157,10 +157,10 @@
# you can set DEFINES on the command line, e.g.,
# nmake -f Make_mvc.mvc "DEFINES=-DEMACS_TAGS"
-RM= del /f /q
-PS= powershell.exe
+RM = del /f /q
+PS = powershell.exe
-PSFLAGS= -NoLogo -NoProfile -Command
+PSFLAGS = -NoLogo -NoProfile -Command
!IF ![$(PS) $(PSFLAGS) try{Out-File -FilePath '.\major.tmp' -InputObject \
\"MAJOR=$$(((Select-String -Pattern 'VIM_VERSION_MAJOR\s+\d{1,2}' \
@@ -171,7 +171,7 @@ PSFLAGS= -NoLogo -NoProfile -Command
! ENDIF
!ELSE
# Change this value for the new version
-MAJOR= 9
+MAJOR = 9
!ENDIF
!IF ![$(PS) $(PSFLAGS) try{Out-File -FilePath '.\minor.tmp' -InputObject \
@@ -183,7 +183,7 @@ MAJOR= 9
! ENDIF
!ELSE
# Change this value for the new version
-MINOR= 1
+MINOR = 1
!ENDIF
!IF ![$(PS) $(PSFLAGS) try{Out-File -FilePath '.\patchlvl.tmp' -InputObject \
@@ -202,7 +202,7 @@ MINOR= 1
TARGETOS = WINNT
!IFDEF PATCHLEVEL
-RCFLAGS= -DVIM_VERSION_PATCHLEVEL=$(PATCHLEVEL)
+RCFLAGS = -DVIM_VERSION_PATCHLEVEL=$(PATCHLEVEL)
!ENDIF
@@ -260,7 +260,7 @@ OBJDIR = $(OBJDIR)d
!ifdef PROCESSOR_ARCHITECTURE
# We're on Windows NT or using VC 6+
! ifdef CPU
-ASSEMBLY_ARCHITECTURE=$(CPU)
+ASSEMBLY_ARCHITECTURE = $(CPU)
# Using I386 for $ASSEMBLY_ARCHITECTURE doesn't work for VC7.
! if "$(CPU)" == "I386"
CPU = i386
@@ -288,7 +288,7 @@ CPU = ARM64
# We're on Windows 95
CPU = i386
!endif # !PROCESSOR_ARCHITECTURE
-ASSEMBLY_ARCHITECTURE=$(CPU)
+ASSEMBLY_ARCHITECTURE = $(CPU)
OBJDIR = $(OBJDIR)$(CPU)
# Build a retail version by default
@@ -355,7 +355,7 @@ WINVER = 0x0601
# Use multiprocess build
USE_MP = yes
-!if "$(FEATURES)"==""
+!if "$(FEATURES)" == ""
FEATURES = HUGE
!endif
@@ -374,7 +374,7 @@ CSCOPE_DEFS = -DFEAT_CSCOPE
!endif
!ifndef TERMINAL
-! if "$(FEATURES)"=="HUGE"
+! if "$(FEATURES)" == "HUGE"
TERMINAL = yes
! else
TERMINAL = no
@@ -403,7 +403,7 @@ TERM_DEPS = \
!endif
!ifndef SOUND
-! if "$(FEATURES)"=="HUGE"
+! if "$(FEATURES)" == "HUGE"
SOUND = yes
! else
SOUND = no
@@ -444,7 +444,7 @@ NETBEANS = $(GUI)
!endif
!ifndef CHANNEL
-! if "$(FEATURES)"=="HUGE" || "$(TERMINAL)"=="yes"
+! if "$(FEATURES)" == "HUGE" || "$(TERMINAL)" == "yes"
CHANNEL = yes
! else
CHANNEL = $(GUI)
@@ -549,8 +549,8 @@ CFLAGS = -c /W3 /GF /nologo -I. -Iproto -DHAVE_PATHDEF
-DWIN32 -DHAVE_STDINT_H \
DEL_TREE = rmdir /s /q
-INTDIR=$(OBJDIR)
-OUTDIR=$(OBJDIR)
+INTDIR = $(OBJDIR)
+OUTDIR = $(OBJDIR)
### Validate CPUNR
!ifndef CPUNR
@@ -960,11 +960,9 @@ LUA_LIB = "$(LUA)\lib\lua$(LUA_VER).lib"
! endif
!endif
-!ifdef PYTHON
-! ifdef PYTHON3
-DYNAMIC_PYTHON=yes
-DYNAMIC_PYTHON3=yes
-! endif
+!if defined(PYTHON) && defined(PYTHON3)
+DYNAMIC_PYTHON = yes
+DYNAMIC_PYTHON3 = yes
!endif
# PYTHON interface
@@ -1029,13 +1027,13 @@ PYTHON3_LIB = "$(PYTHON3)\libs\$(PYTHON3_NAME).lib"
MZSCHEME_VER = 3m_a0solc
! endif
! ifndef MZSCHEME_COLLECTS
-MZSCHEME_COLLECTS=$(MZSCHEME)
--
--
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 [email protected].
To view this discussion on the web visit
https://groups.google.com/d/msgid/vim_dev/E1sYUfI-001lnS-0O%40256bit.org.
