GitHub/vim
1
0
Fork 0
mirror of https://github.com/vim/vim synced 2025-07-16 09:12:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

patch 7.4.1025

Browse Source 
Problem:    Version in installer needs to be updated manually.
Solution:   Generate a file with the version number. (Guopeng Wen)
This commit is contained in:
Bram Moolenaar
2016-01-02 15:44:32 +01:00
parent d5c899a3f1
commit 6c7b44472f
4 changed files with 21 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
Makefile
View File

@ -417,7 +417,9 @@ no_title.vim: Makefile
echo "set notitle noicon nocp nomodeline viminfo=" >no_title.vim echo "set notitle noicon nocp nomodeline viminfo=" >no_title.vim
# MS-DOS sources # 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$(VERSION)src.zip
-rm -rf dist/vim -rm -rf dist/vim
mkdir dist/vim mkdir dist/vim
@ -428,6 +430,7 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt
$(SRC_AMI_DOS) \ $(SRC_AMI_DOS) \
$(SRC_DOS_UNIX) \ $(SRC_DOS_UNIX) \
runtime/doc/uganda.nsis.txt \ runtime/doc/uganda.nsis.txt \
nsis/gvim_version.nsh \
| (cd dist/vim/$(VIMRTDIR); tar xf -) | (cd dist/vim/$(VIMRTDIR); tar xf -)
mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR) mv dist/vim/$(VIMRTDIR)/runtime/* dist/vim/$(VIMRTDIR)
rmdir dist/vim/$(VIMRTDIR)/runtime rmdir dist/vim/$(VIMRTDIR)/runtime
@ -441,6 +444,14 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt
runtime/doc/uganda.nsis.txt: runtime/doc/uganda.txt runtime/doc/uganda.nsis.txt: runtime/doc/uganda.txt
cd runtime/doc && $(MAKE) uganda.nsis.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 dosrt: dist dist/$(COMMENT_RT) dosrt_files
-rm -rf dist/vim$(VERSION)rt.zip -rm -rf dist/vim$(VERSION)rt.zip
cd dist && zip -9 -rD -z vim$(VERSION)rt.zip vim <$(COMMENT_RT) cd dist && zip -9 -rD -z vim$(VERSION)rt.zip vim <$(COMMENT_RT)

3
nsis/gvim.nsi
View File

@ -21,8 +21,7 @@
# comment the next line if you do not want to add Native Language Support # comment the next line if you do not want to add Native Language Support
!define HAVE_NLS !define HAVE_NLS
!define VER_MAJOR 7 !include gvim_version.nsh # for version number
!define VER_MINOR 4
# ----------- No configurable settings below this line ----------- # ----------- No configurable settings below this line -----------

6
nsis/gvim_version.nsh Normal file
View File

@ -0,0 +1,6 @@
# Generated from Makefile: define the version numbers
!ifndef __GVIM_VER__NSH__
!define __GVIM_VER__NSH__
!define VER_MAJOR 7
!define VER_MINOR 4
!endif

2
src/version.c
View File

@ -741,6 +741,8 @@ static char *(features[]) =
static int included_patches[] = static int included_patches[] =
{ /* Add new patch number below this line */ { /* Add new patch number below this line */
/**/
1025,
/**/ /**/
1024, 1024,
/**/ /**/