Mercurial > vim
changeset 35041:e671080ef0e2 v9.1.0370
patch 9.1.0370: MS-Windows: patch number is zero in installer
Commit: https://github.com/vim/vim/commit/ec67ee09d2f04804a14408e035faec9fe06b19b8
Author: RestorerZ <restorer@mail2k.ru>
Date: Thu Apr 25 21:25:19 2024 +0200
patch 9.1.0370: MS-Windows: patch number is zero in installer
Problem: MS-Windows: patch number is zero in installer
(jonathan-b-wiebe)
Solution: Set VIM_VERSION_PATCHLEVEL, fix a few typos in the installer
(RestorerZ)
fixes: #14629
closes: #14635
Signed-off-by: RestorerZ <restorer@mail2k.ru>
Signed-off-by: Christian Brabandt <cb@256bit.org>
author | Christian Brabandt <cb@256bit.org> |
---|---|
date | Thu, 25 Apr 2024 21:30:11 +0200 |
parents | 83145acef2df |
children | efef66876fb4 |
files | nsis/gvim.nsi src/Make_mvc.mak src/dosinst.c src/version.c |
diffstat | 4 files changed, 8 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -225,7 +225,7 @@ Page custom SetCustom ValidateCustom # Version resources VIAddVersionKey /LANG=${LANG_ENGLISH} "ProductName" "Vim" -VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "Vim Developers" +VIAddVersionKey /LANG=${LANG_ENGLISH} "CompanyName" "The Vim Project" VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Vim" VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (C) 1996" VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Vi Improved - A Text Editor"
--- a/src/Make_mvc.mak +++ b/src/Make_mvc.mak @@ -1321,6 +1321,10 @@ all: $(MAIN_TARGET) \ CFLAGS_INST = /nologo /O2 -DNDEBUG -DWIN32 -DWINVER=$(WINVER) -D_WIN32_WINNT=$(WINVER) $(CFLAGS_DEPR) +!IFDEF PATCHLEVEL +CFLAGS_INST= $(CFLAGS_INST) -DVIM_VERSION_PATCHLEVEL=$(PATCHLEVEL) +!ENDIF + install.exe: dosinst.c dosinst.h version.h $(CC) $(CFLAGS_INST) dosinst.c kernel32.lib shell32.lib \ user32.lib ole32.lib advapi32.lib uuid.lib \