changeset 16804:9fa322a3bc31 v8.1.1404

patch 8.1.1404: cannot change the patch level when building with NSIS commit https://github.com/vim/vim/commit/9d591525a5d7a693aa47b4a87c5f53c503500c1c Author: Bram Moolenaar <Bram@vim.org> Date: Sun May 26 20:49:42 2019 +0200 patch 8.1.1404: cannot change the patch level when building with NSIS Problem: Cannot change the patch level when building with NSIS. Solution: Use $PATCHLEVEL if defined. (Christian Brabandt)
author Bram Moolenaar <Bram@vim.org>
date Sun, 26 May 2019 21:00:05 +0200
parents 2490583b9685
children 384375708770
files nsis/gvim.nsi src/version.c
diffstat 2 files changed, 9 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -47,6 +47,11 @@ Unicode true
 
 !include gvim_version.nsh	# for version number
 
+# Definition of Patch for Vim
+!ifndef PATCHLEVEL
+  !define PATCHLEVEL 0
+!endif
+
 # ----------- No configurable settings below this line -----------
 
 !include "Library.nsh"		# For DLL install
@@ -181,8 +186,8 @@ VIAddVersionKey /LANG=${LANG_ENGLISH} "C
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalTrademarks" "Vim"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "LegalCopyright" "Copyright (C) 1996"
 VIAddVersionKey /LANG=${LANG_ENGLISH} "FileDescription" "Vi Improved - A Text Editor"
-VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VER_MAJOR}.${VER_MINOR}.0.0"
-VIProductVersion "${VER_MAJOR}.${VER_MINOR}.0.0"
+VIAddVersionKey /LANG=${LANG_ENGLISH} "FileVersion" "${VER_MAJOR}.${VER_MINOR}.${PATCHLEVEL}.0"
+VIProductVersion "${VER_MAJOR}.${VER_MINOR}.${PATCHLEVEL}.0"
 
 # Global variables
 Var vim_dialog
--- a/src/version.c
+++ b/src/version.c
@@ -768,6 +768,8 @@ static char *(features[]) =
 static int included_patches[] =
 {   /* Add new patch number below this line */
 /**/
+    1404,
+/**/
     1403,
 /**/
     1402,