summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBram Moolenaar <Bram@vim.org>2017-08-19 13:29:19 +0200
committerBram Moolenaar <Bram@vim.org>2017-08-19 13:29:19 +0200
commit98ebd2bbec3443878dd0ed772ab67efb618f2fad (patch)
treeeff4a86c7412237b9a65eab6f4ad9897ce061c12
parent8e539c51c31461fc602071373bdff9edd1aed25f (diff)
patch 8.0.0961: the script to build the installer does not include winptyv8.0.0961
Problem: The script to build the installer does not include winpty. Solution: Add winpty32.dll and winpty-agent.exe like diff.exe
-rw-r--r--nsis/gvim.nsi5
-rw-r--r--src/version.c2
2 files changed, 6 insertions, 1 deletions
diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi
index dba9021b0d..b424392728 100644
--- a/nsis/gvim.nsi
+++ b/nsis/gvim.nsi
@@ -191,13 +191,16 @@ Section "Vim executables and runtime files"
File ${VIMSRC}\vimrun.exe
File /oname=tee.exe ${VIMSRC}\teew32.exe
File /oname=xxd.exe ${VIMSRC}\xxdw32.exe
- File ${VIMTOOLS}\diff.exe
File ${VIMRT}\vimtutor.bat
File ${VIMRT}\README.txt
File ..\uninstal.txt
File ${VIMRT}\*.vim
File ${VIMRT}\rgb.txt
+ File ${VIMTOOLS}\diff.exe
+ File ${VIMTOOLS}\winpty32.dll
+ File ${VIMTOOLS}\winpty-agent.exe
+
SetOutPath $0\colors
File ${VIMRT}\colors\*.*
diff --git a/src/version.c b/src/version.c
index a424c6aefd..a25bbadcb5 100644
--- a/src/version.c
+++ b/src/version.c
@@ -770,6 +770,8 @@ static char *(features[]) =
static int included_patches[] =
{ /* Add new patch number below this line */
/**/
+ 961,
+/**/
960,
/**/
959,