From 9d591525a5d7a693aa47b4a87c5f53c503500c1c Mon Sep 17 00:00:00 2001 From: Bram Moolenaar Date: Sun, 26 May 2019 20:49:42 +0200 Subject: [PATCH] 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) --- nsis/gvim.nsi | 9 +++++++-- src/version.c | 2 ++ 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index cb2664c093..8e6f6d0d16 100644 --- 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} "CompanyName" "Vim Developers" 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 diff --git a/src/version.c b/src/version.c index 4dbff0b2e2..2b869f03df 100644 --- a/src/version.c +++ b/src/version.c @@ -767,6 +767,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ +/**/ + 1404, /**/ 1403, /**/