diff options
| author | Bram Moolenaar <Bram@vim.org> | 2017-10-15 21:43:21 +0200 |
|---|---|---|
| committer | Bram Moolenaar <Bram@vim.org> | 2017-10-15 21:43:21 +0200 |
| commit | 81b07b527e8b9c35d12fd45b63885d6938564723 (patch) | |
| tree | c2a6b826ade36fd9c23230998c6e956ee00f4134 | |
| parent | a20f83df1d646a2d296af835ba1154f09986f102 (diff) | |
| download | vim-git-81b07b527e8b9c35d12fd45b63885d6938564723.tar.gz | |
patch 8.0.1197: MS-Windows build instructions are not up to datev8.0.1197
Problem: MS-Windows build instructions are not up to date.
Solution: Adjust the instructions. Fix the nsis script.
| -rw-r--r-- | Makefile | 6 | ||||
| -rw-r--r-- | nsis/gvim.nsi | 2 | ||||
| -rw-r--r-- | src/version.c | 2 |
3 files changed, 7 insertions, 3 deletions
@@ -131,6 +131,7 @@ MINOR = 0 # - > make dossrc # > make dosrt # Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC. +# This creates the directory vim/vim80 and puts all files in there. # Win32 console version build: # - See src/INSTALLpc.txt for installing the compiler and SDK. # - Set environment for Visual C++ 2015: @@ -186,8 +187,9 @@ MINOR = 0 # gvimext64.dll in src/GvimExt # VisVim.dll in src/VisVim # Note: VisVim needs to be build with MSVC 5, newer versions don't work. -# gvimext64.dll can be obtained from http://code.google.com/p/vim-win3264/ -# It is part of vim72.zip as vim72/gvimext.dll. +# gvimext64.dll can be obtained from: +# https://github.com/vim/vim-win32-installer/releases +# It is part of gvim_8.0.*_x64.zip as vim/vim80/GvimExt/gvimext64.dll. # - Make sure there is a diff.exe two levels up (get it from a previous Vim # version). Also put winpty32.dll and winpty-agent.exe there. # - go to ../nsis and do: diff --git a/nsis/gvim.nsi b/nsis/gvim.nsi index 1c548b3bc..8447d5ffe 100644 --- a/nsis/gvim.nsi +++ b/nsis/gvim.nsi @@ -351,7 +351,7 @@ Section "Add an Edit-with-Vim context menu entry" # Can't copy gvimext.dll, create it under another name and rename it # on next reboot. GetTempFileName $3 $0\GvimExt64 - File /oname=$3 ${VIMSRC}\GvimExt64\gvimext.dll + File /oname=$3 ${VIMSRC}\GvimExt\gvimext64.dll Rename /REBOOTOK $3 $0\GvimExt64\gvimext.dll !ifdef HAVE_NLS GetTempFileName $3 $0\GvimExt64 diff --git a/src/version.c b/src/version.c index 0fcc596e7..2115ead38 100644 --- a/src/version.c +++ b/src/version.c @@ -762,6 +762,8 @@ static char *(features[]) = static int included_patches[] = { /* Add new patch number below this line */ /**/ + 1197, +/**/ 1196, /**/ 1195, |