diff options
| author | Bram Moolenaar <Bram@vim.org> | 2016-01-02 15:44:32 +0100 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2016-01-02 15:44:32 +0100 |
| commit | 6c7b44472f7055c78d996e1b626bd2932502212f (patch) | |
| tree | d7586b7336c2435485155488db9226597d7a36db | |
| parent | d5c899a3f1d67a220e571dadf90dde1bbd41e166 (diff) | |
patch 7.4.1025v7.4.1025
Problem: Version in installer needs to be updated manually.
Solution: Generate a file with the version number. (Guopeng Wen)
| -rw-r--r-- | Makefile | 13 | ||||
| -rw-r--r-- | nsis/gvim.nsi | 3 | ||||
| -rw-r--r-- | nsis/gvim_version.nsh | 6 | ||||
| -rw-r--r-- | src/version.c | 2 |
4 files changed, 21 insertions, 3 deletions
@@ -417,7 +417,9 @@ no_title.vim: Makefile 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 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt $(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 @@ dossrc: dist no_title.vim dist/$(COMMENT_SRC) runtime/doc/uganda.nsis.txt 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) diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index a2d20bf829..7c8d4ba878 100644 --- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -21,8 +21,7 @@ # comment the next line if you do not want to add Native Language Support !define HAVE_NLS -!define VER_MAJOR 7 -!define VER_MINOR 4 +!include gvim_version.nsh # for version number # ----------- No configurable settings below this line ----------- diff --git a/nsis/gvim_version.nsh b/nsis/gvim_version.nsh new file mode 100644 index 0000000000..d2edbc72de --- /dev/null +++ b/nsis/gvim_version.nsh @@ -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 diff --git a/src/version.c b/src/version.c index 2dbd6e9a5f..aaba442482 100644 --- a/src/version.c +++ b/src/version.c @@ -742,6 +742,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1025, +/**/ 1024, /**/ 1023, |