nsis: Getting the Vim version number via makensis
Commit:
https://github.com/vim/vim/commit/fabe9a4c8828db723cbfb58df630da43eae97635
Author: RestorerZ <[email protected]>
Date: Fri Oct 3 14:12:41 2025 +0000
nsis: Getting the Vim version number via makensis
closes: https://github.com/vim/vim/issues/18470
Signed-off-by: RestorerZ <[email protected]>
Signed-off-by: Christian Brabandt <[email protected]>
diff --git a/Filelist b/Filelist
index 225eaf2b5..ae9379d1b 100644
--- a/Filelist
+++ b/Filelist
@@ -641,7 +641,6 @@ SRC_DOS = \
src/xxd/Make_mvc.mak \
nsis/auxiliary.nsh \
nsis/gvim.nsi \
- nsis/gvim_version.nsh \
nsis/Makefile \
nsis/Make_mvc.mak \
nsis/README.txt \
diff --git a/Makefile b/Makefile
index 9de75e346..c33461345 100644
--- a/Makefile
+++ b/Makefile
@@ -105,7 +105,7 @@ MINOR = 1
# - Update Vim version number. For a test version in: src/version.h,
# READMEdir/Contents, MAJOR/MINOR above, VIMMAJOR and VIMMINOR in
# src/Makefile, README.txt, README.md, src/README.md, READMEdir/README*.txt,
-# runtime/doc/*.txt and make nsis/gvim_version.nsh.
+# runtime/doc/*.txt.
# For a minor/major version: src/GvimExt/GvimExt.reg, src/vim.manifest.
# - Compile Vim with GTK, Perl, Python, Python3, TCL, Ruby, Lua, Cscope and
# "huge" features. Add MZscheme if you can make it work.
@@ -410,7 +410,7 @@ amisrc: dist prepare
mv dist/vim$(VERSION)src.tar.gz dist/vim$(VERSION)src.tgz
# MS-DOS sources
-dossrc: dist dist/$(COMMENT_SRC) license nsis/gvim_version.nsh
+dossrc: dist dist/$(COMMENT_SRC) license
-rm -rf dist/vim$(VERSION)src.zip
-rm -rf dist/vim
mkdir dist/vim
@@ -423,7 +423,6 @@ dossrc: dist dist/$(COMMENT_SRC) license
nsis/gvim_version.nsh
$(SRC_DOS_UNIX) \
lang/LICENSE.*.txt \
lang/README.*.txt \
- nsis/gvim_version.nsh \
| (cd dist/vim/$(VIMRTDIR); tar xf -)
mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
rmdir dist/vim/$(VIMRTDIR)/runtime
@@ -432,9 +431,6 @@ dossrc: dist dist/$(COMMENT_SRC) license
nsis/gvim_version.nsh
license:
cd nsis && $(MAKE) -f Makefile $@
-nsis/gvim_version.nsh: Makefile
- cd nsis && $(MAKE) -f Makefile $(@F)
-
dosrt: dist dist/$(COMMENT_RT) dosrt_files
-rm -rf dist/vim$(VERSION)rt.zip
cd dist && zip -9 -rD -z vim$(VERSION)rt.zip vim <$(COMMENT_RT)
diff --git a/nsis/Make_mvc.mak b/nsis/Make_mvc.mak
index 143b5edaa..a1f1ae4b3 100644
--- a/nsis/Make_mvc.mak
+++ b/nsis/Make_mvc.mak
@@ -1,60 +1,12 @@
#
# Makefile for MS Windows for create self-installing exe of Vim.
-# 2024鈥�05, Restorer, [email protected]
+# 2025-10-03, Restorer, [email protected]
#
# included common tools
!INCLUDE ..\src uto
make ools.mak
-# Read MAJOR and MINOR from version.h.
-!IFNDEF MAJOR
-! IF ![for /F "tokens=3" %G in \
- ('findstr /RC:"VIM_VERSION_MAJOR[ ^]*[0-9^]" ..\src ersion.h') \
- do @(echo:MAJOR=%G>> .\_major.tmp)]
-! INCLUDE .\_major.tmp
-! IF [$(RM) .\_major.tmp]
-! ENDIF
-! ELSE
-MAJOR = 9
-! ENDIF
-!ENDIF
-
-!IFNDEF MINOR
-! IF ![for /F "tokens=3" %G in \
- ('findstr /RC:"VIM_VERSION_MINOR[ ^]*[0-9^]" ..\src ersion.h') \
- do @(echo:MINOR=%G>> .\_minor.tmp)]
-! INCLUDE .\_minor.tmp
-! IF [$(RM) .\_minor.tmp]
-! ENDIF
-! ELSE
-MINOR = 1
-! ENDIF
-!ENDIF
-
-# Read PATCHLEVEL from version.c
-!IFNDEF PATCHLEVEL
-! IF ![for /F %G in \
- ('findstr /NBLC:"static int included_patches" ..\src ersion.c \
- ^| (set /p "_t=" ^& set /a _t+=2 ^)') do \
- @$(CMD) $(CMDFLAGS) "for /F "skip=%G delims=, " %H in \
- (..\src ersion.c) do (echo:PATCHLEVEL=%H> .\_patchlvl.tmp & exit /b)"]
-! INCLUDE .\_patchlvl.tmp
-! IF [$(RM) .\_patchlvl.tmp]
-! ENDIF
-! ELSE
-PATCHLEVEL = 0
-! ENDIF
-!ENDIF
-
-!IF $(PATCHLEVEL) < 10
-PATCHLEVEL = 000$(PATCHLEVEL)
-!ELSEIF $(PATCHLEVEL) < 100
-PATCHLEVEL = 00$(PATCHLEVEL)
-!ELSEIF $(PATCHLEVEL) < 1000
-PATCHLEVEL = 0$(PATCHLEVEL)
-!ENDIF
-
.SUFFIXES :
!IFDEF PROGRAMW6432
@@ -119,23 +71,13 @@ all : makeinst
makeinst : prepare
^"$(MKNSIS)" $(MKNSISFLAGS) gvim.nsi $(XX)
-prepare : unzipicons gvim_version.nsh license rename
+prepare : unzipicons license rename
unzipicons : icons.zip
@ if exist %|fF
ul $(RD) %|fF
@ $(PS) $(PSFLAGS) \
Add-Type -AssemblyName 'System.IO.Compression.FileSystem'; \
- [System.IO.Compression.ZipFile]::ExtractToDirectory(\"$**\", \
- \".\")
-
-gvim_version.nsh : Make_mvc.mak
- @ 1> $@ echo:^# Generated from Makefile: define the version numbers
- @ 1>> $@ echo:^!ifndef __GVIM_VER__NSH__
- @ 1>> $@ echo:^!define __GVIM_VER__NSH__
- @ 1>> $@ echo:^!define VER_MAJOR $(MAJOR)
- @ 1>> $@ echo:^!define VER_MINOR $(MINOR)
- @ 1>> $@ echo:^!define PATCHLEVEL $(PATCHLEVEL)
- @ 1>> $@ echo:^!endif
+ [System.IO.Compression.ZipFile]::ExtractToDirectory('$**', '.')
license : ..\lang\LICENSE.*.txt ..\LICENSE
!@ $(PS) $(PSFLAGS) \
@@ -146,7 +88,6 @@ rename :
@ .. ools
ename.bat "$(SRC)" "$(DST)" 1> nul
clean :
- @ if exist .\gvim_version.nsh $(RM) .\gvim_version.nsh
@ if exist ..\lang\LICENSE*.nsis.txt $(RM) ..\lang\LICENSE*.nsis.txt
@ if exist .\icons
ul $(RD) .\icons
@ if exist .\gvim??.exe $(RM) .\gvim??.exe
diff --git a/nsis/Makefile b/nsis/Makefile
index 890ace4ff..4b51b2ac7 100644
--- a/nsis/Makefile
+++ b/nsis/Makefile
@@ -1,6 +1,6 @@
#
# Makefile for UNIX-like for create self-installing exe of Vim.
-# 15/12/2024, Restorer [email protected]
+# 2025-10-03, Restorer, [email protected]
#
@@ -51,13 +51,6 @@ ifdef X
XX := -X"$(X:;=" -X")"
endif
-MAJOR != grep -E 'VIM_VERSION_MAJOR\s{2,}' ../src/version.h | \
- awk '{ printf "%d",$$3 }'
-MINOR != grep -E 'VIM_VERSION_MINOR\s{2,}' ../src/version.h | \
- awk '{ printf "%d",$$3 }'
-PATCH != awk '/number below this line/,/,/' ../src/version.c | \
- awk 'NR == 3 { printf "%04d",$$1 }' | sed -e 's/[ ,]//g'
-
MKNSISFLAGS := -INPUTCHARSET UTF8 $(MKNSISFLAGS)
all: makeinst
@@ -65,21 +58,12 @@ all: makeinst
makeinst: prepare
makensis $(MKNSISFLAGS) gvim.nsi $(XX)
-prepare: unzipicons gvim_version.nsh license rename
+prepare: unzipicons license rename
unzipicons: icons.zip
if test -d `basename $? .zip` ; then rm -rf `basename $? .zip` ; fi
unzip $?
-gvim_version.nsh: Makefile
- echo "# Generated from Makefile: define the version numbers" > $@
- echo "!ifndef __GVIM_VER__NSH__" >> $@
- echo "!define __GVIM_VER__NSH__" >> $@
- echo "!define VER_MAJOR $(MAJOR)" >> $@
- echo "!define VER_MINOR $(MINOR)" >> $@
- echo "!define PATCHLEVEL $(PATCH)" >> $@
- echo "!endif" >> $@
-
license: ../lang/LICENSE.*.txt ../LICENSE
for lic in $? ; do \
bn=`basename $$lic .txt` ; \
@@ -91,7 +75,6 @@ rename:
../tools/rename.bat "$(SRC)" "$(DST)"
clean:
- if test -f gvim_version.nsh ; then rm -f gvim_version.nsh ; fi
rm -f ../lang/LICENSE*.nsis.txt
if test -d icons ; then rm -rf icons ; fi
if test -f gvim??.exe ; then rm -f gvim??.exe ; fi
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index 830f86081..5cfc05122 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -73,11 +73,18 @@ Unicode true ; !include defaults to UTF-8 after Unicode
True since 3.0 Alpha 2
!define INCLUDE_LIBGCC 1
!endif
-!include .\gvim_version.nsh ; for version numbers
+# Get version numbers
+!getdllversion "${VIMSRC}\gvim_ole.exe" VimVer_
+!echo "Vim version MAJOR=${VimVer_1} MINOR=${VimVer_2} PATCHLEVEL=${VimVer_3}"
-# Definition of Patch for Vim.
+!ifndef VER_MAJOR
+ !define VER_MAJOR ${VimVer_1}
+!endif
+!ifndef VER_MINOR
+ !define VER_MINOR ${VimVer_2}
+!endif
!ifndef PATCHLEVEL
- !define PATCHLEVEL 0
+ !define PATCHLEVEL ${VimVer_3}
!endif
# ----------- No configurable settings below this line -----------
diff --git a/nsis/gvim_version.nsh b/nsis/gvim_version.nsh
deleted file mode 100644
index c59366a74..000000000
--- a/nsis/gvim_version.nsh
+++ /dev/null
@@ -1,7 +0,0 @@
-# Generated from Makefile: define the version numbers
-!ifndef __GVIM_VER__NSH__
-!define __GVIM_VER__NSH__
-!define VER_MAJOR 9
-!define VER_MINOR 1
-!define PATCHLEVEL 0
-!endif
--
--
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 visit
https://groups.google.com/d/msgid/vim_dev/E1v4gnL-009T95-JA%40256bit.org.
