patch 7.4.1025
Problem: Version in installer needs to be updated manually.
Solution: Generate a file with the version number. (Guopeng Wen)
diff --git a/Makefile b/Makefile
index e13fbd8..710e59f 100644
--- a/Makefile
+++ b/Makefile
@@ -417,7 +417,9 @@
echo "set notitle noicon nocp nomodeline viminfo=" >no_title.vim
# MS-DOS sources
-dossrc: dist no_title.vim dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt
+dossrc: dist no_title.vim dist/$(COMMENT_SRC) \
+ runtime/doc/uganda.nsis.txt \
+ nsis/gvim_version.nsh
-rm -rf dist/vim$(VERSION)src.zip
-rm -rf dist/vim
mkdir dist/vim
@@ -428,6 +430,7 @@
$(SRC_AMI_DOS) \
$(SRC_DOS_UNIX) \
runtime/doc/uganda.nsis.txt \
+ nsis/gvim_version.nsh \
| (cd dist/vim/$(VIMRTDIR); tar xf -)
mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
rmdir dist/vim/$(VIMRTDIR)/runtime
@@ -441,6 +444,14 @@
runtime/doc/uganda.nsis.txt: runtime/doc/uganda.txt
cd runtime/doc && $(MAKE) uganda.nsis.txt
+nsis/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 "!endif" >> $@
+
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)