Skip to content

Commit 81b07b5

Browse files
committed
patch 8.0.1197: MS-Windows build instructions are not up to date
Problem: MS-Windows build instructions are not up to date. Solution: Adjust the instructions. Fix the nsis script.
1 parent a20f83d commit 81b07b5

3 files changed

Lines changed: 7 additions & 3 deletions

File tree

Makefile

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -131,6 +131,7 @@ MINOR = 0
131131
# - > make dossrc
132132
# > make dosrt
133133
# Unpack dist/vim##rt.zip and dist/vim##src.zip on an MS-Windows PC.
134+
# This creates the directory vim/vim80 and puts all files in there.
134135
# Win32 console version build:
135136
# - See src/INSTALLpc.txt for installing the compiler and SDK.
136137
# - Set environment for Visual C++ 2015:
@@ -186,8 +187,9 @@ MINOR = 0
186187
# gvimext64.dll in src/GvimExt
187188
# VisVim.dll in src/VisVim
188189
# Note: VisVim needs to be build with MSVC 5, newer versions don't work.
189-
# gvimext64.dll can be obtained from http://code.google.com/p/vim-win3264/
190-
# It is part of vim72.zip as vim72/gvimext.dll.
190+
# gvimext64.dll can be obtained from:
191+
# https://github.com/vim/vim-win32-installer/releases
192+
# It is part of gvim_8.0.*_x64.zip as vim/vim80/GvimExt/gvimext64.dll.
191193
# - Make sure there is a diff.exe two levels up (get it from a previous Vim
192194
# version). Also put winpty32.dll and winpty-agent.exe there.
193195
# - go to ../nsis and do:

nsis/gvim.nsi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -351,7 +351,7 @@ Section "Add an Edit-with-Vim context menu entry"
351351
# Can't copy gvimext.dll, create it under another name and rename it
352352
# on next reboot.
353353
GetTempFileName $3 $0\GvimExt64
354-
File /oname=$3 ${VIMSRC}\GvimExt64\gvimext.dll
354+
File /oname=$3 ${VIMSRC}\GvimExt\gvimext64.dll
355355
Rename /REBOOTOK $3 $0\GvimExt64\gvimext.dll
356356
!ifdef HAVE_NLS
357357
GetTempFileName $3 $0\GvimExt64

src/version.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -761,6 +761,8 @@ static char *(features[]) =
761761

762762
static int included_patches[] =
763763
{ /* Add new patch number below this line */
764+
/**/
765+
1197,
764766
/**/
765767
1196,
766768
/**/

0 commit comments

Comments
 (0)